From eb76b4161aab7a251e447d61b24349d2a4c335d3 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Thu, 8 Dec 2016 09:06:04 +0530 Subject: [PATCH 001/110] Task Schedule issue resolved --- .../workzone/orchestration/popups/newTask.html | 6 +++--- .../workzone/orchestration/popups/newTaskCtrl.js | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index fb1d95101..49f7313a8 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -298,7 +298,7 @@
Chef Server Details for - RLChefServer
@@ -387,7 +387,7 @@
Jenkins
@@ -531,7 +531,7 @@
Script Details
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js index 319a81705..20869689f 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js @@ -241,8 +241,12 @@ } }, selectTaskCheckbox: function(){ - $scope.showAddTask = true; $scope.isEventAvailable = false; + if($scope._isEventSelected.flag) { + $scope.showAddTask = true; + } else { + $scope.showAddTask = false; + } }, addTaskEvent : function() { $modal.open({ @@ -268,7 +272,7 @@ selectedDayOfTheMonth = $scope.chefJenkScriptTaskObj.selectedDayOfTheMonth; selectedMonth = $scope.chefJenkScriptTaskObj.monthOfYear; $scope.type = 'edit'; - $scope._isEventSelected = true; + //$scope._isEventSelected = true; $scope.repeatPattern = 'Repeat Every -' + $scope.chefJenkScriptTaskObj.repeats; $scope.cronDetails = { @@ -493,6 +497,9 @@ $scope.isExecution = { flag: 'PARALLEL' }; + $scope._isEventSelected = { + flag: false + }; /*in backend at the time of edit of task the jobResultUrlPattern was going as null. So there was in issue with the links disappearing.*/ $scope.jobResultURLPattern = []; From 44aeb075f58f2b2dd7790250d3bd302c5925b3e4 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Thu, 15 Dec 2016 16:42:28 +0530 Subject: [PATCH 002/110] New changes for Bots --- client/cat3/main.html | 2 +- .../bots/controller/botExecutionLogsCtrl.js | 24 + .../dashboard/bots/controller/chefLogCtrl.js | 244 ++++++++ .../bots/controller/editParamsCtrl.js | 101 +++- .../bots/controller/jenkinsLogCtrl.js | 94 ++++ .../dashboard/bots/controller/libraryCtrl.js | 523 ++++++++++++++---- .../dashboard/bots/view/botExecutionLogs.html | 35 ++ .../dashboard/bots/view/botHistory.html | 44 ++ .../sections/dashboard/bots/view/botInfo.html | 12 +- .../sections/dashboard/bots/view/chefLog.html | 30 + .../dashboard/bots/view/jenkinsLog.html | 6 + .../sections/dashboard/bots/view/library.html | 5 +- .../sections/dashboard/genericServices.js | 20 +- .../blueprint/popups/blueprintLaunchCtrl.js | 7 +- .../popups/blueprintLaunchParamsCtrl.js | 21 +- .../orchestration/orchestrationCtrl.js | 2 + server/app/model/bots/bots.js | 2 +- server/app/routes/v1.0/routes_bots.js | 2 + server/app/services/blueprintService.js | 2 +- server/app/services/botsService.js | 8 +- server/app/services/taskService.js | 2 +- 21 files changed, 1022 insertions(+), 164 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/jenkinsLogCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/chefLog.html create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/jenkinsLog.html diff --git a/client/cat3/main.html b/client/cat3/main.html index da9406da0..95f0d02cc 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -111,9 +111,9 @@ - + diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js new file mode 100644 index 000000000..6748b5692 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js @@ -0,0 +1,24 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Aug 2015 + */ + +(function (angular) { + "use strict"; + angular.module('dashboard.bots') + .controller('botExecutionLogsCtrl', ['$q', '$scope', '$timeout', 'items', function ($q, $scope, $timeout, items) { + console.log(items); + $scope.parentItemDetail=items; + var botExecLogCtrl={}; + botExecLogCtrl.taskLogType=items.taskType; + botExecLogCtrl.cancelAll=function(){ + $scope.$broadcast ('closeWindow'); + $modalInstance.dismiss('cancel'); + return $scope.close; + }; + return botExecLogCtrl; + } + ]); +})(angular); diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js new file mode 100644 index 000000000..c92bb6ed2 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js @@ -0,0 +1,244 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Aug 2015 + */ + +(function (angular) { + "use strict"; + angular.module('dashboard.bots') + .controller('chefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting) { + /*This controller can be invoked from either of two flows - Chef Log History Item Logs OR Chef Task Execute + items object will contain only taskId and historyId. */ + //var items = $scope.parentItemDetail; + $scope.isInstanceListLoading = true; + angular.extend($scope, { + logListInitial: [], + logListDelta: [], + cancel: function () { + helper.stopPolling(); + } + }); + // broadcast the cancel function to the parent controller + $scope.$on('closeWindow', function() { + $scope.$parent.close = $scope.cancel(); + }); + var chefLogData = { + chefHistoryItem: {}, + nodeIdsWithActionLog: {} + }; + var timerObject; + var helper = { + lastTimeStamp: '', + getlastTimeStamp: function (logObj) { + if (logObj instanceof Array && logObj.length) { + var lastTime = logObj[logObj.length - 1].timestamp; + return lastTime; + } + }, + scrollBottom : function () { + $timeout(function () { + var elm = angular.element(".logsArea"); + elm.scrollTop(elm[0].scrollHeight); + }, 100); + }, + /*logsPolling: function () { + timerObject = $timeout(function () { + workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, helper.lastTimeStamp).then(function (resp) { + if (resp.data.length) { + var logData = { + logs: resp.data, + fullLogs: false + }; + helper.lastTimeStamp = helper.getlastTimeStamp(logData.logs); + $scope.logListDelta.push.apply($scope.logListDelta, logData.logs); + helper.scrollBottom(); + } + helper.logsPolling(); + }); + }, orchestrationSetting.orchestrationLogsPollerInterval); + },*/ + stopPolling: function () { + $timeout.cancel(timerObject); + } + }; + var selectFirstInstance = function (firstInstance) { + $scope.selectedInstance = firstInstance; + chefLogData.instanceChange(); + }; + var resetAll = function(){ + $scope.isInstanceListLoading = true; + chefLogData.chefHistoryItem = {}; + chefLogData.nodeIdsWithActionLog = {}; + helper.stopPolling(); //Ensuring polling is stopped, eventhough the scope values for instance id and actionlog id are updated on change + helper.lastTimeStamp = ''; + }; + var init = function () { + //get the details of one chef history entry + var param = { + url = '/bots/' + botId + '/history/' + historyId; + } + genSevs.promiseGet(param).then(function (response) { + console.log(response); + chefLogData.createInstanceList(response.data); + //$modalInstance.close(response.data); + //$rootScope.$emit('BOTS_LIBRARY_REFRESH'); + //helper.botLogModal(items._id, response.historyId, response.taskType); + }; + /*workzoneServices.getTaskHistoryItem(items.taskId, items.historyId).then(function (response) { + chefLogData.createInstanceList(response.data); + });*/ + }; + //method to get the names of the nodes associated to the job and add it to the nodeIdsWithActionLog object. + chefLogData.createInstanceList = function (historyItem) { + var nodeIds = []; + var bluePrintJob = false; //flag for blueprint job + var bluePrintActionLogs = []; + var nodeIdWithActionLogs = []; + // if blueprint job, use blueprintExecutionResults + if (historyItem.blueprintExecutionResults && historyItem.blueprintExecutionResults[0].result) { + bluePrintJob = true; + bluePrintActionLogs = historyItem.blueprintExecutionResults[0].result; + for (var j = 0; j < bluePrintActionLogs.length; j++) { + nodeIds.push(bluePrintActionLogs[j].instanceId); + } + } else { // if not blueprint job, use nodeIds + nodeIds = historyItem.nodeIds; + } + var requestObj = { + "instanceIds": nodeIds + }; + workzoneServices.postRetrieveDetailsForInstanceNames(requestObj).then(function (response) { + var _jobInstances = response.data; + //if blueprint job, use blueprintExecutionResults + if (bluePrintJob) { + for (var i = 0; i < bluePrintActionLogs.length; i++) { + bluePrintActionLogs[i].nodeId = bluePrintActionLogs[i].instanceId; + for (var j = 0; j < _jobInstances.length; j++) { + if (bluePrintActionLogs[i].instanceId === _jobInstances[j]._id) { + bluePrintActionLogs[i].uiNodeName = _jobInstances[j].name; + } + } + } + nodeIdWithActionLogs = bluePrintActionLogs; + } else {//if not blueprint job, use nodeIdsWithActionLog + for (var k = 0; k < historyItem.nodeIdsWithActionLog.length; k++) { + for (var l = 0; l < _jobInstances.length; l++) { + if (historyItem.nodeIdsWithActionLog[k].nodeId === _jobInstances[l]._id) { + historyItem.nodeIdsWithActionLog[k].uiNodeName = _jobInstances[l].name; + } + } + } + nodeIdWithActionLogs = historyItem.nodeIdsWithActionLog; + } + chefLogData.chefHistoryItem = historyItem; //saved as we need timestamps from the historyItem + chefLogData.nodeIdsWithActionLog = nodeIdWithActionLogs; //this can now be used to show instance dropdown + if (chefLogData.nodeIdsWithActionLog[0]) { + $scope.isInstanceListLoading = false; + selectFirstInstance(chefLogData.nodeIdsWithActionLog[0]); + } + }, + function (error) { + $scope.isInstanceListLoading = false; + console.log(error); + $scope.errorMessage = ""; + }); + }; + //method called when user changes the instance name from the dropdown. + chefLogData.instanceChange = function () { + $scope.isLogsLoading = true; + helper.stopPolling(); //Ensuring polling is stopped, eventhough the scope values for instance id and actionlog id are updated on change + helper.lastTimeStamp = ''; + /* when task is completed, with success or failed: + - both timestampStarted and timestampEnded will be present + - we get full logs, no need to poll + */ + if (chefLogData.chefHistoryItem.timestampStarted && chefLogData.chefHistoryItem.timestampEnded) { + var urlParams = ''; + if (timestamp) { + urlParams = 'timestamp=' + timestamp; + } + if(timestamp && timestampEnded) { + urlParams = 'timestamp=' + timestamp + '×tampEnded=' + timestampEnded; + } + var param = { + url = "/instances/" + instanceId + '/actionLogs/' + actionId + + '/logs?' + urlParams; + } + genSevs.promiseGet(param).then(function (response) { + $scope.isLogsLoading = false; + var logData = { + logs: response.data, + fullLogs: true + }; + $scope.logListInitial = logData.logs; + helper.scrollBottom(); + }; + /*workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, chefLogData.chefHistoryItem.timestampStarted, chefLogData.chefHistoryItem.timestampEnded).then(function (response) { + $scope.isLogsLoading = false; + var logData = { + logs: response.data, + fullLogs: true + }; + $scope.logListInitial = logData.logs; + helper.scrollBottom(); + }, function (error) { + $scope.isLogsLoading = false; + console.log(error); + $scope.errorMessage = "Unable to fetch logs for this instance"; + });*/ + } + /* when task is pending or running: ie. during Execute flow or if history is viewed immediately after Execute + - only timestampStarted will be present. timestampEnded will be absent + - we need to poll for further logs + */ + else if (chefLogData.chefHistoryItem.timestampStarted && !chefLogData.chefHistoryItem.timestampEnded) { + var urlParams = ''; + if (timestamp) { + urlParams = 'timestamp=' + timestamp; + } + if(timestamp && timestampEnded) { + urlParams = 'timestamp=' + timestamp + '×tampEnded=' + timestampEnded; + } + var param = { + url = "/instances/" + instanceId + '/actionLogs/' + actionId + + '/logs?' + urlParams; + } + genSevs.promiseGet(param).then(function (response) { + $scope.isLogsLoading = false; + var logData = { + logs: response.data, + fullLogs: true + }; + $scope.logListInitial = logData.logs; + helper.scrollBottom(); + }; + /*workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, chefLogData.chefHistoryItem.timestampStarted).then(function (response) { + $scope.isLogsLoading = false; + helper.lastTimeStamp = helper.getlastTimeStamp(response.data) || chefLogData.chefHistoryItem.timestampStarted; + helper.logsPolling(); + var logData = { + logs: response.data, + fullLogs: true + }; + $scope.logListInitial = logData.logs; + helper.scrollBottom(); + }, function (error) { + $scope.isLogsLoading = false; + console.log(error); + $scope.errorMessage = "Unable to fetch logs for this instance"; + });*/ + } + }; + init(); + // on task change event in the parent controller + $scope.$on('parentChangeCompTask', function (event, args) { + items = args; + resetAll(); + init(); + }); + return chefLogData; + } + ]); +})(angular); 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 29be3d631..b6822c1fd 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -8,9 +8,10 @@ (function (angular) { "use strict"; angular.module('library.params', []) - .controller('editParamsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', 'responseFormatter', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, responseFormatter) { - $scope.botName = items.name; - $scope.taskType = items.taskType; + .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) { @@ -18,23 +19,23 @@ }); $scope.chefAttributesFlag = false; $scope.scriptParamsFlag = false; - if(items.taskConfig.runlist && items.taskConfig.runlist.length) { + if(items.botConfig && items.botConfig.runlist && items.botConfig.runlist.length) { $scope.chefAttributesFlag = true; } - if(items.taskType === 'script') { - for (var i=0; i 0) { + if(items.botLinkedSubCategory === 'script' && items.botConfig) { + for (var i=0; i 0) { $scope.scriptParamsFlag = true; } } } $scope.isChefattributesLoading = true; - if (items.taskType === 'chef') { - $scope.chefComponentSelectorList = responseFormatter.findDataForEditValue(items.taskConfig.runlist); + 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.taskConfig.attributes); - workzoneServices.getCookBookListForOrg(items.orgId).then(function(data){ + $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") { @@ -67,14 +68,37 @@ } }); } - - $scope.jenkinsparams = items.taskConfig.parameterized; - $scope.scriptparams = items.taskConfig.scriptDetails; + 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 + }; + } + } + }); + } + }; + $scope.add = function() { $scope.parameters.push(''); }; @@ -89,7 +113,7 @@ }; $scope.executeBot=function(){ - if (items.taskConfig.taskType === 'script') { + if (items.botConfig && items.botConfig.botLinkedSubCategory === 'script') { var checkParam = false; if ($scope.scriptParamsFlag) { for(var i =0; i<$scope.parameters.length; i++){ @@ -106,32 +130,50 @@ scriptParams = $scope.parameters; } } - if (items.taskConfig.taskType === 'chef') { + if (items.botConfig && items.botConfig.botLinkedSubCategory === 'chef') { cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes); } - if (items.taskConfig.taskType === 'jenkins') { + if (items.botConfig && items.botConfig.botLinkedSubCategory === 'jenkins') { choiceParam = $scope.jenparams; } - $scope.executeTask(); + $scope.executeBot(); }; - $scope.executeTask = function(){ + $scope.executeBot = function(){ var reqBody = {}; - if (items.taskConfig.taskType === 'jenkins') { + if (items.botConfig && items.botConfig.botLinkedSubCategory === 'jenkins') { reqBody.choiceParam = choiceParam; - } else if (items.taskConfig.taskType === 'chef'){ + } else if (items.botConfig && items.botConfig.botLinkedSubCategory === 'chef'){ reqBody.tagServer = $scope.tagSerSelected; if ($scope.chefAttributesFlag) { reqBody.cookbookAttributes = cookbookAttributes; } - } else if (items.taskConfig.taskType === 'script') { + } else if (items.botConfig && items.botConfig.botLinkedSubCategory === 'script') { reqBody.tagServer = $scope.tagSerSelected; if ($scope.scriptParamsFlag) { reqBody.scriptParams = scriptParams; } } - workzoneServices.runTask(items._id, reqBody).then( + 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._id, response.historyId, response.taskType); + }, + function (error) { + error = error.responseText || error; + if (error.message) { + toastr.error(error.message); + } else { + toastr.error(error); + } + }); + /*workzoneServices.runTask(items._id, reqBody).then( function (response) { $modalInstance.close(response.data); $rootScope.$emit('BOTS_LIBRARY_REFRESH'); @@ -145,11 +187,20 @@ toastr.error(error); } } - ); + );*/ + }; + + $scope.cancel= function() { + $modalInstance.dismiss('cancel'); }; + }])/*.controller('botExecutionLogsCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { + $scope.botExecutionLogs = items; + console.log(items); + + $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; - }]); + }])*/; })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/jenkinsLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/jenkinsLogCtrl.js new file mode 100644 index 000000000..de0df9032 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/jenkinsLogCtrl.js @@ -0,0 +1,94 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Aug 2015 + */ + +(function(angular) { + "use strict"; + angular.module('dashboard.bots') + /*.service('orchestrationSetting', [function() { + return { + orchestrationLogsPollerInterval: 5000 + }; + }])*/ + .controller('jenkinsLogCtrl', ['$scope', 'workzoneServices', '$interval', 'orchestrationSetting', '$controller','$timeout', function($scope, workzoneServices, $interval, orchestrationSetting, $controller,$timeout) { + var items = $scope.parentItemDetail; + $scope.getJenkinsHistoryDetails = {}; + angular.extend($scope, { + logs: {}, + timerObject: '', + cancel: function() { + helper.stopPolling(); + } + }); + var resetAll = function(){ + $scope.getJenkinsHistoryDetails = {}; + helper.stopPolling(); + }; + var init = function(){ + workzoneServices.getTaskHistoryItem(items.taskId, items.historyId).then(function(response) { + $scope.getJenkinsHistoryDetails = response.data; //to store the response so that the jenkinsServerID,jobName and buildNumber can be passed to fetch the logs. + $scope.getJenkinsLogDetails(response.data); + }); + }; + var helper = { + eventsPolling: function() { + $scope.timerObject = $interval(function() { + workzoneServices.getJenkinsLogs($scope.getJenkinsHistoryDetails.jenkinsServerId, $scope.getJenkinsHistoryDetails.jobName, $scope.getJenkinsHistoryDetails.buildNumber) + .then(function(response) { + if (response.data) { + $scope.logs.output = helper.formatLogs(response.data.output); + } else { + $scope.logs.output = helper.formatLogs(response.output); + } + + }, function(error) { + $scope.logs = error.data.message; + }); + }, orchestrationSetting.orchestrationLogsPollerInterval); + }, + stopPolling: function() { + $interval.cancel($scope.timerObject); + }, + formatLogs: function(str) { + return str.replace(/\r?\n/g, "
"); + } + }; + $scope.getJenkinsLogDetails = function(historyItem) { + $scope.isJenkinsLogLoading = true; + $timeout(function(){ + workzoneServices.getJenkinsLogs(historyItem.jenkinsServerId, historyItem.jobName, historyItem.buildNumber).then(function(response) { + $scope.isJenkinsLogLoading = false; + if (response.data) { + $scope.logs.output = helper.formatLogs(response.data.output); + } else { + $scope.logs.output = helper.formatLogs(response.output); + } + helper.eventsPolling(); + + }, function(error) { + $scope.isJenkinsLogLoading = false; + $scope.logs = error.data.message; + //removed the error helper method as it was failing. Need to test this part again. + }); + }, 10000); + }; + init(); + // on task change event in the parent controller + $scope.$on('parentChangeCompTask', function (event, args) { + items = args; + resetAll(); + init(); + }); + $scope.$on('$destroy', function() { + $interval.cancel($scope.timerObject); + }); + // broadcast the cancel function to the parent controller + $scope.$on('closeWindow', function() { + $scope.$parent.close = $scope.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 cb62431a9..fadbd0720 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -8,52 +8,131 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal) { + .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; - lib.gridOptions={ - gridOption:{ - paginationPageSizes: [10, 25, 50, 75], - paginationPageSize: 10, - enableColumnMenus:false, - multiSelect :false, + 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={}; + $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 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(); + } + }); + //Pagination for page and pageSize + gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { + $scope.paginationParams.page = newPage; + $scope.paginationParams.pageSize = pageSize; + $scope.botLibraryGridView(); + }); }, - columnDefs: [ - { name:'Task Type', field:'taskType' ,cellTemplate:'row.entity.taskType'+ - 'row.entity.taskType'+ - 'row.entity.taskType'+ - 'row.entity.botType',cellTooltip: true}, - { name: 'BOT Type',displayName: 'BOT Type',field:'botType',cellTooltip: true}, - { name: 'BOT Name',displayName: 'BOT Name',field:'name',cellTooltip: true}, - { name: 'Category',field:'botCategory',cellTooltip: true}, - { name: 'description',field:'shortDesc',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: - '' + - '' + - '' + - '' - } - ], - data:[] + }); + $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(); var gridBottomSpace = 190; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; $scope.launchInstance = function(launch){ - if(launch.launcType === 'task'){ + console.log(launch.botLinkedCategory); + /*if(launch.launcType === 'task'){ genSevs.executeTask(launch); } else if(launch.launcType === 'bp') { - genSevs.lunchBlueprint(launch); + genSevs.launchBlueprint(launch); + }*/ + if(launch.botLinkedCategory === 'Task'){ + genSevs.executeTask(launch); + } else if(launch.botLinkedCategory === 'Blueprint') { + genSevs.launchBlueprint(launch); } }; - $scope.botLogs = function(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({ @@ -114,38 +193,7 @@ console.log('Dismiss time is ' + new Date()); }); }; - $scope.deleteBotTask = function(task) { - var modalOptions = { - closeButtonText: 'Cancel', - actionButtonText: 'Delete', - actionButtonStyle: 'cat-btn-delete', - headerText: 'Delete Bot', - bodyText: 'Are you sure you want to delete this bots?' - }; - confirmbox.showModal({}, modalOptions).then(function() { - var param={ - url:'/tasks/serviceDelivery/' + task._id - }; - genSevs.promiseDelete(param).then(function (response) { - if (response) { - toastr.success('Successfully deleted'); - if($scope.totalBotsSelected) { - lib.init(); - } else if($scope.runningBotsselected) { - $scope.showBotsRunning(); - } else if($scope.failedBotsselected) { - $scope.showFailedBots(); - } else { - lib.init(); - } - lib.summary(); - } - }, function(data) { - toastr.error('error:: ' + data.toString()); - }); - }); - }; - $scope.deleteBotBP = function(blueprint) { + $scope.deleteBot = function(bot) { var modalOptions = { closeButtonText: 'Cancel', actionButtonText: 'Delete', @@ -155,19 +203,19 @@ }; confirmbox.showModal({}, modalOptions).then(function() { var param={ - url:'/blueprints/serviceDelivery/' + blueprint._id + url:'/bots/' + bot.botId }; genSevs.promiseDelete(param).then(function (response) { if (response) { toastr.success('Successfully deleted'); if($scope.totalBotsSelected) { - lib.init(); + $scope.botLibraryGridView(); } else if($scope.runningBotsselected) { $scope.showBotsRunning(); } else if($scope.failedBotsselected) { $scope.showFailedBots(); } else { - lib.init(); + $scope.botLibraryGridView(); } lib.summary(); } @@ -178,14 +226,14 @@ }; $rootScope.$on('BOTS_LIBRARY_REFRESH', function() { lib.summary(); - lib.init(); + $scope.botLibraryGridView(); }); $scope.RefreshBotsLibrary = function() { $scope.totalBotsSelected = true; $scope.runningBotsselected = false; $scope.failedBotsselected = false; lib.summary(); - lib.init(); + $scope.botLibraryGridView(); }; $scope.showBotsRunning = function() { $scope.runningBotsselected = true; @@ -193,12 +241,13 @@ $scope.failedBotsselected = false; lib.gridOptions.data=[]; var param={ - url:'/tasks?serviceDeliveryCheck=true&actionStatus=running' + url:'/bots?actionStatus=running?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { - angular.forEach(result,function (val) { - lib.gridOptions.data.push(val); - }); + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); }); lib.summary(); }; @@ -208,12 +257,13 @@ $scope.totalBotsSelected = false; lib.gridOptions.data=[]; var param={ - url:'/tasks?serviceDeliveryCheck=true&actionStatus=failed' + url:'/bots?actionStatus=failed?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { - angular.forEach(result,function (val) { - lib.gridOptions.data.push(val); - }); + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); }); lib.summary(); }; @@ -228,28 +278,6 @@ }); }; lib.summary(); - lib.init =function(){ - lib.gridOptions.data=[]; - var param={ - url:'/blueprints?serviceDeliveryCheck=true' - }; - genSevs.promiseGet(param).then(function (result) { - angular.forEach(result,function (val) { - angular.extend(val,{launcType:'bp'}); - lib.gridOptions.data.push(val); - }); - }); - var param2={ - url:'/tasks?serviceDeliveryCheck=true' - }; - genSevs.promiseGet(param2).then(function (resultTask) { - angular.forEach(resultTask,function (val) { - angular.extend(val,{launcType:'task'}); - lib.gridOptions.data.push(val); - }); - }); - }; - lib.init(); }]).controller('botInfoCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { $scope.botInfo = items; console.log(items); @@ -344,5 +372,300 @@ $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; - }]); + }]).controller('botHistoryCtrl',["items", '$scope', '$modalInstance', '$modal', '$timeout', 'uiGridOptionsClient', 'genericServices', 'workzoneServices', + function(items, $scope, $modalInstance, $modal, $timeout, uiGridOptionsClient, genSevs, workzoneServices){ + //UI Grid for chef Task starts + console.log(items); + $scope.botHistory = items; + $scope.botId = items.botId; + $scope.taskHistoryChefData = []; + var gridOptionsChef = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryChefGridOptions = gridOptionsChef; + + $scope.initChefGrids = function(){ + $scope.taskHistoryChefGridOptions.data='taskHistoryChefData'; + $scope.taskHistoryChefGridOptions.columnDefs = [ + { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, + { name:'Message', field: 'message', + cellTemplate:'{{row.entity.message}}'}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
'},{ name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryChefListView: function() { + $scope.taskHistoryChefData = []; + /*var param={ + url:'/bots/:$scope.botId/bots-history' + };*/ + 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; + $scope.executionTime = $scope.executionTimeinMS/(60000); + return +(Math.round($scope.executionTime + "e+1") + "e-1"); + }, + getSavedTime: function(endTime, startTime) { + var executionTime = $scope.getExecutionTime(endTime, startTime); + $scope.savedTime = items.manualExecutionTime-executionTime; + return $scope.savedTime; + } + }); + $scope.initchef = function(){ + $scope.initChefGrids(); + $scope.taskHistoryChefListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //$scope.initchef(); + //UI Grid for chef Task ends + + //UI Grid for jenkins Task starts + $scope.taskHistoryJenkinsData = []; + var gridOptionsJenkins = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryJenkinsGridOptions = gridOptionsJenkins; + + $scope.initJenkinsGrids = function(){ + $scope.taskHistoryJenkinsGridOptions.data='taskHistoryJenkinsData'; + $scope.taskHistoryJenkinsGridOptions.columnDefs = [ + { name:'Job Number',field:'buildNumber',cellTemplate:'{{row.entity.buildNumber}}', 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:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | timestampToLocaleTime}}',cellTooltip: true}, + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}',cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryJenkinsListView: function() { + $scope.taskHistoryJenkinsData = []; + var param={ + url:'/bots/:$scope.botId/bots-history' + }; + workzoneServices.getHistory(items.botId).then(function(response) { + console.log(response); + $timeout(function() { + if(response.data){ + $scope.taskHistoryJenkinsData = response.data; + $scope.isjenkinsTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryJenkinsData = response; + $scope.isjenkinsTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Jenkins History Records found"; + $scope.isjenkinsTaskHistoryPageLoading = false; + }); + }, + }); + $scope.initjenkins = function(){ + $scope.initJenkinsGrids(); + $scope.taskHistoryJenkinsListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //$scope.initjenkins(); + //UI Grid for jenkins Task ends + + //UI Grid for script Task starts + $scope.taskHistoryScriptData = []; + var gridOptionsScript = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryScriptGridOptions = gridOptionsScript; + + $scope.initScriptGrids = function(){ + $scope.taskHistoryScriptGridOptions.data='taskHistoryScriptData'; + $scope.taskHistoryScriptGridOptions.columnDefs = [ + { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, + { name:'Message', field: 'message', + cellTemplate:'{{row.entity.message}}'}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
'}, + { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryScriptListView: function() { + $scope.taskHistoryScriptData = []; + /*var param={ + url:'/bots/:$scope.botId/bots-history' + };*/ + workzoneServices.getHistory(items.botId).then(function(response) { + console.log(response); + $timeout(function() { + if(response.data){ + $scope.taskHistoryScriptData = response.data; + $scope.isscriptTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryScriptData = response; + $scope.isscriptTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Script History Records found"; + $scope.isscriptTaskHistoryPageLoading = false; + }); + }, + }); + $scope.initscript = function(){ + $scope.initScriptGrids(); + $scope.taskHistoryScriptListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //$scope.initscript(); + //UI Grid for script Task ends + + //UI Grid for Blueprint starts + $scope.botHistoryBlueprintData = []; + var gridOptionsScript = uiGridOptionsClient.options().gridOption; + $scope.botHistoryBlueprintGridOptions = gridOptionsScript; + + $scope.initBlueprintGrids = function(){ + $scope.botHistoryBlueprintGridOptions.data='botHistoryBlueprintData'; + $scope.botHistoryBlueprintGridOptions.columnDefs = [ + { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, + { name:'Message', field: 'message', + cellTemplate:'{{row.entity.message}}'}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
'}, + { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + botHistoryBlueprintListView: function() { + $scope.botHistoryBlueprintData = []; + /*var param={ + url:'/bots/:$scope.botId/bots-history' + };*/ + workzoneServices.getHistory(items.botId).then(function(response) { + console.log(response); + $timeout(function() { + if(response.data){ + $scope.botHistoryBlueprintData = response.data; + $scope.isBlueprintBotHistoryPageLoading = false; + }else if(response){ + $scope.botHistoryBlueprintData = response; + $scope.isBlueprintBotHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Script History Records found"; + $scope.isBlueprintBotHistoryPageLoading = false; + }); + }, + }); + $scope.initblueprint = function(){ + $scope.initBlueprintGrids(); + $scope.botHistoryBlueprintListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //$scope.initblueprint(); + //UI Grid for Blueprint ends + + $scope.bot=items; + switch ($scope.bot.botLinkedSubCategory){ + case 'chef' : + $scope.ischefTaskHistoryPageLoading = true; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.iscompositeTaskHistoryPageLoading = false; + $scope.ispuppetTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.isBlueprintBotHistoryPageLoading = false; + $scope.initchef(); + break; + case 'jenkins' : + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = true; + $scope.iscompositeTaskHistoryPageLoading = false; + $scope.ispuppetTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.isBlueprintBotHistoryPageLoading = false; + $scope.initjenkins(); + break; + case 'script': + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.iscompositeTaskHistoryPageLoading = false; + $scope.ispuppetTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = true; + $scope.isBlueprintBotHistoryPageLoading = false; + $scope.initscript(); + break; + case 'instance_launch': + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.iscompositeTaskHistoryPageLoading = false; + $scope.ispuppetTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.isBlueprintBotHistoryPageLoading = true; + $scope.initblueprint(); + break; + } + + $scope.historyLogs=function(hist) { + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationLog.html', + controller: 'orchestrationLogCtrl as orchLogCtrl', + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return { + taskId : hist.taskId, + historyId : hist._id, + taskType:hist.taskType + }; + } + } + }); + modalInstance.result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + console.log('Modal Dismissed at ' + new Date()); + }); + }; + $scope.cancel= function() { + $modalInstance.dismiss('cancel'); + }; + } + ]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html new file mode 100644 index 000000000..e2e8e4d80 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html @@ -0,0 +1,35 @@ +
+
+ × +

+ + Execute Logs +

+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ +
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html new file mode 100644 index 000000000..82a6e9c5a --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html @@ -0,0 +1,44 @@ +
+
+

+ × + +   + Bot History For - {{botHistory.botName}} + +

+
+ +
+
+ + +
+ {{taskHistoryChefData.length}} +
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
No Data Found
+
+
+ +
+ +
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html index a82e48010..0f6db8808 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -19,13 +19,13 @@

BOT Name - + - + Task Type: - + @@ -54,7 +54,7 @@

BOT Description - + @@ -67,7 +67,7 @@

- + Job Name @@ -81,7 +81,7 @@

- + Script Type Name diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/chefLog.html b/client/cat3/src/partials/sections/dashboard/bots/view/chefLog.html new file mode 100644 index 000000000..388267569 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/chefLog.html @@ -0,0 +1,30 @@ +
+
+
+ +
+
+ + + + +
+
+ +
+
+ {{log.timestamp | timestampToLocaleTime}} + {{log.log}} +
+
+ {{log.timestamp | timestampToLocaleTime}} + {{log.log}} +
+
+
+
+
+
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/jenkinsLog.html b/client/cat3/src/partials/sections/dashboard/bots/view/jenkinsLog.html new file mode 100644 index 000000000..e20925d07 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/jenkinsLog.html @@ -0,0 +1,6 @@ +
+ +
+

+
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html index 263da4839..3cc456283 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -57,8 +57,9 @@ -
-
+ +
No data Available
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js index bf52eb924..54a88998a 100644 --- a/client/cat3/src/partials/sections/dashboard/genericServices.js +++ b/client/cat3/src/partials/sections/dashboard/genericServices.js @@ -120,11 +120,11 @@ } }; - genericServices.log=function(id,historyId,taskType) { + genericServices.log=function(id,historyId,botLinkedSubCategory) { $modal.open({ animation: true, - templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationLog.html', - controller: 'orchestrationLogCtrl as orchLogCtrl', + templateUrl: 'src/partials/sections/dashboard/bots/view/botExecutionLogs.html', + controller: 'botExecutionLogsCtrl', backdrop: 'static', keyboard: false, resolve: { @@ -132,7 +132,7 @@ return { taskId: id, historyId: historyId, - taskType: taskType + taskType: botLinkedSubCategory }; } } @@ -186,7 +186,7 @@ }; genericServices.executeTask =function(task) { - if ((task.taskConfig.parameterized && task.taskConfig.parameterized.length) || (task.taskType === 'chef') || (task.taskType === 'script')) { + if ((task.botConfig && task.botConfig.parameterized && task.botConfig.parameterized.length) || (task.botLinkedSubCategory === 'chef') || (task.botLinkedSubCategory === 'script')) { $modal.open({ animation: true, templateUrl: 'src/partials/sections/dashboard/bots/view/editParams.html', @@ -199,7 +199,8 @@ } } }).result.then(function(response) { - genericServices.log(task._id,response.historyId,task.taskType); + console.log(response); + //genericServices.log(); if(response.blueprintMessage){ $rootScope.$emit('WZ_INSTANCES_SHOW_LATEST'); } @@ -220,7 +221,7 @@ } } }).result.then(function(response) { - genericServices.log(task._id,response.historyId,task.taskType); + genericServices.log(task._id,response.historyId,task.botLinkedSubCategory); if(response.blueprintMessage){ $rootScope.$emit('WZ_INSTANCES_SHOW_LATEST'); } @@ -231,7 +232,7 @@ } }; - genericServices.lunchBlueprint=function(blueprintObj) { + genericServices.launchBlueprint=function(blueprintObj) { $modal.open({ animate: true, templateUrl: "src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html", @@ -244,7 +245,8 @@ } } }).result.then(function(bpObj) { - if (bpObj.bp.blueprintType === "docker") { + console.log(bpObj); + if (bpObj.bp.botLinkedSubCategory === "docker") { $modal.open({ animate: true, templateUrl: "src/partials/sections/dashboard/workzone/blueprint/popups/dockerLaunchParams.html", diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js index 4141b54a0..929669e17 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js @@ -10,7 +10,7 @@ angular.module('workzone.blueprint') .controller('blueprintLaunchCtrl', ['$scope', '$rootScope', '$modalInstance', 'bpItem', 'workzoneServices', 'workzoneEnvironment', 'instanceLogs', function($scope, $rootScope, $modalInstance, bpItem, workzoneServices, workzoneEnvironment, instanceLogs) { console.log(bpItem); - if(bpItem.bp.blueprintType) { + if(bpItem.bp.botLinkedCategory === 'Blueprint') { $scope.isBPLogsLoading = true; $scope.isNewInstanceLogsPromise = false; var helper = { @@ -44,9 +44,9 @@ } else{ isSuccess = true; - if (bpItem.bp.blueprintType === 'aws_cf') { + if (bpItem.bp.botLinkedCategory === 'aws_cf') { msgStr = 'Stack Id : ' + $scope.launchResponse.stackId + '. You can view your stack in cloudformation tab'; - } else if (bpItem.bp.blueprintType === 'azure_arm') { + } else if (bpItem.bp.botLinkedCategory === 'azure_arm') { msgStr = 'Deployment Id : ' + $scope.launchResponse.armId + '. You can view your deployment in ARM tab'; } else { msgStr = 'Instance Id : '; @@ -75,6 +75,7 @@ var envParams = workzoneEnvironment.getEnvParams(); var versionsList = []; var versionOptional; + versionOptional = 0.1; if(bpItem.bp.blueprintConfig){ if(bpItem.bp.blueprintConfig.infraManagerData && bpItem.bp.blueprintConfig.infraManagerData.versionsList){ versionsList = bpItem.bp.blueprintConfig.infraManagerData.versionsList; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index b8b4e9818..63815827d 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -34,16 +34,17 @@ } genericServices.getTreeNew().then(function (envData) { angular.forEach(envData,function(val){ + console.log(val); var orgID,bgID,projID; if(items.organizationId === undefined) { - orgID = (items.orgId)?items.orgId:items.organization.id; - bgID = (items.bgId)?items.bgId:items.businessGroup.id; - projID = (items.projectId)?items.projectId:items.project.id; + orgID = (items.masterDetails.orgId)?items.masterDetails.orgId:items.organization.id; + bgID = (items.masterDetails.bgId)?items.masterDetails.bgId:items.businessGroup.id; + projID = (items.masterDetails.projectId)?items.masterDetails.projectId:items.project.id; $scope.getMonitorList(orgID); } else { - orgID = items.organizationId; - bgID = items.businessGroupId; - projID = items.projectId; + orgID = items.organizationId || items.masterDetails.orgId; + bgID = items.businessGroupId || items.masterDetails.bgId; + projID = items.projectId || items.masterDetails.projectId; $scope.getMonitorList(orgID); } if(val.rowid === orgID){ @@ -65,9 +66,7 @@ } }); } - }); - }); $scope.stackName=''; $scope.domainName=''; @@ -76,7 +75,7 @@ $modalInstance.dismiss('cancel'); }; $scope.launchBP = function() { - if(items.orgId === undefined){ + if((items.orgId === undefined) && (items.masterDetails && items.masterDetails.orgId === undefined)){ var compBlue={ "blueprintId": (items.id)?items.id:items._id, "environmentId": $scope.envSeleted @@ -88,9 +87,9 @@ toastr.error(data.message, 'Error'); }); } else { - if(items.blueprintType === "aws_cf") { + if(items.blueprintType === "aws_cf" || items.botLinkedSubCategory === "aws_cf") { $scope.showCFTInputs = true; - }else if(items.blueprintType === "azure_arm") { + }else if(items.blueprintType === "azure_arm" || items.botLinkedSubCategory === "azure_arm") { $scope.showARMInputs = true; }else if(items.domainNameCheck === true || items.domainNameCheck === "true") { $scope.showBlueprintInputs = true; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js index 2a8119fad..b6f842ce7 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js @@ -30,6 +30,7 @@ $scope.initGrids = function(){ $scope.orcheGridOptions=angular.extend(orchestrationUIGridDefaults.gridOption,{ data : 'tabData', + enableFiltering: true, columnDefs : [ { name:'Job Type', width:100,field:'taskType' ,cellTemplate:'row.entity.taskType'+ 'row.entity.taskType'+ @@ -133,6 +134,7 @@ $timeout(function() { $scope.orcheGridOptions.totalItems = result.data.metaData.totalRecords; $scope.tabData = result.data.tasks; + console.log($scope.tabData); }, 100); $scope.isOrchestrationPageLoading = false; }, function(error) { diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 319d807af..e8f72a015 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -45,7 +45,7 @@ var BotsSchema = new Schema ({ trim: true, required: true }, - botsConfig:Schema.Types.Mixed, + botConfig:Schema.Types.Mixed, runTimeParams:Schema.Types.Mixed, masterDetails: { orgName: { diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 4a741d0db..ba2fd4c5a 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -58,6 +58,8 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }); 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) { diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index cc9370839..3a060fddc 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -81,7 +81,7 @@ blueprintService.deleteServiceDeliveryBlueprint = function deleteServiceDelivery Blueprints.removeServiceDeliveryBlueprints(blueprintId, next); }, function (deleteTaskCheck, next) { - auditTrail.softRemoveAuditTrails({auditId:blueprintId},next); + auditTrail.softRemoveAuditTrails(blueprintId,next); } ],function (err, results) { if (err) { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 8dbe63bf6..34f850788 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -183,11 +183,11 @@ botsService.removeSoftBotsById = function removeSoftBotsById(botId,callback){ function(next){ bots.getBotsById(botId,next); }, - function(bots,next){ - if(bots.length > 0){ + function(botDetails,next){ + if(botDetails.length > 0){ async.parallel({ - bots:function(callback){ - if(bots[0].botLinkedCategory === 'Task'){ + bot:function(callback){ + if(botDetails[0].botLinkedCategory === 'Task'){ taskService.deleteServiceDeliveryTask(botId, callback); }else{ blueprintService.deleteServiceDeliveryBlueprint(botId,callback) diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 1644e6886..18ce38ea9 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -116,7 +116,7 @@ taskService.deleteServiceDeliveryTask = function deleteServiceDeliveryTask(taskI taskDao.removeServiceDeliveryTask(taskId, next); }, function (deleteTaskCheck, next) { - auditTrail.softRemoveAuditTrails({auditId:taskId},next); + auditTrail.softRemoveAuditTrails(taskId,next); } ],function (err, results) { if (err) { From 906480a4ffb183471a7b42d0a324441bba3a752b Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 15 Dec 2016 16:52:20 +0530 Subject: [PATCH 003/110] Git-Hub Implementation for BOT-Factory --- .../bots/controller/editParamsCtrl.js | 59 +- .../dashboard/bots/controller/libraryCtrl.js | 557 +++++++++++++++--- .../dashboard/bots/view/botHistory.html | 55 ++ .../sections/dashboard/bots/view/botInfo.html | 12 +- .../sections/dashboard/bots/view/library.html | 5 +- .../git-repository-sync/gitRepositorySync.js | 164 ++++++ .../cronjobs/git-repository-sync/package.json | 3 + server/app/model/bots/bots.js | 2 +- server/app/services/blueprintService.js | 2 +- server/app/services/botsService.js | 6 +- server/app/services/taskService.js | 2 +- 11 files changed, 735 insertions(+), 132 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html create mode 100644 server/app/cronjobs/git-repository-sync/gitRepositorySync.js create mode 100644 server/app/cronjobs/git-repository-sync/package.json 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 29be3d631..f47900b1e 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -9,8 +9,9 @@ "use strict"; angular.module('library.params', []) .controller('editParamsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', 'responseFormatter', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, responseFormatter) { - $scope.botName = items.name; - $scope.taskType = items.taskType; + console.log(items); + $scope.botName = items.botName; + $scope.taskType = items.botLinkedSubCategory; $scope.taggingServerList=[]; $scope.envOptions=[]; workzoneServices.getTaggingServer().then(function (topSer) { @@ -18,23 +19,23 @@ }); $scope.chefAttributesFlag = false; $scope.scriptParamsFlag = false; - if(items.taskConfig.runlist && items.taskConfig.runlist.length) { + if(items.botConfig && items.botConfig.runlist && items.botConfig.runlist.length) { $scope.chefAttributesFlag = true; } - if(items.taskType === 'script') { - for (var i=0; i 0) { + if(items.botLinkedSubCategory === 'script' && items.botConfig) { + for (var i=0; i 0) { $scope.scriptParamsFlag = true; } } } $scope.isChefattributesLoading = true; - if (items.taskType === 'chef') { - $scope.chefComponentSelectorList = responseFormatter.findDataForEditValue(items.taskConfig.runlist); + 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.taskConfig.attributes); - workzoneServices.getCookBookListForOrg(items.orgId).then(function(data){ + $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") { @@ -67,9 +68,10 @@ } }); } - - $scope.jenkinsparams = items.taskConfig.parameterized; - $scope.scriptparams = items.taskConfig.scriptDetails; + if (items.botConfig) { + $scope.jenkinsparams = items.botConfig.parameterized; + $scope.scriptparams = items.botConfig.scriptDetails; + } $scope.parameters=['']; var cookbookAttributes = []; var scriptParams = []; @@ -89,7 +91,7 @@ }; $scope.executeBot=function(){ - if (items.taskConfig.taskType === 'script') { + if (items.botConfig.botLinkedSubCategory === 'script') { var checkParam = false; if ($scope.scriptParamsFlag) { for(var i =0; i<$scope.parameters.length; i++){ @@ -106,11 +108,11 @@ scriptParams = $scope.parameters; } } - if (items.taskConfig.taskType === 'chef') { + if (items.botConfig.botLinkedSubCategory === 'chef') { cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes); } - if (items.taskConfig.taskType === 'jenkins') { + if (items.botConfig.botLinkedSubCategory === 'jenkins') { choiceParam = $scope.jenparams; } $scope.executeTask(); @@ -118,20 +120,35 @@ $scope.executeTask = function(){ var reqBody = {}; - if (items.taskConfig.taskType === 'jenkins') { + if (items.botConfig.botLinkedSubCategory === 'jenkins') { reqBody.choiceParam = choiceParam; - } else if (items.taskConfig.taskType === 'chef'){ + } else if (items.botConfig.botLinkedSubCategory === 'chef'){ reqBody.tagServer = $scope.tagSerSelected; if ($scope.chefAttributesFlag) { reqBody.cookbookAttributes = cookbookAttributes; } - } else if (items.taskConfig.taskType === 'script') { + } else if (items.botConfig.botLinkedSubCategory === 'script') { reqBody.tagServer = $scope.tagSerSelected; if ($scope.scriptParamsFlag) { reqBody.scriptParams = scriptParams; } } - workzoneServices.runTask(items._id, reqBody).then( + var param={ + url:'/bots/' + items.botId + '/execute' + }; + genSevs.promisePost({url:param,data:reqBody}).then(function (response) { + $modalInstance.close(response.data); + $rootScope.$emit('BOTS_LIBRARY_REFRESH'); + }, + function (error) { + error = error.responseText || error; + if (error.message) { + toastr.error(error.message); + } else { + toastr.error(error); + } + }); + /*workzoneServices.runTask(items._id, reqBody).then( function (response) { $modalInstance.close(response.data); $rootScope.$emit('BOTS_LIBRARY_REFRESH'); @@ -145,7 +162,7 @@ toastr.error(error); } } - ); + );*/ }; $scope.cancel= function() { diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index cb62431a9..839799dbc 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -8,52 +8,120 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal) { + .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; - lib.gridOptions={ - gridOption:{ - paginationPageSizes: [10, 25, 50, 75], - paginationPageSize: 10, - enableColumnMenus:false, - multiSelect :false, + 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={}; + $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:'botType',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: '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: + '' + + '' + + '' + } + ] + $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(); + }); }, - columnDefs: [ - { name:'Task Type', field:'taskType' ,cellTemplate:'row.entity.taskType'+ - 'row.entity.taskType'+ - 'row.entity.taskType'+ - 'row.entity.botType',cellTooltip: true}, - { name: 'BOT Type',displayName: 'BOT Type',field:'botType',cellTooltip: true}, - { name: 'BOT Name',displayName: 'BOT Name',field:'name',cellTooltip: true}, - { name: 'Category',field:'botCategory',cellTooltip: true}, - { name: 'description',field:'shortDesc',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: - '' + - '' + - '' + - '' - } - ], - data:[] + }); + $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(); var gridBottomSpace = 190; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; $scope.launchInstance = function(launch){ - if(launch.launcType === 'task'){ - genSevs.executeTask(launch); - } else if(launch.launcType === 'bp') { - genSevs.lunchBlueprint(launch); - } + genSevs.executeTask(launch); }; - $scope.botLogs = function(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({ @@ -114,38 +182,7 @@ console.log('Dismiss time is ' + new Date()); }); }; - $scope.deleteBotTask = function(task) { - var modalOptions = { - closeButtonText: 'Cancel', - actionButtonText: 'Delete', - actionButtonStyle: 'cat-btn-delete', - headerText: 'Delete Bot', - bodyText: 'Are you sure you want to delete this bots?' - }; - confirmbox.showModal({}, modalOptions).then(function() { - var param={ - url:'/tasks/serviceDelivery/' + task._id - }; - genSevs.promiseDelete(param).then(function (response) { - if (response) { - toastr.success('Successfully deleted'); - if($scope.totalBotsSelected) { - lib.init(); - } else if($scope.runningBotsselected) { - $scope.showBotsRunning(); - } else if($scope.failedBotsselected) { - $scope.showFailedBots(); - } else { - lib.init(); - } - lib.summary(); - } - }, function(data) { - toastr.error('error:: ' + data.toString()); - }); - }); - }; - $scope.deleteBotBP = function(blueprint) { + $scope.deleteBot = function(bot) { var modalOptions = { closeButtonText: 'Cancel', actionButtonText: 'Delete', @@ -155,19 +192,19 @@ }; confirmbox.showModal({}, modalOptions).then(function() { var param={ - url:'/blueprints/serviceDelivery/' + blueprint._id + url:'/bots/' + bot.botId }; genSevs.promiseDelete(param).then(function (response) { if (response) { toastr.success('Successfully deleted'); if($scope.totalBotsSelected) { - lib.init(); + $scope.botLibraryGridView(); } else if($scope.runningBotsselected) { $scope.showBotsRunning(); } else if($scope.failedBotsselected) { $scope.showFailedBots(); } else { - lib.init(); + $scope.botLibraryGridView(); } lib.summary(); } @@ -178,14 +215,14 @@ }; $rootScope.$on('BOTS_LIBRARY_REFRESH', function() { lib.summary(); - lib.init(); + $scope.botLibraryGridView(); }); $scope.RefreshBotsLibrary = function() { $scope.totalBotsSelected = true; $scope.runningBotsselected = false; $scope.failedBotsselected = false; lib.summary(); - lib.init(); + $scope.botLibraryGridView(); }; $scope.showBotsRunning = function() { $scope.runningBotsselected = true; @@ -193,7 +230,7 @@ $scope.failedBotsselected = false; lib.gridOptions.data=[]; var param={ - url:'/tasks?serviceDeliveryCheck=true&actionStatus=running' + url:'/bots?actionStatus=running?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { angular.forEach(result,function (val) { @@ -208,7 +245,7 @@ $scope.totalBotsSelected = false; lib.gridOptions.data=[]; var param={ - url:'/tasks?serviceDeliveryCheck=true&actionStatus=failed' + url:'/bots?actionStatus=failed?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { angular.forEach(result,function (val) { @@ -228,28 +265,6 @@ }); }; lib.summary(); - lib.init =function(){ - lib.gridOptions.data=[]; - var param={ - url:'/blueprints?serviceDeliveryCheck=true' - }; - genSevs.promiseGet(param).then(function (result) { - angular.forEach(result,function (val) { - angular.extend(val,{launcType:'bp'}); - lib.gridOptions.data.push(val); - }); - }); - var param2={ - url:'/tasks?serviceDeliveryCheck=true' - }; - genSevs.promiseGet(param2).then(function (resultTask) { - angular.forEach(resultTask,function (val) { - angular.extend(val,{launcType:'task'}); - lib.gridOptions.data.push(val); - }); - }); - }; - lib.init(); }]).controller('botInfoCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { $scope.botInfo = items; console.log(items); @@ -344,5 +359,353 @@ $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; - }]); + }]).controller('botHistoryCtrl',["items", '$scope', '$modalInstance', '$modal', '$timeout', 'uiGridOptionsClient', 'genericServices', + function(items, $scope, $modalInstance, $modal, $timeout, uiGridOptionsClient, genSevs){ + //UI Grid for chef Task starts + console.log(items); + $scope.botHistory = items; + $scope.botId = items.botId; + $scope.taskHistoryChefData = []; + var gridOptionsChef = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryChefGridOptions = gridOptionsChef; + + $scope.initChefGrids = function(){ + $scope.taskHistoryChefGridOptions.data='taskHistoryChefData'; + $scope.taskHistoryChefGridOptions.columnDefs = [ + { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, + { name:'Message', field: 'message', + cellTemplate:'{{row.entity.message}}'}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
'},{ name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryChefListView: function() { + $scope.taskHistoryChefData = []; + var param={ + url:'/bots/:$scope.botId/bots-history' + }; + genSevs.promiseGet(param).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; + }); + genSevs.getHistory(items._id).then(function(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; + $scope.executionTime = $scope.executionTimeinMS/(60000); + return +(Math.round($scope.executionTime + "e+1") + "e-1"); + }, + getSavedTime: function(endTime, startTime) { + var executionTime = $scope.getExecutionTime(endTime, startTime); + $scope.savedTime = items.manualExecutionTime-executionTime; + return $scope.savedTime; + } + }); + $scope.initchef = function(){ + $scope.initChefGrids(); + $scope.taskHistoryChefListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //UI Grid for chef Task ends + + //UI Grid for jenkins Task starts + $scope.taskHistoryJenkinsData = []; + var gridOptionsJenkins = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryJenkinsGridOptions = gridOptionsJenkins; + + $scope.initJenkinsGrids = function(){ + $scope.taskHistoryJenkinsGridOptions.data='taskHistoryJenkinsData'; + $scope.taskHistoryJenkinsGridOptions.columnDefs = [ + { name:'Job Number',field:'buildNumber',cellTemplate:'{{row.entity.buildNumber}}', 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:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | timestampToLocaleTime}}',cellTooltip: true}, + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}',cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryJenkinsListView: function() { + $scope.taskHistoryJenkinsData = []; + var param={ + url:'/bots/:$scope.botId/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { + console.log(response); + $timeout(function() { + if(response.data){ + $scope.taskHistoryJenkinsData = response.data; + $scope.isjenkinsTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryJenkinsData = response; + $scope.isjenkinsTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Jenkins History Records found"; + $scope.isjenkinsTaskHistoryPageLoading = false; + }); + }, + }); + $scope.initjenkins = function(){ + $scope.initJenkinsGrids(); + $scope.taskHistoryJenkinsListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //UI Grid for jenkins Task ends + + //UI Grid for composite Task starts + $scope.taskHistoryCompositeData = []; + var gridOptionsComposite = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryCompositeGridOptions = gridOptionsComposite; + + $scope.initCompositeGrids = function(){ + $scope.taskHistoryCompositeGridOptions.data='taskHistoryCompositeData'; + $scope.taskHistoryCompositeGridOptions.columnDefs = [ + { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}',cellTooltip: true}, + { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, + { name:'Message', field: 'message', + cellTemplate:'{{row.entity.message}}'}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
'} + ]; + }; + angular.extend($scope, { + taskHistoryCompositeListView: function() { + $scope.taskHistoryCompositeData = []; + var param={ + url:'/bots/:$scope.botId/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { + console.log(response); + $timeout(function() { + if(response.data){ + $scope.taskHistoryCompositeData = response.data; + $scope.iscompositeTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryCompositeData = response; + $scope.iscompositeTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Composite History Records found"; + $scope.iscompositeTaskHistoryPageLoading = false; + }); + }, + }); + $scope.initcomposite = function(){ + $scope.initCompositeGrids(); + $scope.taskHistoryCompositeListView(); + }; + //UI Grid for composite Task ends + + //UI Grid for puppet Task starts + $scope.taskHistoryPuppetData = []; + var gridOptionsPuppet = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryPuppetGridOptions = gridOptionsPuppet; + + $scope.initPuppetGrids = function(){ + $scope.taskHistoryPuppetGridOptions.data='taskHistoryPuppetData'; + $scope.taskHistoryPuppetGridOptions.columnDefs = [ + { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}', cellTooltip: true}, + { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, + { name:'Message', field: 'message', cellTemplate:'{{row.entity.message}}'}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, cellTemplate:'
'} + ]; + }; + angular.extend($scope, { + taskHistoryPuppetListView: function() { + $scope.taskHistoryPuppetData = []; + var param={ + url:'/bots/:$scope.botId/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { + console.log(response); + $timeout(function() { + if(response.data){ + $scope.taskHistoryPuppetData = response.data; + $scope.ispuppetTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryPuppetData = response; + $scope.ispuppetTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Puppet History Records found"; + $scope.ispuppetTaskHistoryPageLoading = false; + }); + }, + }); + $scope.initpuppet = function(){ + $scope.initPuppetGrids(); + $scope.taskHistoryPuppetListView(); + }; + //UI Grid for puppet Task ends + + //UI Grid for script Task starts + $scope.taskHistoryScriptData = []; + var gridOptionsScript = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryScriptGridOptions = gridOptionsScript; + + $scope.initScriptGrids = function(){ + $scope.taskHistoryScriptGridOptions.data='taskHistoryScriptData'; + $scope.taskHistoryScriptGridOptions.columnDefs = [ + { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, + { name:'Message', field: 'message', + cellTemplate:'{{row.entity.message}}'}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
'}, + { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryScriptListView: function() { + $scope.taskHistoryScriptData = []; + var param={ + url:'/bots/:$scope.botId/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { + console.log(response); + $timeout(function() { + if(response.data){ + $scope.taskHistoryScriptData = response.data; + $scope.isscriptTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryScriptData = response; + $scope.isscriptTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Script History Records found"; + $scope.isscriptTaskHistoryPageLoading = false; + }); + }, + }); + $scope.initscript = function(){ + $scope.initScriptGrids(); + $scope.taskHistoryScriptListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //UI Grid for script Task ends + + $scope.task=items; + switch ($scope.task.taskType){ + case 'chef' : + $scope.ischefTaskHistoryPageLoading = true; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.iscompositeTaskHistoryPageLoading = false; + $scope.ispuppetTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.initchef(); + break; + case 'jenkins' : + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = true; + $scope.iscompositeTaskHistoryPageLoading = false; + $scope.ispuppetTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.initjenkins(); + break; + case 'composite' : + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.iscompositeTaskHistoryPageLoading = true; + $scope.ispuppetTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.initcomposite(); + break; + case 'puppet': + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.iscompositeTaskHistoryPageLoading = false; + $scope.ispuppetTaskHistoryPageLoading = true; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.initpuppet(); + break; + case 'script': + $scope.isscriptTaskHistoryPageLoading = true; + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.iscompositeTaskHistoryPageLoading = false; + $scope.ispuppetTaskHistoryPageLoading = false; + $scope.initscript(); + break; + } + + $scope.historyLogs=function(hist) { + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationLog.html', + controller: 'orchestrationLogCtrl as orchLogCtrl', + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return { + taskId : hist.taskId, + historyId : hist._id, + taskType:hist.taskType + }; + } + } + }); + modalInstance.result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + console.log('Modal Dismissed at ' + new Date()); + }); + }; + $scope.cancel= function() { + $modalInstance.dismiss('cancel'); + }; + } + ]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html new file mode 100644 index 000000000..eabcee612 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html @@ -0,0 +1,55 @@ +
+
+

+ × + +   + Chef History For - {{botHistory.botName}} + + +   + Jenkins Job History For - {{botHistory.botName}} + + +   + Script History For - {{botHistory.botName}} + + +   + Script History For - {{botHistory.botName}} + +

+
+ +
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
No Data Found
+
+
+ +
+ +
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html index a82e48010..0f6db8808 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -19,13 +19,13 @@

BOT Name - + - + Task Type: - + @@ -54,7 +54,7 @@

BOT Description - + @@ -67,7 +67,7 @@

- + Job Name @@ -81,7 +81,7 @@

- + Script Type Name diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html index 263da4839..3cc456283 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -57,8 +57,9 @@ -
-
+ +
No data Available
+
\ No newline at end of file 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..93a3ae23e --- /dev/null +++ b/server/app/cronjobs/git-repository-sync/gitRepositorySync.js @@ -0,0 +1,164 @@ + +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 = '*/2 * * * *'; +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, + { + fetchOpts: { + callbacks: { + credentials: function(url, userName) { + return nodeGit.Cred.sshKeyNew( + userName, + '/Users/radek/.ssh/id_rsa.pub', + '/Users/radek/.ssh/id_rsa', + ""); + } + } + } + }) + .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/model/bots/bots.js b/server/app/model/bots/bots.js index 319d807af..e8f72a015 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -45,7 +45,7 @@ var BotsSchema = new Schema ({ trim: true, required: true }, - botsConfig:Schema.Types.Mixed, + botConfig:Schema.Types.Mixed, runTimeParams:Schema.Types.Mixed, masterDetails: { orgName: { diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index cc9370839..3a060fddc 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -81,7 +81,7 @@ blueprintService.deleteServiceDeliveryBlueprint = function deleteServiceDelivery Blueprints.removeServiceDeliveryBlueprints(blueprintId, next); }, function (deleteTaskCheck, next) { - auditTrail.softRemoveAuditTrails({auditId:blueprintId},next); + auditTrail.softRemoveAuditTrails(blueprintId,next); } ],function (err, results) { if (err) { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 8dbe63bf6..d8a0a2a64 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -183,11 +183,11 @@ botsService.removeSoftBotsById = function removeSoftBotsById(botId,callback){ function(next){ bots.getBotsById(botId,next); }, - function(bots,next){ - if(bots.length > 0){ + function(botDetails,next){ + if(botDetails.length > 0){ async.parallel({ bots:function(callback){ - if(bots[0].botLinkedCategory === 'Task'){ + if(botDetails[0].botLinkedCategory === 'Task'){ taskService.deleteServiceDeliveryTask(botId, callback); }else{ blueprintService.deleteServiceDeliveryBlueprint(botId,callback) diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 1644e6886..18ce38ea9 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -116,7 +116,7 @@ taskService.deleteServiceDeliveryTask = function deleteServiceDeliveryTask(taskI taskDao.removeServiceDeliveryTask(taskId, next); }, function (deleteTaskCheck, next) { - auditTrail.softRemoveAuditTrails({auditId:taskId},next); + auditTrail.softRemoveAuditTrails(taskId,next); } ],function (err, results) { if (err) { From 4c65545e1db0152b77f36c96074bc1551ce86368 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Fri, 16 Dec 2016 14:09:14 +0530 Subject: [PATCH 004/110] Bot history, execute & schedular related changes. --- client/cat3/main.html | 1 + client/cat3/src/clientRoutes.js | 4 - .../src/partials/globals/header/header.scss | 4 +- .../bots/controller/editParamsCtrl.js | 41 +--- .../dashboard/bots/controller/libraryCtrl.js | 220 +++++++++++------- .../dashboard/bots/view/botExecutionLogs.html | 4 - .../dashboard/bots/view/botHistory.html | 9 +- .../dashboard/bots/view/botHistoryLogs.html | 31 +++ .../dashboard/bots/view/editParams.html | 4 +- .../sections/dashboard/bots/view/library.html | 17 +- .../blueprint/popups/blueprintLaunchCtrl.js | 7 +- .../popups/blueprintLaunchParamsCtrl.js | 21 +- .../orchestration/orchestrationCtrl.js | 1 - .../popups/orchestrationHistoryCtrl.js | 37 +-- server/app/routes/v1.0/routes_bots.js | 1 + 15 files changed, 214 insertions(+), 188 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html diff --git a/client/cat3/main.html b/client/cat3/main.html index 95f0d02cc..dce92b810 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -114,6 +114,7 @@ + diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js index fca4c6c1e..527ec017d 100644 --- a/client/cat3/src/clientRoutes.js +++ b/client/cat3/src/clientRoutes.js @@ -36,7 +36,6 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/workzone", templateUrl: "src/partials/sections/dashboard/workzone/workzone.html", controller: "workzoneCtrl", - params:{filterView:{workzone:true}}, onEnter: function () { }, onExit: function () { @@ -58,7 +57,6 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/design", templateUrl: "src/partials/sections/dashboard/design/design.html", controller: "designCtrl as desCtrl", - params:{filterView:{design:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); @@ -76,7 +74,6 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/analytics/", templateUrl: "src/partials/sections/dashboard/analytics/analytics.html", controller: "analyticsCtrl as analytic", - params:{filterView:{analytics:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); @@ -95,7 +92,6 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/bots", templateUrl: "src/partials/sections/dashboard/bots/bots.html", controller: "botsCtrl as bts", - params:{filterView:{bots:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); diff --git a/client/cat3/src/partials/globals/header/header.scss b/client/cat3/src/partials/globals/header/header.scss index e52098f80..b56e0bb1d 100755 --- a/client/cat3/src/partials/globals/header/header.scss +++ b/client/cat3/src/partials/globals/header/header.scss @@ -19,8 +19,8 @@ cursor:pointer; } - .header-selected-item { - color: #40BAF1; + .activeSection i { + color: #40BAF1 !important; } .header-logo-image { 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 b6822c1fd..fc7e3a947 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -113,7 +113,7 @@ }; $scope.executeBot=function(){ - if (items.botConfig && items.botConfig.botLinkedSubCategory === 'script') { + if (items.botConfig && items.botConfig.taskType === 'script') { var checkParam = false; if ($scope.scriptParamsFlag) { for(var i =0; i<$scope.parameters.length; i++){ @@ -130,11 +130,10 @@ scriptParams = $scope.parameters; } } - if (items.botConfig && items.botConfig.botLinkedSubCategory === 'chef') { + if (items.botConfig && items.botConfig.taskType === 'chef') { cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes); - } - if (items.botConfig && items.botConfig.botLinkedSubCategory === 'jenkins') { + if (items.botConfig && items.botConfig.taskType === 'jenkins') { choiceParam = $scope.jenparams; } $scope.executeBot(); @@ -142,14 +141,14 @@ $scope.executeBot = function(){ var reqBody = {}; - if (items.botConfig && items.botConfig.botLinkedSubCategory === 'jenkins') { + if (items.botConfig && items.botConfig.taskType === 'jenkins') { reqBody.choiceParam = choiceParam; - } else if (items.botConfig && items.botConfig.botLinkedSubCategory === 'chef'){ + } else if (items.botConfig && items.botConfig.taskType === 'chef'){ reqBody.tagServer = $scope.tagSerSelected; if ($scope.chefAttributesFlag) { reqBody.cookbookAttributes = cookbookAttributes; } - } else if (items.botConfig && items.botConfig.botLinkedSubCategory === 'script') { + } else if (items.botConfig && items.botConfig.taskType === 'script') { reqBody.tagServer = $scope.tagSerSelected; if ($scope.scriptParamsFlag) { reqBody.scriptParams = scriptParams; @@ -163,7 +162,7 @@ console.log(response); $modalInstance.close(response.data); $rootScope.$emit('BOTS_LIBRARY_REFRESH'); - helper.botLogModal(items._id, response.historyId, response.taskType); + helper.botLogModal(items.botId, response.historyId, response.taskType); }, function (error) { error = error.responseText || error; @@ -173,34 +172,10 @@ toastr.error(error); } }); - /*workzoneServices.runTask(items._id, reqBody).then( - function (response) { - $modalInstance.close(response.data); - $rootScope.$emit('BOTS_LIBRARY_REFRESH'); - $rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT'); - }, - function (error) { - error = error.responseText || error; - if (error.message) { - toastr.error(error.message); - } else { - toastr.error(error); - } - } - );*/ }; $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; - }])/*.controller('botExecutionLogsCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { - $scope.botExecutionLogs = items; - console.log(items); - - - - $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 fadbd0720..8206a3c97 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -21,28 +21,30 @@ console.log($scope.paginationParams.sortBy); $scope.initGrids = function(){ - $scope.botLibGridOptions={}; + $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 Info',displayName: 'BOT Info',cellTemplate: - ''}, - { name: 'BOT Action',displayName: 'BOT Action',cellTemplate: - '' + - '' + - '' - } - ] + { 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 Info',displayName: 'BOT Info',cellTemplate: + ''}, + { name: 'BOT Action',displayName: 'BOT Action',cellTemplate: + '' + + '' + + '' + } + ] $scope.botLibGridOptions.data=[]; angular.extend($scope.botLibGridOptions,botLibraryUIGridDefaults.gridOption); }; @@ -96,6 +98,26 @@ }); }; $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"; + }); + }; var gridBottomSpace = 190; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; $scope.launchInstance = function(launch){ @@ -153,7 +175,7 @@ console.log('Modal Dismissed at ' + new Date()); }); }; - $scope.botSchedule = function() { + $scope.botSchedule = function(bot) { $modal.open({ templateUrl: 'src/partials/sections/dashboard/bots/view/botSchedule.html', controller: 'botScheduleCtrl', @@ -161,10 +183,7 @@ keyboard: false, resolve: { items: function () { - return { - chefJenkScriptTaskObj:$scope.chefJenkScriptTaskObj, - type:$scope.type - } + return bot } } }).result.then(function (chefEventDetails) { @@ -241,7 +260,7 @@ $scope.failedBotsselected = false; lib.gridOptions.data=[]; var param={ - url:'/bots?actionStatus=running?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + url:'/bots?actionStatus=running&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { $timeout(function() { @@ -257,7 +276,7 @@ $scope.totalBotsSelected = false; lib.gridOptions.data=[]; var param={ - url:'/bots?actionStatus=failed?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + url:'/bots?actionStatus=failed&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { $timeout(function() { @@ -287,6 +306,7 @@ }; }]).controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) { console.log(items); + $scope.botId = items.botId; $scope.defaultSelection = function() { $scope.repeatsType = 'Minutes';//default selection. $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); @@ -351,9 +371,7 @@ $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]; $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]; - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; + $scope.ok=function(){ $scope.eventParams = { repeats: $scope.repeatsType, @@ -366,7 +384,14 @@ selectedDayOfTheMonth: $scope.selectedDayOfTheMonth, monthOfYear: $scope.selectedMonth }; - $modalInstance.close($scope.eventParams); + var param={ + url:'/bots/' + $scope.botId + '/scheduler', + reqBody: $scope.eventParams + }; + genSevs.promisePut(param).then(function (response) { + $scope.botSummary = response; + $scope.totalSavedTimeForBots = parseInt($scope.botSummary.totalSavedTimeForBots); + }); }; $scope.cancel = function() { @@ -386,25 +411,24 @@ $scope.taskHistoryChefGridOptions.data='taskHistoryChefData'; $scope.taskHistoryChefGridOptions.columnDefs = [ { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, - { name:'Message', field: 'message', - cellTemplate:'{{row.entity.message}}'}, { name:'User',field:'user',cellTooltip: true}, { name:'Logs',width: 70, - cellTemplate:'
'},{ name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + 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} ]; }; angular.extend($scope, { taskHistoryChefListView: function() { $scope.taskHistoryChefData = []; - /*var param={ - url:'/bots/:$scope.botId/bots-history' - };*/ - workzoneServices.getHistory(items.botId).then(function(response) { + var param={ + url:'/bots/' + $scope.botId + '/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { console.log(response); $timeout(function() { if(response.data){ @@ -419,6 +443,21 @@ $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; @@ -437,7 +476,6 @@ $scope.getExecutionTime(); $scope.getSavedTime(); }; - //$scope.initchef(); //UI Grid for chef Task ends //UI Grid for jenkins Task starts @@ -448,15 +486,15 @@ $scope.initJenkinsGrids = function(){ $scope.taskHistoryJenkinsGridOptions.data='taskHistoryJenkinsData'; $scope.taskHistoryJenkinsGridOptions.columnDefs = [ - { name:'Job Number',field:'buildNumber',cellTemplate:'{{row.entity.buildNumber}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { 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:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | timestampToLocaleTime}}',cellTooltip: true}, - { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}',cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + { 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} ]; }; @@ -464,9 +502,9 @@ taskHistoryJenkinsListView: function() { $scope.taskHistoryJenkinsData = []; var param={ - url:'/bots/:$scope.botId/bots-history' + url:'/bots/' + $scope.botId + '/bots-history' }; - workzoneServices.getHistory(items.botId).then(function(response) { + genSevs.promiseGet(param).then(function (response) { console.log(response); $timeout(function() { if(response.data){ @@ -489,7 +527,6 @@ $scope.getExecutionTime(); $scope.getSavedTime(); }; - //$scope.initjenkins(); //UI Grid for jenkins Task ends //UI Grid for script Task starts @@ -501,26 +538,24 @@ $scope.taskHistoryScriptGridOptions.data='taskHistoryScriptData'; $scope.taskHistoryScriptGridOptions.columnDefs = [ { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, - { name:'Message', field: 'message', - cellTemplate:'{{row.entity.message}}'}, { name:'User',field:'user',cellTooltip: true}, { name:'Logs',width: 70, cellTemplate:'
'}, - { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + { 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} ]; }; angular.extend($scope, { taskHistoryScriptListView: function() { $scope.taskHistoryScriptData = []; - /*var param={ - url:'/bots/:$scope.botId/bots-history' - };*/ - workzoneServices.getHistory(items.botId).then(function(response) { + var param={ + url:'/bots/' + $scope.botId + '/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { console.log(response); $timeout(function() { if(response.data){ @@ -543,7 +578,6 @@ $scope.getExecutionTime(); $scope.getSavedTime(); }; - //$scope.initscript(); //UI Grid for script Task ends //UI Grid for Blueprint starts @@ -555,26 +589,24 @@ $scope.botHistoryBlueprintGridOptions.data='botHistoryBlueprintData'; $scope.botHistoryBlueprintGridOptions.columnDefs = [ { name:'Status',field:'status',cellTemplate:'
{{row.entity.status}}
', cellTooltip: true}, - { name:'Message', field: 'message', - cellTemplate:'{{row.entity.message}}'}, { name:'User',field:'user',cellTooltip: true}, { name:'Logs',width: 70, cellTemplate:'
'}, - { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + + { 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} ]; }; angular.extend($scope, { botHistoryBlueprintListView: function() { $scope.botHistoryBlueprintData = []; - /*var param={ - url:'/bots/:$scope.botId/bots-history' - };*/ - workzoneServices.getHistory(items.botId).then(function(response) { + var param={ + url:'/bots/' + $scope.botId + '/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { console.log(response); $timeout(function() { if(response.data){ @@ -597,7 +629,6 @@ $scope.getExecutionTime(); $scope.getSavedTime(); }; - //$scope.initblueprint(); //UI Grid for Blueprint ends $scope.bot=items; @@ -605,8 +636,6 @@ case 'chef' : $scope.ischefTaskHistoryPageLoading = true; $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.iscompositeTaskHistoryPageLoading = false; - $scope.ispuppetTaskHistoryPageLoading = false; $scope.isscriptTaskHistoryPageLoading = false; $scope.isBlueprintBotHistoryPageLoading = false; $scope.initchef(); @@ -614,8 +643,6 @@ case 'jenkins' : $scope.ischefTaskHistoryPageLoading = false; $scope.isjenkinsTaskHistoryPageLoading = true; - $scope.iscompositeTaskHistoryPageLoading = false; - $scope.ispuppetTaskHistoryPageLoading = false; $scope.isscriptTaskHistoryPageLoading = false; $scope.isBlueprintBotHistoryPageLoading = false; $scope.initjenkins(); @@ -623,8 +650,6 @@ case 'script': $scope.ischefTaskHistoryPageLoading = false; $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.iscompositeTaskHistoryPageLoading = false; - $scope.ispuppetTaskHistoryPageLoading = false; $scope.isscriptTaskHistoryPageLoading = true; $scope.isBlueprintBotHistoryPageLoading = false; $scope.initscript(); @@ -632,8 +657,6 @@ case 'instance_launch': $scope.ischefTaskHistoryPageLoading = false; $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.iscompositeTaskHistoryPageLoading = false; - $scope.ispuppetTaskHistoryPageLoading = false; $scope.isscriptTaskHistoryPageLoading = false; $scope.isBlueprintBotHistoryPageLoading = true; $scope.initblueprint(); @@ -641,18 +664,19 @@ } $scope.historyLogs=function(hist) { + console.log(hist); var modalInstance = $modal.open({ animation: true, - templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationLog.html', - controller: 'orchestrationLogCtrl as orchLogCtrl', + templateUrl: 'src/partials/sections/dashboard/bots/view/botExecutionLogs.html', + controller: 'botExecutionLogsCtrl as botExecLogCtrl', backdrop : 'static', keyboard: false, resolve: { items: function() { return { - taskId : hist.taskId, + taskId : hist.auditId, historyId : hist._id, - taskType:hist.taskType + taskType:hist.auditTrailConfig.executionType }; } } @@ -667,5 +691,21 @@ $modalInstance.dismiss('cancel'); }; } - ]); + ]).controller('botHistoryLogsCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { + $scope.botInfo = items; + console.log(items); + $scope.parentItemDetail=items; + var botHistLogsCtrl={}; + botHistLogsCtrl.taskLogType=items.taskType; + botHistLogsCtrl.cancelAll=function(){ + $scope.$broadcast ('closeWindow'); + $modalInstance.dismiss('cancel'); + return $scope.close; + }; + return botHistLogsCtrl; + + $scope.cancel= function() { + $modalInstance.dismiss('cancel'); + }; + }]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html index e2e8e4d80..8a6fc9461 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html @@ -19,10 +19,6 @@

- diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html index 82a6e9c5a..20c586642 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html @@ -14,23 +14,22 @@

- {{taskHistoryChefData.length}} -
+
-
+
-
+
-
+
No Data Found
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html new file mode 100644 index 000000000..ceccb2d25 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html @@ -0,0 +1,31 @@ +
+
+ × +

+ + Execute Logs +

+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ +
+
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index ce379adb3..30ab2a830 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -82,8 +82,8 @@

Add Parameters:

Key - Value Description + Value @@ -91,8 +91,8 @@

Add Parameters:

{{param}} - + 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 3cc456283..e8ce2e69d 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -61,5 +61,20 @@
No data Available
+
+
+ +
+
- \ No newline at end of file + + + \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js index 929669e17..4141b54a0 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js @@ -10,7 +10,7 @@ angular.module('workzone.blueprint') .controller('blueprintLaunchCtrl', ['$scope', '$rootScope', '$modalInstance', 'bpItem', 'workzoneServices', 'workzoneEnvironment', 'instanceLogs', function($scope, $rootScope, $modalInstance, bpItem, workzoneServices, workzoneEnvironment, instanceLogs) { console.log(bpItem); - if(bpItem.bp.botLinkedCategory === 'Blueprint') { + if(bpItem.bp.blueprintType) { $scope.isBPLogsLoading = true; $scope.isNewInstanceLogsPromise = false; var helper = { @@ -44,9 +44,9 @@ } else{ isSuccess = true; - if (bpItem.bp.botLinkedCategory === 'aws_cf') { + if (bpItem.bp.blueprintType === 'aws_cf') { msgStr = 'Stack Id : ' + $scope.launchResponse.stackId + '. You can view your stack in cloudformation tab'; - } else if (bpItem.bp.botLinkedCategory === 'azure_arm') { + } else if (bpItem.bp.blueprintType === 'azure_arm') { msgStr = 'Deployment Id : ' + $scope.launchResponse.armId + '. You can view your deployment in ARM tab'; } else { msgStr = 'Instance Id : '; @@ -75,7 +75,6 @@ var envParams = workzoneEnvironment.getEnvParams(); var versionsList = []; var versionOptional; - versionOptional = 0.1; if(bpItem.bp.blueprintConfig){ if(bpItem.bp.blueprintConfig.infraManagerData && bpItem.bp.blueprintConfig.infraManagerData.versionsList){ versionsList = bpItem.bp.blueprintConfig.infraManagerData.versionsList; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index 63815827d..b8b4e9818 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -34,17 +34,16 @@ } genericServices.getTreeNew().then(function (envData) { angular.forEach(envData,function(val){ - console.log(val); var orgID,bgID,projID; if(items.organizationId === undefined) { - orgID = (items.masterDetails.orgId)?items.masterDetails.orgId:items.organization.id; - bgID = (items.masterDetails.bgId)?items.masterDetails.bgId:items.businessGroup.id; - projID = (items.masterDetails.projectId)?items.masterDetails.projectId:items.project.id; + orgID = (items.orgId)?items.orgId:items.organization.id; + bgID = (items.bgId)?items.bgId:items.businessGroup.id; + projID = (items.projectId)?items.projectId:items.project.id; $scope.getMonitorList(orgID); } else { - orgID = items.organizationId || items.masterDetails.orgId; - bgID = items.businessGroupId || items.masterDetails.bgId; - projID = items.projectId || items.masterDetails.projectId; + orgID = items.organizationId; + bgID = items.businessGroupId; + projID = items.projectId; $scope.getMonitorList(orgID); } if(val.rowid === orgID){ @@ -66,7 +65,9 @@ } }); } + }); + }); $scope.stackName=''; $scope.domainName=''; @@ -75,7 +76,7 @@ $modalInstance.dismiss('cancel'); }; $scope.launchBP = function() { - if((items.orgId === undefined) && (items.masterDetails && items.masterDetails.orgId === undefined)){ + if(items.orgId === undefined){ var compBlue={ "blueprintId": (items.id)?items.id:items._id, "environmentId": $scope.envSeleted @@ -87,9 +88,9 @@ toastr.error(data.message, 'Error'); }); } else { - if(items.blueprintType === "aws_cf" || items.botLinkedSubCategory === "aws_cf") { + if(items.blueprintType === "aws_cf") { $scope.showCFTInputs = true; - }else if(items.blueprintType === "azure_arm" || items.botLinkedSubCategory === "azure_arm") { + }else if(items.blueprintType === "azure_arm") { $scope.showARMInputs = true; }else if(items.domainNameCheck === true || items.domainNameCheck === "true") { $scope.showBlueprintInputs = true; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js index b6f842ce7..f6d484af3 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js @@ -30,7 +30,6 @@ $scope.initGrids = function(){ $scope.orcheGridOptions=angular.extend(orchestrationUIGridDefaults.gridOption,{ data : 'tabData', - enableFiltering: true, columnDefs : [ { name:'Job Type', width:100,field:'taskType' ,cellTemplate:'row.entity.taskType'+ 'row.entity.taskType'+ diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js index 287cc8a24..99e7c6183 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js @@ -25,11 +25,7 @@ { name:'User',field:'user',cellTooltip: true}, { name:'Logs',width: 70, cellTemplate:'
'},{ name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + - 'NA', cellTooltip: true} + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}', cellTooltip: true} ]; }; angular.extend($scope, { @@ -49,23 +45,11 @@ $scope.errorMessage = "No Chef History Records found"; $scope.ischefTaskHistoryPageLoading = false; }); - }, - getExecutionTime: function(endTime, startTime) { - $scope.executionTimeinMS = endTime-startTime; - $scope.executionTime = $scope.executionTimeinMS/(60000); - return +(Math.round($scope.executionTime + "e+1") + "e-1"); - }, - getSavedTime: function(endTime, startTime) { - var executionTime = $scope.getExecutionTime(endTime, startTime); - $scope.savedTime = items.manualExecutionTime-executionTime; - return $scope.savedTime; - } + } }); $scope.initchef = function(){ $scope.initChefGrids(); $scope.taskHistoryChefListView(); - $scope.getExecutionTime(); - $scope.getSavedTime(); }; //UI Grid for chef Task ends @@ -82,11 +66,7 @@ { name:'Log Info',width: 90,cellTemplate:'',cellTooltip: true}, { name:'Status',field:'status',cellTemplate:'
{{row.entity.status.toUpperCase()}}
'}, { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | timestampToLocaleTime}}',cellTooltip: true}, - { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}',cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + - 'NA', cellTooltip: true} + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}',cellTooltip: true} ]; }; angular.extend($scope, { @@ -111,8 +91,6 @@ $scope.initjenkins = function(){ $scope.initJenkinsGrids(); $scope.taskHistoryJenkinsListView(); - $scope.getExecutionTime(); - $scope.getSavedTime(); }; //UI Grid for jenkins Task ends @@ -215,11 +193,8 @@ { name:'Logs',width: 70, cellTemplate:'
'}, { name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | 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.timestampEnded,row.entity.timestampStarted)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins' + - 'NA', cellTooltip: true} + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}', cellTooltip: true} + ]; }; angular.extend($scope, { @@ -244,8 +219,6 @@ $scope.initscript = function(){ $scope.initScriptGrids(); $scope.taskHistoryScriptListView(); - $scope.getExecutionTime(); - $scope.getSavedTime(); }; //UI Grid for script Task ends diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index ba2fd4c5a..3a0ec1cdb 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -111,6 +111,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { if (err) { return res.status(500).send(err); } else { + data.botId=req.params.botId; return res.status(200).send(data); } }) From 618a90b2126c08fbe0ef179e7da9585e488ba1bf Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Dec 2016 14:55:10 +0530 Subject: [PATCH 005/110] BOTs Implementation for Blueprint Copy Functionality --- .../bots/controller/editParamsCtrl.js | 12 +- .../dashboard/bots/controller/libraryCtrl.js | 71 ++++---- .../design/view/blueprintCreate.html | 1 + server/app/model/blueprint/blueprint.js | 25 +++ server/app/model/bots/bots.js | 4 + server/app/routes/v1.0/routes_blueprints.js | 24 ++- server/app/routes/v1.0/routes_bots.js | 4 +- server/app/services/blueprintService.js | 155 +++++++++--------- 8 files changed, 157 insertions(+), 139 deletions(-) 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 093e95c5e..16156b95a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -113,7 +113,7 @@ } }; - $scope.executeBot=function(){ + /* $scope.executeBot=function(){ if (items.botConfig && items.botConfig.botLinkedSubCategory === 'script') { var checkParam = false; if ($scope.scriptParamsFlag) { @@ -138,7 +138,7 @@ choiceParam = $scope.jenparams; } $scope.executeBot(); - }; + };*/ $scope.executeBot = function(){ var reqBody = {}; @@ -160,10 +160,12 @@ data: reqBody }; genSevs.promisePost(param).then(function (response) { - console.log(response); - $modalInstance.close(response.data); + /* console.log(response); + //helper.orchestrationLogModal(task._id, response.data.historyId, task.taskType); + $modalInstance.close(response.data);*/ + helper.botLogModal(items.botId, response.historyId, response.taskType); $rootScope.$emit('BOTS_LIBRARY_REFRESH'); - helper.botLogModal(items._id, response.historyId, response.taskType); + }, function (error) { error = error.responseText || error; 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 29e82f155..5ec6a8011 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -240,7 +240,7 @@ $scope.failedBotsselected = false; lib.gridOptions.data=[]; var param={ - url:'/bots?actionStatus=running?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + url:'/bots?actionStatus=running&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { $timeout(function() { @@ -256,7 +256,7 @@ $scope.totalBotsSelected = false; lib.gridOptions.data=[]; var param={ - url:'/bots?actionStatus=failed?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + url:'/bots?actionStatus=failed&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { $timeout(function() { @@ -400,25 +400,10 @@ angular.extend($scope, { taskHistoryChefListView: function() { $scope.taskHistoryChefData = []; - /*var param={ + var param={ url:'/bots/:$scope.botId/bots-history' - };*/ - 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; - }); - genSevs.getHistory(items._id).then(function(response) { + }; + genSevs.promiseGet(param).then(function(response) { $timeout(function() { if(response.data){ $scope.taskHistoryChefData = response.data; @@ -478,7 +463,7 @@ taskHistoryJenkinsListView: function() { $scope.taskHistoryJenkinsData = []; var param={ - url:'/bots/:$scope.botId/bots-history' + url:'/bots/'+$scope.botId+'/bots-history' }; workzoneServices.getHistory(items.botId).then(function(response) { console.log(response); @@ -531,24 +516,24 @@ angular.extend($scope, { taskHistoryScriptListView: function() { $scope.taskHistoryScriptData = []; - /*var param={ - url:'/bots/:$scope.botId/bots-history' - };*/ - workzoneServices.getHistory(items.botId).then(function(response) { - console.log(response); + var param={ + url:'/bots/'+$scope.botId+'/bots-history' + }; + genSevs.promiseGet(param).then(function(response) { $timeout(function() { if(response.data){ - $scope.taskHistoryScriptData = response.data; - $scope.isscriptTaskHistoryPageLoading = false; + $scope.taskHistoryChefData = response.data; + $scope.ischefTaskHistoryPageLoading = false; }else if(response){ - $scope.taskHistoryScriptData = response; - $scope.isscriptTaskHistoryPageLoading = false; + $scope.taskHistoryChefData = response; + $scope.ischefTaskHistoryPageLoading = false; } },100); }, function(){ - $scope.errorMessage = "No Script History Records found"; - $scope.isscriptTaskHistoryPageLoading = false; + $scope.errorMessage = "No Chef History Records found"; + $scope.ischefTaskHistoryPageLoading = false; }); + }, }); $scope.initscript = function(){ @@ -585,23 +570,23 @@ angular.extend($scope, { botHistoryBlueprintListView: function() { $scope.botHistoryBlueprintData = []; - /*var param={ - url:'/bots/:$scope.botId/bots-history' - };*/ - workzoneServices.getHistory(items.botId).then(function(response) { - console.log(response); + var param={ + url:'/bots/'+$scope.botId+'/bots-history' + }; + + genSevs.promiseGet(param).then(function(response) { $timeout(function() { if(response.data){ - $scope.botHistoryBlueprintData = response.data; - $scope.isBlueprintBotHistoryPageLoading = false; + $scope.taskHistoryChefData = response.data; + $scope.ischefTaskHistoryPageLoading = false; }else if(response){ - $scope.botHistoryBlueprintData = response; - $scope.isBlueprintBotHistoryPageLoading = false; + $scope.taskHistoryChefData = response; + $scope.ischefTaskHistoryPageLoading = false; } },100); }, function(){ - $scope.errorMessage = "No Script History Records found"; - $scope.isBlueprintBotHistoryPageLoading = false; + $scope.errorMessage = "No Chef History Records found"; + $scope.ischefTaskHistoryPageLoading = false; }); }, }); 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/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..3b735b57e 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -176,6 +176,10 @@ var BotsSchema = new Schema ({ type: Boolean, default: false }, + version: { + type: Number, + default: 1 + }, }); BotsSchema.plugin(mongoosePaginate); 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 ba2fd4c5a..2f9198dbd 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -58,8 +58,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }); 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) { @@ -111,6 +109,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { if (err) { return res.status(500).send(err); } else { + data.botId=req.params.botId; return res.status(200).send(data); } }) @@ -126,5 +125,4 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { } }) }); - }; \ No newline at end of file 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; From 936f82309007412462ac0a76844cb52cf73ca025 Mon Sep 17 00:00:00 2001 From: Udesh Date: Fri, 16 Dec 2016 16:18:55 +0530 Subject: [PATCH 006/110] added few more cookbooks for sensu --- server/app/lib/utils/masterUtil.js | 5 + .../aws-blueprint/aws-blueprint.js | 5 +- server/app/routes/v1.0/routes_chef.js | 265 ++- .../app/routes/v1.0/routes_organizations.js | 1790 +++++++++-------- .../app/routes/v1.0/routes_providercommon.js | 698 ++++--- 5 files changed, 1386 insertions(+), 1377 deletions(-) diff --git a/server/app/lib/utils/masterUtil.js b/server/app/lib/utils/masterUtil.js index 3fa0b1b02..ca10e8105 100755 --- a/server/app/lib/utils/masterUtil.js +++ b/server/app/lib/utils/masterUtil.js @@ -2225,6 +2225,11 @@ var MasterUtil = function () { return callback(null, templates); }); }; + + this.getSensuCookbooks = function(){ + var cookbooks = ['recipe[sensu-client]','recipe[sensu_check_load]','recipe[sensu_check_disk]','recipe[sensu_check_cpu]','recipe[sensu_check_memory]']; + return cookbooks; + }; //return cookbook attributes object for sensu-client this.getSensuCookbookAttributes = function (monitorDetails, instanceId) { diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js index d6747e94b..afe69e624 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js @@ -537,9 +537,10 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { runlist = launchParams.blueprintData.extraRunlist.concat(instance.runlist); } - var sensuCookBook = 'recipe[sensu-client]'; + var sensuCookBooks = masterUtil.getSensuCookbooks(); + var sensuCookBook = sensuCookBooks[0]; if (runlist.indexOf(sensuCookBook) === -1 && launchParams.monitor && launchParams.monitor.parameters.transportProtocol === 'rabbitmq') { - runlist.unshift(sensuCookBook); + runlist = sensuCookBooks.concat(runlist); jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(launchParams.monitor, instance.id); } diff --git a/server/app/routes/v1.0/routes_chef.js b/server/app/routes/v1.0/routes_chef.js index 7684d37a2..c9a42a677 100755 --- a/server/app/routes/v1.0/routes_chef.js +++ b/server/app/routes/v1.0/routes_chef.js @@ -308,131 +308,130 @@ module.exports.setRoutes = function (app, verificationFunc) { return; } else if (credentialStatus) { monitorsModel.getById(reqBody.monitorId, function (err, monitor) { - var instance = { - name: node.name, - orgId: orgId, - bgId: bgId, - projectId: projectId, - envId: node.envId, - orgName: reqBody.orgName, - bgName: reqBody.bgName, - projectName: reqBody.projectName, - environmentName: envName, - chefNodeName: node.name, - runlist: runlist, - platformId: platformId, - instanceIP: nodeIp, - instanceState: 'running', - bootStrapStatus: 'success', - hardware: hardwareData, - tagServer: reqBody.tagServer, - monitor: monitor, - credentials: encryptedCredentials, - users: users, - chef: { - serverId: req.params.serverId, - chefNodeName: node.name - }, - blueprintData: { - blueprintName: node.name, - templateId: "chef_import", - iconPath: "../private/img/templateicons/chef_import.png" - } - }; - instancesDao.createInstance(instance, function (err, data) { - if (err) { - logger.debug(err, 'occured in inserting node in mongo'); - callback(err, null); - return; - } - instance.id = data._id; - instance._id = data._id; - - //install sensu client if monitoring server configured - if (instance.monitor && instance.monitor.parameters.transportProtocol === 'rabbitmq') { - var sensuCookBook = 'recipe[sensu-client]'; - var runlist = []; - var jsonAttributes = {}; - runlist.push(sensuCookBook); - jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor,instance.id); - - runOptions = { - privateKey: credentials.pemFileLocation, - username: credentials.username, - host: instance.instanceIP, - instanceOS: instance.hardware.os, - port: 22, - runlist: runlist, - overrideRunlist: false, - jsonAttributes: JSON.stringify(jsonAttributes) - }; - chef.runClient(runOptions, function (err, retCode) { - logger.debug("knife ret code", retCode); - }); - - } - - - - - var timestampStarted = new Date().getTime(); - var actionLog = instancesDao.insertBootstrapActionLogForChef(instance.id, [], req.session.user.cn, timestampStarted); - var logsReferenceIds = [instance.id, actionLog._id]; - logsDao.insertLog({ - referenceId: logsReferenceIds, - err: false, - log: "Node Imported", - timestamp: timestampStarted - }); - var instanceLog = { - actionId: actionLog._id, - instanceId: instance.id, + var instance = { + name: node.name, + orgId: orgId, + bgId: bgId, + projectId: projectId, + envId: node.envId, orgName: reqBody.orgName, bgName: reqBody.bgName, projectName: reqBody.projectName, - envName: envName, - status: "running", - bootStrap: "success", - actionStatus: "success", + environmentName: envName, + chefNodeName: node.name, + runlist: runlist, platformId: platformId, - blueprintName: node.name, - data: runlist, - platform: hardwareData.platform, - os: hardwareData.os, - size: "", - user: req.session.user.cn, - startedOn: new Date().getTime(), - createdOn: new Date().getTime(), - providerType: "", - action: "Imported From ChefServer", - logs: [{ - err: false, - log: "Node Imported", - timestamp: new Date().getTime() - }] - }; - - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); + instanceIP: nodeIp, + instanceState: 'running', + bootStrapStatus: 'success', + hardware: hardwareData, + tagServer: reqBody.tagServer, + monitor: monitor, + credentials: encryptedCredentials, + users: users, + chef: { + serverId: req.params.serverId, + chefNodeName: node.name + }, + blueprintData: { + blueprintName: node.name, + templateId: "chef_import", + iconPath: "../private/img/templateicons/chef_import.png" } - }); - var _docker = new Docker(); - _docker.checkDockerStatus(data._id, function (err, retCode) { + }; + instancesDao.createInstance(instance, function (err, data) { if (err) { - logger.error("Failed _docker.checkDockerStatus", err); + logger.debug(err, 'occured in inserting node in mongo'); + callback(err, null); return; } - logger.debug('Docker Check Returned:' + retCode); - if (retCode == '0') { - instancesDao.updateInstanceDockerStatus(data._id, "success", '', function (data) { - logger.debug('Instance Docker Status set to Success'); + instance.id = data._id; + instance._id = data._id; + + //install sensu client if monitoring server configured + if (instance.monitor && instance.monitor.parameters.transportProtocol === 'rabbitmq') { + var sensuCookBooks = MasterUtils.getSensuCookbooks(); + var runlist = sensuCookBooks; + var jsonAttributes = {}; + jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id); + + runOptions = { + privateKey: credentials.pemFileLocation, + username: credentials.username, + host: instance.instanceIP, + instanceOS: instance.hardware.os, + port: 22, + runlist: runlist, + overrideRunlist: false, + jsonAttributes: JSON.stringify(jsonAttributes) + }; + chef.runClient(runOptions, function (err, retCode) { + logger.debug("knife ret code", retCode); }); + } + + + + + var timestampStarted = new Date().getTime(); + var actionLog = instancesDao.insertBootstrapActionLogForChef(instance.id, [], req.session.user.cn, timestampStarted); + var logsReferenceIds = [instance.id, actionLog._id]; + logsDao.insertLog({ + referenceId: logsReferenceIds, + err: false, + log: "Node Imported", + timestamp: timestampStarted + }); + var instanceLog = { + actionId: actionLog._id, + instanceId: instance.id, + orgName: reqBody.orgName, + bgName: reqBody.bgName, + projectName: reqBody.projectName, + envName: envName, + status: "running", + bootStrap: "success", + actionStatus: "success", + platformId: platformId, + blueprintName: node.name, + data: runlist, + platform: hardwareData.platform, + os: hardwareData.os, + size: "", + user: req.session.user.cn, + startedOn: new Date().getTime(), + createdOn: new Date().getTime(), + providerType: "", + action: "Imported From ChefServer", + logs: [{ + err: false, + log: "Node Imported", + timestamp: new Date().getTime() + }] + }; + + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); + var _docker = new Docker(); + _docker.checkDockerStatus(data._id, function (err, retCode) { + if (err) { + logger.error("Failed _docker.checkDockerStatus", err); + return; + } + logger.debug('Docker Check Returned:' + retCode); + if (retCode == '0') { + instancesDao.updateInstanceDockerStatus(data._id, "success", '', function (data) { + logger.debug('Instance Docker Status set to Success'); + }); + } + }); + callback(null, data); }); - callback(null, data); }); - }); } else { callback({message: "Invalid Credentials"}, null); } @@ -559,7 +558,7 @@ module.exports.setRoutes = function (app, verificationFunc) { } MasterUtils.getCongifMgmtsById(req.params.serverId, function (err, chefDetails) { - + if (err) { res.send(500); return; @@ -1422,25 +1421,25 @@ module.exports.setRoutes = function (app, verificationFunc) { app.get("/chef/nodeList", function (req, res) { var reqObj = {}; async.waterfall( - [ - function (next) { - apiUtil.changeRequestForJqueryPagination(req.query, next); - }, - function (reqData, next) { - reqObj = reqData; - apiUtil.paginationRequest(reqData, 'chefNodes', next); - }, - function (paginationReq, next) { - paginationReq['searchColumns'] = ['chefNodeIp', 'chefNodeName', "chefNodePlatform"]; - apiUtil.databaseUtil(paginationReq, next); - }, - function (queryObj, next) { - chefDao.getNodesByServerId(queryObj, next); - }, - function (nodes, next) { - apiUtil.changeResponseForJqueryPagination(nodes, reqObj, next); - }, - ], function (err, results) { + [ + function (next) { + apiUtil.changeRequestForJqueryPagination(req.query, next); + }, + function (reqData, next) { + reqObj = reqData; + apiUtil.paginationRequest(reqData, 'chefNodes', next); + }, + function (paginationReq, next) { + paginationReq['searchColumns'] = ['chefNodeIp', 'chefNodeName', "chefNodePlatform"]; + apiUtil.databaseUtil(paginationReq, next); + }, + function (queryObj, next) { + chefDao.getNodesByServerId(queryObj, next); + }, + function (nodes, next) { + apiUtil.changeResponseForJqueryPagination(nodes, reqObj, next); + }, + ], function (err, results) { if (err) { res.send(err); } else { diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js index 0a852c9eb..c6b94c98c 100755 --- a/server/app/routes/v1.0/routes_organizations.js +++ b/server/app/routes/v1.0/routes_organizations.js @@ -1,12 +1,12 @@ /* Copyright [2016] [Relevance Lab] - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -56,14 +56,14 @@ var monitorsModel = require('_pr/model/monitors/monitors.js'); var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); var botsService = require('_pr/services/botsService.js'); -module.exports.setRoutes = function(app, sessionVerification) { +module.exports.setRoutes = function (app, sessionVerification) { /* * API without authentication provider to support telemetry. * @TODO To be moved to routes specific to containers. */ - app.get('/containers', function(req, res) { + app.get('/containers', function (req, res) { logger.debug("Enter get() for all docker Containers"); - containerDao.getAllContainers(function(err, containerList) { + containerDao.getAllContainers(function (err, containerList) { if (err) { logger.error(err); res.send(err); @@ -81,111 +81,111 @@ module.exports.setRoutes = function(app, sessionVerification) { app.all('/organizations/*', sessionVerification); - app.get('/organizations/getTreeNew', function(req, res) { + app.get('/organizations/getTreeNew', function (req, res) { logger.debug("Enter get() for /organizations/getTreeNew"); var loggedInUser = req.session.user.cn; var masterDetailList = []; var orgIds = []; async.waterfall([ - function(next){ - masterUtil.getLoggedInUser(loggedInUser,next); + function (next) { + masterUtil.getLoggedInUser(loggedInUser, next); }, - function(userDetails,next){ - if(userDetails.loginname){ - masterUtil.getAllSettingsForUser(loggedInUser,next); - }else{ - next('Invalid User.',null); + function (userDetails, next) { + if (userDetails.loginname) { + masterUtil.getAllSettingsForUser(loggedInUser, next); + } else { + next('Invalid User.', null); } }, - function(masterDetails,next){ - if(masterDetails.length > 0){ + function (masterDetails, next) { + if (masterDetails.length > 0) { masterDetailList = masterDetails; d4dModelNew.d4dModelMastersOrg.find({ - id: '1', - active: true, - rowid: { - $in: masterDetails[0].orgs - } - },next) - }else{ - next('getTeamsOrgBuProjForUser : is null',null); + id: '1', + active: true, + rowid: { + $in: masterDetails[0].orgs + } + }, next) + } else { + next('getTeamsOrgBuProjForUser : is null', null); } }, - function(orgList,next){ - if(orgList.length > 0){ + function (orgList, next) { + if (orgList.length > 0) { var orgTree = []; - for(var i = 0; i < orgList.length;i++){ + for (var i = 0; i < orgList.length; i++) { orgIds.push(orgList[i].rowid); var orgObj = { - name:orgList[i].orgname, - orgid:orgList[i].rowid, - rowid:orgList[i].rowid, - businessGroups:[], - environments:[], + name: orgList[i].orgname, + orgid: orgList[i].rowid, + rowid: orgList[i].rowid, + businessGroups: [], + environments: [], } orgTree.push(orgObj); - if(orgTree.length === orgList.length){ - next(null,orgTree); + if (orgTree.length === orgList.length) { + next(null, orgTree); } } - }else{ - next(null,orgList); + } else { + next(null, orgList); } }, - function(orgTree,next){ - if(orgTree.length > 0){ + function (orgTree, next) { + if (orgTree.length > 0) { var orgCount = 0; var bgObjList = []; - for(var i = 0; i < orgTree.length;i++){ - (function(org){ + for (var i = 0; i < orgTree.length; i++) { + (function (org) { d4dModelNew.d4dModelMastersProductGroup.find({ id: '2', - orgname_rowid:{ - $in :[org.rowid] + orgname_rowid: { + $in: [org.rowid] }, rowid: { $in: masterDetailList[0].bunits } - }, function(err, bgList) { - if(err){ + }, function (err, bgList) { + if (err) { next(err); - }else if(bgList.length > 0){ + } else if (bgList.length > 0) { orgCount++; - for(var j = 0; j < bgList.length;j++){ - (function(bg){ + for (var j = 0; j < bgList.length; j++) { + (function (bg) { var bgObj = { name: bg.productgroupname, rowid: bg.rowid, projects: [] } - syncDesignTreeWithProjectAndEnv(org.rowid,bg.rowid,function(err,data){ - if(err){ + syncDesignTreeWithProjectAndEnv(org.rowid, bg.rowid, function (err, data) { + if (err) { next(err); } bgObj.projects = data; org.businessGroups.push(bgObj); bgObjList.push(bgObj); - if(orgCount === orgTree.length && bgObjList.length === bgList.length){ - next(null,orgTree); + if (orgCount === orgTree.length && bgObjList.length === bgList.length) { + next(null, orgTree); } }) })(bgList[j]); } - }else{ + } else { orgCount++; - if(orgCount === orgTree.length && bgObjList.length === bgList.length){ - next(null,orgTree); + if (orgCount === orgTree.length && bgObjList.length === bgList.length) { + next(null, orgTree); } } }) })(orgTree[i]); } - }else{ - next(null,orgTree); + } else { + next(null, orgTree); } }, - function(orgBgProjectTree,next){ - if(orgBgProjectTree.length > 0) { + function (orgBgProjectTree, next) { + if (orgBgProjectTree.length > 0) { var orgCount = 0; var envObjList = []; for (var i = 0; i < orgBgProjectTree.length; i++) { @@ -211,7 +211,7 @@ module.exports.setRoutes = function(app, sessionVerification) { next(null, orgBgProjectTree); } } - }else{ + } else { orgTree.environments.push(''); if (orgCount === orgBgProjectTree.length) { next(null, orgBgProjectTree); @@ -220,36 +220,36 @@ module.exports.setRoutes = function(app, sessionVerification) { }); })(orgBgProjectTree[i]); } - }else{ - next(null,orgBgProjectTree); + } else { + next(null, orgBgProjectTree); } } - ],function(err,results){ - if(err){ + ], function (err, results) { + if (err) { res.status(500).send(err); } res.status(200).send(results); }) }); - app.get('/organizations/getTreeForbtv', function(req, res) { + app.get('/organizations/getTreeForbtv', function (req, res) { logger.debug("Enter get() for /organizations/getTreeForbtv"); var loggedInUser = req.session.user.cn; var masterDetailList = []; var orgIds = []; async.waterfall([ - function(next){ - masterUtil.getLoggedInUser(loggedInUser,next); + function (next) { + masterUtil.getLoggedInUser(loggedInUser, next); }, - function(userDetails,next){ - if(userDetails.loginname){ - masterUtil.getAllSettingsForUser(loggedInUser,next); - }else{ - next('Invalid User.',null); + function (userDetails, next) { + if (userDetails.loginname) { + masterUtil.getAllSettingsForUser(loggedInUser, next); + } else { + next('Invalid User.', null); } }, - function(masterDetails,next){ - if(masterDetails.length > 0){ + function (masterDetails, next) { + if (masterDetails.length > 0) { masterDetailList = masterDetails; d4dModelNew.d4dModelMastersOrg.find({ id: '1', @@ -257,15 +257,15 @@ module.exports.setRoutes = function(app, sessionVerification) { rowid: { $in: masterDetails[0].orgs } - },next) - }else{ - next('getTeamsOrgBuProjForUser : is null',null); + }, next) + } else { + next('getTeamsOrgBuProjForUser : is null', null); } }, - function(orgList,next){ - if(orgList.length > 0){ + function (orgList, next) { + if (orgList.length > 0) { var orgTree = []; - for(var i = 0; i < orgList.length;i++){ + for (var i = 0; i < orgList.length; i++) { orgIds.push(orgList[i].rowid); var orgObj = { name: orgList[i].orgname, @@ -281,35 +281,35 @@ module.exports.setRoutes = function(app, sessionVerification) { environments: [] } orgTree.push(orgObj); - if(orgTree.length === orgList.length){ - next(null,orgTree); + if (orgTree.length === orgList.length) { + next(null, orgTree); } } - }else{ - next(null,orgList); + } else { + next(null, orgList); } }, - function(orgTree,next){ - if(orgTree.length > 0){ + function (orgTree, next) { + if (orgTree.length > 0) { var orgCount = 0; var bgObjList = []; - for(var i = 0; i < orgTree.length;i++){ - (function(org){ + for (var i = 0; i < orgTree.length; i++) { + (function (org) { d4dModelNew.d4dModelMastersProductGroup.find({ id: '2', - orgname_rowid:{ - $in :[org.rowid] + orgname_rowid: { + $in: [org.rowid] }, rowid: { $in: masterDetailList[0].bunits } - }, function(err, bgList) { - if(err){ + }, function (err, bgList) { + if (err) { next(err); - }else if(bgList.length > 0){ + } else if (bgList.length > 0) { orgCount++; - for(var j = 0; j < bgList.length;j++){ - (function(bg){ + for (var j = 0; j < bgList.length; j++) { + (function (bg) { var bgObj = { name: bg.productgroupname, text: bg.productgroupname, @@ -331,41 +331,41 @@ module.exports.setRoutes = function(app, sessionVerification) { itemtype: 'bg', projects: [] } - syncWorkZoneTreeWithProjectAndEnv(org.rowid,org.name,bg.rowid,bg.productgroupname,function(err,data){ - if(err){ + syncWorkZoneTreeWithProjectAndEnv(org.rowid, org.name, bg.rowid, bg.productgroupname, function (err, data) { + if (err) { next(err); } - if(data.projectObj){ + if (data.projectObj) { bgObj.projects = data.projectObj; nodeObj.projects = data.projectObj; } - if(data.projectNodeObj){ + if (data.projectNodeObj) { nodeObj.nodes = data.projectNodeObj; } org.businessGroups.push(bgObj); org.nodes.push(nodeObj); bgObjList.push(bgObj); - if(orgCount === orgTree.length && bgObjList.length === bgList.length){ - next(null,orgTree); + if (orgCount === orgTree.length && bgObjList.length === bgList.length) { + next(null, orgTree); } }) })(bgList[j]); } - }else{ + } else { orgCount++; - if(orgCount === orgTree.length && bgObjList.length === bgList.length){ - next(null,orgTree); + if (orgCount === orgTree.length && bgObjList.length === bgList.length) { + next(null, orgTree); } } }) })(orgTree[i]); } - }else{ - next(null,orgTree); + } else { + next(null, orgTree); } }, - function(orgBgProjectTree,next){ - if(orgBgProjectTree.length > 0) { + function (orgBgProjectTree, next) { + if (orgBgProjectTree.length > 0) { var orgCount = 0; var envObjList = []; for (var i = 0; i < orgBgProjectTree.length; i++) { @@ -391,7 +391,7 @@ module.exports.setRoutes = function(app, sessionVerification) { next(null, orgBgProjectTree); } } - }else{ + } else { orgTree.environments.push(''); if (orgCount === orgBgProjectTree.length) { next(null, orgBgProjectTree); @@ -400,22 +400,22 @@ module.exports.setRoutes = function(app, sessionVerification) { }) })(orgBgProjectTree[i]); } - }else{ - next(null,orgBgProjectTree); + } else { + next(null, orgBgProjectTree); } } - ],function(err,results){ - if(err){ + ], function (err, results) { + if (err) { res.status(500).send(err); } res.status(200).send(results); }) }); - app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/blueprints', function(req, res) { + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/blueprints', function (req, res) { logger.debug("Enter get() for /organizations/%s/businessgroups/%s/projects/%s/environments/%s/blueprints", req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId); //getting the list of projects and confirming if user has permission on project - blueprintsDao.getBlueprintsByOrgBgProjectAndEnvId(req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId, req.query.blueprintType, req.session.user.cn, function(err, data) { + blueprintsDao.getBlueprintsByOrgBgProjectAndEnvId(req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId, req.query.blueprintType, req.session.user.cn, function (err, data) { if (err) { res.send(500); return; @@ -427,7 +427,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/blueprints', function(req, res) { + app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/blueprints', function (req, res) { logger.debug("Enter post() for /organizations/%s/businessgroups/%s/projects/%s/environments/%s/blueprints", req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId, req.params.providerId, req.params.imageId); //validating if user has permission to save a blueprint @@ -455,10 +455,10 @@ module.exports.setRoutes = function(app, sessionVerification) { var botType = req.body.blueprintData.botType; var botCategory = req.body.blueprintData.botCategory; var serviceDeliveryCheck = req.body.blueprintData.serviceDeliveryCheck; - if(req.body.blueprintData.manualExecutionTime && req.body.blueprintData.manualExecutionTime !== null){ + if (req.body.blueprintData.manualExecutionTime && req.body.blueprintData.manualExecutionTime !== null) { manualExecutionTime = req.body.blueprintData.manualExecutionTime; } - if(req.body.blueprintData.domainNameCheck === 'true'){ + if (req.body.blueprintData.domainNameCheck === 'true') { domainNameCheck = true; } // a temp fix for invalid appurl data. will be removed in next iteration @@ -473,7 +473,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } appUrls = tempAppUrls; - usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) { + usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) { if (!err) { logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false)); if (data == false) { @@ -504,12 +504,12 @@ module.exports.setRoutes = function(app, sessionVerification) { blueprintType: blueprintType, nexus: nexus, docker: docker, - shortDesc:shortDesc, - botType:botType, - botCategory:botCategory, - serviceDeliveryCheck:serviceDeliveryCheck, - domainNameCheck:domainNameCheck, - manualExecutionTime:manualExecutionTime + shortDesc: shortDesc, + botType: botType, + botCategory: botCategory, + serviceDeliveryCheck: serviceDeliveryCheck, + domainNameCheck: domainNameCheck, + manualExecutionTime: manualExecutionTime }; //adding bluerpintID if present (edit mode) if (blueprintId) @@ -667,7 +667,7 @@ module.exports.setRoutes = function(app, sessionVerification) { // }); // return; // } - Blueprints.createNew(blueprintData, function(err, bluePrintData) { + Blueprints.createNew(blueprintData, function (err, bluePrintData) { if (err) { logger.error('error occured while saving blueorint', err); res.status(500).send({ @@ -675,8 +675,8 @@ module.exports.setRoutes = function(app, sessionVerification) { }); return; } - if(bluePrintData.serviceDeliveryCheck === true){ - masterUtil.getParticularProject(projectId, function(err, project) { + if (bluePrintData.serviceDeliveryCheck === true) { + masterUtil.getParticularProject(projectId, function (err, project) { if (err) { logger.error(err); } else if (project.length > 0) { @@ -684,9 +684,9 @@ module.exports.setRoutes = function(app, sessionVerification) { bluePrintData.bgName = project[0].productgroupname; bluePrintData.projectName = project[0].projectname; botsService.createOrUpdateBots(bluePrintData, 'Blueprint', blueprintType, function (err, botsData) { - if(err) { + if (err) { logger.error("Error in creating bots entry. " + err); - }else{ + } else { logger.debug("Successfully added data for Bots.") } }); @@ -704,7 +704,7 @@ module.exports.setRoutes = function(app, sessionVerification) { - app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/instances', function(req, res) { + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/instances', function (req, res) { var jsonData = {}; jsonData['orgId'] = req.params.orgId; jsonData['bgId'] = req.params.bgId; @@ -713,7 +713,7 @@ module.exports.setRoutes = function(app, sessionVerification) { jsonData['instanceType'] = req.query.instanceType; jsonData['userName'] = req.session.user.cn; jsonData['id'] = 'instances'; - instancesDao.getInstancesByOrgBgProjectAndEnvId(jsonData, function(err, instancedata) { + instancesDao.getInstancesByOrgBgProjectAndEnvId(jsonData, function (err, instancedata) { if (err) { res.send(500); return; @@ -722,14 +722,14 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/tasks', function(req, res) { + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/tasks', function (req, res) { var jsonData = {}; jsonData['orgId'] = req.params.orgId; jsonData['bgId'] = req.params.bgId; jsonData['projectId'] = req.params.projectId; jsonData['envId'] = req.params.envId; - Task.getTasksByOrgBgProjectAndEnvId(jsonData, function(err, taskdata) { + Task.getTasksByOrgBgProjectAndEnvId(jsonData, function (err, taskdata) { if (err) { res.send(500); return; @@ -738,12 +738,12 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/applications', function(req, res) { + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/applications', function (req, res) { var jsonData = {}; jsonData['orgId'] = req.params.orgId; jsonData['bgId'] = req.params.bgId; jsonData['projectId'] = req.params.projectId; - Application.getAppCardsByOrgBgAndProjectId(jsonData, function(err, applications) { + Application.getAppCardsByOrgBgAndProjectId(jsonData, function (err, applications) { if (err) { res.send(500); return; @@ -753,14 +753,14 @@ module.exports.setRoutes = function(app, sessionVerification) { }); app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/instanceList', validate(orgValidator.get), getInstanceList); - + function getInstanceList(req, res, next) { var reqData = {}; async.waterfall([ - function(next) { + function (next) { apiUtil.paginationRequest(req.query, 'instances', next); }, - function(paginationReq, next) { + function (paginationReq, next) { paginationReq['orgId'] = req.params.orgId; paginationReq['bgId'] = req.params.bgId; paginationReq['projectId'] = req.params.projectId; @@ -770,33 +770,33 @@ module.exports.setRoutes = function(app, sessionVerification) { reqData = paginationReq; apiUtil.databaseUtil(paginationReq, next); }, - function(queryObj, next) { + function (queryObj, next) { queryObj['pagination'] = true; instancesDao.getInstancesByOrgBgProjectAndEnvId(queryObj, next); }, - function(instances, next) { + function (instances, next) { apiUtil.paginationResponse(instances, reqData, next); - }],function(err, results) { - if (err) { - res.send({ - "errorCode": 500, - "message": "Error occured while fetching Instance." - }); - } else{ - return res.send(results); - } - }); + }], function (err, results) { + if (err) { + res.send({ + "errorCode": 500, + "message": "Error occured while fetching Instance." + }); + } else { + return res.send(results); + } + }); } app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/taskList', validate(orgValidator.get), getTaskList); - + function getTaskList(req, res, next) { var reqData = {}; async.waterfall([ - function(next) { + function (next) { apiUtil.paginationRequest(req.query, 'tasks', next); }, - function(paginationReq, next) { + function (paginationReq, next) { paginationReq['orgId'] = req.params.orgId; paginationReq['bgId'] = req.params.bgId; paginationReq['projectId'] = req.params.projectId; @@ -805,22 +805,22 @@ module.exports.setRoutes = function(app, sessionVerification) { reqData = paginationReq; apiUtil.databaseUtil(paginationReq, next); }, - function(queryObj, next) { + function (queryObj, next) { queryObj['pagination'] = true; Task.getTasksByOrgBgProjectAndEnvId(queryObj, next); }, - function(tasks, next) { + function (tasks, next) { apiUtil.paginationResponse(tasks, reqData, next); - }],function(err, results) { - if (err) { - res.send({ - "errorCode": 500, - "message": "Error occured while fetching Task." - }); - } else{ - return res.send(results); - } - }); + }], function (err, results) { + if (err) { + res.send({ + "errorCode": 500, + "message": "Error occured while fetching Task." + }); + } else { + return res.send(results); + } + }); } app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/chefTasks', validate(orgValidator.get), getChefTaskList); @@ -831,7 +831,7 @@ module.exports.setRoutes = function(app, sessionVerification) { jsonData['bgId'] = req.params.bgId; jsonData['projectId'] = req.params.projectId; jsonData['envId'] = req.params.envId; - taskService.getChefTasksByOrgBgProjectAndEnvId(jsonData, function(err, chefTasks) { + taskService.getChefTasksByOrgBgProjectAndEnvId(jsonData, function (err, chefTasks) { if (err) { logger.err(err); res.send(500); @@ -846,48 +846,48 @@ module.exports.setRoutes = function(app, sessionVerification) { function getApplicationList(req, res, next) { var reqData = {}; async.waterfall([ - function(next) { + function (next) { apiUtil.paginationRequest(req.query, 'applications', next); }, - function(paginationReq, next) { + function (paginationReq, next) { paginationReq['orgId'] = req.params.orgId; paginationReq['bgId'] = req.params.bgId; paginationReq['projectId'] = req.params.projectId; - paginationReq['searchColumns']=['name','buildId']; + paginationReq['searchColumns'] = ['name', 'buildId']; reqData = paginationReq; apiUtil.databaseUtil(paginationReq, next); }, - function(queryObj, next) { + function (queryObj, next) { queryObj['pagination'] = true; Application.getAppCardsByOrgBgAndProjectId(paginationReq, next); }, - function(applications, next) { + function (applications, next) { apiUtil.paginationResponse(applications, reqData, next); } - ],function(err, results) { - if (err) { - res.send({ - "errorCode": 500, - "message": "Error occured while fetching Blueprints." - }); - } else{ - return res.send(results); - } - }); + ], function (err, results) { + if (err) { + res.send({ + "errorCode": 500, + "message": "Error occured while fetching Blueprints." + }); + } else { + return res.send(results); + } + }); } - app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/applications/:applicationId/build/:buildId', function(req, res) { - Application.getApplicationById(req.params.applicationId, function(err, application) { + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/applications/:applicationId/build/:buildId', function (req, res) { + Application.getApplicationById(req.params.applicationId, function (err, application) { if (err) { res.status(500).send(errorResponses.db.error); return; } if (application) { - application.getBuild(function(err, build) { + application.getBuild(function (err, build) { if (err) { res.status(500).send(errorResponses.db.error); return; @@ -902,7 +902,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/applications', function(req, res) { + app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/applications', function (req, res) { logger.debug(req.files); logger.debug(req.body.appData); logger.debug("Enter post() for /organizations/%s/businessgroups/%s/projects/%s/applications", req.params.orgId, req.params.bgId, req.params.projectId); @@ -910,7 +910,7 @@ module.exports.setRoutes = function(app, sessionVerification) { appData.orgId = req.params.orgId; appData.bgId = req.params.bgId; appData.projectId = req.params.projectId; - Application.createNew(appData, function(err, data) { + Application.createNew(appData, function (err, data) { if (err) { res.send(500); return; @@ -922,7 +922,7 @@ module.exports.setRoutes = function(app, sessionVerification) { //Duplicated with provider filter for BP Edit - app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/', function(req, res) { + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/', function (req, res) { var jsonData = {}; jsonData['orgId'] = req.params.orgId; jsonData['bgId'] = req.params.bgId; @@ -933,7 +933,7 @@ module.exports.setRoutes = function(app, sessionVerification) { jsonData['blueprintType'] = req.query.blueprintType - configmgmtDao.getTeamsOrgBuProjForUser(req.session.user.cn, function(err, orgbuprojs) { + configmgmtDao.getTeamsOrgBuProjForUser(req.session.user.cn, function (err, orgbuprojs) { if (orgbuprojs.length === 0) { res.send(401, "User not part of team to see project."); return; @@ -941,31 +941,31 @@ module.exports.setRoutes = function(app, sessionVerification) { if (!err) { if (typeof orgbuprojs[0].projects !== "undefined" && orgbuprojs[0].projects.indexOf(req.params.projectId) >= 0) { async.parallel({ - tasks: function(callback) { - Task.getTasksByOrgBgProjectAndEnvId(jsonData, callback); - }, - instances: function(callback) { - instancesDao.getInstancesByOrgBgProjectAndEnvId(jsonData, callback); - }, - blueprints: function(callback) { - Blueprints.getBlueprintsByOrgBgProject(jsonData, callback); - }, - stacks: function(callback) { - CloudFormation.findByOrgBgProjectAndEnvId(jsonData, callback); - }, - arms: function(callback) { - AzureArm.findByOrgBgProjectAndEnvId(jsonData, callback); - } + tasks: function (callback) { + Task.getTasksByOrgBgProjectAndEnvId(jsonData, callback); }, - function(err, results) { - if (err) { - res.status(500).send("Internal Server Error"); - } else if (!results) { - res.status(400).send("Data Not Found"); - } else { - res.status(200).send(results); - } + instances: function (callback) { + instancesDao.getInstancesByOrgBgProjectAndEnvId(jsonData, callback); + }, + blueprints: function (callback) { + Blueprints.getBlueprintsByOrgBgProject(jsonData, callback); + }, + stacks: function (callback) { + CloudFormation.findByOrgBgProjectAndEnvId(jsonData, callback); + }, + arms: function (callback) { + AzureArm.findByOrgBgProjectAndEnvId(jsonData, callback); } + }, + function (err, results) { + if (err) { + res.status(500).send("Internal Server Error"); + } else if (!results) { + res.status(400).send("Data Not Found"); + } else { + res.status(200).send(results); + } + } ); } else { @@ -979,7 +979,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/tasks', function(req, res) { + app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/tasks', function (req, res) { logger.debug("Enter post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments); var taskData = req.body.taskData; taskData.orgId = req.params.orgId; @@ -987,12 +987,13 @@ module.exports.setRoutes = function(app, sessionVerification) { taskData.projectId = req.params.projectId; taskData.envId = req.params.envId; taskData.autoSyncFlag = req.body.taskData.autoSyncFlag; - masterUtil.getParticularProject(req.params.projectId, function(err, project) { + masterUtil.getParticularProject(req.params.projectId, function (err, project) { if (err) { logger.error(err); res.status(500).send("Failed to get project via project id: ", err); return; - }; + } + ; if (project.length === 0) { logger.error(err); res.status(500).send("Unable to find Project Information from project id: ", err); @@ -1001,31 +1002,31 @@ module.exports.setRoutes = function(app, sessionVerification) { taskData.orgName = project[0].orgname; taskData.bgName = project[0].productgroupname; taskData.projectName = project[0].projectname; - if(taskData.taskScheduler && taskData.taskScheduler !== null && Object.keys(taskData.taskScheduler).length !== 0) { + if (taskData.taskScheduler && taskData.taskScheduler !== null && Object.keys(taskData.taskScheduler).length !== 0) { taskData.taskScheduler = apiUtil.createCronJobPattern(taskData.taskScheduler); taskData.isTaskScheduled = true; } - if(taskData.taskType === 'jenkins'){ - taskData.executionOrder= 'PARALLEL'; + if (taskData.taskType === 'jenkins') { + taskData.executionOrder = 'PARALLEL'; } - if(taskData.manualExecutionTime && taskData.manualExecutionTime !== null){ + if (taskData.manualExecutionTime && taskData.manualExecutionTime !== null) { taskData.manualExecutionTime = parseInt(taskData.manualExecutionTime); - }else{ + } else { taskData.manualExecutionTime = 10; } - configmgmtDao.getEnvNameFromEnvId(req.params.envId, function(err, envName) { + configmgmtDao.getEnvNameFromEnvId(req.params.envId, function (err, envName) { if (err) { res.status(500).send("Failed to fetch ENV: ", err); return; } taskData.envName = envName; - if(taskData.taskType === 'script'){ - encryptedParam(taskData.scriptDetails,function(err,encryptedParam){ - if(err){ + if (taskData.taskType === 'script') { + encryptedParam(taskData.scriptDetails, function (err, encryptedParam) { + if (err) { logger.error(err); res.status(500).send("Failed to encrypted script parameters: ", err); return; - }else{ + } else { taskData.scriptDetails = encryptedParam; Task.createNew(taskData, function (err, task) { if (err) { @@ -1033,16 +1034,17 @@ module.exports.setRoutes = function(app, sessionVerification) { res.status(500).send("Failed to create task: ", err); return; } - if(task.isTaskScheduled === true){ - if(task.executionOrder === 'PARALLEL'){ + if (task.isTaskScheduled === true) { + if (task.executionOrder === 'PARALLEL') { catalystSync.executeParallelScheduledTasks(); - }else{ + } else { catalystSync.executeSerialScheduledTasks(); } - }; - if(task.serviceDeliveryCheck === true){ - botsService.createOrUpdateBots(task,'Task',task.taskType,function(err,data){ - if(err) { + } + ; + if (task.serviceDeliveryCheck === true) { + botsService.createOrUpdateBots(task, 'Task', task.taskType, function (err, data) { + if (err) { logger.error("Error in creating bots entry." + err); } }); @@ -1052,24 +1054,25 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } }) - }else { + } else { Task.createNew(taskData, function (err, task) { if (err) { logger.error(err); res.status(500).send("Failed to create task: ", err); return; } - if(task.isTaskScheduled === true){ - if(task.executionOrder === 'PARALLEL'){ + if (task.isTaskScheduled === true) { + if (task.executionOrder === 'PARALLEL') { catalystSync.executeParallelScheduledTasks(); - }else{ + } else { catalystSync.executeSerialScheduledTasks(); } - }; - if(task.serviceDeliveryCheck === true){ - botsService.createOrUpdateBots(task,'Task',task.taskType,function(err,data){ - if(err) { + } + ; + if (task.serviceDeliveryCheck === true) { + botsService.createOrUpdateBots(task, 'Task', task.taskType, function (err, data) { + if (err) { logger.error("Error in creating bots entry." + err); } }); @@ -1082,50 +1085,50 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - function encryptedParam(paramDetails,callback){ + function encryptedParam(paramDetails, callback) { var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); var count = 0; var encryptedList = []; - for(var i = 0; i < paramDetails.length; i++){ - (function(paramDetail){ - if(paramDetail.scriptParameters.length > 0){ + for (var i = 0; i < paramDetails.length; i++) { + (function (paramDetail) { + if (paramDetail.scriptParameters.length > 0) { count++; - for(var j = 0; j < paramDetail.scriptParameters.length; j++){ - (function(scriptParameter){ + for (var j = 0; j < paramDetail.scriptParameters.length; j++) { + (function (scriptParameter) { var encryptedText = cryptography.encryptText(scriptParameter.paramVal, cryptoConfig.encryptionEncoding, - cryptoConfig.decryptionEncoding); + cryptoConfig.decryptionEncoding); encryptedList.push({ - paramVal:encryptedText, - paramDesc:scriptParameter.paramDesc + paramVal: encryptedText, + paramDesc: scriptParameter.paramDesc }); - if(encryptedList.length === paramDetail.scriptParameters.length){ + if (encryptedList.length === paramDetail.scriptParameters.length) { paramDetail.scriptParameters = encryptedList; encryptedList = []; } })(paramDetail.scriptParameters[j]); } - }else{ + } else { count++; } - if(count === paramDetails.length){ - callback(null,paramDetails); + if (count === paramDetails.length) { + callback(null, paramDetails); return; } })(paramDetails[i]); } } - + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/cftList', validate(orgValidator.get), getCftList); function getCftList(req, res, next) { var reqData = {}; async.waterfall([ - function(next) { + function (next) { apiUtil.paginationRequest(req.query, 'cftList', next); }, - function(paginationReq, next) { + function (paginationReq, next) { paginationReq['orgId'] = req.params.orgId; paginationReq['bgId'] = req.params.bgId; paginationReq['projectId'] = req.params.projectId; @@ -1134,22 +1137,22 @@ module.exports.setRoutes = function(app, sessionVerification) { reqData = paginationReq; apiUtil.databaseUtil(paginationReq, next); }, - function(queryObj, next) { + function (queryObj, next) { queryObj['pagination'] = true; CloudFormation.findByOrgBgProjectAndEnvId(queryObj, next); }, - function(cftData, next) { + function (cftData, next) { apiUtil.paginationResponse(cftData, reqData, next); - }], function(err, results) { - if (err) { - res.send({ - "errorCode": 500, - "message": "Error occured while fetching CFT." - }); - } else{ - return res.send(results); - } - }); + }], function (err, results) { + if (err) { + res.send({ + "errorCode": 500, + "message": "Error occured while fetching CFT." + }); + } else { + return res.send(results); + } + }); } app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/azureArmList', validate(orgValidator.get), getAzureArmList); @@ -1157,10 +1160,10 @@ module.exports.setRoutes = function(app, sessionVerification) { function getAzureArmList(req, res, next) { var reqData = {}; async.waterfall([ - function(next) { + function (next) { apiUtil.paginationRequest(req.query, 'azureArms', next); }, - function(paginationReq, next) { + function (paginationReq, next) { paginationReq['orgId'] = req.params.orgId; paginationReq['bgId'] = req.params.bgId; paginationReq['projectId'] = req.params.projectId; @@ -1169,23 +1172,23 @@ module.exports.setRoutes = function(app, sessionVerification) { reqData = paginationReq; apiUtil.databaseUtil(paginationReq, next); }, - function(queryObj, next) { + function (queryObj, next) { queryObj['pagination'] = true; AzureArm.findByOrgBgProjectAndEnvId(queryObj, next); }, - function(armsData, next) { + function (armsData, next) { apiUtil.paginationResponse(armsData, reqData, next); }], - function(err, results) { - if (err) { - res.send({ - "errorCode": 500, - "message": "Error occured while fetching Azure." - }); - } else{ - return res.send(results); - } - }); + function (err, results) { + if (err) { + res.send({ + "errorCode": 500, + "message": "Error occured while fetching Azure." + }); + } else { + return res.send(results); + } + }); } app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/containerList', validate(orgValidator.get), getContainerList); @@ -1193,10 +1196,10 @@ module.exports.setRoutes = function(app, sessionVerification) { function getContainerList(req, res, next) { var reqData = {}; async.waterfall([ - function(next) { + function (next) { apiUtil.paginationRequest(req.query, 'containerList', next); }, - function(paginationReq, next) { + function (paginationReq, next) { paginationReq['orgId'] = req.params.orgId; paginationReq['bgId'] = req.params.bgId; paginationReq['projectId'] = req.params.projectId; @@ -1205,27 +1208,28 @@ module.exports.setRoutes = function(app, sessionVerification) { reqData = paginationReq; apiUtil.databaseUtil(paginationReq, next); }, - function(queryObj, next) { + function (queryObj, next) { queryObj['pagination'] = true; containerDao.getContainerListByOrgBgProjectAndEnvId(queryObj, next); }, - function(containerData, next) { + function (containerData, next) { apiUtil.paginationResponse(containerData, reqData, next); - }],function(err, results) { + }], function (err, results) { if (err) { res.send({ "errorCode": 500, "message": "Error occured while fetching Containers." }); - } else{ + } else { return res.send(results); } }); - }; + } + ; - app.get('/organizations/:orgId/chefserver', function(req, res) { + app.get('/organizations/:orgId/chefserver', function (req, res) { logger.debug("Enter get() for /organizations/%s/chefserver", req.params.orgId); - configmgmtDao.getChefServerDetailsByOrgname(req.params.orgId, function(err, chefDetails) { + configmgmtDao.getChefServerDetailsByOrgname(req.params.orgId, function (err, chefDetails) { if (err) { res.send(500); return; @@ -1241,9 +1245,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/organizations/:orgname/cookbooks', function(req, res) { + app.get('/organizations/:orgname/cookbooks', function (req, res) { logger.debug("Enter get() for /organizations/%s/cookbooks", req.params.orgname); - configmgmtDao.getChefServerDetailsByOrgname(req.params.orgname, function(err, chefDetails) { + configmgmtDao.getChefServerDetailsByOrgname(req.params.orgname, function (err, chefDetails) { if (err) { res.send(500); logger.error(err); @@ -1265,7 +1269,7 @@ module.exports.setRoutes = function(app, sessionVerification) { hostedChefUrl: chefDetails.url, }); - chef.getCookbooksList(function(err, cookbooks) { + chef.getCookbooksList(function (err, cookbooks) { if (err) { logger.error('Unable to fetch cookbooks : ', err); @@ -1284,9 +1288,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/organizations/:orgname/roles', function(req, res) { + app.get('/organizations/:orgname/roles', function (req, res) { logger.debug("Enter get() for /organizations/%s/roles", req.params.orgname); - configmgmtDao.getChefServerDetailsByOrgname(req.params.orgname, function(err, chefDetails) { + configmgmtDao.getChefServerDetailsByOrgname(req.params.orgname, function (err, chefDetails) { if (err) { res.send("There is some Internal Server Error. ", 500); return; @@ -1305,7 +1309,7 @@ module.exports.setRoutes = function(app, sessionVerification) { hostedChefUrl: chefDetails.url, }); - chef.getRolesList(function(err, roles) { + chef.getRolesList(function (err, roles) { if (err) { logger.error('Unable to fetch roles : ', err); res.send(500); @@ -1321,9 +1325,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/organizations/:orgname/chefRunlist', function(req, res) { + app.get('/organizations/:orgname/chefRunlist', function (req, res) { logger.debug("Enter get() for /organizations/%s/chefRunlist", req.params.orgname); - configmgmtDao.getChefServerDetailsByOrgname(req.params.orgname, function(err, chefDetails) { + configmgmtDao.getChefServerDetailsByOrgname(req.params.orgname, function (err, chefDetails) { if (err) { res.status(500).send(errorResponses.db.error); return; @@ -1341,14 +1345,14 @@ module.exports.setRoutes = function(app, sessionVerification) { hostedChefUrl: chefDetails.url, }); - chef.getCookbooksList(function(err, cookbooks) { + chef.getCookbooksList(function (err, cookbooks) { if (err) { logger.error('Unable to fetch cookbooks : ', err); res.status(500).send(errorResponses.chef.connectionError); return; } else { - chef.getRolesList(function(err, roles) { + chef.getRolesList(function (err, roles) { if (err) { logger.error('Unable to fetch roles : ', err); @@ -1369,9 +1373,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/organizations/usechefserver/:chefserverid/chefRunlist', function(req, res) { + app.get('/organizations/usechefserver/:chefserverid/chefRunlist', function (req, res) { logger.debug("Enter get() for /organizations/usechefserver/%s/chefRunlist", req.params.orgname); - configmgmtDao.getChefServerDetails(req.params.chefserverid, function(err, chefDetails) { + configmgmtDao.getChefServerDetails(req.params.chefserverid, function (err, chefDetails) { if (err) { res.send(500); return; @@ -1390,13 +1394,13 @@ module.exports.setRoutes = function(app, sessionVerification) { hostedChefUrl: chefDetails.url, }); - chef.getCookbooksList(function(err, cookbooks) { + chef.getCookbooksList(function (err, cookbooks) { if (err) { logger.error('Unable to fetch cookbooks : ', err); res.send(500); return; } else { - chef.getRolesList(function(err, roles) { + chef.getRolesList(function (err, roles) { if (err) { logger.error('Unable to fetch roles : ', err); @@ -1419,7 +1423,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/addInstance', function(req, res) { + app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/addInstance', function (req, res) { logger.debug("Enter post() for /organizations/%s/businessgroups/%s/projects/%s/environments/%s/addInstance", req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId); logger.debug("Body::::" + req.body); logger.debug("JSON Body::::" + JSON.stringify(req.body)); @@ -1432,7 +1436,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var category = 'instancelaunch'; var permissionto = 'execute'; - usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) { + usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) { if (!err) { logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false)); if (data == false) { @@ -1446,20 +1450,21 @@ module.exports.setRoutes = function(app, sessionVerification) { res.send(500); return; } - masterUtil.getParticularProject(req.params.projectId, function(err, project) { + masterUtil.getParticularProject(req.params.projectId, function (err, project) { if (err) { callback({ message: "Failed to get project via project id" }, null); return; - }; + } + ; if (project.length === 0) { callback({ "message": "Unable to find Project Information from project id" }); return; } - instancesDao.getInstanceByOrgAndNodeNameOrIP(req.params.orgId, req.body.fqdn, req.body.fqdn, function(err, instances) { + instancesDao.getInstanceByOrgAndNodeNameOrIP(req.params.orgId, req.body.fqdn, req.body.fqdn, function (err, instances) { if (err) { logger.error("error occured while fetching instances by IP", err); res.status(500).send(errorResponses.db.error); @@ -1480,7 +1485,7 @@ module.exports.setRoutes = function(app, sessionVerification) { res.send(400); } - configmgmtDao.getEnvNameFromEnvId(req.params.envId, function(err, envName) { + configmgmtDao.getEnvNameFromEnvId(req.params.envId, function (err, envName) { if (err) { res.send(500); return; @@ -1490,7 +1495,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var credentials = req.body.credentials; if (req.body.credentials.pemFileData) { credentials.pemFileLocation = appConfig.tempDir + uuid.v4(); - fileIo.writeFile(credentials.pemFileLocation, req.body.credentials.pemFileData, null, function(err) { + fileIo.writeFile(credentials.pemFileLocation, req.body.credentials.pemFileData, null, function (err) { if (err) { logger.error('unable to create pem file ', err); callback(err, null); @@ -1503,7 +1508,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } } - getCredentialsFromReq(function(err, credentials) { + getCredentialsFromReq(function (err, credentials) { if (err) { res.send(500); return; @@ -1514,7 +1519,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); return; } - masterUtil.getCongifMgmtsById(req.body.configManagmentId, function(err, infraManagerDetails) { + masterUtil.getCongifMgmtsById(req.body.configManagmentId, function (err, infraManagerDetails) { if (err) { res.send(500); return; @@ -1530,7 +1535,7 @@ module.exports.setRoutes = function(app, sessionVerification) { if (req.body.os === 'windows') { openport = 5985; } - waitForPort(req.body.fqdn, openport, function(err) { + waitForPort(req.body.fqdn, openport, function (err) { if (err) { logger.debug(err); res.status(400).send({ @@ -1542,9 +1547,9 @@ module.exports.setRoutes = function(app, sessionVerification) { nodeIp: req.body.fqdn, nodeOs: req.body.os, nodeName: req.body.fqdn, - nodeEnv:envName + nodeEnv: envName } - checkNodeCredentials(credentials,nodeDetails, function (err, credentialStatus) { + checkNodeCredentials(credentials, nodeDetails, function (err, credentialStatus) { if (err) { logger.error(err); res.status(400).send({ @@ -1564,243 +1569,264 @@ module.exports.setRoutes = function(app, sessionVerification) { monitorsModel.getById(req.body.monitorId, function (err, monitor) { - var appUrls = req.body.appUrls; - if (appConfig.appUrls && appConfig.appUrls.length) { - appUrls = appUrls.concat(appConfig.appUrls); - } - - var instance = { - name: req.body.fqdn, - orgId: req.params.orgId, - orgName: project[0].orgname, - bgId: req.params.bgId, - bgName: project[0].productgroupname, - projectId: req.params.projectId, - projectName: project[0].projectname, - envId: req.params.envId, - environmentName: envName, - platformId: req.body.fqdn, - instanceIP: req.body.fqdn, - instanceState: nodeAlive, - bootStrapStatus: 'waiting', - tagServer: req.params.tagServer, - runlist: [], - appUrls: appUrls, - monitor: monitor, - users: [req.session.user.cn], //need to change this - catUser: req.session.user.cn, - hardware: { - platform: 'unknown', - platformVersion: 'unknown', - architecture: 'unknown', - memory: { - total: 'unknown', - free: 'unknown', - }, - os: req.body.os - }, - credentials: encryptedCredentials, - - blueprintData: { - blueprintName: req.body.fqdn, - templateId: "chef_import", - iconPath: "../private/img/templateicons/chef_import.png" - } - } - if (infraManagerDetails.configType === 'chef') { - instance.chef = { - serverId: infraManagerDetails.rowid, - chefNodeName: req.body.fqdn + var appUrls = req.body.appUrls; + if (appConfig.appUrls && appConfig.appUrls.length) { + appUrls = appUrls.concat(appConfig.appUrls); } - } else { - instance.puppet = { - serverId: infraManagerDetails.rowid - } - } - instancesDao.createInstance(instance, function (err, data) { - if (err) { - logger.error('Unable to create Instance ', err); - res.send(500); - return; - } - instance.id = data._id; - instance._id = data._id; - var timestampStarded = new Date().getTime(); - var actionLog = instancesDao.insertBootstrapActionLog(instance.id, [], req.session.user.cn, timestampStarded); - var logsRefernceIds = [instance.id, actionLog._id]; - logsDao.insertLog({ - referenceId: logsRefernceIds, - err: false, - log: "Bootstrapping instance", - timestamp: timestampStarded - }); - var instanceLog = { - actionId: actionLog._id, - instanceId: instance.id, + var instance = { + name: req.body.fqdn, + orgId: req.params.orgId, orgName: project[0].orgname, + bgId: req.params.bgId, bgName: project[0].productgroupname, + projectId: req.params.projectId, projectName: project[0].projectname, - envName: envName, - status: nodeAlive, - actionStatus: "waiting", + envId: req.params.envId, + environmentName: envName, platformId: req.body.fqdn, - blueprintName: req.body.fqdn, - data: [], - platform: "unknown", - os: req.body.os, - size: "", - user: req.session.user.cn, - createdOn: new Date().getTime(), - startedOn: new Date().getTime(), - providerType: "", - action: "ImportByIP", - logs: [{ - err: false, - log: "Bootstrapping instance", - timestamp: new Date().getTime() - }] - }; + instanceIP: req.body.fqdn, + instanceState: nodeAlive, + bootStrapStatus: 'waiting', + tagServer: req.params.tagServer, + runlist: [], + appUrls: appUrls, + monitor: monitor, + users: [req.session.user.cn], //need to change this + catUser: req.session.user.cn, + hardware: { + platform: 'unknown', + platformVersion: 'unknown', + architecture: 'unknown', + memory: { + total: 'unknown', + free: 'unknown', + }, + os: req.body.os + }, + credentials: encryptedCredentials, - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); + blueprintData: { + blueprintName: req.body.fqdn, + templateId: "chef_import", + iconPath: "../private/img/templateicons/chef_import.png" } - }); + } + if (infraManagerDetails.configType === 'chef') { + instance.chef = { + serverId: infraManagerDetails.rowid, + chefNodeName: req.body.fqdn + } + } else { + instance.puppet = { + serverId: infraManagerDetails.rowid - credentialCryptography.decryptCredential(encryptedCredentials, function (err, decryptedCredentials) { + } + } + instancesDao.createInstance(instance, function (err, data) { if (err) { - logger.error("unable to decrypt credentials", err); - var timestampEnded = new Date().getTime(); - logsDao.insertLog({ - referenceId: logsRefernceIds, - err: true, - log: "Unable to decrypt credentials. Bootstrap Failed", - timestamp: timestampEnded - }); - instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded); - instanceLog.endedOn = new Date().getTime(); - instanceLog.logs = { - err: true, - log: "Unable to decrypt credentials. Bootstrap Failed", - timestamp: new Date().getTime() - }; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); - } - }); + logger.error('Unable to create Instance ', err); res.send(500); return; } - var infraManager; - var bootstarpOption; - var deleteOptions; - if (infraManagerDetails.configType === 'chef') { - logger.debug('In chef '); - infraManager = new Chef({ - userChefRepoLocation: infraManagerDetails.chefRepoLocation, - chefUserName: infraManagerDetails.loginname, - chefUserPemFile: infraManagerDetails.userpemfile, - chefValidationPemFile: infraManagerDetails.validatorpemfile, - hostedChefUrl: infraManagerDetails.url - }); - bootstarpOption = { - instanceIp: instance.instanceIP, - pemFilePath: decryptedCredentials.pemFileLocation, - instancePassword: decryptedCredentials.password, - instanceUsername: instance.credentials.username, - nodeName: instance.chef.chefNodeName, - environment: envName, - instanceOS: instance.hardware.os - }; - if (instance.monitor && instance.monitor.parameters.transportProtocol === 'rabbitmq') { - var sensuCookBook = 'recipe[sensu-client]'; - var runlist = []; - var jsonAttributes = {}; - - runlist.push(sensuCookBook); - jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(instance.monitor,instance.id); - - bootstarpOption['runlist'] = runlist; - bootstarpOption['jsonAttributes'] = jsonAttributes; + instance.id = data._id; + instance._id = data._id; + var timestampStarded = new Date().getTime(); + var actionLog = instancesDao.insertBootstrapActionLog(instance.id, [], req.session.user.cn, timestampStarded); + var logsRefernceIds = [instance.id, actionLog._id]; + logsDao.insertLog({ + referenceId: logsRefernceIds, + err: false, + log: "Bootstrapping instance", + timestamp: timestampStarded + }); + var instanceLog = { + actionId: actionLog._id, + instanceId: instance.id, + orgName: project[0].orgname, + bgName: project[0].productgroupname, + projectName: project[0].projectname, + envName: envName, + status: nodeAlive, + actionStatus: "waiting", + platformId: req.body.fqdn, + blueprintName: req.body.fqdn, + data: [], + platform: "unknown", + os: req.body.os, + size: "", + user: req.session.user.cn, + createdOn: new Date().getTime(), + startedOn: new Date().getTime(), + providerType: "", + action: "ImportByIP", + logs: [{ + err: false, + log: "Bootstrapping instance", + timestamp: new Date().getTime() + }] + }; - } - deleteOptions = { - privateKey: decryptedCredentials.pemFileLocation, - username: decryptedCredentials.username, - host: instance.instanceIP, - instanceOS: instance.hardware.os, - port: 22, - cmds: ["rm -rf /etc/chef/", "rm -rf /var/chef/"], - cmdswin: ["del "] - } - if (decryptedCredentials.pemFileLocation) { - deleteOptions.privateKey = decryptedCredentials.pemFileLocation; - } else { - deleteOptions.password = decryptedCredentials.password; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); } + }); - } else { - var puppetSettings = { - host: infraManagerDetails.hostname, - username: infraManagerDetails.username, - }; - if (infraManagerDetails.pemFileLocation) { - puppetSettings.pemFileLocation = infraManagerDetails.pemFileLocation; - } else { - puppetSettings.password = infraManagerDetails.puppetpassword; - } - logger.debug('puppet pemfile ==> ' + puppetSettings.pemFileLocation); - bootstarpOption = { - host: instance.instanceIP, - username: instance.credentials.username, - pemFileLocation: decryptedCredentials.pemFileLocation, - password: decryptedCredentials.password, - environment: envName - }; - - var deleteOptions = { - username: decryptedCredentials.username, - host: instance.instanceIP, - port: 22, + credentialCryptography.decryptCredential(encryptedCredentials, function (err, decryptedCredentials) { + if (err) { + logger.error("unable to decrypt credentials", err); + var timestampEnded = new Date().getTime(); + logsDao.insertLog({ + referenceId: logsRefernceIds, + err: true, + log: "Unable to decrypt credentials. Bootstrap Failed", + timestamp: timestampEnded + }); + instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded); + instanceLog.endedOn = new Date().getTime(); + instanceLog.logs = { + err: true, + log: "Unable to decrypt credentials. Bootstrap Failed", + timestamp: new Date().getTime() + }; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); + res.send(500); + return; } + var infraManager; + var bootstarpOption; + var deleteOptions; + if (infraManagerDetails.configType === 'chef') { + logger.debug('In chef '); + infraManager = new Chef({ + userChefRepoLocation: infraManagerDetails.chefRepoLocation, + chefUserName: infraManagerDetails.loginname, + chefUserPemFile: infraManagerDetails.userpemfile, + chefValidationPemFile: infraManagerDetails.validatorpemfile, + hostedChefUrl: infraManagerDetails.url + }); + bootstarpOption = { + instanceIp: instance.instanceIP, + pemFilePath: decryptedCredentials.pemFileLocation, + instancePassword: decryptedCredentials.password, + instanceUsername: instance.credentials.username, + nodeName: instance.chef.chefNodeName, + environment: envName, + instanceOS: instance.hardware.os + }; + if (instance.monitor && instance.monitor.parameters.transportProtocol === 'rabbitmq') { + var sensuCookBooks = masterUtil.getSensuCookbooks(); + var runlist = sensuCookBooks; + var jsonAttributes = {}; + + jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(instance.monitor, instance.id); + + bootstarpOption['runlist'] = runlist; + bootstarpOption['jsonAttributes'] = jsonAttributes; + + } + deleteOptions = { + privateKey: decryptedCredentials.pemFileLocation, + username: decryptedCredentials.username, + host: instance.instanceIP, + instanceOS: instance.hardware.os, + port: 22, + cmds: ["rm -rf /etc/chef/", "rm -rf /var/chef/"], + cmdswin: ["del "] + } + if (decryptedCredentials.pemFileLocation) { + deleteOptions.privateKey = decryptedCredentials.pemFileLocation; + } else { + deleteOptions.password = decryptedCredentials.password; + } - if (decryptedCredentials.pemFileLocation) { - deleteOptions.pemFileLocation = decryptedCredentials.pemFileLocation; } else { - deleteOptions.password = decryptedCredentials.password; + var puppetSettings = { + host: infraManagerDetails.hostname, + username: infraManagerDetails.username, + }; + if (infraManagerDetails.pemFileLocation) { + puppetSettings.pemFileLocation = infraManagerDetails.pemFileLocation; + } else { + puppetSettings.password = infraManagerDetails.puppetpassword; + } + logger.debug('puppet pemfile ==> ' + puppetSettings.pemFileLocation); + bootstarpOption = { + host: instance.instanceIP, + username: instance.credentials.username, + pemFileLocation: decryptedCredentials.pemFileLocation, + password: decryptedCredentials.password, + environment: envName + }; + + var deleteOptions = { + username: decryptedCredentials.username, + host: instance.instanceIP, + port: 22, + } + + if (decryptedCredentials.pemFileLocation) { + deleteOptions.pemFileLocation = decryptedCredentials.pemFileLocation; + } else { + deleteOptions.password = decryptedCredentials.password; + } + + infraManager = new Puppet(puppetSettings); } - infraManager = new Puppet(puppetSettings); - } + //removing files on node to facilitate re-bootstrap + logger.debug("Node OS : %s", instance.hardware.os); + logger.debug('Cleaning instance'); + infraManager.cleanClient(deleteOptions, function (err, retCode) { + logger.debug("Entering chef.bootstarp"); + infraManager.bootstrapInstance(bootstarpOption, function (err, code, bootstrapData) { - //removing files on node to facilitate re-bootstrap - logger.debug("Node OS : %s", instance.hardware.os); - logger.debug('Cleaning instance'); - infraManager.cleanClient(deleteOptions, function (err, retCode) { - logger.debug("Entering chef.bootstarp"); - infraManager.bootstrapInstance(bootstarpOption, function (err, code, bootstrapData) { + if (err) { + logger.error("knife launch err ==>", err); + instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) { - if (err) { - logger.error("knife launch err ==>", err); - instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) { + }); + if (err.message) { + var timestampEnded = new Date().getTime(); + logsDao.insertLog({ + referenceId: logsRefernceIds, + err: true, + log: err.message, + timestamp: timestampEnded + }); + instanceLog.endedOn = new Date().getTime(); + instanceLog.actionStatus = "failed"; + instanceLog.logs = { + err: true, + log: err.message, + timestamp: new Date().getTime() + }; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); - }); - if (err.message) { + } var timestampEnded = new Date().getTime(); logsDao.insertLog({ referenceId: logsRefernceIds, err: true, - log: err.message, + log: "Bootstrap Failed", timestamp: timestampEnded }); + instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded); instanceLog.endedOn = new Date().getTime(); instanceLog.actionStatus = "failed"; instanceLog.logs = { err: true, - log: err.message, + log: "Bootstrap Failed", timestamp: new Date().getTime() }; instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { @@ -1809,277 +1835,255 @@ module.exports.setRoutes = function(app, sessionVerification) { } }); - } - var timestampEnded = new Date().getTime(); - logsDao.insertLog({ - referenceId: logsRefernceIds, - err: true, - log: "Bootstrap Failed", - timestamp: timestampEnded - }); - instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded); - instanceLog.endedOn = new Date().getTime(); - instanceLog.actionStatus = "failed"; - instanceLog.logs = { - err: true, - log: "Bootstrap Failed", - timestamp: new Date().getTime() - }; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); - } - }); - - } else { - if (code == 0) { - instancesDao.updateInstanceBootstrapStatus(instance.id, 'success', function (err, updateData) { - if (err) { - logger.error("Unable to set instance bootstarp status. code 0"); - } else { - logger.debug("Instance bootstrap status set to success"); - } - }); - - // updating puppet node name - var nodeName; - if (bootstrapData && bootstrapData.puppetNodeName) { - instancesDao.updateInstancePuppetNodeName(instance.id, bootstrapData.puppetNodeName, function (err, updateData) { + } else { + if (code == 0) { + instancesDao.updateInstanceBootstrapStatus(instance.id, 'success', function (err, updateData) { if (err) { - logger.error("Unable to set puppet node name"); + logger.error("Unable to set instance bootstarp status. code 0"); } else { - logger.debug("puppet node name updated successfully"); + logger.debug("Instance bootstrap status set to success"); } }); - nodeName = bootstrapData.puppetNodeName; - } else { - nodeName = instance.chef.chefNodeName; - } - - - var timestampEnded = new Date().getTime(); - logsDao.insertLog({ - referenceId: logsRefernceIds, - err: false, - log: "Instance Bootstrapped Successfully", - timestamp: timestampEnded - }); - instanceLog.endedOn = new Date().getTime(); - instanceLog.actionStatus = "success"; - instanceLog.logs = { - err: false, - log: "Instance Bootstrapped Successfully", - timestamp: new Date().getTime() - }; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); - } - }); - instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded); - var hardwareData = {}; - if (bootstrapData && bootstrapData.puppetNodeName) { - var runOptions = { - username: decryptedCredentials.username, - host: instance.instanceIP, - port: 22, - } - if (decryptedCredentials.pemFileLocation) { - runOptions.pemFileLocation = decryptedCredentials.pemFileLocation; + // updating puppet node name + var nodeName; + if (bootstrapData && bootstrapData.puppetNodeName) { + instancesDao.updateInstancePuppetNodeName(instance.id, bootstrapData.puppetNodeName, function (err, updateData) { + if (err) { + logger.error("Unable to set puppet node name"); + } else { + logger.debug("puppet node name updated successfully"); + } + }); + nodeName = bootstrapData.puppetNodeName; } else { - runOptions.password = decryptedCredentials.password; + nodeName = instance.chef.chefNodeName; } - infraManager.runClient(runOptions, function (err, retCode) { - if (decryptedCredentials.pemFileLocation) { - fileIo.removeFile(decryptedCredentials.pemFileLocation, function (err) { - if (err) { - logger.debug("Unable to delete temp pem file =>", err); - } else { - logger.debug("temp pem file deleted =>", err); - } - }); - } + + var timestampEnded = new Date().getTime(); + logsDao.insertLog({ + referenceId: logsRefernceIds, + err: false, + log: "Instance Bootstrapped Successfully", + timestamp: timestampEnded + }); + instanceLog.endedOn = new Date().getTime(); + instanceLog.actionStatus = "success"; + instanceLog.logs = { + err: false, + log: "Instance Bootstrapped Successfully", + timestamp: new Date().getTime() + }; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { if (err) { - logger.error("Unable to run puppet client", err); - return; + logger.error("Failed to create or update instanceLog: ", err); } - // waiting for 30 sec to update node data - setTimeout(function () { - infraManager.getNode(nodeName, function (err, nodeData) { - if (err) { - logger.error(err); - return; - } - instanceLog.platform = nodeData.facts.values.operatingsystem; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + }); + instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded); + var hardwareData = {}; + if (bootstrapData && bootstrapData.puppetNodeName) { + var runOptions = { + username: decryptedCredentials.username, + host: instance.instanceIP, + port: 22, + } + + if (decryptedCredentials.pemFileLocation) { + runOptions.pemFileLocation = decryptedCredentials.pemFileLocation; + } else { + runOptions.password = decryptedCredentials.password; + } + + infraManager.runClient(runOptions, function (err, retCode) { + if (decryptedCredentials.pemFileLocation) { + fileIo.removeFile(decryptedCredentials.pemFileLocation, function (err) { if (err) { - logger.error("Failed to create or update instanceLog: ", err); + logger.debug("Unable to delete temp pem file =>", err); + } else { + logger.debug("temp pem file deleted =>", err); } }); - // is puppet node - hardwareData.architecture = nodeData.facts.values.hardwaremodel; - hardwareData.platform = nodeData.facts.values.operatingsystem; - hardwareData.platformVersion = nodeData.facts.values.operatingsystemrelease; - hardwareData.memory = { - total: 'unknown', - free: 'unknown' - }; - hardwareData.memory.total = nodeData.facts.values.memorysize; - hardwareData.memory.free = nodeData.facts.values.memoryfree; - hardwareData.os = instance.hardware.os; - instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) { + } + if (err) { + logger.error("Unable to run puppet client", err); + return; + } + // waiting for 30 sec to update node data + setTimeout(function () { + infraManager.getNode(nodeName, function (err, nodeData) { if (err) { - logger.error("Unable to set instance hardware details code (setHardwareDetails)", err); - } else { - logger.debug("Instance hardware details set successessfully"); + logger.error(err); + return; } + instanceLog.platform = nodeData.facts.values.operatingsystem; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); + // is puppet node + hardwareData.architecture = nodeData.facts.values.hardwaremodel; + hardwareData.platform = nodeData.facts.values.operatingsystem; + hardwareData.platformVersion = nodeData.facts.values.operatingsystemrelease; + hardwareData.memory = { + total: 'unknown', + free: 'unknown' + }; + hardwareData.memory.total = nodeData.facts.values.memorysize; + hardwareData.memory.free = nodeData.facts.values.memoryfree; + hardwareData.os = instance.hardware.os; + instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) { + if (err) { + logger.error("Unable to set instance hardware details code (setHardwareDetails)", err); + } else { + logger.debug("Instance hardware details set successessfully"); + } + }); }); - }); - }, 30000); - }); + }, 30000); + }); - } else { - infraManager.getNode(nodeName, function (err, nodeData) { - if (err) { - logger.error(err); - return; - } - instanceLog.platform = nodeData.automatic.platform; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + } else { + infraManager.getNode(nodeName, function (err, nodeData) { if (err) { - logger.error("Failed to create or update instanceLog: ", err); + logger.error(err); + return; } - }); - hardwareData.architecture = nodeData.automatic.kernel.machine; - hardwareData.platform = nodeData.automatic.platform; - hardwareData.platformVersion = nodeData.automatic.platform_version; - hardwareData.memory = { - total: 'unknown', - free: 'unknown' - }; - if (nodeData.automatic.memory) { - hardwareData.memory.total = nodeData.automatic.memory.total; - hardwareData.memory.free = nodeData.automatic.memory.free; - } - hardwareData.os = instance.hardware.os; - instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) { - if (err) { - logger.error("Unable to set instance hardware details code (setHardwareDetails)", err); - } else { - logger.debug("Instance hardware details set successessfully"); + instanceLog.platform = nodeData.automatic.platform; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); + hardwareData.architecture = nodeData.automatic.kernel.machine; + hardwareData.platform = nodeData.automatic.platform; + hardwareData.platformVersion = nodeData.automatic.platform_version; + hardwareData.memory = { + total: 'unknown', + free: 'unknown' + }; + if (nodeData.automatic.memory) { + hardwareData.memory.total = nodeData.automatic.memory.total; + hardwareData.memory.free = nodeData.automatic.memory.free; } - }); - if (decryptedCredentials.pemFilePath) { - fileIo.removeFile(decryptedCredentials.pemFilePath, function (err) { + hardwareData.os = instance.hardware.os; + instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) { if (err) { - logger.error("Unable to delete temp pem file =>", err); + logger.error("Unable to set instance hardware details code (setHardwareDetails)", err); } else { - logger.debug("temp pem file deleted"); + logger.debug("Instance hardware details set successessfully"); } }); - } - }); - } + if (decryptedCredentials.pemFilePath) { + fileIo.removeFile(decryptedCredentials.pemFilePath, function (err) { + if (err) { + logger.error("Unable to delete temp pem file =>", err); + } else { + logger.debug("temp pem file deleted"); + } + }); + } + }); + } - var _docker = new Docker(); - _docker.checkDockerStatus(instance.id, function (err, retCode) { - if (err) { - logger.error("Failed _docker.checkDockerStatus", err); - return; - //res.end('200'); + var _docker = new Docker(); + _docker.checkDockerStatus(instance.id, function (err, retCode) { + if (err) { + logger.error("Failed _docker.checkDockerStatus", err); + return; + //res.end('200'); - } - logger.debug('Docker Check Returned:' + retCode); - if (retCode == '0') { - instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function (data) { - logger.debug('Instance Docker Status set to Success'); - }); + } + logger.debug('Docker Check Returned:' + retCode); + if (retCode == '0') { + instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function (data) { + logger.debug('Instance Docker Status set to Success'); + }); - } - }); + } + }); - } else { - instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) { - if (err) { - logger.error("Unable to set instance bootstarp status code != 0"); - } else { - logger.debug("Instance bootstrap status set to failed"); - } - }); + } else { + instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) { + if (err) { + logger.error("Unable to set instance bootstarp status code != 0"); + } else { + logger.debug("Instance bootstrap status set to failed"); + } + }); - var timestampEnded = new Date().getTime(); - logsDao.insertLog({ - referenceId: logsRefernceIds, - err: true, - log: "Bootstrap Failed", - timestamp: timestampEnded - }); - instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded); - instanceLog.endedOn = new Date().getTime(); - instanceLog.actionStatus = "failed"; - instanceLog.logs = { - err: true, - log: "Bootstrap Failed", - timestamp: new Date().getTime() - }; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); - } - }); + var timestampEnded = new Date().getTime(); + logsDao.insertLog({ + referenceId: logsRefernceIds, + err: true, + log: "Bootstrap Failed", + timestamp: timestampEnded + }); + instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded); + instanceLog.endedOn = new Date().getTime(); + instanceLog.actionStatus = "failed"; + instanceLog.logs = { + err: true, + log: "Bootstrap Failed", + timestamp: new Date().getTime() + }; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); + } } - } - }, function (stdOutData) { + }, function (stdOutData) { - logsDao.insertLog({ - referenceId: logsRefernceIds, - err: false, - log: stdOutData.toString('ascii'), - timestamp: new Date().getTime() - }); - instanceLog.logs = { - err: false, - log: stdOutData.toString('ascii'), - timestamp: new Date().getTime() - }; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); - } - }); + logsDao.insertLog({ + referenceId: logsRefernceIds, + err: false, + log: stdOutData.toString('ascii'), + timestamp: new Date().getTime() + }); + instanceLog.logs = { + err: false, + log: stdOutData.toString('ascii'), + timestamp: new Date().getTime() + }; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); - }, function (stdErrData) { + }, function (stdErrData) { - logsDao.insertLog({ - referenceId: logsRefernceIds, - err: true, - log: stdErrData.toString('ascii'), - timestamp: new Date().getTime() - }); + logsDao.insertLog({ + referenceId: logsRefernceIds, + err: true, + log: stdErrData.toString('ascii'), + timestamp: new Date().getTime() + }); - instanceLog.logs = { - err: true, - log: stdErrData.toString('ascii'), - timestamp: new Date().getTime() - }; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); - } + instanceLog.logs = { + err: true, + log: stdErrData.toString('ascii'), + timestamp: new Date().getTime() + }; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); }); - }); - }); //end of chefcleanup + }); //end of chefcleanup + }); + res.send(instance); + logger.debug("Exit post() for /organizations/%s/businessgroups/%s/projects/%s/environments/%s/addInstance", req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId); }); - res.send(instance); - logger.debug("Exit post() for /organizations/%s/businessgroups/%s/projects/%s/environments/%s/addInstance", req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId); }); }); - }); } else { res.status(400).send({ message: "The username or password/pemfile you entered is incorrect" @@ -2094,49 +2098,49 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); }); - function checkNodeCredentials(credentials,nodeDetail,callback){ - if(nodeDetail.nodeOs !== 'windows') { - var sshOptions = { - username: credentials.username, - host: nodeDetail.nodeIp, - port: 22, - } - if (credentials.pemFileLocation) { - sshOptions.privateKey = credentials.pemFileLocation; - sshOptions.pemFileData = credentials.pemFileData; - } else { - sshOptions.password = credentials.password; - } - var sshExec = new SSHExec(sshOptions); - - sshExec.exec('echo Welcome', function (err, retCode) { - if (err) { - callback(err, null); - return; - } else if (retCode === 0) { - callback(null, true); - } else { - callback(null, false); - } - }, function (stdOut) { - logger.debug(stdOut.toString('ascii')); - }, function (stdErr) { - logger.error(stdErr.toString('ascii')); - }); + function checkNodeCredentials(credentials, nodeDetail, callback) { + if (nodeDetail.nodeOs !== 'windows') { + var sshOptions = { + username: credentials.username, + host: nodeDetail.nodeIp, + port: 22, + } + if (credentials.pemFileLocation) { + sshOptions.privateKey = credentials.pemFileLocation; + sshOptions.pemFileData = credentials.pemFileData; } else { - callback(null, true); + sshOptions.password = credentials.password; } + var sshExec = new SSHExec(sshOptions); + + sshExec.exec('echo Welcome', function (err, retCode) { + if (err) { + callback(err, null); + return; + } else if (retCode === 0) { + callback(null, true); + } else { + callback(null, false); + } + }, function (stdOut) { + logger.debug(stdOut.toString('ascii')); + }, function (stdErr) { + logger.error(stdErr.toString('ascii')); + }); + } else { + callback(null, true); } + } }); - app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/blueprints/docker', function(req, res) { + app.post('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/blueprints/docker', function (req, res) { //validating if user has permission to save a blueprint logger.debug('Verifying User permission set'); var user = req.session.user; var category = 'blueprints'; var permissionto = 'create'; - usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) { + usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) { if (!err) { logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false)); if (data == false) { @@ -2174,7 +2178,7 @@ module.exports.setRoutes = function(app, sessionVerification) { return; } - blueprintsDao.createBlueprint(blueprintData, function(err, data) { + blueprintsDao.createBlueprint(blueprintData, function (err, data) { if (err) { res.send(500); return; @@ -2185,7 +2189,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/:provider', function(req, res) { + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/:provider', function (req, res) { var jsonData = {}; jsonData['orgId'] = req.params.orgId; jsonData['bgId'] = req.params.bgId; @@ -2194,12 +2198,12 @@ module.exports.setRoutes = function(app, sessionVerification) { jsonData['instanceType'] = req.params.instanceType; jsonData['userName'] = req.session.user.cn; jsonData['blueprintType'] = req.query.blueprintType; - if(req.params.provider === null || req.params.provider ==='null'){ + if (req.params.provider === null || req.params.provider === 'null') { jsonData['providerType'] = 'aws'; - }else{ + } else { jsonData['providerType'] = req.params.provider; } - configmgmtDao.getTeamsOrgBuProjForUser(req.session.user.cn, function(err, orgbuprojs) { + configmgmtDao.getTeamsOrgBuProjForUser(req.session.user.cn, function (err, orgbuprojs) { if (orgbuprojs.length === 0) { res.send(401, "User not part of team to see project."); return; @@ -2207,31 +2211,31 @@ module.exports.setRoutes = function(app, sessionVerification) { if (!err) { if (typeof orgbuprojs[0].projects !== "undefined" && orgbuprojs[0].projects.indexOf(req.params.projectId) >= 0) { async.parallel({ - tasks: function(callback) { - Task.getTasksByOrgBgProjectAndEnvId(jsonData, callback); - }, - instances: function(callback) { - instancesDao.getInstancesByOrgBgProjectAndEnvId(jsonData, callback); - }, - blueprints: function(callback) { - Blueprints.getBlueprintsByOrgBgProjectProvider(jsonData, callback); - }, - stacks: function(callback) { - CloudFormation.findByOrgBgProjectAndEnvId(jsonData, callback); - }, - arms: function(callback) { - AzureArm.findByOrgBgProjectAndEnvId(jsonData, callback); - } + tasks: function (callback) { + Task.getTasksByOrgBgProjectAndEnvId(jsonData, callback); }, - function(err, results) { - if (err) { - res.status(500).send("Internal Server Error"); - } else if (!results) { - res.status(400).send("Data Not Found"); - } else { - res.status(200).send(results); - } + instances: function (callback) { + instancesDao.getInstancesByOrgBgProjectAndEnvId(jsonData, callback); + }, + blueprints: function (callback) { + Blueprints.getBlueprintsByOrgBgProjectProvider(jsonData, callback); + }, + stacks: function (callback) { + CloudFormation.findByOrgBgProjectAndEnvId(jsonData, callback); + }, + arms: function (callback) { + AzureArm.findByOrgBgProjectAndEnvId(jsonData, callback); } + }, + function (err, results) { + if (err) { + res.status(500).send("Internal Server Error"); + } else if (!results) { + res.status(400).send("Data Not Found"); + } else { + res.status(200).send(results); + } + } ); } else { @@ -2246,8 +2250,8 @@ module.exports.setRoutes = function(app, sessionVerification) { }); // End point which will give list of all Docker instances for Org,BG,Proj and Env. - app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/docker/instances', function(req, res) { - instancesDao.getInstancesByOrgBgProjectAndEnvForDocker(req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId, function(err, instances) { + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/environments/:envId/docker/instances', function (req, res) { + instancesDao.getInstancesByOrgBgProjectAndEnvForDocker(req.params.orgId, req.params.bgId, req.params.projectId, req.params.envId, function (err, instances) { if (err) { res.status(500).send({ "errorCode": 500, @@ -2259,7 +2263,7 @@ module.exports.setRoutes = function(app, sessionVerification) { return; }); }); - + app.get('/organizations/:orgId/businessgroups/:bgId/projects/:projectId/blueprintList', validate(orgValidator.applications), getBluePrintList); @@ -2267,130 +2271,132 @@ module.exports.setRoutes = function(app, sessionVerification) { function getBluePrintList(req, res, next) { var reqData = {}; async.waterfall([ - function(next) { - apiUtil.paginationRequest(req.query, 'blueprints', next); - }, - function(paginationReq, next) { - if(req.query.templateType === 'composite'){ - paginationReq['organizationId'] = req.params.orgId; - paginationReq['businessGroupId'] = req.params.bgId; - paginationReq['projectId'] = req.params.projectId; - paginationReq['cloudProviderType'] = req.query.providerType; - paginationReq['searchColumns'] = ['name']; - }else{ - paginationReq['orgId'] = req.params.orgId; - paginationReq['bgId'] = req.params.bgId; - paginationReq['projectId'] = req.params.projectId; - paginationReq['templateType'] = req.query.templateType; - paginationReq['blueprintConfig.cloudProviderType'] = req.query.providerType; - paginationReq['searchColumns'] = ['name']; - } - reqData = paginationReq; - apiUtil.databaseUtil(paginationReq, next); - - }, - function(queryObj, next) { - if(req.query.templateType === 'composite'){ - compositeBlueprintModel.getCompositeBlueprintByOrgBgProject(queryObj, next) - }else { - Blueprints.getBlueprintByOrgBgProjectProviderType(queryObj, next); - } - }, - function(blueprints, next) { - if(req.query.pagination === 'true'){ - apiUtil.paginationResponse(blueprints, reqData, next); - }else{ - next(null,blueprints.docs); - } - }], function(err, results) { - if (err) { - res.send({ - "errorCode": 500, - "message": "Error occured while fetching Blueprints." - }); - } else{ - return res.send(results); + function (next) { + apiUtil.paginationRequest(req.query, 'blueprints', next); + }, + function (paginationReq, next) { + if (req.query.templateType === 'composite') { + paginationReq['organizationId'] = req.params.orgId; + paginationReq['businessGroupId'] = req.params.bgId; + paginationReq['projectId'] = req.params.projectId; + paginationReq['cloudProviderType'] = req.query.providerType; + paginationReq['searchColumns'] = ['name']; + } else { + paginationReq['orgId'] = req.params.orgId; + paginationReq['bgId'] = req.params.bgId; + paginationReq['projectId'] = req.params.projectId; + paginationReq['templateType'] = req.query.templateType; + paginationReq['blueprintConfig.cloudProviderType'] = req.query.providerType; + paginationReq['searchColumns'] = ['name']; } - }); + reqData = paginationReq; + apiUtil.databaseUtil(paginationReq, next); + + }, + function (queryObj, next) { + if (req.query.templateType === 'composite') { + compositeBlueprintModel.getCompositeBlueprintByOrgBgProject(queryObj, next) + } else { + Blueprints.getBlueprintByOrgBgProjectProviderType(queryObj, next); + } + }, + function (blueprints, next) { + if (req.query.pagination === 'true') { + apiUtil.paginationResponse(blueprints, reqData, next); + } else { + next(null, blueprints.docs); + } + }], function (err, results) { + if (err) { + res.send({ + "errorCode": 500, + "message": "Error occured while fetching Blueprints." + }); + } else { + return res.send(results); + } + }); } } -function syncDesignTreeWithProjectAndEnv(orgId,bgId,callback){ +function syncDesignTreeWithProjectAndEnv(orgId, bgId, callback) { var projectObjList = []; d4dModelNew.d4dModelMastersProjects.find({ id: '4', orgname_rowid: { - $in: [orgId] + $in: [orgId] }, productgroupname_rowid: bgId - }, function(err, projectList) { - if(err){ - callback (err,null);; - }else if(projectList.length > 0){ - for(var i = 0; i < projectList.length;i++){ - if(projectList[i].environmentname_rowid && projectList[i].environmentname_rowid !== ''){ + }, function (err, projectList) { + if (err) { + callback(err, null); + ; + } else if (projectList.length > 0) { + for (var i = 0; i < projectList.length; i++) { + if (projectList[i].environmentname_rowid && projectList[i].environmentname_rowid !== '') { var envIds = projectList[i].environmentname_rowid.split(','); var envNames = projectList[i].environmentname.split(','); - var envObjList =[]; - for(var j = 0; j < envIds.length; j++) { + var envObjList = []; + for (var j = 0; j < envIds.length; j++) { envObjList.push({ name: envNames[j], rowid: envIds[j], }); } - if(envObjList.length === envIds.length){ + if (envObjList.length === envIds.length) { var projectObj = { - name:projectList[i].projectname, - rowId:projectList[i].rowid, - environments:envObjList + name: projectList[i].projectname, + rowId: projectList[i].rowid, + environments: envObjList } projectObjList.push(projectObj); projectObj = {}; - if(projectObjList.length === projectList.length){ - callback (null,projectObjList); + if (projectObjList.length === projectList.length) { + callback(null, projectObjList); } } - }else{ + } else { var projectObj = { - name:projectList[i].projectname, - rowId:projectList[i].rowid, - environments:[""] + name: projectList[i].projectname, + rowId: projectList[i].rowid, + environments: [""] } projectObjList.push(projectObj); projectObj = {}; - if(projectObjList.length === projectList.length){ - callback (null,projectObjList); + if (projectObjList.length === projectList.length) { + callback(null, projectObjList); } } } - }else{ - callback (null,projectObjList); + } else { + callback(null, projectObjList); } }) } -function syncWorkZoneTreeWithProjectAndEnv(orgId,orgName,bgId,bgName,callback){ +function syncWorkZoneTreeWithProjectAndEnv(orgId, orgName, bgId, bgName, callback) { var resultObj = {}; - var projectObjList =[],projectNodeObjList =[]; + var projectObjList = [], projectNodeObjList = []; d4dModelNew.d4dModelMastersProjects.find({ id: '4', orgname_rowid: { $in: [orgId] }, productgroupname_rowid: bgId - }, function(err, projectList) { - if(err){ - callback (err,null);; - }else if(projectList.length > 0){ - for(var i = 0; i < projectList.length;i++){ - (function(project){ - if(project.environmentname_rowid && project.environmentname_rowid !== '') { + }, function (err, projectList) { + if (err) { + callback(err, null); + ; + } else if (projectList.length > 0) { + for (var i = 0; i < projectList.length; i++) { + (function (project) { + if (project.environmentname_rowid && project.environmentname_rowid !== '') { var envIds = project.environmentname_rowid.split(','); var envNames = project.environmentname.split(','); - var envNodeList =[],envObjList =[]; + var envNodeList = [], envObjList = []; for (var j = 0; j < envIds.length; j++) { envObjList.push({ name: envNames[j], @@ -2443,7 +2449,7 @@ function syncWorkZoneTreeWithProjectAndEnv(orgId,orgName,bgId,bgName,callback){ callback(null, resultObj); } } - }else{ + } else { var projectObj = { name: project.projectname, text: project.projectname, @@ -2478,8 +2484,8 @@ function syncWorkZoneTreeWithProjectAndEnv(orgId,orgName,bgId,bgName,callback){ } })(projectList[i]); } - }else{ - callback (null,resultObj); + } else { + callback(null, resultObj); } }) } diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js index 0a01cb85b..adc320023 100644 --- a/server/app/routes/v1.0/routes_providercommon.js +++ b/server/app/routes/v1.0/routes_providercommon.js @@ -90,32 +90,32 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function getManagedInstancesList(req, res, next) { var reqObj = {}; async.waterfall( - [ - function (next) { - apiUtil.changeRequestForJqueryPagination(req.query, next); - }, - function (reqData, next) { - reqObj = reqData; - apiUtil.paginationRequest(reqData, 'managedInstances', next); - }, - function (paginationReq, next) { - paginationReq['providerId'] = req.params.providerId; - paginationReq['searchColumns'] = ['instanceIP', 'instanceState', 'platformId', 'hardware.os', 'projectName', 'environmentName']; - apiUtil.databaseUtil(paginationReq, next); - }, - function (queryObj, next) { - instancesDao.getByProviderId(queryObj, next); - }, - function (managedInstances, next) { - apiUtil.changeResponseForJqueryPagination(managedInstances, reqObj, next); - } - ], - function (err, results) { - if (err) - next(err); - else - return res.status(200).send(results); - }); + [ + function (next) { + apiUtil.changeRequestForJqueryPagination(req.query, next); + }, + function (reqData, next) { + reqObj = reqData; + apiUtil.paginationRequest(reqData, 'managedInstances', next); + }, + function (paginationReq, next) { + paginationReq['providerId'] = req.params.providerId; + paginationReq['searchColumns'] = ['instanceIP', 'instanceState', 'platformId', 'hardware.os', 'projectName', 'environmentName']; + apiUtil.databaseUtil(paginationReq, next); + }, + function (queryObj, next) { + instancesDao.getByProviderId(queryObj, next); + }, + function (managedInstances, next) { + apiUtil.changeResponseForJqueryPagination(managedInstances, reqObj, next); + } + ], + function (err, results) { + if (err) + next(err); + else + return res.status(200).send(results); + }); } ; @@ -124,29 +124,29 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function getManagedInstances(req, res, next) { var reqData = {}; async.waterfall( - [ - function (next) { - apiUtil.paginationRequest(req.query, 'managedInstances', next); - }, - function (paginationReq, next) { - paginationReq['providerId'] = req.params.providerId; - paginationReq['searchColumns'] = ['instanceIP', 'instanceState', 'platformId', 'hardware.os', 'projectName', 'environmentName']; - reqData = paginationReq; - apiUtil.databaseUtil(paginationReq, next); - }, - function (queryObj, next) { - instancesDao.getByProviderId(queryObj, next); - }, - function (managedInstances, next) { - apiUtil.paginationResponse(managedInstances, reqData, next); - } - ], - function (err, results) { - if (err) - next(err); - else - return res.status(200).send(results); - }); + [ + function (next) { + apiUtil.paginationRequest(req.query, 'managedInstances', next); + }, + function (paginationReq, next) { + paginationReq['providerId'] = req.params.providerId; + paginationReq['searchColumns'] = ['instanceIP', 'instanceState', 'platformId', 'hardware.os', 'projectName', 'environmentName']; + reqData = paginationReq; + apiUtil.databaseUtil(paginationReq, next); + }, + function (queryObj, next) { + instancesDao.getByProviderId(queryObj, next); + }, + function (managedInstances, next) { + apiUtil.paginationResponse(managedInstances, reqData, next); + } + ], + function (err, results) { + if (err) + next(err); + else + return res.status(200).send(results); + }); } @@ -155,30 +155,30 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function getUnManagedInstances(req, res, next) { var reqData = {}; async.waterfall( - [ - function (next) { - apiUtil.paginationRequest(req.query, 'unmanagedInstances', next); - }, - function (paginationReq, next) { - paginationReq['providerId'] = req.params.providerId; - paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'projectName', 'environmentName', 'providerData.region']; - reqData = paginationReq; - apiUtil.databaseUtil(paginationReq, next); - }, - function (queryObj, next) { - unManagedInstancesDao.getByProviderId(queryObj, next); - }, - function (unmanagedInstances, next) { - apiUtil.paginationResponse(unmanagedInstances, reqData, next); - } + [ + function (next) { + apiUtil.paginationRequest(req.query, 'unmanagedInstances', next); + }, + function (paginationReq, next) { + paginationReq['providerId'] = req.params.providerId; + paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'projectName', 'environmentName', 'providerData.region']; + reqData = paginationReq; + apiUtil.databaseUtil(paginationReq, next); + }, + function (queryObj, next) { + unManagedInstancesDao.getByProviderId(queryObj, next); + }, + function (unmanagedInstances, next) { + apiUtil.paginationResponse(unmanagedInstances, reqData, next); + } - ], - function (err, results) { - if (err) - next(err); - else - return res.status(200).send(results); - }); + ], + function (err, results) { + if (err) + next(err); + else + return res.status(200).send(results); + }); } ; @@ -187,33 +187,33 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function getUnManagedInstancesList(req, res, next) { var reqObj = {}; async.waterfall( - [ - function (next) { - apiUtil.changeRequestForJqueryPagination(req.query, next); - }, - function (reqData, next) { - reqObj = reqData; - apiUtil.paginationRequest(reqData, 'unmanagedInstances', next); - }, - function (paginationReq, next) { - paginationReq['providerId'] = req.params.providerId; - paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'projectName', 'environmentName', 'providerData.region']; - apiUtil.databaseUtil(paginationReq, next); - }, - function (queryObj, next) { - unManagedInstancesDao.getByProviderId(queryObj, next); - }, - function (unmanagedInstances, next) { - apiUtil.changeResponseForJqueryPagination(unmanagedInstances, reqObj, next); - } + [ + function (next) { + apiUtil.changeRequestForJqueryPagination(req.query, next); + }, + function (reqData, next) { + reqObj = reqData; + apiUtil.paginationRequest(reqData, 'unmanagedInstances', next); + }, + function (paginationReq, next) { + paginationReq['providerId'] = req.params.providerId; + paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'projectName', 'environmentName', 'providerData.region']; + apiUtil.databaseUtil(paginationReq, next); + }, + function (queryObj, next) { + unManagedInstancesDao.getByProviderId(queryObj, next); + }, + function (unmanagedInstances, next) { + apiUtil.changeResponseForJqueryPagination(unmanagedInstances, reqObj, next); + } - ], - function (err, results) { - if (err) - next(err); - else - return res.status(200).send(results); - }); + ], + function (err, results) { + if (err) + next(err); + else + return res.status(200).send(results); + }); } ; // @TODO To be refactored and API end point to be changed @@ -383,7 +383,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { return; } taskstatus = obj; - + for (var i = 0; i < unmanagedInstances.length; i++) { (function (unmanagedInstance) { var openport = 22; @@ -571,11 +571,9 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { if (instance.monitor && instance.monitor.parameters.transportProtocol === 'rabbitmq') { - var sensuCookBook = 'recipe[sensu-client]'; - var runlist = []; + var sensuCookBooks = MasterUtils.getSensuCookbooks(); + var runlist = sensuCookBooks; var jsonAttributes = {}; - - runlist.push(sensuCookBook); jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id); ; @@ -1219,7 +1217,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * } */ app.get('/providers/:providerId/tag-mappings/:catalystEntityType', validate(tagsValidator.tagsMapping), - getTagMapping); + getTagMapping); /** * @api {post} /providers/:providerId/tags-mappings Create tag mappings @@ -1377,7 +1375,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * } */ app.patch('/providers/:providerId/tag-mappings/:catalystEntityType', validate(tagsValidator.tagsMapping), - updateTagMapping); + updateTagMapping); /** * @api {delete} /providers/:providerId/tag-mappings/:catalystEntityType Delete tag mapping @@ -1391,7 +1389,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * */ app.delete('/providers/:providerId/tag-mappings/:catalystEntityType', validate(tagsValidator.tagsMapping), - deleteTagMapping); + deleteTagMapping); /** @@ -1491,7 +1489,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * } */ app.patch('/providers/:providerId/unassigned-instances/:instanceId', - validate(instanceValidator.update), updateUnassignedInstanceTags); + validate(instanceValidator.update), updateUnassignedInstanceTags); /** * @api {patch} /providers/:providerId/unassigned-instances Update unassigned instance @@ -1554,79 +1552,79 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * } */ app.patch('/providers/:providerId/unassigned-instances', - validate(instanceValidator.get), bulkUpdateUnassignedInstances); + validate(instanceValidator.get), bulkUpdateUnassignedInstances); function getTagsList(req, res, callback) { async.waterfall( - [ - - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - providerService.getTagsByProvider, - providerService.createTagsList - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + [ + + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + providerService.getTagsByProvider, + providerService.createTagsList + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function getUnassignedInstancesList(req, res, callback) { var reqData = {}; async.waterfall( - [ - function (next) { - apiUtil.changeRequestForJqueryPagination(req.query, next); - }, - function (reqData, next) { - apiUtil.paginationRequest(reqData, 'unassignedInstances', next); - }, - function (paginationReq, next) { - paginationReq['providerId'] = req.params.providerId; - paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'providerData.region']; - reqData = paginationReq; - apiUtil.databaseUtil(paginationReq, next); - }, - function (queryObj, next) { - instanceService.getUnassignedInstancesByProvider(queryObj, next); - }, - function (unAssignedInstances, next) { - apiUtil.changeResponseForJqueryPagination(unAssignedInstances, reqData, next); - } + [ + function (next) { + apiUtil.changeRequestForJqueryPagination(req.query, next); + }, + function (reqData, next) { + apiUtil.paginationRequest(reqData, 'unassignedInstances', next); + }, + function (paginationReq, next) { + paginationReq['providerId'] = req.params.providerId; + paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'providerData.region']; + reqData = paginationReq; + apiUtil.databaseUtil(paginationReq, next); + }, + function (queryObj, next) { + instanceService.getUnassignedInstancesByProvider(queryObj, next); + }, + function (unAssignedInstances, next) { + apiUtil.changeResponseForJqueryPagination(unAssignedInstances, reqData, next); + } - ], - function (err, results) { - if (err) - callback(err); - else - return res.status(200).send(results); - }); + ], + function (err, results) { + if (err) + callback(err); + else + return res.status(200).send(results); + }); } function getTag(req, res, callback) { async.waterfall( - [ - - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - providerService.getTagByNameAndProvider(provider._id, req.params.tagName, next); - }, - providerService.createTagObject - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + [ + + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + providerService.getTagByNameAndProvider(provider._id, req.params.tagName, next); + }, + providerService.createTagObject + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } @@ -1635,252 +1633,252 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function updateTag(req, res, callback) { async.waterfall( - [ - - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - var tagDetails = { - 'name': req.params.tagName, - 'description': req.body.description - }; - providerService.updateTag(provider, tagDetails, next); - }, - providerService.createTagObject - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + [ + + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + var tagDetails = { + 'name': req.params.tagName, + 'description': req.body.description + }; + providerService.updateTag(provider, tagDetails, next); + }, + providerService.createTagObject + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function deleteTag(req, res, callback) { async.waterfall( - [ + [ - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - providerService.deleteTag(provider, req.params.tagName, next); - } - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + providerService.deleteTag(provider, req.params.tagName, next); + } + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function getTagMappingsList(req, res, callback) { async.waterfall( - [ - - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - providerService.getTagsByProvider, - providerService.createTagMappingList - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + [ + + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + providerService.getTagsByProvider, + providerService.createTagMappingList + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function getTagMapping(req, res, callback) { async.waterfall( - [ - - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - providerService.getTagByCatalystEntityTypeAndProvider(provider._id, - req.params.catalystEntityType, next); - }, - providerService.createTagMappingObject - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + [ + + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + providerService.getTagByCatalystEntityTypeAndProvider(provider._id, + req.params.catalystEntityType, next); + }, + providerService.createTagMappingObject + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function addTagMappings(req, res, callback) { async.waterfall( - [ - - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - providerService.addMultipleTagMappings(provider._id, req.body, next); - }, - providerService.createTagMappingList - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(201).send(results); + [ + + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + providerService.addMultipleTagMappings(provider._id, req.body, next); + }, + providerService.createTagMappingList + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(201).send(results); + } } - } ); } function updateTagMapping(req, res, callback) { async.waterfall( - [ - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - providerService.getTagByCatalystEntityTypeAndProvider(provider._id, - req.params.catalystEntityType, next); - }, - function (tag, next) { - providerService.updateTagMapping(tag, req.body, next); - }, - /*function (tag, next) { - providerService.getTagByNameAndProvider(req.params.providerId, tag.name, next); - },*/ - providerService.createTagMappingObject - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + [ + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + providerService.getTagByCatalystEntityTypeAndProvider(provider._id, + req.params.catalystEntityType, next); + }, + function (tag, next) { + providerService.updateTagMapping(tag, req.body, next); + }, + /*function (tag, next) { + providerService.getTagByNameAndProvider(req.params.providerId, tag.name, next); + },*/ + providerService.createTagMappingObject + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function deleteTagMapping(req, res, callback) { async.waterfall( - [ + [ - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - providerService.deleteTagMapping(provider._id, req.params.catalystEntityType, next); - } - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + providerService.deleteTagMapping(provider._id, req.params.catalystEntityType, next); + } + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function getCatalystEntityMapping(req, res, callback) { async.waterfall( - [ - - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - providerService.getTagByCatalystEntityTypeAndProvider(provider._id, - req.params.catalystEntityType, next); - }, - function (tag, next) { - providerService.createCatalystEntityMappingObject(tag, req.params.catalystEntityId, next); - } - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + [ + + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + providerService.getTagByCatalystEntityTypeAndProvider(provider._id, + req.params.catalystEntityType, next); + }, + function (tag, next) { + providerService.createCatalystEntityMappingObject(tag, req.params.catalystEntityId, next); + } + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function updateUnassignedInstanceTags(req, res, callback) { async.waterfall( - [ - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - instanceService.updateUnassignedInstanceProviderTags(provider, req.params.instanceId, - req.body.tags, next); - }, - function (instance, next) { - // @TODO Nested callback with anonymous function to be avoided. - providerService.getTagMappingsByProviderId(instance.providerId, - function (err, tagMappingsList) { - if (err) { - next(err); - } else { - instanceService.updateUnassignedInstanceTags(instance, - req.body.tags, tagMappingsList, next); - } - } - ); - }, - instanceService.createUnassignedInstanceObject - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); + [ + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + instanceService.updateUnassignedInstanceProviderTags(provider, req.params.instanceId, + req.body.tags, next); + }, + function (instance, next) { + // @TODO Nested callback with anonymous function to be avoided. + providerService.getTagMappingsByProviderId(instance.providerId, + function (err, tagMappingsList) { + if (err) { + next(err); + } else { + instanceService.updateUnassignedInstanceTags(instance, + req.body.tags, tagMappingsList, next); + } + } + ); + }, + instanceService.createUnassignedInstanceObject + ], + function (err, results) { + if (err) { + callback(err); + } else { + return res.status(200).send(results); + } } - } ); } function bulkUpdateUnassignedInstances(req, res, callback) { async.waterfall( - [ - function (next) { - providerService.checkIfProviderExists(req.params.providerId, next); - }, - function (provider, next) { - if ('instances' in req.body) { - instanceService.bulkUpdateInstanceProviderTags(provider, req.body.instances, next); + [ + function (next) { + providerService.checkIfProviderExists(req.params.providerId, next); + }, + function (provider, next) { + if ('instances' in req.body) { + instanceService.bulkUpdateInstanceProviderTags(provider, req.body.instances, next); + } else { + var err = new Error("Malformed request"); + err.status = 400; + next(err); + } + }, + function (instances, next) { + instanceService.bulkUpdateUnassignedInstanceTags(instances, next); + } + ], + function (err, results) { + if (err) { + callback(err); } else { - var err = new Error("Malformed request"); - err.status = 400; - next(err); + return res.status(200).send(results); } - }, - function (instances, next) { - instanceService.bulkUpdateUnassignedInstanceTags(instances, next); } - ], - function (err, results) { - if (err) { - callback(err); - } else { - return res.status(200).send(results); - } - } ); } }; From e1c6fcb76f82507d549becbb1976b29f5d2fd8dd Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 19 Dec 2016 11:45:49 +0530 Subject: [PATCH 007/110] Integration BOTs UI with REST API --- .../bots/controller/botExecutionLogsCtrl.js | 2 +- .../dashboard/bots/controller/libraryCtrl.js | 47 ++++++++----------- .../catalyst-scheduler/catalystScheduler.js | 4 +- .../git-repository-sync/gitRepositorySync.js | 20 ++------ server/app/lib/utils/apiUtil.js | 6 +-- .../app/model/audit-trail/base-audit-trail.js | 5 ++ server/app/model/bots/bots.js | 1 + server/app/routes/v1.0/routes_bots.js | 10 ++++ server/app/services/botsService.js | 35 ++++++++++++-- server/app/services/schedulerService.js | 4 +- server/app/services/taskService.js | 5 ++ 11 files changed, 85 insertions(+), 54 deletions(-) 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/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index 4e12b0ad2..5f767e910 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -374,23 +374,29 @@ $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'); + } }); }; @@ -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; @@ -675,7 +666,7 @@ items: function() { return { taskId : hist.auditId, - historyId : hist._id, + historyId : hist.auditHistoryId, taskType:hist.auditTrailConfig.executionType }; } diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index 0cea183c5..284b89fe5 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -175,7 +175,7 @@ catalystSync.executeSerialScheduledTasks = function executeSerialScheduledTasks( } catalystSync.executeScheduledBots = function executeScheduledBots() { - botsDao.getScheduledBots(function(err, bots) { + /* botsDao.getScheduledBots(function(err, bots) { if (err) { logger.error("Failed to fetch bots: ", err); return; @@ -209,7 +209,7 @@ catalystSync.executeScheduledBots = function executeScheduledBots() { logger.debug("There is no scheduled Bots right now."); return; } - }); + });*/ } function cancelOldCronJobs(ids){ diff --git a/server/app/cronjobs/git-repository-sync/gitRepositorySync.js b/server/app/cronjobs/git-repository-sync/gitRepositorySync.js index 93a3ae23e..af9089f25 100644 --- a/server/app/cronjobs/git-repository-sync/gitRepositorySync.js +++ b/server/app/cronjobs/git-repository-sync/gitRepositorySync.js @@ -8,12 +8,14 @@ var path = "/tmp/bot-factory"; var Promise = require('promise'); var gitRepoSync = Object.create(CatalystCronJob); -gitRepoSync.interval = '*/2 * * * *'; +gitRepoSync.interval = '* * * * *'; gitRepoSync.execute = gitRepositorySync; module.exports = gitRepoSync; function gitRepositorySync(){ + + /*var nodegit = require('nodegit'), path = require('path'); @@ -41,7 +43,7 @@ function gitRepositorySync(){ } };*/ - var url = "https://github.com/pazdera/scriptster.git", cloneOpts = {},userName ='Durgesh1988' + var url = "https://github.com/pazdera/scriptster.git", cloneOpts = {},userName ='Durgesh1988'; var cloneOpts = { fetchOpts: { @@ -62,19 +64,7 @@ function gitRepositorySync(){ nodeGit.Clone( "https://github.com/RLIndia/botsfactory.git", path, - { - fetchOpts: { - callbacks: { - credentials: function(url, userName) { - return nodeGit.Cred.sshKeyNew( - userName, - '/Users/radek/.ssh/id_rsa.pub', - '/Users/radek/.ssh/id_rsa', - ""); - } - } - } - }) + cloneOpts) .then(function(repo) { console.log("Durgesh"); console.log(repo); 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/bots/bots.js b/server/app/model/bots/bots.js index 3b735b57e..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; diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 2f9198dbd..4c7a108f4 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -57,6 +57,16 @@ 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){ var reqBody = null; if(req.body.category && req.body.category ==='Blueprints') { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 34f850788..7c7b5e26d 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){ diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index 58b8fe4ad..a03b044de 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -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; 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; }); From df6fb05ac842908a14ddfbc8b86c26c7aef76872 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 19 Dec 2016 12:41:25 +0530 Subject: [PATCH 008/110] Integration BOTs UI with REST API --- server/app/cronjobs/catalyst-scheduler/catalystScheduler.js | 4 ++-- server/app/services/botsService.js | 4 +++- server/app/services/schedulerService.js | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index 284b89fe5..0cea183c5 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -175,7 +175,7 @@ catalystSync.executeSerialScheduledTasks = function executeSerialScheduledTasks( } catalystSync.executeScheduledBots = function executeScheduledBots() { - /* botsDao.getScheduledBots(function(err, bots) { + botsDao.getScheduledBots(function(err, bots) { if (err) { logger.error("Failed to fetch bots: ", err); return; @@ -209,7 +209,7 @@ catalystSync.executeScheduledBots = function executeScheduledBots() { logger.debug("There is no scheduled Bots right now."); return; } - });*/ + }); } function cancelOldCronJobs(ids){ diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 7c7b5e26d..6491532f2 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -279,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/schedulerService.js b/server/app/services/schedulerService.js index a03b044de..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; @@ -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); From f5e55e4adf29df7084fa7e187c99b8f7a34e631e Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Mon, 19 Dec 2016 15:08:13 +0530 Subject: [PATCH 009/110] Bots UI new changes. --- client/cat3/main.html | 1 - .../bots/controller/audittrailCtrl.js | 93 ++++++++++++++----- .../dashboard/bots/view/audittrail.html | 6 +- .../dashboard/bots/view/botHistory.html | 2 +- .../sections/dashboard/bots/view/botInfo.html | 50 +++++++++- .../dashboard/bots/view/confirmBotRun.html | 23 +++++ .../sections/dashboard/genericServices.js | 29 ++++-- 7 files changed, 168 insertions(+), 36 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/confirmBotRun.html diff --git a/client/cat3/main.html b/client/cat3/main.html index dce92b810..95f0d02cc 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -114,7 +114,6 @@ - diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index 7c5a1c816..b95db64f5 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -8,19 +8,23 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('audittrailCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', - function ($scope, $rootScope, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) { + .controller('audittrailCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', 'uiGridOptionsService', '$timeout', + function ($scope, $rootScope, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal, uiGridOptionsService, $timeout) { var treeNames = ['BOTs','Audit Trail']; $rootScope.$emit('treeNameUpdate', treeNames); var audit=this; - audit.gridOptions={ - gridOption:{ - paginationPageSizes: [10, 25, 50, 75], - paginationPageSize: 10, - enableColumnMenus:false, - multiSelect :false, - }, - columnDefs: [ + var botAuditTrailUIGridDefaults = uiGridOptionsService.options(); + $scope.paginationParams = botAuditTrailUIGridDefaults.pagination; + $scope.paginationParams=[]; + $scope.paginationParams.page = 1; + $scope.paginationParams.pageSize = 10; + $scope.paginationParams.sortBy = 'startedOn'; + $scope.paginationParams.sortOrder = 'desc'; + $scope.initGrids = function(){ + $scope.botAuditTrailGridOptions={ + enableFiltering: false + }; + $scope.botAuditTrailGridOptions.columnDefs = [ { name: 'Start Time',field:'startedOn', cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', cellTooltip: true}, { name: 'End Time',field:'endedOn', @@ -32,9 +36,9 @@ 'row.entity.botType',cellTooltip: true}, { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name',cellTooltip: true}, { name: 'Status',field:'status', - cellTemplate:'' + - '' + - '', + cellTemplate:'' + + '' + + '', cellTooltip: true}, { name: 'Org',field:'masterDetails.orgName'}, { name: 'BU',field:'masterDetails.bgName'}, @@ -42,12 +46,49 @@ { name: 'Env',field:'masterDetails.envName'}, { name: 'User',field:'user'}, { name: 'Logs',cellTemplate: ''} - ], - data:[] + ] + $scope.botAuditTrailGridOptions.data=[]; + angular.extend($scope.botAuditTrailGridOptions,botAuditTrailUIGridDefaults.gridOption); }; + $scope.initGrids(); + var gridBottomSpace = 40; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botAuditTrailPage') - gridBottomSpace; + //for server side(external) pagination. + angular.extend($scope.botAuditTrailGridOptions,botAuditTrailUIGridDefaults.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.init(); + } + }); + //Pagination for page and pageSize + gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { + console.log(newPage); + $scope.paginationParams.page = newPage; + $scope.paginationParams.pageSize = pageSize; + $scope.init(); + }); + }, + }); + /*$scope.setFirstPageView = function(){ + $scope.botAuditTrailGridOptions.paginationCurrentPage = $scope.paginationParams.page = 1; + }; + $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.init(); + } + }; + $scope.setPaginationDefaults();*/ + $scope.botAuditTrailLogs=function(hist) { var modalInstance = $modal.open({ animation: true, @@ -69,20 +110,26 @@ }; $scope.RefreshBotsAuditTrail = function() { - audit.init(); + $scope.init(); }; - audit.init =function(){ - audit.gridOptions.data=[]; + $scope.init =function(){ + $scope.botAuditTrailGridOptions.data=[]; var param={ - url:'/audit-trail?filterBy=auditType:BOTs' + url:'/audit-trail?filterBy=auditType:BOTs&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (response) { - angular.forEach(response,function () { - audit.gridOptions.data=response.auditTrails; - }); + $timeout(function() { + console.log(response); + $scope.botAuditTrailGridOptions.data=response.auditTrails; + }, 100); + $scope.isBotAuditTrailPageLoading = false; + }, function(error) { + $scope.isBotAuditTrailPageLoading = false; + console.log(error); + $scope.errorMessage = "No Records found"; }); }; - audit.init(); + $scope.init(); }]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html index 9941d03e9..1a3d347e0 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html @@ -9,8 +9,10 @@
-
-
+ +
No data Available
+ +
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html index 20c586642..0a23d5a2b 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html @@ -29,7 +29,7 @@

-
+
No Data Found
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html index 0f6db8808..f0602d01c 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -67,17 +67,55 @@

+ + + Runlist + + + + + + Attributes + + + + + Job Name - + Job URL - + + + + + Bot Parameter Type + + + + + + Bot Parameter Name + + + + + + Bot Parameter Value + + + + + + Bot Parameter Description + + @@ -85,7 +123,13 @@

Script Type Name - + + + + + Script Parameter Description + + diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/confirmBotRun.html b/client/cat3/src/partials/sections/dashboard/bots/view/confirmBotRun.html new file mode 100644 index 000000000..aceeab403 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/confirmBotRun.html @@ -0,0 +1,23 @@ +
+
+ × +

+ + Execute BOT +

+
+ +
+ Are you sure you want to execute this BOT? +
+ +
+ + + +
+
diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js index 54a88998a..747ba7968 100644 --- a/client/cat3/src/partials/sections/dashboard/genericServices.js +++ b/client/cat3/src/partials/sections/dashboard/genericServices.js @@ -155,6 +155,23 @@ }); }; + genericServices.newTask=function(bot) { + $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html', + controller: 'newTaskCtrl', + backdrop: 'static', + keyboard: false, + size: 'lg', + windowClass: 'my-modal-popup', + resolve: { + items: function() { + return bot; + } + } + }); + }; + genericServices.removeBlueprint= function(blueprintObj, bpType) { var modalOptions = { closeButtonText: 'Cancel', @@ -201,23 +218,23 @@ }).result.then(function(response) { console.log(response); //genericServices.log(); - if(response.blueprintMessage){ + /*if(response.blueprintMessage){ $rootScope.$emit('WZ_INSTANCES_SHOW_LATEST'); } - $rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT'); + $rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT');*/ }, function() { - $rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT'); + //$rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT'); }); } else { $modal.open({ animation: true, - templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/confirmJobRun.html', - controller: 'confirmJobRunCtrl', + templateUrl: 'src/partials/sections/dashboard/bots/view/confirmBotRun.html', + controller: 'confirmBotRunCtrl', backdrop: 'static', keyboard: false, resolve: { items: function() { - return task._id; + return task; } } }).result.then(function(response) { From 2d737f4968b9a7bf9b9a55dcd0cd273dd898d525 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 19 Dec 2016 17:18:55 +0530 Subject: [PATCH 010/110] Integration BOTs UI with REST API --- server/app/model/bots/bots.js | 3 ++- .../app/model/classes/tasks/taskTypeChef.js | 2 +- .../app/model/classes/tasks/taskTypeScript.js | 6 +---- server/app/services/auditTrailService.js | 16 +++++++++---- server/app/services/botsService.js | 24 ++++++++++++++++--- server/app/services/taskService.js | 3 ++- 6 files changed, 38 insertions(+), 16 deletions(-) diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 8301ab1de..33d71c337 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -298,7 +298,8 @@ BotsSchema.statics.updateBotsExecutionCount = function updateBotsExecutionCount( BotsSchema.statics.getScheduledBots = function getScheduledBots(callback) { Bots.find({ - isBotScheduled: true + isBotScheduled: true, + isDeleted:false }, function (err, bots) { if (err) { logger.error(err); diff --git a/server/app/model/classes/tasks/taskTypeChef.js b/server/app/model/classes/tasks/taskTypeChef.js index e48aae65c..29975a973 100755 --- a/server/app/model/classes/tasks/taskTypeChef.js +++ b/server/app/model/classes/tasks/taskTypeChef.js @@ -269,7 +269,7 @@ chefTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, appDat }); }); - } else if (tagServer) { + } else if (tagServer !== 'undefined' && tagServer !== null) { logger.debug('in tagServer',tagServer); instancesDao.getInstancesByTagServer(tagServer, function(err, instances) { if (err) { diff --git a/server/app/model/classes/tasks/taskTypeScript.js b/server/app/model/classes/tasks/taskTypeScript.js index e8bf81c8c..492653555 100644 --- a/server/app/model/classes/tasks/taskTypeScript.js +++ b/server/app/model/classes/tasks/taskTypeScript.js @@ -67,9 +67,8 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu var sudoFlag = this.isSudo; var scriptDetails = this.scriptDetails; var instanceResultList = []; - function getInstances(instanceIds, tagServer, callback) { - if (tagServer) { + if (tagServer !== 'undefined' && tagServer !== null) { logger.debug('in tagServer', tagServer); instancesDao.getInstancesByTagServer(tagServer, function (err, instances) { if (err) { @@ -83,7 +82,6 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu }); } else { - if (!(instanceIds && instanceIds.length)) { if (typeof onExecute === 'function') { onExecute({ @@ -104,8 +102,6 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu }); } } - - getInstances(instanceIds, self.botTagServer, function (err, instances) { if (err) { logger.error(err); diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index 1aafa8f3e..ad80b6a43 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -186,7 +186,8 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ totalNoOfSuccessBots: function(callback){ var query={ auditType:'BOTs', - actionStatus:'success' + actionStatus:'success', + isDeleted:false }; auditTrail.getAuditTrails(query,function(err,data){ if(err){ @@ -200,7 +201,8 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ totalNoOfRunningBots: function(callback){ var query={ auditType:'BOTs', - actionStatus:'running' + actionStatus:'running', + isDeleted:false }; auditTrail.getAuditTrails(query,function(err,data){ if(err){ @@ -213,7 +215,9 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ }, totalSavedTimeForBots: function(callback){ var query={ - auditType:'BOTs' + auditType:'BOTs', + actionStatus:'success', + isDeleted:false }; auditTrail.getAuditTrails(query,function(err,botAuditTrail){ if(err){ @@ -241,7 +245,8 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ totalNoOfFailedBots: function(callback){ var query={ auditType:'BOTs', - actionStatus:'failed' + actionStatus:'failed', + isDeleted:false }; auditTrail.getAuditTrails(query,function(err,data){ if(err){ @@ -267,7 +272,8 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ auditTrailService.getBotsAuditTrailHistory = function getBotsAuditTrailHistory(botId,callback){ var query={ auditType:'BOTs', - auditId:botId + auditId:botId, + isDeleted:false }; auditTrail.getAuditTrails(query,function(err,data){ if(err){ diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 6491532f2..01d981053 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -20,6 +20,7 @@ var bots = require('_pr/model/bots/bots.js'); var async = require("async"); var apiUtil = require('_pr/lib/utils/apiUtil.js'); var taskService = require('_pr/services/taskService.js'); +var tasks = require('_pr/model/classes/tasks/tasks.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'); @@ -103,6 +104,23 @@ botsService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,call if (botsData[0].isBotScheduled === true) { var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); catalystSync.executeScheduledBots(); + if(botsData[0].botLinkedCategory === 'Task'){ + tasks.getTaskById(botId,function(err,task){ + if(err){ + logger.error("Error in fetching Task details",err); + }else if(task.isTaskScheduled === true){ + tasks.updateTaskScheduler(botId,function(err,updateData){ + if(err){ + logger.error("Error in Updating Task details",err); + } + }); + if(task.cronJobId && task.cronJobId !== null){ + var cronTab = require('node-crontab'); + cronTab.cancelJob(task.cronJobId); + } + } + }); + } } else if (botsData[0].cronJobId && botsData[0].cronJobId !== null) { var cronTab = require('node-crontab'); cronTab.cancelJob(botsData[0].cronJobId); @@ -279,9 +297,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.userName : 'system',reqBody.hostProtocol ? reqBody.hostProtocol : '', - reqBody.choiceParam ? reqBody.choiceParam : '',reqBody.appData ? reqBody.appData : '',reqBody.paramOptions ? reqBody.paramOptions : '', - reqBody.tagServer ? reqBody.tagServer : '', callback); + taskService.executeTask(botId,reqBody.userName ? reqBody.userName : 'system',reqBody.hostProtocol ? reqBody.hostProtocol : 'undefined', + reqBody.choiceParam ? reqBody.choiceParam : 'undefined',reqBody.appData ? reqBody.appData : 'undefined',reqBody.paramOptions ? reqBody.paramOptions : 'undefined', + reqBody.tagServer ? reqBody.tagServer : 'undefined', callback); }else{ blueprintService.launch(botId,reqBody,callback) } diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 795c6f5ee..630d79e4d 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -52,7 +52,8 @@ taskService.getAllServiceDeliveryTask = function getAllServiceDeliveryTask(query var query = { auditType: 'BOTs', actionStatus: queryObj.actionStatus, - auditCategory: 'Task' + auditCategory: 'Task', + isDeleted:false }; var taskIds = []; async.waterfall([ From 01cebcca4e872f4a436d92e5eee198b39182efc1 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Mon, 19 Dec 2016 17:20:48 +0530 Subject: [PATCH 011/110] UI changes for BOT. --- .../bots/controller/audittrailCtrl.js | 36 +- .../bots/controller/editParamsCtrl.js | 294 ++++----- .../dashboard/bots/controller/libraryCtrl.js | 599 ++++++++++-------- .../sections/dashboard/bots/view/library.html | 26 +- .../sections/dashboard/genericServices.js | 21 +- 5 files changed, 523 insertions(+), 453 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index b95db64f5..781d016c3 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -21,9 +21,7 @@ $scope.paginationParams.sortBy = 'startedOn'; $scope.paginationParams.sortOrder = 'desc'; $scope.initGrids = function(){ - $scope.botAuditTrailGridOptions={ - enableFiltering: false - }; + $scope.botAuditTrailGridOptions={}; $scope.botAuditTrailGridOptions.columnDefs = [ { name: 'Start Time',field:'startedOn', cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', cellTooltip: true}, @@ -63,18 +61,36 @@ 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.init(); + $scope.botAuditTrailGridView(); } }); //Pagination for page and pageSize gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { - console.log(newPage); $scope.paginationParams.page = newPage; $scope.paginationParams.pageSize = pageSize; - $scope.init(); + $scope.botAuditTrailGridView(); }); }, }); + /*angular.extend($scope.botAuditTrailGridOptions,botAuditTrailUIGridDefaults.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.botAuditTrailGridView(); + } + }); + //Pagination for page and pageSize + gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { + console.log(newPage); + $scope.paginationParams.page = newPage; + $scope.paginationParams.pageSize = pageSize; + $scope.botAuditTrailGridView(); + }); + }, + });*/ /*$scope.setFirstPageView = function(){ $scope.botAuditTrailGridOptions.paginationCurrentPage = $scope.paginationParams.page = 1; }; @@ -110,18 +126,18 @@ }; $scope.RefreshBotsAuditTrail = function() { - $scope.init(); + $scope.botAuditTrailGridView(); }; - $scope.init =function(){ + $scope.botAuditTrailGridView =function(){ $scope.botAuditTrailGridOptions.data=[]; var param={ url:'/audit-trail?filterBy=auditType:BOTs&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { - console.log(response); $scope.botAuditTrailGridOptions.data=response.auditTrails; + $scope.botAuditTrailGridOptions.totalItems = response.metaData.totalRecords; }, 100); $scope.isBotAuditTrailPageLoading = false; }, function(error) { @@ -130,6 +146,6 @@ $scope.errorMessage = "No Records found"; }); }; - $scope.init(); + $scope.botAuditTrailGridView(); }]); })(angular); \ No newline at end of file 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 01283672c..475cf7f27 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; + .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; + } } - if(items.botLinkedSubCategory === 'script' && items.botConfig) { - for (var i=0; i 0) { - $scope.scriptParamsFlag = 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); } } - } - $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 (runlist.length > 0) { + workzoneServices.getcookBookAttributes(runlist, data.data.serverId).then(function (response) { + var data; + if (response.data) { + data = response.data; + } else { + data = response; } - } - 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 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.cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes); + $scope.isChefattributesLoading = false; }); + }); + } + }); + } + if (items.botConfig) { + $scope.jenkinsparams = items.botConfig.parameterized; + $scope.scriptparams = items.botConfig.scriptDetails; + } + $scope.parameters=['']; + //var cookbookAttributes = []; + $scope.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 = {}; + }; - 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 && items.botConfig.taskType === 'jenkins') { + choiceParam = $scope.jenparams; + }*/ - $scope.add = function() { - $scope.parameters.push(''); - }; + /*$scope.add = function() { + $scope.parameters.push(''); + }; - $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.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; - } + /*$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 (items.botConfig && items.botConfig.taskType === 'chef') { - cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes); + if(checkParam){ + scriptParams = $scope.parameters; + } + } + + };*/ + + $scope.executeBot = function(){ + var reqBody = {}; + if (items.botConfig && items.botConfig.taskType === 'jenkins') { + reqBody.choiceParam = $scope.jenparams[params.name]; + } else if (items.botConfig && items.botConfig.taskType === 'chef'){ + reqBody.tagServer = $scope.tagSerSelected; + if ($scope.chefAttributesFlag) { + reqBody.cookbookAttributes = $scope.cookbookAttributes; } - if (items.botConfig && items.botConfig.taskType === 'jenkins') { - choiceParam = $scope.jenparams; + } else if (items.botConfig && items.botConfig.taskType === 'script') { + reqBody.tagServer = $scope.tagSerSelected; + if ($scope.scriptParamsFlag) { + reqBody.scriptParams = $scope.parameters; } - $scope.executeBot(); + } + var param={ + url:'/bots/' + items.botId + '/execute', + data: reqBody }; - - $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; - } + 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); } - 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 5f767e910..55a16c189 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,329 @@ (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.page = 1; + $scope.paginationParams.pageSize = 10; + $scope.paginationParams.sortBy = 'createdOn'; + $scope.paginationParams.sortOrder = 'desc'; + + $scope.initGrids = function(){ + $scope.botLibGridOptions={}; + $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); + }); + //Pagination for page and pageSize + gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { + $scope.paginationParams.page = newPage; + $scope.paginationParams.pageSize = pageSize; + $scope.botLibraryGridView(); + }); + }, + }); + $scope.setFirstPageView = function(){ + $scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page = 1; + }; + $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=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; - $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(); - }); - }, + 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=[]; + }; + $scope.botLibraryGridView(); + $scope.searchBotNameCategory = function() { + $scope.searchString = $scope.botLibrarySearch; + lib.gridOptions=[]; + if($scope.totalBotsSelected) { 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=[]; + url:'/bots?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString + } + } else if($scope.runningBotsselected) { 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"; - }); - }; - 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); + url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString + } + } else if($scope.failedBotsselected) { + var param={ + url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString } }; - /*$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; - } + 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 = 225; + $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; } - }); - 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.botInfo=function(bot) { + genSevs.newTask(bot); + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/popups/newTask.html', + controller: 'newTaskCtrl', + backdrop : 'static', + size: 'lg', + 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 + } + }); + 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 } - }, 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?' - }; - 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(); - } - }, function(data) { - toastr.error('error:: ' + data.toString()); - }); - }); - }; - $rootScope.$on('BOTS_LIBRARY_REFRESH', function() { - lib.summary(); - $scope.botLibraryGridView(); + } + }).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.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); - }); - lib.summary(); + }; + $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?' }; - $scope.showFailedBots = function() { - $scope.failedBotsselected = true; - $scope.runningBotsselected = false; - $scope.totalBotsSelected = false; - lib.gridOptions.data=[]; + confirmbox.showModal({}, modalOptions).then(function() { var param={ - url:'/bots?actionStatus=failed&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + url:'/bots/' + bot.botId }; - genSevs.promiseGet(param).then(function (result) { - $timeout(function() { - $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botLibGridOptions.data=result.bots; - }, 100); + 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(); + } + }, function(data) { + toastr.error('error:: ' + data.toString()); }); - lib.summary(); + }); + }; + $rootScope.$on('BOTS_LIBRARY_REFRESH', function() { + lib.summary(); + $scope.botLibraryGridView(); + }); + $scope.RefreshBotsLibrary = function() { + $scope.totalBotsSelected = true; + $scope.runningBotsselected = false; + $scope.failedBotsselected = false; + $scope.botLibrarySearch = ''; + 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=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; - 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); - }); + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + }); + lib.summary(); + }; + $scope.showFailedBots = function() { + $scope.failedBotsselected = true; + $scope.runningBotsselected = false; + $scope.totalBotsSelected = false; + lib.gridOptions.data=[]; + var param={ + url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&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(); - }]).controller('botInfoCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { + }; + 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 +354,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; @@ -666,7 +699,7 @@ items: function() { return { taskId : hist.auditId, - historyId : hist.auditHistoryId, + historyId : hist._id, taskType:hist.auditTrailConfig.executionType }; } @@ -698,5 +731,33 @@ $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; - }]); + }]).controller('confirmBotRunCtrl', ['$scope', '$modalInstance', 'items', 'genericServices','toastr', function ($scope, $modalInstance, items, genSevs, toastr) { + console.log(items); + $scope.botId = items.botId; + $scope.isJobRunExecuting = false; + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + $scope.runJob = function () { + $scope.isJobRunExecuting = true; + var param={ + url:'/bots/' + items.botId + '/execute' + }; + 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); + } + }); + }; + } + ]); })(angular); \ No newline at end of file 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 892b952dd..8cdd60c4d 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -57,24 +57,34 @@ - -
- No data Available -
-
+ + +
+ No data Available +
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js index 747ba7968..dc6651c96 100644 --- a/client/cat3/src/partials/sections/dashboard/genericServices.js +++ b/client/cat3/src/partials/sections/dashboard/genericServices.js @@ -139,7 +139,7 @@ }); }; - genericServices.botHistory=function(bot) { + /*genericServices.botHistory=function(bot) { $modal.open({ animation: true, templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistory.html', @@ -153,24 +153,7 @@ } } }); - }; - - genericServices.newTask=function(bot) { - $modal.open({ - animation: true, - templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html', - controller: 'newTaskCtrl', - backdrop: 'static', - keyboard: false, - size: 'lg', - windowClass: 'my-modal-popup', - resolve: { - items: function() { - return bot; - } - } - }); - }; + };*/ genericServices.removeBlueprint= function(blueprintObj, bpType) { var modalOptions = { From 0140fcb88dfeb4530842f3167592429de993b97d Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Tue, 20 Dec 2016 12:13:37 +0530 Subject: [PATCH 012/110] Integration BOTs UI with REST API --- .../dashboard/bots/controller/libraryCtrl.js | 26 ++++++++++++++++--- .../design/controllers/blueprintListCtrl.js | 2 +- .../blueprint/popups/blueprintLaunchCtrl.js | 12 ++++++--- .../popups/blueprintLaunchParamsCtrl.js | 13 +++++----- .../instance/popups/instanceLogsCtrl.js | 2 ++ server/app/model/blueprint/blueprint.js | 12 +++------ server/app/model/bots/bots.js | 4 +++ .../app/routes/v1.0/routes_authentication.js | 1 - server/app/routes/v1.0/routes_d4dMasters.js | 6 +++-- server/app/services/botsService.js | 2 ++ server/app/services/settingsService.js | 5 +++- 11 files changed, 58 insertions(+), 27 deletions(-) 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 55a16c189..335f10546 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -699,7 +699,7 @@ items: function() { return { taskId : hist.auditId, - historyId : hist._id, + historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId, taskType:hist.auditTrailConfig.executionType }; } @@ -731,22 +731,40 @@ $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; - }]).controller('confirmBotRunCtrl', ['$scope', '$modalInstance', 'items', 'genericServices','toastr', function ($scope, $modalInstance, items, genSevs, toastr) { + }]).controller('confirmBotRunCtrl', ['$scope', '$modalInstance', 'items', 'genericServices','toastr','$modal', function ($scope, $modalInstance, items, genSevs, toastr,$modal) { console.log(items); $scope.botId = items.botId; $scope.isJobRunExecuting = false; $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; + 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.runJob = function () { $scope.isJobRunExecuting = true; var param={ url:'/bots/' + items.botId + '/execute' }; 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) { diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js index 63e1a58ad..7d8c5666e 100755 --- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js @@ -115,7 +115,7 @@ }; pbList.launchInstance = $scope.launchInstance =function($event,pb){ $event.stopPropagation(); - gencSers.lunchBlueprint(pb); + gencSers.launchBlueprint(pb); }; pbList.selectCard = function (cardObj){ pbList[cardObj._id] = !pbList[cardObj._id]; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js index 4141b54a0..34287e090 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js @@ -10,7 +10,7 @@ angular.module('workzone.blueprint') .controller('blueprintLaunchCtrl', ['$scope', '$rootScope', '$modalInstance', 'bpItem', 'workzoneServices', 'workzoneEnvironment', 'instanceLogs', function($scope, $rootScope, $modalInstance, bpItem, workzoneServices, workzoneEnvironment, instanceLogs) { console.log(bpItem); - if(bpItem.bp.blueprintType) { + if(bpItem.bp.blueprintType || bpItem.bp.botLinkedSubCategory) { $scope.isBPLogsLoading = true; $scope.isNewInstanceLogsPromise = false; var helper = { @@ -44,9 +44,9 @@ } else{ isSuccess = true; - if (bpItem.bp.blueprintType === 'aws_cf') { + if (bpItem.bp.blueprintType === 'aws_cf' || bpItem.bp.botLinkedSubCategory === 'aws_cf') { msgStr = 'Stack Id : ' + $scope.launchResponse.stackId + '. You can view your stack in cloudformation tab'; - } else if (bpItem.bp.blueprintType === 'azure_arm') { + } else if (bpItem.bp.blueprintType === 'azure_arm' || bpItem.bp.botLinkedSubCategory === 'azure_arm') { msgStr = 'Deployment Id : ' + $scope.launchResponse.armId + '. You can view your deployment in ARM tab'; } else { msgStr = 'Instance Id : '; @@ -80,12 +80,16 @@ versionsList = bpItem.bp.blueprintConfig.infraManagerData.versionsList; versionOptional = versionsList[versionsList.length-1].ver; } + }else{ + versionOptional = bpItem.bp.version ? bpItem.bp.version : 1; } var selectedVersionBpId = bpItem.bp.selectedVersionBpId; var monitorId = bpItem.monitorId; if(bpItem && bpItem.bp && bpItem.bp.selectedVersionBpId){ selectedVersionBpId = bpItem.bp.selectedVersionBpId; - } else { + } else if(bpItem.bp.botType){ + selectedVersionBpId = bpItem.bp.botId; + } else{ selectedVersionBpId = bpItem.bp._id; } var lEnv=null; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index b8b4e9818..ac3dc1a44 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -36,9 +36,9 @@ angular.forEach(envData,function(val){ var orgID,bgID,projID; if(items.organizationId === undefined) { - orgID = (items.orgId)?items.orgId:items.organization.id; - bgID = (items.bgId)?items.bgId:items.businessGroup.id; - projID = (items.projectId)?items.projectId:items.project.id; + orgID = (items.orgId)?items.orgId:items.masterDetails.orgId; + bgID = (items.bgId)?items.bgId:items.masterDetails.bgId; + projID = (items.projectId)?items.projectId:items.masterDetails.projectId; $scope.getMonitorList(orgID); } else { orgID = items.organizationId; @@ -76,7 +76,7 @@ $modalInstance.dismiss('cancel'); }; $scope.launchBP = function() { - if(items.orgId === undefined){ + if(items.orgId === undefined && items.botType === undefined){ var compBlue={ "blueprintId": (items.id)?items.id:items._id, "environmentId": $scope.envSeleted @@ -88,13 +88,14 @@ toastr.error(data.message, 'Error'); }); } else { - if(items.blueprintType === "aws_cf") { + if(items.blueprintType === "aws_cf" || items.botLinkedSubCategory === "aws_cf") { $scope.showCFTInputs = true; - }else if(items.blueprintType === "azure_arm") { + }else if(items.blueprintType === "azure_arm" || items.botLinkedSubCategory === "azure_arm") { $scope.showARMInputs = true; }else if(items.domainNameCheck === true || items.domainNameCheck === "true") { $scope.showBlueprintInputs = true; }else { + console.log("Durgesh"); launchHelper.launch(); } } diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js index 174f5a698..9a5897334 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js @@ -9,6 +9,8 @@ "use strict"; angular.module('workzone.instance') .controller('instanceLogsCtrl', ['$scope', '$rootScope', '$modalInstance', 'items', 'workzoneServices', 'instanceSetting', 'instanceLogs', function($scope, $rootScope , $modalInstance, items, workzoneServices, instanceSetting, instanceLogs) { + console.log(items); + console.log("Durgesh"); $scope.instanceName = items.name; $scope.isInstanceLogsLoading = true; angular.extend($scope, { diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js index 72bfb2e97..a0a243f0c 100755 --- a/server/app/model/blueprint/blueprint.js +++ b/server/app/model/blueprint/blueprint.js @@ -288,15 +288,13 @@ BlueprintSchema.methods.launch = function (opts, callback) { message: "Failed to get env name from env id" }, null); return; - } - ; + }; if (!envName) { callback({ "message": "Unable to find environment name from environment id" }); return; - } - ; + }; configmgmtDao.getChefServerDetails(infraManager.infraManagerId, function (err, chefDetails) { if (err) { logger.error("Failed to getChefServerDetails", err); @@ -304,16 +302,14 @@ BlueprintSchema.methods.launch = function (opts, callback) { message: "Failed to getChefServerDetails" }, null); return; - } - ; + }; if (!chefDetails) { logger.error("No CHef Server Detailed available.", err); callback({ message: "No Chef Server Detailed available" }, null); return; - } - ; + }; var chef = new Chef({ userChefRepoLocation: chefDetails.chefRepoLocation, chefUserName: chefDetails.loginname, diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 33d71c337..4e03b12de 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -181,6 +181,10 @@ var BotsSchema = new Schema ({ type: Number, default: 1 }, + domainNameCheck: { + type: Boolean, + default: false + } }); BotsSchema.plugin(mongoosePaginate); diff --git a/server/app/routes/v1.0/routes_authentication.js b/server/app/routes/v1.0/routes_authentication.js index a59fa6ad7..8126b3c92 100755 --- a/server/app/routes/v1.0/routes_authentication.js +++ b/server/app/routes/v1.0/routes_authentication.js @@ -37,7 +37,6 @@ var aws = require('aws-sdk'); module.exports.setRoutes = function(app) { app.post('/auth/createldapUser', function(req, res) { if (req.body) { - LDAPUser.getLdapUser(function(err, ldapData) { if (err) { logger.error("Failed to get ldap-user: ", err); diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 624450b06..580bfdcb5 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -2736,8 +2736,7 @@ module.exports.setRoutes = function (app, sessionVerification) { logger.error('Hit getting setting wizard error', err); res.send(500); return; - } - if (settingWizards.currentStep && settingWizards.currentStep.name === 'User Configuration') { + }else if (settingWizards.currentStep && settingWizards.currentStep.name === 'User Configuration') { var settingWizardSteps = appConfig.settingWizardSteps; settingWizards.currentStep.nestedSteps[1].isCompleted = true; settingWizards.currentStep.isCompleted = true; @@ -2753,6 +2752,9 @@ module.exports.setRoutes = function (app, sessionVerification) { res.send(200); return; }); + }else{ + res.send(200); + return; } }) } diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 01d981053..859bbb2b8 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -51,6 +51,8 @@ botsService.createOrUpdateBots = function createOrUpdateBots(botsDetail,linkedCa botLinkedCategory: linkedCategory, botLinkedSubCategory:linkedSubCategory, manualExecutionTime:botsDetail.manualExecutionTime, + version:botsDetail.version, + domainNameCheck:botsDetail.domainNameCheck, createdOn: new Date().getTime() }; bots.getBotsById(botsDetail._id,function(err,data){ diff --git a/server/app/services/settingsService.js b/server/app/services/settingsService.js index 4eea8841f..73c5a6486 100644 --- a/server/app/services/settingsService.js +++ b/server/app/services/settingsService.js @@ -81,7 +81,10 @@ settingsService.updateProjectData = function updateProjectData(enviornment,callb }; settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callback){ - if(id === '1'){ + if(orgId === null || orgId === ''){ + callback(null,orgId); + return; + }else if(id === '1'){ settingWizard.removeSettingWizardByOrgId(orgId,function(err,data){ if(err){ callback(err,null); From a10c39a4e3b9df85cce712df341c023a01255c0a Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 20 Dec 2016 12:21:45 +0530 Subject: [PATCH 013/110] firebase test --- client/cat3/main.html | 2 + client/cat3/src/main.js | 2 +- .../sections/dashboard/track/track.html | 13 +- .../sections/dashboard/track/trackCtrl.js | 123 +++++++++++++++++- 4 files changed, 133 insertions(+), 7 deletions(-) diff --git a/client/cat3/main.html b/client/cat3/main.html index d7cfa2ac0..427554ce5 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -37,6 +37,8 @@ + + diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js index 55ec51ab8..389caf669 100644 --- a/client/cat3/src/main.js +++ b/client/cat3/src/main.js @@ -12,7 +12,7 @@ * All modules/feature will be through * */ -var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr', +var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr','firebase', 'global.login', 'global.breadcrumb', 'authentication', diff --git a/client/cat3/src/partials/sections/dashboard/track/track.html b/client/cat3/src/partials/sections/dashboard/track/track.html index 6103062cb..7ff89150b 100644 --- a/client/cat3/src/partials/sections/dashboard/track/track.html +++ b/client/cat3/src/partials/sections/dashboard/track/track.html @@ -1,3 +1,10 @@ -
- {{Text}} -
\ No newline at end of file +
+

{{ day.name }}

+
+ + +
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/track/trackCtrl.js b/client/cat3/src/partials/sections/dashboard/track/trackCtrl.js index 38b7e6e8d..116ff2885 100644 --- a/client/cat3/src/partials/sections/dashboard/track/trackCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/track/trackCtrl.js @@ -1,7 +1,124 @@ (function (angular) { - "use strict"; angular.module('dashboard.track', []) - .controller('trackCtrl',['$scope', function ($scope) { - $scope.Text = 'Track page'; + .controller('trackCtrl',['$scope','$firebase', function ($scope,$firebase) { + + // get # of real time users + var listRef = new Firebase("https://burning-torch-4263.firebaseio.com/presence/"); + var userRef = listRef.push(); + + // Add ourselves to presence list when online. + var presenceRef = new Firebase("https://burning-torch-4263.firebaseio.com/.info/connected"); + presenceRef.on("value", function(snap) { + if (snap.val()) { + userRef.set(true); + // Remove ourselves when we disconnect. + userRef.onDisconnect().remove(); + } + }); + + listRef.on("value", function(snap) { + $scope.online = snap.numChildren(); + }); + + var ref = new Firebase("https://burning-torch-4263.firebaseio.com/days"); + var fb = $firebase(ref); + + // three way data binding + var syncObject = fb.$asObject(); + syncObject.$bindTo($scope, 'days'); + + $scope.reset = function() { + fb.$set({ + monday: { + name: 'Monday', + slots: { + 0900: { + time: '9:00am', + booked: false + }, + 0110: { + time: '11:00am', + booked: false + }, + 100: { + time: '1:00pm', + booked: false + }, + 300: { + time: '3:00pm', + booked: false + }, + 500: { + time: '5:00pm', + booked: false + }, + 700: { + time: '7:00pm', + booked: false + } + } + }, + tuesday: { + name: 'Tuesday', + slots: { + 0900: { + time: '9:00am', + booked: false + }, + 0110: { + time: '11:00am', + booked: false + }, + 100: { + time: '1:00pm', + booked: false + }, + 300: { + time: '3:00pm', + booked: false + }, + 500: { + time: '5:00pm', + booked: false + }, + 700: { + time: '7:00pm', + booked: false + } + } + }, + wednesday: { + name: 'Wednesday', + slots: { + 0900: { + time: '9:00am', + booked: false + }, + 0110: { + time: '11:00am', + booked: false + }, + 100: { + time: '1:00pm', + booked: false + }, + 300: { + time: '3:00pm', + booked: false + }, + 500: { + time: '5:00pm', + booked: false + }, + 700: { + time: '7:00pm', + booked: false + } + } + } + }); + }; + }]); + })(angular); \ No newline at end of file From d7d4c6b03443b64005fe75c749661789accc18d7 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 20 Dec 2016 12:49:15 +0530 Subject: [PATCH 014/110] Bot UI changes. --- .../sections/dashboard/bots/bots.scss | 19 +++++- .../bots/controller/audittrailCtrl.js | 54 +++++++---------- .../bots/controller/blueprintLogCtrl.js | 60 +++++++++++++++++++ .../bots/controller/botExecutionLogsCtrl.js | 1 - .../dashboard/bots/controller/chefLogCtrl.js | 5 +- .../bots/controller/editParamsCtrl.js | 60 ++++++------------- .../dashboard/bots/view/audittrail.html | 8 +++ .../dashboard/bots/view/blueprintLog.html | 10 ++++ .../dashboard/bots/view/botExecutionLogs.html | 3 + .../dashboard/bots/view/botHistoryLogs.html | 3 + .../sections/dashboard/bots/view/botInfo.html | 8 +-- .../dashboard/bots/view/editParams.html | 3 - .../sections/dashboard/bots/view/library.html | 18 +----- 13 files changed, 147 insertions(+), 105 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index 152523d25..96a95bfa1 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -208,7 +208,24 @@ /*global css*/ .ui-grid .ui-grid-row { - border-bottom: 1px solid #ccc; } } + +.bot-library-search { + height: 33px; + margin-right: 12px; +} + +.bot-audit-trail-search { + height: 31px; + margin: 6px 9px 0 0px; +} + +.search-text { + font-weight: normal; +} + +.bot-search { + -webkit-appearance: textfield !important; +} \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index 781d016c3..a2dad1382 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -50,7 +50,7 @@ }; $scope.initGrids(); - var gridBottomSpace = 40; + var gridBottomSpace = 80; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botAuditTrailPage') - gridBottomSpace; //for server side(external) pagination. @@ -72,38 +72,26 @@ }); }, }); - /*angular.extend($scope.botAuditTrailGridOptions,botAuditTrailUIGridDefaults.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.botAuditTrailGridView(); - } - }); - //Pagination for page and pageSize - gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { - console.log(newPage); - $scope.paginationParams.page = newPage; - $scope.paginationParams.pageSize = pageSize; - $scope.botAuditTrailGridView(); - }); - }, - });*/ - /*$scope.setFirstPageView = function(){ - $scope.botAuditTrailGridOptions.paginationCurrentPage = $scope.paginationParams.page = 1; - }; - $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.init(); - } + + $scope.searchBotAuditTrailName = function() { + $scope.searchString = $scope.botAuditTrailSearch; + $scope.botAuditTrailGridOptions.data=[]; + var param={ + url:'/audit-trail?filterBy=auditType:BOTs&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString + }; + genSevs.promiseGet(param).then(function (result) { + console.log(result); + $timeout(function() { + $scope.botAuditTrailGridOptions.totalItems = result.metaData.totalRecords; + $scope.botAuditTrailGridOptions.data=result.auditTrails; + }, 100); + $scope.isBotAuditTrailPageLoading = false; + }, function(error) { + $scope.isBotAuditTrailPageLoading = false; + toastr.error(error); + $scope.errorMessage = "No Records found"; + }); }; - $scope.setPaginationDefaults();*/ $scope.botAuditTrailLogs=function(hist) { var modalInstance = $modal.open({ @@ -142,7 +130,7 @@ $scope.isBotAuditTrailPageLoading = false; }, function(error) { $scope.isBotAuditTrailPageLoading = false; - console.log(error); + toastr.error(error); $scope.errorMessage = "No Records found"; }); }; diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js new file mode 100644 index 000000000..12cc426d5 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js @@ -0,0 +1,60 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Aug 2015 + */ + +(function (angular) { + "use strict"; + angular.module('dashboard.bots') + .controller('blueprintLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr) { + console.log(items); + var _instance = items.cpInstance; + $scope.instanceName = _instance.name; + var _actionItem = items.actionHistoryData; + var helper = { + lastTimeStamp: '', + getlastTimeStamp: function(logObj) { + if (logObj instanceof Array && logObj.length) { + return logObj[logObj.length - 1].timestamp; + } + }, + logsPolling: function() { + $scope.timerObject = $interval(function() { + workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id) + .then(function(response) { + if (response.data.length) { + helper.lastTimeStamp = helper.getlastTimeStamp(response); + $scope.logListDelta.push.apply($scope.logListDelta, response.data); + } + }); + }, instanceSetting.logCheckTimer * 100); + }, + stopPolling: function() { + $interval.cancel($scope.timerObject); + } + }; + + angular.extend($scope, { + logListInitial: [], + logListDelta: [], + cancel: function() { + helper.stopPolling(); + $modalInstance.dismiss('cancel'); + }, + timerObject: undefined + }); + + workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id).then(function(response) { + helper.lastTimeStamp = helper.getlastTimeStamp(response.data); + $scope.logListInitial = response.data; + helper.logsPolling(); + }); + + $scope.$on('$destroy', function() { + $interval.cancel($scope.timerObject); + }); + } + ]); +})(angular); 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 533f36624..c59de9054 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js @@ -9,7 +9,6 @@ "use strict"; angular.module('dashboard.bots') .controller('botExecutionLogsCtrl', ['$q', '$scope', '$timeout', 'items','$modalInstance', function ($q, $scope, $timeout, items,$modalInstance) { - console.log(items); $scope.parentItemDetail=items; var botExecLogCtrl={}; botExecLogCtrl.taskLogType=items.taskType; diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js index c92bb6ed2..284734545 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js @@ -8,7 +8,7 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('chefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting) { + .controller('chefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr) { /*This controller can be invoked from either of two flows - Chef Log History Item Logs OR Chef Task Execute items object will contain only taskId and historyId. */ //var items = $scope.parentItemDetail; @@ -80,7 +80,6 @@ url = '/bots/' + botId + '/history/' + historyId; } genSevs.promiseGet(param).then(function (response) { - console.log(response); chefLogData.createInstanceList(response.data); //$modalInstance.close(response.data); //$rootScope.$emit('BOTS_LIBRARY_REFRESH'); @@ -141,7 +140,7 @@ }, function (error) { $scope.isInstanceListLoading = false; - console.log(error); + toastr.error(error); $scope.errorMessage = ""; }); }; 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 475cf7f27..b737599ad 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -9,7 +9,6 @@ "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=[]; @@ -74,11 +73,11 @@ $scope.scriptparams = items.botConfig.scriptDetails; } $scope.parameters=['']; - //var cookbookAttributes = []; + var cookbookAttributes = []; $scope.cookbookAttributes = []; - //var scriptParams = []; + var scriptParams = []; var choiceParam = {}; - //$scope.jenparams = {}; + $scope.jenparams = {}; var helper = { botLogModal: function(id,historyId,taskType) { @@ -101,48 +100,24 @@ } }; - /*if (items.botConfig && items.botConfig.taskType === 'jenkins') { - choiceParam = $scope.jenparams; - }*/ - - /*$scope.add = function() { - $scope.parameters.push(''); - }; - - $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(){ + $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; - } + 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.executeTask(); + }; - $scope.executeBot = function(){ + $scope.executeTask = function(){ var reqBody = {}; if (items.botConfig && items.botConfig.taskType === 'jenkins') { - reqBody.choiceParam = $scope.jenparams[params.name]; + reqBody.choiceParam = choiceParam; } else if (items.botConfig && items.botConfig.taskType === 'chef'){ reqBody.tagServer = $scope.tagSerSelected; if ($scope.chefAttributesFlag) { @@ -151,7 +126,7 @@ } else if (items.botConfig && items.botConfig.taskType === 'script') { reqBody.tagServer = $scope.tagSerSelected; if ($scope.scriptParamsFlag) { - reqBody.scriptParams = $scope.parameters; + reqBody.scriptParams = scriptParams; } } var param={ @@ -159,7 +134,6 @@ 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); diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html index 1a3d347e0..c0cff4e84 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html @@ -9,6 +9,14 @@
+
+
+ +
+
+
No data Available diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html b/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html new file mode 100644 index 000000000..5865ca3fe --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html @@ -0,0 +1,10 @@ +
+
+
+ +
+ +
+
+
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html index 8a6fc9461..c7951a779 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html @@ -19,6 +19,9 @@

+
+
+

diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html index ceccb2d25..112fa3fde 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html @@ -19,6 +19,9 @@

+
+
+
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html index f0602d01c..21cd4e783 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -2,7 +2,7 @@
×

- Bot Info - {{botInfo.name}} + Bot Info - {{botInfo.botName}}

@@ -57,7 +57,7 @@

- + @@ -129,7 +129,7 @@

Script Parameter Description - + diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 30ab2a830..9a0942fd8 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -84,7 +84,6 @@

Add Parameters:

Key Description Value - @@ -93,12 +92,10 @@

Add Parameters:

- - 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 8cdd60c4d..61d969127 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -61,7 +61,6 @@
@@ -72,19 +71,4 @@
- - - \ No newline at end of file + \ No newline at end of file From 45dcfedf7646bea319e9683a86658f83f587049e Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 20 Dec 2016 12:57:11 +0530 Subject: [PATCH 015/110] CAT-2558 Timeout error when user tries to create Orgadmin role. --- server/app/routes/v1.0/routes_d4dMasters.js | 6 ++-- server/app/services/settingsService.js | 37 +++++++++++---------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 624450b06..d4562e615 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -2736,8 +2736,7 @@ module.exports.setRoutes = function (app, sessionVerification) { logger.error('Hit getting setting wizard error', err); res.send(500); return; - } - if (settingWizards.currentStep && settingWizards.currentStep.name === 'User Configuration') { + }else if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.name === 'User Configuration') { var settingWizardSteps = appConfig.settingWizardSteps; settingWizards.currentStep.nestedSteps[1].isCompleted = true; settingWizards.currentStep.isCompleted = true; @@ -2753,6 +2752,9 @@ module.exports.setRoutes = function (app, sessionVerification) { res.send(200); return; }); + }else { + res.send(200); + return; } }) } diff --git a/server/app/services/settingsService.js b/server/app/services/settingsService.js index 4eea8841f..e9f0c79fb 100644 --- a/server/app/services/settingsService.js +++ b/server/app/services/settingsService.js @@ -81,7 +81,10 @@ settingsService.updateProjectData = function updateProjectData(enviornment,callb }; settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callback){ - if(id === '1'){ + if(orgId === null || orgId === ''){ + callback(null,orgId); + return; + }else if(id === '1'){ settingWizard.removeSettingWizardByOrgId(orgId,function(err,data){ if(err){ callback(err,null); @@ -89,14 +92,14 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba } callback(null,data); }) - }else if(id === '2'){ + }else if(id === '2'){ settingWizard.getSettingWizardByOrgId(orgId,function(err,settingWizards) { if (err) { callback(err, null); return; } logger.debug(JSON.stringify(settingWizards)); - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Org Configuration' && settingWizards.currentStep.nestedSteps[1].isCompleted === true) { settingWizards.currentStep.nestedSteps[1].isCompleted = false; @@ -113,13 +116,13 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba return; } }) - }else if(id === '4'){ + }else if(id === '4'){ settingWizard.getSettingWizardByOrgId(orgId,function(err,settingWizards) { if (err) { callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Config Management' && settingWizards.currentStep.nestedSteps[0].isCompleted === false) { var settingWizardSteps = appConfig.settingWizardSteps; settingWizards.currentStep = settingWizards.previousStep; @@ -145,7 +148,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Config Management' && settingWizards.currentStep.nestedSteps[1].isCompleted === false) { settingWizards.currentStep.nestedSteps[0].isCompleted = false; @@ -167,7 +170,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'User Configuration' && settingWizards.currentStep.nestedSteps[0].isCompleted === false) { var settingWizardSteps = appConfig.settingWizardSteps; @@ -199,7 +202,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'User Configuration' && settingWizards.currentStep.nestedSteps[1].isCompleted === false) { settingWizards.currentStep.nestedSteps[0].isCompleted = false; @@ -222,7 +225,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Provider Configuration' && settingWizards.currentStep.nestedSteps[0].isCompleted === false) { var settingWizardSteps = appConfig.settingWizardSteps; @@ -253,7 +256,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Devops Roles' && settingWizards.currentStep.nestedSteps[1].isCompleted === false) { settingWizards.currentStep.nestedSteps[0].isCompleted = false; @@ -275,7 +278,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Devops Roles' && settingWizards.currentStep.nestedSteps[2].isCompleted === false) { settingWizards.currentStep.nestedSteps[1].isCompleted = false; @@ -297,7 +300,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Wizard Status' && settingWizards.currentStep.isCompleted === true) { var settingWizardSteps = appConfig.settingWizardSteps; @@ -329,7 +332,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Gallery Setup' && settingWizards.nestedSteps[1].isCompleted === false) { settingWizards.nestedSteps[0].isCompleted = false; @@ -351,7 +354,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Gallery Setup' && settingWizards.nestedSteps[2].isCompleted === false) { settingWizards.nestedSteps[1].isCompleted = false; @@ -373,7 +376,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Provider Configuration' && settingWizards.currentStep.nestedSteps[1].isCompleted === false) { settingWizards.currentStep.nestedSteps[0].isCompleted = false; @@ -395,7 +398,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Gallery Setup' && settingWizards.currentStep.nestedSteps[0].isCompleted === false) { var settingWizardSteps = appConfig.settingWizardSteps; @@ -426,7 +429,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba callback(err, null); return; } - if (settingWizards.currentStep && settingWizards.currentStep.nestedSteps + if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps && settingWizards.currentStep.name === 'Devops Roles' && settingWizards.currentStep.nestedSteps[0].isCompleted === false) { var settingWizardSteps = appConfig.settingWizardSteps; var previousStep = settingWizardSteps[4]; From 9b8b397431dcd582813d076df7b94a3375574c96 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 20 Dec 2016 14:56:05 +0530 Subject: [PATCH 016/110] Blueprint Logs related changes. --- .../bots/controller/editParamsCtrl.js | 12 +- .../dashboard/bots/controller/libraryCtrl.js | 184 +++++++----------- .../manage/templates/cpActionHistoryCtrl.js | 47 ++++- .../instance/popups/instanceLogs.html | 5 +- 4 files changed, 129 insertions(+), 119 deletions(-) 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 b737599ad..6610422d6 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -139,11 +139,13 @@ 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); + if(error) { + error = error.responseText || error; + if (error.message) { + toastr.error(error.message); + } else { + toastr.error(error); + } } }); }; 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 335f10546..626a60390 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -88,14 +88,13 @@ }; 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); + toastr.error(error); $scope.errorMessage = "No Records found"; }); }; @@ -118,35 +117,25 @@ }; 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); + toastr.error(error); $scope.errorMessage = "No Records found"; }); }; var gridBottomSpace = 225; $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, @@ -186,27 +175,6 @@ console.log('Modal Dismissed at ' + new Date()); }); }; - /*$scope.botInfo=function(bot) { - genSevs.newTask(bot); - var modalInstance = $modal.open({ - animation: true, - templateUrl: 'src/partials/sections/dashboard/workzone/popups/newTask.html', - controller: 'newTaskCtrl', - 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.botSchedule = function(bot) { $modal.open({ templateUrl: 'src/partials/sections/dashboard/bots/view/botSchedule.html', @@ -218,28 +186,8 @@ 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; + }).result.then(function () { - $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()); }); @@ -332,13 +280,11 @@ lib.summary(); }]).controller('botInfoCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { $scope.botInfo = items; - console.log(items); $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; }]).controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) { - console.log(items); $scope.botId = items.botId; $scope.defaultSelection = function() { $scope.repeatsType = 'Minutes';//default selection. @@ -439,7 +385,6 @@ }]).controller('botHistoryCtrl',["items", '$scope', '$modalInstance', '$modal', '$timeout', 'uiGridOptionsClient', 'genericServices', 'workzoneServices', function(items, $scope, $modalInstance, $modal, $timeout, uiGridOptionsClient, genSevs, workzoneServices){ //UI Grid for chef Task starts - console.log(items); $scope.botHistory = items; $scope.botId = items.botId; $scope.taskHistoryChefData = []; @@ -468,7 +413,6 @@ url:'/bots/' + $scope.botId + '/bots-history' }; genSevs.promiseGet(param).then(function (response) { - console.log(response); $timeout(function() { if(response.data){ $scope.taskHistoryChefData = response.data; @@ -529,7 +473,6 @@ url:'/bots/' + $scope.botId + '/bots-history' }; genSevs.promiseGet(param).then(function (response) { - console.log(response); $timeout(function() { if(response.data){ $scope.taskHistoryJenkinsData = response.data; @@ -580,7 +523,6 @@ url:'/bots/' + $scope.botId + '/bots-history' }; genSevs.promiseGet(param).then(function (response) { - console.log(response); $timeout(function() { if(response.data){ $scope.taskHistoryScriptData = response.data; @@ -631,7 +573,6 @@ url:'/bots/' + $scope.botId + '/bots-history' }; genSevs.promiseGet(param).then(function (response) { - console.log(response); $timeout(function() { if(response.data){ $scope.botHistoryBlueprintData = response.data; @@ -688,36 +629,58 @@ } $scope.historyLogs=function(hist) { - console.log(hist); - var modalInstance = $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 : hist.auditId, - historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId, - taskType:hist.auditTrailConfig.executionType - }; + console.log(hist.auditTrailConfig.executionType); + if(hist.auditTrailConfig && (hist.auditTrailConfig.executionType == 'chef') || (hist.auditTrailConfig.executionType == 'jenkins') || (hist.auditTrailConfig.executionType == 'script')) { + var modalInstance = $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 : hist.auditId, + historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId, + taskType:hist.auditTrailConfig.executionType + }; + } } - } - }); - modalInstance.result.then(function(selectedItem) { - $scope.selected = selectedItem; - }, function() { - console.log('Modal Dismissed at ' + new Date()); - }); - }; + }); + modalInstance.result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + console.log('Modal Dismissed at ' + new Date()); + }); + } else { + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/instance/popups/instanceLogs.html', + controller: 'cpActionHistoryLogCtrl', + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return { + actionHistoryData : hist, + cpInstance: hist + }; + } + } + }); + modalInstance.result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + console.log('Modal Dismissed at ' + new Date()); + }); + }; + } + $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; } - ]).controller('botHistoryLogsCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { - $scope.botInfo = items; - console.log(items); + ]).controller('botHistoryLogsCtrl',['$scope', 'items', '$modalInstance', '$modal', function ($scope, items, $modalInstance, $modal) { $scope.parentItemDetail=items; var botHistLogsCtrl={}; botHistLogsCtrl.taskLogType=items.taskType; @@ -731,33 +694,35 @@ $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; - }]).controller('confirmBotRunCtrl', ['$scope', '$modalInstance', 'items', 'genericServices','toastr','$modal', function ($scope, $modalInstance, items, genSevs, toastr,$modal) { - console.log(items); + }]).controller('confirmBotRunCtrl', ['$scope', '$modal', '$modalInstance', 'items', 'genericServices','toastr', function ($scope, $modal, $modalInstance, items, genSevs, toastr) { $scope.botId = items.botId; $scope.isJobRunExecuting = false; + + 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.cancel = function () { $modalInstance.dismiss('cancel'); }; - 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.runJob = function () { $scope.isJobRunExecuting = true; var param={ @@ -765,6 +730,7 @@ }; genSevs.promisePost(param).then(function (response) { $modalInstance.close(response.data); + $rootScope.$emit('BOTS_LIBRARY_REFRESH'); helper.botLogModal(items.botId, response.historyId, response.taskType); }, function (error) { diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/templates/cpActionHistoryCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/templates/cpActionHistoryCtrl.js index 1fcedc7ec..c8227eb91 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/templates/cpActionHistoryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/templates/cpActionHistoryCtrl.js @@ -76,9 +76,19 @@ }; $scope.init(); }]).controller('cpActionHistoryLogCtrl',['$scope', '$modalInstance', 'items', 'workzoneServices', 'instanceSetting', '$interval',function($scope, $modalInstance, items, workzoneServices, instanceSetting, $interval){ + if(items.actionHistoryData.auditType === 'BOTs') { + $scope.botLogs = true; + } var _instance = items.cpInstance; + console.log(_instance); $scope.instanceName = _instance.name; - var _actionItem = items.actionHistoryData; + if($scope.botLogs) { + var _actionItem = items.actionHistoryData.actionLogId; + } + else { + var _actionItem = items.actionHistoryData; + } + console.log(_actionItem); var helper = { lastTimeStamp: '', getlastTimeStamp: function(logObj) { @@ -88,13 +98,23 @@ }, logsPolling: function() { $scope.timerObject = $interval(function() { - workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id) + if($scope.botLogs) { + workzoneServices.getActionHistoryLogs(_instance.auditTrailConfig.nodeIds[0],_actionItem) .then(function(response) { if (response.data.length) { helper.lastTimeStamp = helper.getlastTimeStamp(response); $scope.logListDelta.push.apply($scope.logListDelta, response.data); } }); + } else { + workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id) + .then(function(response) { + if (response.data.length) { + helper.lastTimeStamp = helper.getlastTimeStamp(response); + $scope.logListDelta.push.apply($scope.logListDelta, response.data); + } + }); + } }, instanceSetting.logCheckTimer * 100); }, stopPolling: function() { @@ -111,12 +131,31 @@ }, timerObject: undefined }); + if($scope.botLogs) { + workzoneServices.getActionHistoryLogs(_instance.auditTrailConfig.nodeIds[0],_actionItem) + .then(function(response) { + if (response.data.length) { + helper.lastTimeStamp = helper.getlastTimeStamp(response); + $scope.logListInitial = response.data; + helper.logsPolling(); + } + }); + } else { + workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id) + .then(function(response) { + if (response.data.length) { + helper.lastTimeStamp = helper.getlastTimeStamp(response); + $scope.logListInitial = response.data; + helper.logsPolling(); + } + }); + } - workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id).then(function(response) { + /*workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id).then(function(response) { helper.lastTimeStamp = helper.getlastTimeStamp(response.data); $scope.logListInitial = response.data; helper.logsPolling(); - }); + });*/ $scope.$on('$destroy', function() { $interval.cancel($scope.timerObject); diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogs.html b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogs.html index a9201eab4..302f8f5bf 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogs.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogs.html @@ -1,9 +1,12 @@
× -

+

Instance Logs - {{instanceName}}

+

+ Execute Logs +

From da0ac2f14a845f92be58d0c0e1d0a6a949828cf4 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 20 Dec 2016 14:57:30 +0530 Subject: [PATCH 017/110] removed unnecessary console --- .../dashboard/workzone/instance/popups/instanceLogsCtrl.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js index 9a5897334..174f5a698 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js @@ -9,8 +9,6 @@ "use strict"; angular.module('workzone.instance') .controller('instanceLogsCtrl', ['$scope', '$rootScope', '$modalInstance', 'items', 'workzoneServices', 'instanceSetting', 'instanceLogs', function($scope, $rootScope , $modalInstance, items, workzoneServices, instanceSetting, instanceLogs) { - console.log(items); - console.log("Durgesh"); $scope.instanceName = items.name; $scope.isInstanceLogsLoading = true; angular.extend($scope, { From 8fb91220137699a863cafba1d45f729eec5a52fc Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 20 Dec 2016 16:41:08 +0530 Subject: [PATCH 018/110] Execution logs, History Logs related changes. --- .../bots/controller/blueprintLogCtrl.js | 60 ------------------- .../dashboard/bots/controller/libraryCtrl.js | 19 ++---- .../dashboard/bots/view/blueprintLog.html | 10 ---- .../dashboard/bots/view/botExecutionLogs.html | 3 - .../dashboard/bots/view/botHistoryLogs.html | 9 +++ .../dashboard/bots/view/editParams.html | 4 +- 6 files changed, 15 insertions(+), 90 deletions(-) delete mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js delete mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js deleted file mode 100644 index 12cc426d5..000000000 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved - * Unauthorized copying of this file, via any medium is strictly prohibited - * Proprietary and confidential - * Written by Relevance UI Team, - * Aug 2015 - */ - -(function (angular) { - "use strict"; - angular.module('dashboard.bots') - .controller('blueprintLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr) { - console.log(items); - var _instance = items.cpInstance; - $scope.instanceName = _instance.name; - var _actionItem = items.actionHistoryData; - var helper = { - lastTimeStamp: '', - getlastTimeStamp: function(logObj) { - if (logObj instanceof Array && logObj.length) { - return logObj[logObj.length - 1].timestamp; - } - }, - logsPolling: function() { - $scope.timerObject = $interval(function() { - workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id) - .then(function(response) { - if (response.data.length) { - helper.lastTimeStamp = helper.getlastTimeStamp(response); - $scope.logListDelta.push.apply($scope.logListDelta, response.data); - } - }); - }, instanceSetting.logCheckTimer * 100); - }, - stopPolling: function() { - $interval.cancel($scope.timerObject); - } - }; - - angular.extend($scope, { - logListInitial: [], - logListDelta: [], - cancel: function() { - helper.stopPolling(); - $modalInstance.dismiss('cancel'); - }, - timerObject: undefined - }); - - workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id).then(function(response) { - helper.lastTimeStamp = helper.getlastTimeStamp(response.data); - $scope.logListInitial = response.data; - helper.logsPolling(); - }); - - $scope.$on('$destroy', function() { - $interval.cancel($scope.timerObject); - }); - } - ]); -})(angular); 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 626a60390..b27d6eb34 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -620,6 +620,9 @@ $scope.initscript(); break; case 'instance_launch': + case 'aws_cf': + case 'docker': + case 'azure_launch': $scope.ischefTaskHistoryPageLoading = false; $scope.isjenkinsTaskHistoryPageLoading = false; $scope.isscriptTaskHistoryPageLoading = false; @@ -680,21 +683,7 @@ $modalInstance.dismiss('cancel'); }; } - ]).controller('botHistoryLogsCtrl',['$scope', 'items', '$modalInstance', '$modal', function ($scope, items, $modalInstance, $modal) { - $scope.parentItemDetail=items; - var botHistLogsCtrl={}; - botHistLogsCtrl.taskLogType=items.taskType; - botHistLogsCtrl.cancelAll=function(){ - $scope.$broadcast ('closeWindow'); - $modalInstance.dismiss('cancel'); - return $scope.close; - }; - return botHistLogsCtrl; - - $scope.cancel= function() { - $modalInstance.dismiss('cancel'); - }; - }]).controller('confirmBotRunCtrl', ['$scope', '$modal', '$modalInstance', 'items', 'genericServices','toastr', function ($scope, $modal, $modalInstance, items, genSevs, toastr) { + ]).controller('confirmBotRunCtrl', ['$scope', '$modal', '$modalInstance', 'items', 'genericServices','toastr', '$rootScope', function ($scope, $modal, $modalInstance, items, genSevs, toastr, $rootScope) { $scope.botId = items.botId; $scope.isJobRunExecuting = false; diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html b/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html deleted file mode 100644 index 5865ca3fe..000000000 --- a/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
-
- -
- -
-
-
-
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html index c7951a779..8a6fc9461 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html @@ -19,9 +19,6 @@

-
-
-

diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html index 112fa3fde..6d38934e3 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html @@ -22,6 +22,15 @@

+
+
+
+
+
+
+
+
+
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 9a0942fd8..2106a5dc3 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -40,7 +40,7 @@

Edit Parameters:

- + @@ -66,7 +66,7 @@

Edit Parameters:

- From b669353c536495154b5653ca85f2b40f74bd1b14 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Tue, 20 Dec 2016 17:50:09 +0530 Subject: [PATCH 019/110] Add Cron Job for Syncing Running Task --- server/app/cronjobs/task-sync/package.json | 3 + server/app/cronjobs/task-sync/taskSync.js | 160 ++++++++++++++++++ server/app/model/audit-trail/audit-trail.js | 12 ++ server/app/model/classes/tasks/taskHistory.js | 22 +++ server/app/services/auditTrailService.js | 4 +- server/app/services/botsService.js | 2 +- 6 files changed, 200 insertions(+), 3 deletions(-) create mode 100644 server/app/cronjobs/task-sync/package.json create mode 100644 server/app/cronjobs/task-sync/taskSync.js diff --git a/server/app/cronjobs/task-sync/package.json b/server/app/cronjobs/task-sync/package.json new file mode 100644 index 000000000..10b0130d9 --- /dev/null +++ b/server/app/cronjobs/task-sync/package.json @@ -0,0 +1,3 @@ +{ + "main": "taskSync.js" +} diff --git a/server/app/cronjobs/task-sync/taskSync.js b/server/app/cronjobs/task-sync/taskSync.js new file mode 100644 index 000000000..cedb152b1 --- /dev/null +++ b/server/app/cronjobs/task-sync/taskSync.js @@ -0,0 +1,160 @@ + +var logger = require('_pr/logger')(module); +var CatalystCronJob = require('_pr/cronjobs/CatalystCronJob'); +var async = require('async'); +var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); +var taskHistory = require('_pr/model/classes/tasks/taskHistory.js'); +var TaskSync = Object.create(CatalystCronJob); +TaskSync.interval = '*/5 * * * *'; +TaskSync.execute = taskSync; + +module.exports = TaskSync; + +function taskSync(){ + logger.debug("Task Sync is started"); + async.parallel({ + botSync : function(callback){ + var query={ + auditType:'BOTs', + actionStatus:'running', + isDeleted:false + }; + executeTaskSyncForBotHistory(query,callback); + }, + taskSync : function(callback){ + var query={ + status:'running' + }; + executeTaskSyncForTaskHistory(query,callback); + } + + },function(err,results){ + if(err){ + logger.error("There are some error in Task Sync.",err); + return; + }else{ + logger.debug("Task Sync is successfully ended"); + return; + } + + }) +} + +function executeTaskSyncForBotHistory(query,callback){ + async.waterfall([ + function(next){ + auditTrail.getAuditTrails(query,next); + }, + function(runningAuditTrailList,next){ + if(runningAuditTrailList.length > 0){ + var count = 0; + for(var i = 0; i < runningAuditTrailList.length; i++){ + (function(runningBot){ + var currentDate = new Date(); + var startBotTime = new Date(runningBot.startedOn); + if(getMinutesDiff(startBotTime,currentDate) > 20){ + count++; + var queryObj = { + actionStatus:'failed', + status:'failed', + endedOn : new Date().getTime() + } + auditTrail.updateAuditTrails(runningBot._id,queryObj,function(err,updatedData){ + if(err){ + logger.error(err); + }else if(count === runningAuditTrailList.length){ + next(null,runningAuditTrailList); + }else{ + logger.debug("Task Sync is going on"); + } + }) + + }else{ + count++; + if(count === runningAuditTrailList.length) { + next(null, runningAuditTrailList); + } + } + })(runningAuditTrailList[i]); + } + + }else{ + next({ + errCode:400, + errMsg:"There is no BOTs in running state currently." + },null); + } + } + ],function(err,results){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,results); + return; + } + }) +} + +function executeTaskSyncForTaskHistory(query,callback){ + async.waterfall([ + function(next){ + taskHistory.getTaskHistory(query,next); + }, + function(runningTaskHistoryList,next){ + if(runningTaskHistoryList.length > 0){ + var count = 0; + for(var i = 0; i < runningTaskHistoryList.length; i++){ + (function(runningTask){ + var currentDate = new Date(); + var startBotTime = new Date(runningTask.timestampStarted); + if(getMinutesDiff(startBotTime,currentDate) > 20){ + count++; + var queryObj = { + status:'failed', + timestampEnded : new Date().getTime() + } + taskHistory.updateRunningTaskHistory(runningTask._id,queryObj,function(err,updatedData){ + if(err){ + logger.error(err); + }else if(count === runningTaskHistoryList.length){ + next(null,runningTaskHistoryList); + }else{ + logger.debug("Task Sync is going on"); + } + }) + + }else{ + count++; + if(count === runningTaskHistoryList.length) { + next(null, runningTaskHistoryList); + } + } + })(runningTaskHistoryList[i]); + } + + }else{ + next({ + errCode:400, + errMsg:"There is no Tasks in running state currently." + },null); + } + } + ],function(err,results){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,results); + return; + } + }) +} + +function getMinutesDiff(date1,date2){ + var diff =(date2.getTime() - date1.getTime()) / 1000; + diff /= 60; + return Math.abs(Math.round(diff)); +} + + diff --git a/server/app/model/audit-trail/audit-trail.js b/server/app/model/audit-trail/audit-trail.js index b9fc9735d..eeba04f7d 100644 --- a/server/app/model/audit-trail/audit-trail.js +++ b/server/app/model/audit-trail/audit-trail.js @@ -60,6 +60,18 @@ AuditTrailSchema.statics.removeAuditTrails = function(queryObj,callback){ }); }; +AuditTrailSchema.statics.updateAuditTrails = function(auditId,queryObj,callback){ + AuditTrail.update({_id:new ObjectId(auditId)},{$set:queryObj},{multi:true}, function(err, updatedAuditTrail) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, updatedAuditTrail); + }); +}; + AuditTrailSchema.statics.softRemoveAuditTrails = function(auditId,callback){ AuditTrail.update({auditId:auditId},{$set:{isDeleted:true}},{multi:true}, function(err, sortDeleteAuditTrail) { if (err) { diff --git a/server/app/model/classes/tasks/taskHistory.js b/server/app/model/classes/tasks/taskHistory.js index c78748847..18443d38d 100755 --- a/server/app/model/classes/tasks/taskHistory.js +++ b/server/app/model/classes/tasks/taskHistory.js @@ -251,6 +251,28 @@ taskHistorySchema.statics.updateHistory = function updateHistory(hId, historyDat }); }; +taskHistorySchema.statics.getTaskHistory = function getTaskHistory(query,callback) { + this.find(query,function(err, tHistories) { + if (err) { + callback(err, null); + return; + } + callback(null, tHistories); + }); +}; + +taskHistorySchema.statics.updateRunningTaskHistory = function updateRunningTaskHistory(taskHistoryId,queryObj,callback){ + TaskHistory.update({_id:new ObjectId(taskHistoryId)},{$set:queryObj},{multi:true}, function(err, updatedTaskHistory) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, updatedTaskHistory); + }); +}; + var TaskHistory = mongoose.model('taskHistory', taskHistorySchema); module.exports = TaskHistory; diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index ad80b6a43..773ed5ad9 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -136,7 +136,7 @@ auditTrailService.getAuditTrailList = function getAuditTrailList(auditTrailQuery apiUtil.paginationRequest(auditTrailQuery, 'auditTrails', next); }, function(paginationReq, next) { - paginationReq['searchColumns'] = ['status', 'action', 'user', 'actionStatus', 'masterDetails.orgName', 'masterDetails.bgName', 'masterDetails.projectName', 'masterDetails.envName']; + paginationReq['searchColumns'] = ['status', 'action', 'user', 'actionStatus', 'auditTrailConfig.name','masterDetails.orgName', 'masterDetails.bgName', 'masterDetails.projectName', 'masterDetails.envName']; reqData = paginationReq; apiUtil.databaseUtil(paginationReq, next); }, @@ -227,7 +227,7 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ for(var i = 0; i < botAuditTrail.length; i++){ (function(auditTrail){ count++; - if(auditTrail.endedOn && auditTrail.endedOn !== null && auditTrail.actionStatus !== 'failed' + if(auditTrail.endedOn && auditTrail.endedOn !== null && auditTrail.auditTrailConfig.manualExecutionTime && auditTrail.auditTrailConfig.manualExecutionTime !== null) { var executionTime = getExecutionTime(auditTrail.endedOn, auditTrail.startedOn); totalTimeInSeconds = totalTimeInSeconds + ((auditTrail.auditTrailConfig.manualExecutionTime*60) - executionTime); diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 859bbb2b8..bb69680ad 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -146,7 +146,7 @@ botsService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) apiUtil.paginationRequest(botsQuery, 'bots', next); }, function(paginationReq, next) { - paginationReq['searchColumns'] = ['botName', 'botType', 'botCategory', 'botLinkedCategory','botLinkedSubCategory', 'masterDetails.orgName', 'masterDetails.bgName', 'masterDetails.projectName', 'masterDetails.envName']; + paginationReq['searchColumns'] = ['botName', 'botType', 'botCategory','botDesc', 'botLinkedCategory','botLinkedSubCategory', 'masterDetails.orgName', 'masterDetails.bgName', 'masterDetails.projectName', 'masterDetails.envName']; reqData = paginationReq; apiUtil.databaseUtil(paginationReq, next); }, From 7fd7ac092b84dbc0d185e34ddfb02681f1acb066 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Tue, 20 Dec 2016 18:02:45 +0530 Subject: [PATCH 020/110] Resolved merge conflicts --- server/app/cronjobs/cron-jobs.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/app/cronjobs/cron-jobs.js b/server/app/cronjobs/cron-jobs.js index c5b3823b6..7b027e5e8 100644 --- a/server/app/cronjobs/cron-jobs.js +++ b/server/app/cronjobs/cron-jobs.js @@ -26,6 +26,7 @@ var providerTagsAggregation = require('_pr/cronjobs/provider-tags-aggregation'); var dockerContainerSync = require('_pr/cronjobs/docker-container-sync'); var awsRDSS3ProviderSync = require('_pr/cronjobs/provider-rds-s3-sync'); var chefSync = require('_pr/cronjobs/chef-sync'); +var taskSync = require('_pr/cronjobs/task-sync'); module.exports.start = function start() { @@ -60,4 +61,8 @@ module.exports.start = function start() { var chefSyncJobId = crontab.scheduleJob(chefSync.getInterval(), chefSync.execute); + logger.info('Task Sync started with interval ==> '+ taskSync.getInterval()); + var taskSyncJobId + = crontab.scheduleJob(taskSync.getInterval(), taskSync.execute); + } \ No newline at end of file From c6f7c876e78f67bbe4a1c4239a3f2fdaa6542627 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Tue, 20 Dec 2016 18:58:26 +0530 Subject: [PATCH 021/110] Resolve UI error for PROD Build --- .../dashboard/bots/controller/chefLogCtrl.js | 182 +++++++++--------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js index 284734545..2fbcaf590 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js @@ -8,7 +8,7 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('chefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr) { + .controller('chefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr','items', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr,items) { /*This controller can be invoked from either of two flows - Chef Log History Item Logs OR Chef Task Execute items object will contain only taskId and historyId. */ //var items = $scope.parentItemDetail; @@ -44,21 +44,21 @@ }, 100); }, /*logsPolling: function () { - timerObject = $timeout(function () { - workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, helper.lastTimeStamp).then(function (resp) { - if (resp.data.length) { - var logData = { - logs: resp.data, - fullLogs: false - }; - helper.lastTimeStamp = helper.getlastTimeStamp(logData.logs); - $scope.logListDelta.push.apply($scope.logListDelta, logData.logs); - helper.scrollBottom(); - } - helper.logsPolling(); - }); - }, orchestrationSetting.orchestrationLogsPollerInterval); - },*/ + timerObject = $timeout(function () { + workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, helper.lastTimeStamp).then(function (resp) { + if (resp.data.length) { + var logData = { + logs: resp.data, + fullLogs: false + }; + helper.lastTimeStamp = helper.getlastTimeStamp(logData.logs); + $scope.logListDelta.push.apply($scope.logListDelta, logData.logs); + helper.scrollBottom(); + } + helper.logsPolling(); + }); + }, orchestrationSetting.orchestrationLogsPollerInterval); + },*/ stopPolling: function () { $timeout.cancel(timerObject); } @@ -76,18 +76,18 @@ }; var init = function () { //get the details of one chef history entry - var param = { - url = '/bots/' + botId + '/history/' + historyId; + var param = { + url : '/bots/' + botId + '/history/' + historyId } genSevs.promiseGet(param).then(function (response) { - chefLogData.createInstanceList(response.data); - //$modalInstance.close(response.data); - //$rootScope.$emit('BOTS_LIBRARY_REFRESH'); - //helper.botLogModal(items._id, response.historyId, response.taskType); - }; - /*workzoneServices.getTaskHistoryItem(items.taskId, items.historyId).then(function (response) { chefLogData.createInstanceList(response.data); - });*/ + //$modalInstance.close(response.data); + //$rootScope.$emit('BOTS_LIBRARY_REFRESH'); + //helper.botLogModal(items._id, response.historyId, response.taskType); + }); + /*workzoneServices.getTaskHistoryItem(items.taskId, items.historyId).then(function (response) { + chefLogData.createInstanceList(response.data); + });*/ }; //method to get the names of the nodes associated to the job and add it to the nodeIdsWithActionLog object. chefLogData.createInstanceList = function (historyItem) { @@ -109,40 +109,40 @@ "instanceIds": nodeIds }; workzoneServices.postRetrieveDetailsForInstanceNames(requestObj).then(function (response) { - var _jobInstances = response.data; - //if blueprint job, use blueprintExecutionResults - if (bluePrintJob) { - for (var i = 0; i < bluePrintActionLogs.length; i++) { - bluePrintActionLogs[i].nodeId = bluePrintActionLogs[i].instanceId; - for (var j = 0; j < _jobInstances.length; j++) { - if (bluePrintActionLogs[i].instanceId === _jobInstances[j]._id) { - bluePrintActionLogs[i].uiNodeName = _jobInstances[j].name; + var _jobInstances = response.data; + //if blueprint job, use blueprintExecutionResults + if (bluePrintJob) { + for (var i = 0; i < bluePrintActionLogs.length; i++) { + bluePrintActionLogs[i].nodeId = bluePrintActionLogs[i].instanceId; + for (var j = 0; j < _jobInstances.length; j++) { + if (bluePrintActionLogs[i].instanceId === _jobInstances[j]._id) { + bluePrintActionLogs[i].uiNodeName = _jobInstances[j].name; + } } } - } - nodeIdWithActionLogs = bluePrintActionLogs; - } else {//if not blueprint job, use nodeIdsWithActionLog - for (var k = 0; k < historyItem.nodeIdsWithActionLog.length; k++) { - for (var l = 0; l < _jobInstances.length; l++) { - if (historyItem.nodeIdsWithActionLog[k].nodeId === _jobInstances[l]._id) { - historyItem.nodeIdsWithActionLog[k].uiNodeName = _jobInstances[l].name; + nodeIdWithActionLogs = bluePrintActionLogs; + } else {//if not blueprint job, use nodeIdsWithActionLog + for (var k = 0; k < historyItem.nodeIdsWithActionLog.length; k++) { + for (var l = 0; l < _jobInstances.length; l++) { + if (historyItem.nodeIdsWithActionLog[k].nodeId === _jobInstances[l]._id) { + historyItem.nodeIdsWithActionLog[k].uiNodeName = _jobInstances[l].name; + } } } + nodeIdWithActionLogs = historyItem.nodeIdsWithActionLog; } - nodeIdWithActionLogs = historyItem.nodeIdsWithActionLog; - } - chefLogData.chefHistoryItem = historyItem; //saved as we need timestamps from the historyItem - chefLogData.nodeIdsWithActionLog = nodeIdWithActionLogs; //this can now be used to show instance dropdown - if (chefLogData.nodeIdsWithActionLog[0]) { + chefLogData.chefHistoryItem = historyItem; //saved as we need timestamps from the historyItem + chefLogData.nodeIdsWithActionLog = nodeIdWithActionLogs; //this can now be used to show instance dropdown + if (chefLogData.nodeIdsWithActionLog[0]) { + $scope.isInstanceListLoading = false; + selectFirstInstance(chefLogData.nodeIdsWithActionLog[0]); + } + }, + function (error) { $scope.isInstanceListLoading = false; - selectFirstInstance(chefLogData.nodeIdsWithActionLog[0]); - } - }, - function (error) { - $scope.isInstanceListLoading = false; - toastr.error(error); - $scope.errorMessage = ""; - }); + toastr.error(error); + $scope.errorMessage = ""; + }) }; //method called when user changes the instance name from the dropdown. chefLogData.instanceChange = function () { @@ -161,20 +161,11 @@ if(timestamp && timestampEnded) { urlParams = 'timestamp=' + timestamp + '×tampEnded=' + timestampEnded; } - var param = { - url = "/instances/" + instanceId + '/actionLogs/' + actionId + - '/logs?' + urlParams; + var param = { + url : "/instances/" + instanceId + '/actionLogs/' + actionId + + '/logs?' + urlParams } genSevs.promiseGet(param).then(function (response) { - $scope.isLogsLoading = false; - var logData = { - logs: response.data, - fullLogs: true - }; - $scope.logListInitial = logData.logs; - helper.scrollBottom(); - }; - /*workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, chefLogData.chefHistoryItem.timestampStarted, chefLogData.chefHistoryItem.timestampEnded).then(function (response) { $scope.isLogsLoading = false; var logData = { logs: response.data, @@ -182,11 +173,20 @@ }; $scope.logListInitial = logData.logs; helper.scrollBottom(); - }, function (error) { - $scope.isLogsLoading = false; - console.log(error); - $scope.errorMessage = "Unable to fetch logs for this instance"; - });*/ + }); + /*workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, chefLogData.chefHistoryItem.timestampStarted, chefLogData.chefHistoryItem.timestampEnded).then(function (response) { + $scope.isLogsLoading = false; + var logData = { + logs: response.data, + fullLogs: true + }; + $scope.logListInitial = logData.logs; + helper.scrollBottom(); + }, function (error) { + $scope.isLogsLoading = false; + console.log(error); + $scope.errorMessage = "Unable to fetch logs for this instance"; + });*/ } /* when task is pending or running: ie. during Execute flow or if history is viewed immediately after Execute - only timestampStarted will be present. timestampEnded will be absent @@ -200,34 +200,34 @@ if(timestamp && timestampEnded) { urlParams = 'timestamp=' + timestamp + '×tampEnded=' + timestampEnded; } - var param = { - url = "/instances/" + instanceId + '/actionLogs/' + actionId + - '/logs?' + urlParams; + var param = { + url : "/instances/" + instanceId + '/actionLogs/' + actionId + + '/logs?' + urlParams } genSevs.promiseGet(param).then(function (response) { - $scope.isLogsLoading = false; - var logData = { - logs: response.data, - fullLogs: true - }; - $scope.logListInitial = logData.logs; - helper.scrollBottom(); - }; - /*workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, chefLogData.chefHistoryItem.timestampStarted).then(function (response) { $scope.isLogsLoading = false; - helper.lastTimeStamp = helper.getlastTimeStamp(response.data) || chefLogData.chefHistoryItem.timestampStarted; - helper.logsPolling(); var logData = { logs: response.data, fullLogs: true }; $scope.logListInitial = logData.logs; helper.scrollBottom(); - }, function (error) { - $scope.isLogsLoading = false; - console.log(error); - $scope.errorMessage = "Unable to fetch logs for this instance"; - });*/ + }); + /*workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, chefLogData.chefHistoryItem.timestampStarted).then(function (response) { + $scope.isLogsLoading = false; + helper.lastTimeStamp = helper.getlastTimeStamp(response.data) || chefLogData.chefHistoryItem.timestampStarted; + helper.logsPolling(); + var logData = { + logs: response.data, + fullLogs: true + }; + $scope.logListInitial = logData.logs; + helper.scrollBottom(); + }, function (error) { + $scope.isLogsLoading = false; + console.log(error); + $scope.errorMessage = "Unable to fetch logs for this instance"; + });*/ } }; init(); @@ -239,5 +239,5 @@ }); return chefLogData; } - ]); -})(angular); + ]); +})(angular); \ No newline at end of file From 0c1c7f0e7cdcd35e23c4df0e38d019e69f6ae658 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 21 Dec 2016 14:37:33 +0530 Subject: [PATCH 022/110] Resolved BOTs QA Issues --- .../aws-blueprint/aws-blueprint.js | 197 +++++++++--------- server/app/services/botsService.js | 4 +- 2 files changed, 100 insertions(+), 101 deletions(-) diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js index d6747e94b..5cf1deb7b 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js @@ -607,7 +607,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } else { - if (code == 0) { + if (code === 0) { instancesDao.updateInstanceBootstrapStatus(instance.id, 'success', function (err, updateData) { if (err) { logger.error("Unable to set instance bootstarp status. code 0", err); @@ -654,123 +654,122 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } logger.debug("Domain name is updated successfully"); }); - instanceLog.endedOn = new Date().getTime(); - instanceLog.actionStatus = "success"; - instanceLog.logs = { - err: false, - log: "Instance Bootstrapped successfully", - timestamp: new Date().getTime() - }; - if (launchParams.auditTrailId !== null) { - var resultTaskExecution = { - actionStatus: "success", - status: "success", - endedOn: new Date().getTime() - } - auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { - if (err) { - logger.error("Failed to create or update bots Log: ", err); - } - }); + } + instanceLog.endedOn = new Date().getTime(); + instanceLog.actionStatus = "success"; + instanceLog.logs = { + err: false, + log: "Instance Bootstrapped successfully", + timestamp: new Date().getTime() + }; + if (launchParams.auditTrailId !== null) { + var resultTaskExecution = { + actionStatus: "success", + status: "success", + endedOn: new Date().getTime() } - instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded); - launchParams.infraManager.getNode(instance.chefNodeName, function (err, nodeData) { + auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { if (err) { - logger.error("Failed chef.getNode", err); - return; - } - instanceLog.platform = nodeData.automatic.platform; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { - if (err) { - logger.error("Failed to create or update instanceLog: ", err); - } - }); - var hardwareData = {}; - hardwareData.architecture = nodeData.automatic.kernel.machine; - hardwareData.platform = nodeData.automatic.platform; - hardwareData.platformVersion = nodeData.automatic.platform_version; - hardwareData.memory = { - total: 'unknown', - free: 'unknown' - }; - if (nodeData.automatic.memory) { - hardwareData.memory.total = nodeData.automatic.memory.total; - hardwareData.memory.free = nodeData.automatic.memory.free; + logger.error("Failed to create or update bots Log: ", err); } - hardwareData.os = instance.hardware.os; - instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) { - if (err) { - logger.error("Unable to set instance hardware details code (setHardwareDetails)", err); - } else { - logger.debug("Instance hardware details set successessfully"); - } - }); - //Checking docker status and updating - var _docker = new Docker(); - _docker.checkDockerStatus(instance.id, - function (err, retCode) { - if (err) { - logger.error("Failed _docker.checkDockerStatus", err); - res.send(500); - return; - //res.end('200'); - - } - logger.debug('Docker Check Returned:' + retCode); - if (retCode == '0') { - instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function (data) { - logger.debug('Instance Docker Status set to Success'); - }); - - } - }); - }); - - } else { - instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) { + } + instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded); + launchParams.infraManager.getNode(instance.chefNodeName, function (err, nodeData) { + if (err) { + logger.error("Failed chef.getNode", err); + return; + } + instanceLog.platform = nodeData.automatic.platform; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { if (err) { - logger.error("Unable to set instance bootstarp status code != 0", err); - } else { - logger.debug("Instance bootstrap status set to failed"); + logger.error("Failed to create or update instanceLog: ", err); } }); - instanceLog.endedOn = new Date().getTime(); - instanceLog.actionStatus = "failed"; - instanceLog.logs = { - err: false, - log: "Bootstrap Failed", - timestamp: new Date().getTime() + var hardwareData = {}; + hardwareData.architecture = nodeData.automatic.kernel.machine; + hardwareData.platform = nodeData.automatic.platform; + hardwareData.platformVersion = nodeData.automatic.platform_version; + hardwareData.memory = { + total: 'unknown', + free: 'unknown' }; - instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (nodeData.automatic.memory) { + hardwareData.memory.total = nodeData.automatic.memory.total; + hardwareData.memory.free = nodeData.automatic.memory.free; + } + hardwareData.os = instance.hardware.os; + instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) { if (err) { - logger.error("Failed to create or update instanceLog: ", err); + logger.error("Unable to set instance hardware details code (setHardwareDetails)", err); + } else { + logger.debug("Instance hardware details set successessfully"); } }); - if (launchParams.auditTrailId !== null) { - var resultTaskExecution = { - actionStatus: "failed", - status: "failed", - endedOn: new Date().getTime() - } - auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { + //Checking docker status and updating + var _docker = new Docker(); + _docker.checkDockerStatus(instance.id, + function (err, retCode) { if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed _docker.checkDockerStatus", err); + res.send(500); + return; + //res.end('200'); + + } + logger.debug('Docker Check Returned:' + retCode); + if (retCode == '0') { + instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function (data) { + logger.debug('Instance Docker Status set to Success'); + }); + } }); + + }); + + }else { + instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) { + if (err) { + logger.error("Unable to set instance bootstarp status code != 0", err); + } else { + logger.debug("Instance bootstrap status set to failed"); } - var timestampEnded = new Date().getTime(); - logsDao.insertLog({ - referenceId: logsReferenceIds, - err: false, - log: "Bootstrap Failed", - timestamp: timestampEnded + }); + instanceLog.endedOn = new Date().getTime(); + instanceLog.actionStatus = "failed"; + instanceLog.logs = { + err: false, + log: "Bootstrap Failed", + timestamp: new Date().getTime() + }; + instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) { + if (err) { + logger.error("Failed to create or update instanceLog: ", err); + } + }); + if (launchParams.auditTrailId !== null) { + var resultTaskExecution = { + actionStatus: "failed", + status: "failed", + endedOn: new Date().getTime() + } + auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { + if (err) { + logger.error("Failed to create or update bot Log: ", err); + } }); - instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded); } + var timestampEnded = new Date().getTime(); + logsDao.insertLog({ + referenceId: logsReferenceIds, + err: false, + log: "Bootstrap Failed", + timestamp: timestampEnded + }); + instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded); } } - }, function (stdOutData) { instanceLog.logs = { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index bb69680ad..713850460 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -51,8 +51,8 @@ botsService.createOrUpdateBots = function createOrUpdateBots(botsDetail,linkedCa botLinkedCategory: linkedCategory, botLinkedSubCategory:linkedSubCategory, manualExecutionTime:botsDetail.manualExecutionTime, - version:botsDetail.version, - domainNameCheck:botsDetail.domainNameCheck, + version:botsDetail.version ? botsDetail.version : 1, + domainNameCheck:botsDetail.domainNameCheck ? botsDetail.domainNameCheck : false, createdOn: new Date().getTime() }; bots.getBotsById(botsDetail._id,function(err,data){ From 7186e3ef71d25d9d9b2e74062122cd13704d4bc1 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 21 Dec 2016 16:37:46 +0530 Subject: [PATCH 023/110] Resolved BOTs QA Issues --- .../sections/dashboard/bots/controller/libraryCtrl.js | 2 +- server/app/model/audit-trail/bot-audit-trail.js | 4 ++++ server/app/model/classes/tasks/tasks.js | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) 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 b27d6eb34..2b22f9500 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -455,7 +455,7 @@ $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:'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}, diff --git a/server/app/model/audit-trail/bot-audit-trail.js b/server/app/model/audit-trail/bot-audit-trail.js index 215b90f61..1c0cf258c 100644 --- a/server/app/model/audit-trail/bot-audit-trail.js +++ b/server/app/model/audit-trail/bot-audit-trail.js @@ -54,6 +54,10 @@ var BotAuditTrailSchema = new BaseAuditTrail({ type: String, trim:true }, + jobResultURL:{ + type: [String], + trim:true + }, manualExecutionTime:{ type: Number, required: false diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 03fb2d04a..6aa1e548c 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -376,7 +376,8 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b "endedOn":self.timestampEnded, "actionLogId":taskHistory.jenkinsServerId, "auditTrailConfig.jenkinsBuildNumber":taskHistory.buildNumber, - "auditTrailConfig.jenkinsJobName":taskHistory.jobName + "auditTrailConfig.jenkinsJobName":taskHistory.jobName, + "auditTrailConfig.jobResultURL":taskHistory.jobResultURL }; }else{ resultTaskExecution = { From ff69f9461e1090f79344e3f68baa2c8770d71db6 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Wed, 21 Dec 2016 16:49:00 +0530 Subject: [PATCH 024/110] Resolved QA issues related to BOTS. --- .../bots/controller/audittrailCtrl.js | 1 + .../dashboard/bots/controller/chefLogCtrl.js | 6 +- .../dashboard/bots/controller/libraryCtrl.js | 59 ++++++++++--------- .../sections/dashboard/bots/view/botInfo.html | 30 ++++++++-- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index a2dad1382..f8aa58063 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -115,6 +115,7 @@ $scope.RefreshBotsAuditTrail = function() { $scope.botAuditTrailGridView(); + $scope.botAuditTrailSearch = ''; }; $scope.botAuditTrailGridView =function(){ diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js index 2fbcaf590..e3b75f9a4 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js @@ -8,7 +8,7 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('chefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr','items', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr,items) { + .controller('chefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr) { /*This controller can be invoked from either of two flows - Chef Log History Item Logs OR Chef Task Execute items object will contain only taskId and historyId. */ //var items = $scope.parentItemDetail; @@ -232,11 +232,11 @@ }; init(); // on task change event in the parent controller - $scope.$on('parentChangeCompTask', function (event, args) { + /*$scope.$on('parentChangeCompTask', function (event, args) { items = args; resetAll(); init(); - }); + });*/ return chefLogData; } ]); 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 b27d6eb34..7430e17fc 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -32,7 +32,7 @@ { 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: 'Organization',field:'masterDetails.orgName',cellTooltip: true}, { name: 'Total Runs',field:'executionCount'}, { name: 'BOT History',displayName: 'BOT History',cellTemplate:'NA'+ ''}, @@ -175,6 +175,7 @@ console.log('Modal Dismissed at ' + new Date()); }); }; + $scope.botSchedule = function(bot) { $modal.open({ templateUrl: 'src/partials/sections/dashboard/bots/view/botSchedule.html', @@ -192,6 +193,7 @@ console.log('Dismiss time is ' + new Date()); }); }; + $scope.deleteBot = function(bot) { var modalOptions = { closeButtonText: 'Cancel', @@ -285,44 +287,43 @@ $modalInstance.dismiss('cancel'); }; }]).controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) { + $scope.scheduleDeatils = items; $scope.botId = items.botId; $scope.defaultSelection = function() { $scope.repeatsType = 'Minutes';//default selection. $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY'); }; - if(items.type !== 'new'){ - if(items.chefJenkScriptTaskObj !==undefined){ - if(items.chefJenkScriptTaskObj.cronStartOn && items.chefJenkScriptTaskObj.cronEndOn) { - var newStartOn = parseInt(items.chefJenkScriptTaskObj.cronStartOn); - var newDate = new Date(newStartOn).toLocaleDateString(); - var datearray = newDate.split("/"); - var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; - $scope.schedulerStartOn = newdate; - var newEndOn = parseInt(items.chefJenkScriptTaskObj.cronEndOn); - 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.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString(); - $scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency; - $scope.timeEventType = items.chefJenkScriptTaskObj.startTime; - $scope.timeEventMinute = items.chefJenkScriptTaskObj.startTimeMinute; - $scope.weekOfTheDay = items.chefJenkScriptTaskObj.dayOfWeek; - $scope.currentDate = items.chefJenkScriptTaskObj.startDate; - $scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.selectedDayOfTheMonth; - $scope.selectedMonth = items.chefJenkScriptTaskObj.monthOfYear; + + if(items.botScheduler){ + if(items.botScheduler.cronStartOn && items.botScheduler.cronEndOn) { + var newStartOn = parseInt(items.botScheduler.cronStartOn); + var newDate = new Date(newStartOn).toLocaleDateString(); + var datearray = newDate.split("/"); + var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; + $scope.schedulerStartOn = newdate; + var newEndOn = parseInt(items.botScheduler.cronEndOn); + var newEndData = new Date(newEndOn).toLocaleDateString(); + var datearrayNew = newEndData.split("/"); + var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2]; + $scope.schedulerEndOn = newdateEnd; } else { - $scope.defaultSelection(); + $scope.schedulerStartOn = items.botScheduler.cronStartOn; + $scope.schedulerEndOn = items.botScheduler.cronEndOn; } + + $scope.repeatBy = items.botScheduler.repeatBy || items.botScheduler.cronRepeatEvery.toString(); + $scope.repeatsType = items.botScheduler.repeats || items.botScheduler.cronFrequency; + $scope.timeEventType = items.botScheduler.timeEventHour || (items.botScheduler.cronHour && items.botScheduler.cronHour !==null) ? items.botScheduler.cronHour.toString() : ''; + $scope.timeEventMinute = items.botScheduler.timeEventMinute || (items.botScheduler.cronMinute && items.botScheduler.cronMinute !==null) ? items.botScheduler.cronMinute.toString() : ''; + $scope.weekOfTheDay = items.botScheduler.weekOfTheDay || (items.botScheduler.cronWeekDay && items.botScheduler.cronWeekDay !==null) ?items.botScheduler.cronWeekDay.toString(): ''; + $scope.selectedDayOfTheMonth = items.botScheduler.selectedDayOfTheMonth || (items.botScheduler.cronDate && items.botScheduler.cronDate !==null) ?items.botScheduler.cronDate.toString() : ''; + $scope.selectedMonth = items.botScheduler.selectedMonth || (items.botScheduler.cronMonth && items.botScheduler.cronMonth !==null) ? items.botScheduler.cronMonth.toString() : ''; + /*$scope.currentDate = items.botScheduler.startDate;*/ } else { $scope.defaultSelection(); } + $scope.dateChange= function () { var startDate = Date.parse($scope.schedulerStartOn); @@ -374,6 +375,7 @@ genSevs.promisePut(param).then(function (response) { if(response){ toastr.success('BOTs Scheduler successfully updated'); + $rootScope.$emit('BOTS_LIBRARY_REFRESH'); $modalInstance.dismiss('cancel'); } }); @@ -479,6 +481,7 @@ $scope.isjenkinsTaskHistoryPageLoading = false; }else if(response){ $scope.taskHistoryJenkinsData = response; + console.log($scope.taskHistoryJenkinsData); $scope.isjenkinsTaskHistoryPageLoading = false; } },100); diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html index 21cd4e783..e60f7e55c 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -71,11 +71,17 @@

Runlist - + - - Attributes + + Attribute{{$index+1}} + + + + + + Attribute @@ -106,8 +112,14 @@

- - Bot Parameter Value + + + Bot Parameter Values @@ -126,12 +138,18 @@

- + Script Parameter Description + + Script Parameter{{$index+1}} Description + + + + From 80b241656f815db80bf2576790a9d98b9067ed95 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 21 Dec 2016 18:47:41 +0530 Subject: [PATCH 025/110] Resolved BOTs QA Issues --- .../dashboard/bots/controller/libraryCtrl.js | 29 ++++++++++++--- .../dashboard/bots/view/botSchedule.html | 36 +++++++++++++------ .../app/model/classes/tasks/taskTypeChef.js | 26 +++++++------- .../app/model/classes/tasks/taskTypeScript.js | 25 +++++++------ 4 files changed, 74 insertions(+), 42 deletions(-) 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 175e7be09..e6845f740 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -287,6 +287,13 @@ $modalInstance.dismiss('cancel'); }; }]).controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) { + if(items.isBotScheduled === true){ + $scope._isEventSelected = true; + $scope.isScheduled = true; + }else{ + $scope._isEventSelected = false; + $scope.isScheduled = false; + } $scope.scheduleDeatils = items; $scope.botId = items.botId; $scope.defaultSelection = function() { @@ -294,7 +301,13 @@ $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY'); }; - + $scope.selectBotCheckbox = function(){ + if($scope.isScheduled === true || $scope.isScheduled === 'true') { + $scope._isEventSelected = true; + }else{ + $scope._isEventSelected = false; + } + } if(items.botScheduler){ if(items.botScheduler.cronStartOn && items.botScheduler.cronEndOn) { var newStartOn = parseInt(items.botScheduler.cronStartOn); @@ -364,9 +377,17 @@ cronDate: $scope.selectedDayOfTheMonth, cronMonth: $scope.selectedMonth }; - var reqBody = { - botScheduler:$scope.eventParams, - isBotScheduled:true + var reqBody = null; + if($scope.isScheduled === true || $scope.isScheduled === 'true'){ + reqBody = { + botScheduler:$scope.eventParams, + isBotScheduled:true + } + }else{ + reqBody = { + botScheduler:{}, + isBotScheduled:false + } } var param={ url:'/bots/' + $scope.botId + '/scheduler', diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html b/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html index 014c1901b..855fe5333 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html @@ -4,21 +4,34 @@ ×

 Schedule your Bot

+
+
+ +
+
+ + + + +
+ -
+ +
- +
-
+
- + Start Date should be less than End date !
+
-
+
Interval
@@ -33,10 +46,10 @@

 Schedule your Bot
- @@ -60,7 +73,7 @@

 Schedule your Bot @@ -83,7 +96,7 @@

 Schedule your Bot @@ -108,6 +121,7 @@

 Schedule your Bot

+
- - - - - - - - +
  • +
    +
    + + Resources +
    +
    +
    • diff --git a/client/cat3/src/partials/sections/dashboard/track/track.html b/client/cat3/src/partials/sections/dashboard/track/track.html index 7ff89150b..6103062cb 100644 --- a/client/cat3/src/partials/sections/dashboard/track/track.html +++ b/client/cat3/src/partials/sections/dashboard/track/track.html @@ -1,10 +1,3 @@ -
    -

    {{ day.name }}

    -
    - - -
    -
    \ No newline at end of file +
    + {{Text}} +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/track/trackCtrl.js b/client/cat3/src/partials/sections/dashboard/track/trackCtrl.js index 116ff2885..38b7e6e8d 100644 --- a/client/cat3/src/partials/sections/dashboard/track/trackCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/track/trackCtrl.js @@ -1,124 +1,7 @@ (function (angular) { + "use strict"; angular.module('dashboard.track', []) - .controller('trackCtrl',['$scope','$firebase', function ($scope,$firebase) { - - // get # of real time users - var listRef = new Firebase("https://burning-torch-4263.firebaseio.com/presence/"); - var userRef = listRef.push(); - - // Add ourselves to presence list when online. - var presenceRef = new Firebase("https://burning-torch-4263.firebaseio.com/.info/connected"); - presenceRef.on("value", function(snap) { - if (snap.val()) { - userRef.set(true); - // Remove ourselves when we disconnect. - userRef.onDisconnect().remove(); - } - }); - - listRef.on("value", function(snap) { - $scope.online = snap.numChildren(); - }); - - var ref = new Firebase("https://burning-torch-4263.firebaseio.com/days"); - var fb = $firebase(ref); - - // three way data binding - var syncObject = fb.$asObject(); - syncObject.$bindTo($scope, 'days'); - - $scope.reset = function() { - fb.$set({ - monday: { - name: 'Monday', - slots: { - 0900: { - time: '9:00am', - booked: false - }, - 0110: { - time: '11:00am', - booked: false - }, - 100: { - time: '1:00pm', - booked: false - }, - 300: { - time: '3:00pm', - booked: false - }, - 500: { - time: '5:00pm', - booked: false - }, - 700: { - time: '7:00pm', - booked: false - } - } - }, - tuesday: { - name: 'Tuesday', - slots: { - 0900: { - time: '9:00am', - booked: false - }, - 0110: { - time: '11:00am', - booked: false - }, - 100: { - time: '1:00pm', - booked: false - }, - 300: { - time: '3:00pm', - booked: false - }, - 500: { - time: '5:00pm', - booked: false - }, - 700: { - time: '7:00pm', - booked: false - } - } - }, - wednesday: { - name: 'Wednesday', - slots: { - 0900: { - time: '9:00am', - booked: false - }, - 0110: { - time: '11:00am', - booked: false - }, - 100: { - time: '1:00pm', - booked: false - }, - 300: { - time: '3:00pm', - booked: false - }, - 500: { - time: '5:00pm', - booked: false - }, - 700: { - time: '7:00pm', - booked: false - } - } - } - }); - }; - + .controller('trackCtrl',['$scope', function ($scope) { + $scope.Text = 'Track page'; }]); - })(angular); \ No newline at end of file From 2218dc317e17c102e3bbb93bbf186933be5bf50b Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 22 Dec 2016 12:44:16 +0530 Subject: [PATCH 027/110] cinfilict --- client/cat3/src/clientRoutes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js index 538102361..267fc8ff5 100644 --- a/client/cat3/src/clientRoutes.js +++ b/client/cat3/src/clientRoutes.js @@ -74,6 +74,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/CM/", templateUrl: "src/partials/sections/dashboard/analytics/analytics.html", controller: "analyticsCtrl as analytic", + //params:{filterView:{analytics:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); From 7bc5eec2c0f3051a25772f45a73791844852856e Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Thu, 22 Dec 2016 16:06:50 +0530 Subject: [PATCH 028/110] Resolved CAT-2543,2545,2546 --- .../orchestration/popups/newTask.html | 7 ++----- .../orchestration/popups/newTaskCtrl.js | 20 +++++++------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 0cf15ad56..09dbc49f8 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -301,7 +301,6 @@
    Chef Server Details for - RLChefServer
     Schedule a Task  - @@ -390,7 +389,6 @@
    Jenkins
     Schedule a Task  -     @@ -534,7 +532,6 @@
    Script Details
     Schedule a Task  -     @@ -554,8 +551,8 @@
    Script Details
    diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js index 20869689f..789c92ffd 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js @@ -241,7 +241,6 @@ } }, selectTaskCheckbox: function(){ - $scope.isEventAvailable = false; if($scope._isEventSelected.flag) { $scope.showAddTask = true; } else { @@ -263,7 +262,6 @@ } } }).result.then(function (chefEventDetails) { - $scope.isEventAvailable = true; $scope.chefJenkScriptTaskObj = chefEventDetails; var startTimeMinute,startTimeHour,dayOfWeek,selectedDayOfTheMonth,selectedMonth; startTimeMinute = $scope.chefJenkScriptTaskObj.startTimeMinute; @@ -272,7 +270,6 @@ selectedDayOfTheMonth = $scope.chefJenkScriptTaskObj.selectedDayOfTheMonth; selectedMonth = $scope.chefJenkScriptTaskObj.monthOfYear; $scope.type = 'edit'; - //$scope._isEventSelected = true; $scope.repeatPattern = 'Repeat Every -' + $scope.chefJenkScriptTaskObj.repeats; $scope.cronDetails = { @@ -417,8 +414,7 @@ //first time execute will get result from jobResultURLPattern. taskJSON.jobResultURLPattern = taskJSON.jobResultURL; taskJSON.parameterized = $scope.jenkinsParamsList; - taskJSON.isTaskScheduled = $scope._isEventSelected; - //taskJSON.taskScheduler = $scope.cronPattern; + taskJSON.isTaskScheduled = $scope._isEventSelected.flag; taskJSON.taskScheduler = $scope.cronDetails; } //if task type is script @@ -454,8 +450,7 @@ } if($scope.taskType === "chef" || $scope.taskType === "script") { taskJSON.executionOrder = $scope.isExecution.flag; - taskJSON.isTaskScheduled = $scope._isEventSelected; - //taskJSON.taskScheduler = $scope.cronPattern; + taskJSON.isTaskScheduled = $scope._isEventSelected.flag; taskJSON.taskScheduler = $scope.cronDetails; var selectedList = instanceSelector.getSelectorList(); if (selectedList && selectedList.length) { @@ -718,13 +713,12 @@ $scope.isExecution.flag = items.executionOrder; } if(items.taskType === "chef" || items.taskType === "jenkins" || items.taskType === "script") { - //if(items.taskScheduler){ - $scope._isEventSelected = items.isTaskScheduled; + $scope._isEventSelected.flag = items.isTaskScheduled; + if(items.isTaskScheduled === true) { $scope.showAddTask = true; - $scope.isEventAvailable = true; - $scope.chefJenkScriptTaskObj = items.taskScheduler; - $scope.type = 'edit'; - //} + } + $scope.chefJenkScriptTaskObj = items.taskScheduler; + $scope.type = 'edit'; } } } From 5a2c10d0c5d85a4d2b69bd1b7374276d079a88d0 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 22 Dec 2016 16:15:20 +0530 Subject: [PATCH 029/110] Resolve BOTs Issues --- client/cat3/main.html | 1 + .../bots/controller/botChefLogCtrl.js | 160 ++++++++++++ .../dashboard/bots/controller/chefLogCtrl.js | 243 ------------------ .../sections/dashboard/bots/view/chefLog.html | 2 +- .../app/model/classes/tasks/taskTypeScript.js | 8 +- server/app/model/classes/tasks/tasks.js | 15 +- server/app/routes/v1.0/routes_bots.js | 2 +- 7 files changed, 180 insertions(+), 251 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/botChefLogCtrl.js delete mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js diff --git a/client/cat3/main.html b/client/cat3/main.html index e0111215b..c2e86ed3b 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -121,6 +121,7 @@ + diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botChefLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botChefLogCtrl.js new file mode 100644 index 000000000..f92b18c22 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botChefLogCtrl.js @@ -0,0 +1,160 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Aug 2015 + */ + +(function (angular) { + "use strict"; + angular.module('dashboard.bots') + .controller('botChefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr','genericServices', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr,genSevs) { + /*This controller can be invoked from either of two flows - Chef Log History Item Logs OR Chef Task Execute + items object will contain only taskId and historyId. */ + var items = $scope.parentItemDetail; + + $scope.isInstanceListLoading = true; + angular.extend($scope, { + logListInitial: [], + logListDelta: [], + cancel: function () { + helper.stopPolling(); + } + }); + // broadcast the cancel function to the parent controller + $scope.$on('closeWindow', function() { + $scope.$parent.close = $scope.cancel(); + }); + var chefLogData = { + chefHistoryItem: {}, + nodeIdsWithActionLog: {} + }; + var timerObject; + var helper = { + lastTimeStamp: '', + getlastTimeStamp: function (logObj) { + if (logObj instanceof Array && logObj.length) { + var lastTime = logObj[logObj.length - 1].timestamp; + return lastTime; + } + }, + scrollBottom : function () { + $timeout(function () { + var elm = angular.element(".logsArea"); + elm.scrollTop(elm[0].scrollHeight); + }, 100); + }, + logsPolling: function () { + timerObject = $timeout(function () { + workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, helper.lastTimeStamp).then(function (resp) { + if (resp.data.length) { + var logData = { + logs: resp.data, + fullLogs: false + }; + helper.lastTimeStamp = helper.getlastTimeStamp(logData.logs); + $scope.logListDelta.push.apply($scope.logListDelta, logData.logs); + helper.scrollBottom(); + } + helper.logsPolling(); + }); + }, orchestrationSetting.orchestrationLogsPollerInterval); + }, + stopPolling: function () { + $timeout.cancel(timerObject); + } + }; + var selectFirstInstance = function (firstInstance) { + $scope.selectedInstance = firstInstance; + chefLogData.instanceChange(); + }; + var resetAll = function(){ + $scope.isInstanceListLoading = true; + chefLogData.chefHistoryItem = {}; + chefLogData.nodeIdsWithActionLog = {}; + helper.stopPolling(); //Ensuring polling is stopped, eventhough the scope values for instance id and actionlog id are updated on change + helper.lastTimeStamp = ''; + }; + var init = function () { + //get the details of one chef history entry + var param = { + url : '/bots/' + items.taskId + '/bots-history/' + items.historyId + } + genSevs.promiseGet(param).then(function (response) { + chefLogData.createInstanceList(response); + }); + }; + chefLogData.createInstanceList = function (historyItem) { + var nodeIds =historyItem.nodeIds ? historyItem.nodeIds : historyItem.auditTrailConfig.nodeIds ; + var nodeIdWithActionLogs = []; + var requestObj = { + "instanceIds": nodeIds + }; + workzoneServices.postRetrieveDetailsForInstanceNames(requestObj).then(function (response) { + var _jobInstances = response.data; + var nodeIdsWithActionId = historyItem.nodeIdsWithActionLog ? historyItem.nodeIdsWithActionLog : historyItem.auditTrailConfig.nodeIdsWithActionLog; + for (var k = 0; k < nodeIdsWithActionId.length; k++) { + for (var l = 0; l < _jobInstances.length; l++) { + if (nodeIdsWithActionId[k].nodeId === _jobInstances[l]._id) { + nodeIdsWithActionId[k].uiNodeName = _jobInstances[l].name; + } + } + } + nodeIdWithActionLogs = nodeIdsWithActionId; + chefLogData.chefHistoryItem = historyItem; //saved as we need timestamps from the historyItem + chefLogData.nodeIdsWithActionLog = nodeIdWithActionLogs; //this can now be used to show instance dropdown + if (chefLogData.nodeIdsWithActionLog[0]) { + $scope.isInstanceListLoading = false; + selectFirstInstance(chefLogData.nodeIdsWithActionLog[0]); + } + }, function (error) { + $scope.isInstanceListLoading = false; + toastr.error(error); + $scope.errorMessage = ""; + }) + }; + chefLogData.instanceChange = function () { + $scope.isLogsLoading = true; + helper.stopPolling(); //Ensuring polling is stopped, eventhough the scope values for instance id and actionlog id are updated on change + helper.lastTimeStamp = ''; + if (chefLogData.chefHistoryItem.startedOn && chefLogData.chefHistoryItem.endedOn) { + var urlParams = ''; + urlParams = 'timestamp=' + chefLogData.chefHistoryItem.startedOn + '×tampEnded=' + chefLogData.chefHistoryItem.endedOn; + var param = { + url : "/instances/" + $scope.selectedInstance.nodeId + '/actionLogs/' + $scope.selectedInstance.actionLogId + + '/logs?' + urlParams + } + genSevs.promiseGet(param).then(function (response) { + $scope.isLogsLoading = false; + var logData = { + logs: response, + fullLogs: true + }; + $scope.logListInitial = logData.logs; + helper.scrollBottom(); + }); + + } else if (chefLogData.chefHistoryItem.startedOn && !chefLogData.chefHistoryItem.endedOn) { + var urlParams = 'timestamp=' + chefLogData.chefHistoryItem.startedOn; + var param = { + url : "/instances/" + $scope.selectedInstance.nodeId + '/actionLogs/' + $scope.selectedInstance.actionLogId + + '/logs?' + urlParams + } + genSevs.promiseGet(param).then(function (response) { + $scope.isLogsLoading = false; + helper.lastTimeStamp = helper.getlastTimeStamp(response) || chefLogData.chefHistoryItem.startedOn; + helper.logsPolling(); + var logData = { + logs: response, + fullLogs: true + }; + $scope.logListInitial = logData.logs; + helper.scrollBottom(); + }); + } + }; + init(); + return chefLogData; + } + ]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js deleted file mode 100644 index e3b75f9a4..000000000 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/chefLogCtrl.js +++ /dev/null @@ -1,243 +0,0 @@ -/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved - * Unauthorized copying of this file, via any medium is strictly prohibited - * Proprietary and confidential - * Written by Relevance UI Team, - * Aug 2015 - */ - -(function (angular) { - "use strict"; - angular.module('dashboard.bots') - .controller('chefLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr) { - /*This controller can be invoked from either of two flows - Chef Log History Item Logs OR Chef Task Execute - items object will contain only taskId and historyId. */ - //var items = $scope.parentItemDetail; - $scope.isInstanceListLoading = true; - angular.extend($scope, { - logListInitial: [], - logListDelta: [], - cancel: function () { - helper.stopPolling(); - } - }); - // broadcast the cancel function to the parent controller - $scope.$on('closeWindow', function() { - $scope.$parent.close = $scope.cancel(); - }); - var chefLogData = { - chefHistoryItem: {}, - nodeIdsWithActionLog: {} - }; - var timerObject; - var helper = { - lastTimeStamp: '', - getlastTimeStamp: function (logObj) { - if (logObj instanceof Array && logObj.length) { - var lastTime = logObj[logObj.length - 1].timestamp; - return lastTime; - } - }, - scrollBottom : function () { - $timeout(function () { - var elm = angular.element(".logsArea"); - elm.scrollTop(elm[0].scrollHeight); - }, 100); - }, - /*logsPolling: function () { - timerObject = $timeout(function () { - workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, helper.lastTimeStamp).then(function (resp) { - if (resp.data.length) { - var logData = { - logs: resp.data, - fullLogs: false - }; - helper.lastTimeStamp = helper.getlastTimeStamp(logData.logs); - $scope.logListDelta.push.apply($scope.logListDelta, logData.logs); - helper.scrollBottom(); - } - helper.logsPolling(); - }); - }, orchestrationSetting.orchestrationLogsPollerInterval); - },*/ - stopPolling: function () { - $timeout.cancel(timerObject); - } - }; - var selectFirstInstance = function (firstInstance) { - $scope.selectedInstance = firstInstance; - chefLogData.instanceChange(); - }; - var resetAll = function(){ - $scope.isInstanceListLoading = true; - chefLogData.chefHistoryItem = {}; - chefLogData.nodeIdsWithActionLog = {}; - helper.stopPolling(); //Ensuring polling is stopped, eventhough the scope values for instance id and actionlog id are updated on change - helper.lastTimeStamp = ''; - }; - var init = function () { - //get the details of one chef history entry - var param = { - url : '/bots/' + botId + '/history/' + historyId - } - genSevs.promiseGet(param).then(function (response) { - chefLogData.createInstanceList(response.data); - //$modalInstance.close(response.data); - //$rootScope.$emit('BOTS_LIBRARY_REFRESH'); - //helper.botLogModal(items._id, response.historyId, response.taskType); - }); - /*workzoneServices.getTaskHistoryItem(items.taskId, items.historyId).then(function (response) { - chefLogData.createInstanceList(response.data); - });*/ - }; - //method to get the names of the nodes associated to the job and add it to the nodeIdsWithActionLog object. - chefLogData.createInstanceList = function (historyItem) { - var nodeIds = []; - var bluePrintJob = false; //flag for blueprint job - var bluePrintActionLogs = []; - var nodeIdWithActionLogs = []; - // if blueprint job, use blueprintExecutionResults - if (historyItem.blueprintExecutionResults && historyItem.blueprintExecutionResults[0].result) { - bluePrintJob = true; - bluePrintActionLogs = historyItem.blueprintExecutionResults[0].result; - for (var j = 0; j < bluePrintActionLogs.length; j++) { - nodeIds.push(bluePrintActionLogs[j].instanceId); - } - } else { // if not blueprint job, use nodeIds - nodeIds = historyItem.nodeIds; - } - var requestObj = { - "instanceIds": nodeIds - }; - workzoneServices.postRetrieveDetailsForInstanceNames(requestObj).then(function (response) { - var _jobInstances = response.data; - //if blueprint job, use blueprintExecutionResults - if (bluePrintJob) { - for (var i = 0; i < bluePrintActionLogs.length; i++) { - bluePrintActionLogs[i].nodeId = bluePrintActionLogs[i].instanceId; - for (var j = 0; j < _jobInstances.length; j++) { - if (bluePrintActionLogs[i].instanceId === _jobInstances[j]._id) { - bluePrintActionLogs[i].uiNodeName = _jobInstances[j].name; - } - } - } - nodeIdWithActionLogs = bluePrintActionLogs; - } else {//if not blueprint job, use nodeIdsWithActionLog - for (var k = 0; k < historyItem.nodeIdsWithActionLog.length; k++) { - for (var l = 0; l < _jobInstances.length; l++) { - if (historyItem.nodeIdsWithActionLog[k].nodeId === _jobInstances[l]._id) { - historyItem.nodeIdsWithActionLog[k].uiNodeName = _jobInstances[l].name; - } - } - } - nodeIdWithActionLogs = historyItem.nodeIdsWithActionLog; - } - chefLogData.chefHistoryItem = historyItem; //saved as we need timestamps from the historyItem - chefLogData.nodeIdsWithActionLog = nodeIdWithActionLogs; //this can now be used to show instance dropdown - if (chefLogData.nodeIdsWithActionLog[0]) { - $scope.isInstanceListLoading = false; - selectFirstInstance(chefLogData.nodeIdsWithActionLog[0]); - } - }, - function (error) { - $scope.isInstanceListLoading = false; - toastr.error(error); - $scope.errorMessage = ""; - }) - }; - //method called when user changes the instance name from the dropdown. - chefLogData.instanceChange = function () { - $scope.isLogsLoading = true; - helper.stopPolling(); //Ensuring polling is stopped, eventhough the scope values for instance id and actionlog id are updated on change - helper.lastTimeStamp = ''; - /* when task is completed, with success or failed: - - both timestampStarted and timestampEnded will be present - - we get full logs, no need to poll - */ - if (chefLogData.chefHistoryItem.timestampStarted && chefLogData.chefHistoryItem.timestampEnded) { - var urlParams = ''; - if (timestamp) { - urlParams = 'timestamp=' + timestamp; - } - if(timestamp && timestampEnded) { - urlParams = 'timestamp=' + timestamp + '×tampEnded=' + timestampEnded; - } - var param = { - url : "/instances/" + instanceId + '/actionLogs/' + actionId + - '/logs?' + urlParams - } - genSevs.promiseGet(param).then(function (response) { - $scope.isLogsLoading = false; - var logData = { - logs: response.data, - fullLogs: true - }; - $scope.logListInitial = logData.logs; - helper.scrollBottom(); - }); - /*workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, chefLogData.chefHistoryItem.timestampStarted, chefLogData.chefHistoryItem.timestampEnded).then(function (response) { - $scope.isLogsLoading = false; - var logData = { - logs: response.data, - fullLogs: true - }; - $scope.logListInitial = logData.logs; - helper.scrollBottom(); - }, function (error) { - $scope.isLogsLoading = false; - console.log(error); - $scope.errorMessage = "Unable to fetch logs for this instance"; - });*/ - } - /* when task is pending or running: ie. during Execute flow or if history is viewed immediately after Execute - - only timestampStarted will be present. timestampEnded will be absent - - we need to poll for further logs - */ - else if (chefLogData.chefHistoryItem.timestampStarted && !chefLogData.chefHistoryItem.timestampEnded) { - var urlParams = ''; - if (timestamp) { - urlParams = 'timestamp=' + timestamp; - } - if(timestamp && timestampEnded) { - urlParams = 'timestamp=' + timestamp + '×tampEnded=' + timestampEnded; - } - var param = { - url : "/instances/" + instanceId + '/actionLogs/' + actionId + - '/logs?' + urlParams - } - genSevs.promiseGet(param).then(function (response) { - $scope.isLogsLoading = false; - var logData = { - logs: response.data, - fullLogs: true - }; - $scope.logListInitial = logData.logs; - helper.scrollBottom(); - }); - /*workzoneServices.getChefJobLogs($scope.selectedInstance.nodeId, $scope.selectedInstance.actionLogId, chefLogData.chefHistoryItem.timestampStarted).then(function (response) { - $scope.isLogsLoading = false; - helper.lastTimeStamp = helper.getlastTimeStamp(response.data) || chefLogData.chefHistoryItem.timestampStarted; - helper.logsPolling(); - var logData = { - logs: response.data, - fullLogs: true - }; - $scope.logListInitial = logData.logs; - helper.scrollBottom(); - }, function (error) { - $scope.isLogsLoading = false; - console.log(error); - $scope.errorMessage = "Unable to fetch logs for this instance"; - });*/ - } - }; - init(); - // on task change event in the parent controller - /*$scope.$on('parentChangeCompTask', function (event, args) { - items = args; - resetAll(); - init(); - });*/ - return chefLogData; - } - ]); -})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/chefLog.html b/client/cat3/src/partials/sections/dashboard/bots/view/chefLog.html index 388267569..146f8acb9 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/chefLog.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/chefLog.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/server/app/model/classes/tasks/taskTypeScript.js b/server/app/model/classes/tasks/taskTypeScript.js index d74cecee9..6be55d130 100644 --- a/server/app/model/classes/tasks/taskTypeScript.js +++ b/server/app/model/classes/tasks/taskTypeScript.js @@ -287,11 +287,9 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu } else { var cmdLine = scriptType +' /tmp/' + fileName; } - if (script.isParameterized === true) { - for (var j = 0; j < scriptParameters.length; j++) { - var decryptedText = cryptography.decryptText(scriptParameters[j].paramVal, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - cmdLine = cmdLine + ' "' + decryptedText + '"'; - } + for (var j = 0; j < scriptParameters.length; j++) { + var decryptedText = cryptography.decryptText(scriptParameters[j].paramVal ? scriptParameters[j].paramVal : scriptParameters[j], cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + cmdLine = cmdLine + ' "' + decryptedText + '"'; } sshExec.exec(cmdLine, function (err, retCode) { if (err) { diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 6aa1e548c..2d7514252 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -360,7 +360,20 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b taskHistory = new TaskHistory(taskHistoryData); taskHistory.save(); } - callback(null, taskExecuteData, taskHistory); + var resultBots = { + "actionLogId":taskHistory.nodeIdsWithActionLog[0].actionLogId, + "auditTrailConfig.nodeIdsWithActionLog":taskHistory.nodeIdsWithActionLog + }; + if(auditTrailId !== null && resultBots !== null){ + auditTrailService.updateAuditTrail('BOTs',auditTrailId,resultBots,function(err,auditTrail){ + if (err) { + logger.error("Failed to create or update bots Log: ", err); + } + }); + callback(null, taskExecuteData, taskHistory); + }else{ + callback(null, taskExecuteData, taskHistory); + } }, function(err, status, resultData) { self.timestampEnded = new Date().getTime(); if (status == 0) { diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 4c7a108f4..b97724390 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -62,7 +62,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { if (err) { return res.status(500).send(err); } else { - return res.status(200).send(data); + return res.status(200).send(data[0]); } }) }); From 149d6b75c8ff4c8c5e0313ff26362a72cf2741d9 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 22 Dec 2016 18:42:33 +0530 Subject: [PATCH 030/110] Resolve BOTs Issues --- server/app/model/classes/tasks/tasks.js | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 2d7514252..c6c061b9d 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -30,6 +30,7 @@ var mongoosePaginate = require('mongoose-paginate'); var ApiUtils = require('_pr/lib/utils/apiUtil.js'); var Schema = mongoose.Schema; var auditTrailService = require('_pr/services/auditTrailService'); +var bots = require('_pr/model/bots/bots.js'); var TASK_TYPE = { @@ -349,7 +350,67 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b return; } logger.debug("Task jobResultURL updated"); + bots.updateBotsDetail(self._id,{botConfig:taskConfig},function(err,botsData){ + if (err) { + logger.error("Unable to update Bots"); + } + logger.debug("Bots updated"); + }); + }); + } + if (taskHistoryData.taskType === TASK_TYPE.SCRIPT_TASK && self.botParams.scriptParams) { + var taskConfig = self.taskConfig; + for(var i = 0; i < taskConfig.scriptDetails.length; i++){ + for(var j = 0; j < taskConfig.scriptDetails[i].scriptParameters.length; j++){ + taskConfig.scriptDetails[i].scriptParameters[j].paramVal = self.botParams.scriptParams[j]; + } + } + Tasks.update({ + "_id": new ObjectId(self._id) + }, { + $set: { + taskConfig: taskConfig + } + }, { + upsert: false + }, function(err, data) { + if (err) { + logger.error("Unable to update Script task."); + return; + } + logger.debug("Script task updated"); + bots.updateBotsDetail(self._id,{botConfig:taskConfig},function(err,botsData){ + if (err) { + logger.error("Unable to update Bots"); + } + logger.debug("Bots updated"); + }); + }); + } + if (taskHistoryData.taskType === TASK_TYPE.CHEF_TASK && self.botParams.cookbookAttributes) { + var taskConfig = self.taskConfig; + taskConfig.attributes=self.botParams.cookbookAttributes; + Tasks.update({ + "_id": new ObjectId(self._id) + }, { + $set: { + taskConfig: taskConfig + } + }, { + upsert: false + }, function(err, data) { + if (err) { + logger.error("Unable to update Chef task."); + return; + } + logger.debug("Chef task updated"); + bots.updateBotsDetail(self._id,{botConfig:taskConfig},function(err,botsData){ + if (err) { + logger.error("Unable to update Bots"); + } + logger.debug("Bots updated"); + }); }); } // hack for composite task From 743fca0dc432db22237fbe43fc9006760b03b922 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Mon, 26 Dec 2016 12:42:42 +0530 Subject: [PATCH 031/110] Resolved CAT-2575 & CAT-2577. --- .../bots/controller/editParamsCtrl.js | 4 ++-- .../dashboard/bots/controller/libraryCtrl.js | 20 +++++++++++++++---- .../sections/dashboard/bots/view/library.html | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) 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 6610422d6..cbdcbe568 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -29,7 +29,7 @@ } } $scope.isChefattributesLoading = true; - if (items.botLinkedSubCategory === 'chef' && items.botConfig) { + if (items.botLinkedSubCategory === 'chef') { $scope.chefComponentSelectorList = responseFormatter.findDataForEditValue(items.botConfig.runlist); var nodesList = responseFormatter.chefRunlistFormatter($scope.chefComponentSelectorList); $scope.chefattributes = []; @@ -121,7 +121,7 @@ } else if (items.botConfig && items.botConfig.taskType === 'chef'){ reqBody.tagServer = $scope.tagSerSelected; if ($scope.chefAttributesFlag) { - reqBody.cookbookAttributes = $scope.cookbookAttributes; + reqBody.cookbookAttributes = cookbookAttributes; } } else if (items.botConfig && items.botConfig.taskType === 'script') { reqBody.tagServer = $scope.tagSerSelected; 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 e6845f740..9546a1139 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -209,6 +209,7 @@ genSevs.promiseDelete(param).then(function (response) { if (response) { toastr.success('Successfully deleted'); + lib.summary(); if($scope.totalBotsSelected) { $scope.botLibraryGridView(); } else if($scope.runningBotsselected) { @@ -218,7 +219,6 @@ } else { $scope.botLibraryGridView(); } - lib.summary(); } }, function(data) { toastr.error('error:: ' + data.toString()); @@ -230,10 +230,22 @@ $scope.botLibraryGridView(); }); $scope.RefreshBotsLibrary = function() { + $scope.botLibrarySearch = ''; + lib.summary(); + if($scope.totalBotsSelected) { + $scope.botLibraryGridView(); + } else if($scope.runningBotsselected) { + $scope.showBotsRunning(); + } else if($scope.failedBotsselected) { + $scope.showFailedBots(); + } else { + $scope.botLibraryGridView(); + } + }; + $scope.showAllBots = function() { $scope.totalBotsSelected = true; $scope.runningBotsselected = false; $scope.failedBotsselected = false; - $scope.botLibrarySearch = ''; lib.summary(); $scope.botLibraryGridView(); }; @@ -656,7 +668,7 @@ } $scope.historyLogs=function(hist) { - console.log(hist.auditTrailConfig.executionType); + console.log(hist); if(hist.auditTrailConfig && (hist.auditTrailConfig.executionType == 'chef') || (hist.auditTrailConfig.executionType == 'jenkins') || (hist.auditTrailConfig.executionType == 'script')) { var modalInstance = $modal.open({ animation: true, @@ -668,7 +680,7 @@ items: function() { return { taskId : hist.auditId, - historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId, + historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0] && hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId, 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 b8d1dc36b..720eca00a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -11,7 +11,7 @@
    -
    +
    From 0b7fd437864f807ee433ff792c9e177ea7296a7b Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Mon, 26 Dec 2016 14:00:01 +0530 Subject: [PATCH 032/110] update tag mapping --- .../controller/discoveryResourcesCtrl.js | 114 ++++++++++-------- .../controller/discoveryTagMappingCtrl.js | 42 +++++-- .../analytics/view/discoveryTagMapping.html | 6 +- 3 files changed, 99 insertions(+), 63 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index 5ca9e3c04..f723aa90b 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -3,48 +3,77 @@ angular.module('dashboard.analytics') .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){ var disResrc=this; - $scope.TangName={}; - $scope.tagValue=[{'id':'a','value':'a'},{'id':'b','value':'b'}] - + $scope.TangName={ + environment:[], + bg:[], + project:[] + }; // get gat name Start disResrc.getAllTagNames=function () { - // environment - var param = { - url: '/providers/' + fltrObj.provider.id + '/tag-mappings/environment' - }; - genSevs.promiseGet(param).then(function (instResult) { - $scope.TangName.environment = instResult.tagValues; + // environment + var param = { + url: '/providers/' + fltrObj.provider.id + '/tag-mappings/environment' + }; + genSevs.promiseGet(param).then(function (instResult) { + angular.forEach(instResult.tagValues,function(val){ + $scope.TangName.environment.push({id:val,name:val}) }); - // Bu - var param = { - url: '/providers/' + fltrObj.provider.id + '/tag-mappings/bgName' - }; - genSevs.promiseGet(param).then(function (instResult) { - $scope.TangName.bg = instResult.tagValues; + }); + // Bu + var param = { + url: '/providers/' + fltrObj.provider.id + '/tag-mappings/bgName' + }; + genSevs.promiseGet(param).then(function (instResult) { + angular.forEach(instResult.tagValues,function(val){ + $scope.TangName.bg.push({id:val,name:val}) }); - // project - var param = { - url: '/providers/' + fltrObj.provider.id + '/tag-mappings/project' - }; - genSevs.promiseGet(param).then(function (instResult) { - $scope.TangName.project = instResult.tagValues; + }); + // project + var param = { + url: '/providers/' + fltrObj.provider.id + '/tag-mappings/project' + }; + genSevs.promiseGet(param).then(function (instResult) { + angular.forEach(instResult.tagValues,function(val){ + $scope.TangName.project.push({id:val,name:val}) }); - console.log($scope.TangName); + + }); + // get gat name End########## }; - 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} - ] + disResrc.init=function () { + disResrc.getAllTagNames(); + $timeout(function () { + 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.TangName.bg, editDropdownIdLabel: 'name', + editDropdownValueLabel: 'id'}, + { name: 'Project Tag Value', enableCellEdit: true,editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray:$scope.TangName.project, editDropdownIdLabel: 'name', + editDropdownValueLabel: 'id'}, + { name: 'Env. Tag Value', enableCellEdit: true,editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray:$scope.TangName.environment, editDropdownIdLabel: 'name', + editDropdownValueLabel: 'id'} + ] + }; + 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; + }); + } + },200); }; + $rootScope.stateItems = $state.params; $rootScope.organNewEnt.provider='0'; $rootScope.organNewEnt.instanceType='unassigned-instances'; @@ -52,24 +81,11 @@ 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 - }; - disResrc.getAllTagNames(); - genSevs.promiseGet(param).then(function (instResult) { - disResrc.gridOptionInstances.data=instResult.data; - }); - } - }; - $rootScope.applyFilter =function(filterApp,period){ analyticsServices.applyFilter(true,null); - disResrc.getInstances(); + disResrc.init(); }; - disResrc.getInstances(); + disResrc.init(); }]); })(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 index e129a4417..70af8e932 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -1,7 +1,7 @@ (function (angular) { "use strict"; angular.module('dashboard.analytics') - .controller('discoveryTagMappingCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){ + .controller('discoveryTagMappingCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','toastr', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,toastr){ var disTgMap=this; $rootScope.stateItems = $state.params; $rootScope.organNewEnt.instanceType=false; @@ -12,9 +12,19 @@ $scope.newEnt={}; var fltrObj=$rootScope.filterNewEnt; disTgMap.tagOption=[]; - disTgMap.getAllTags =function () { - $scope.newEnt={}; + disTgMap.getTagMapping=function () { if(fltrObj && fltrObj.provider && fltrObj.provider.id) { + var param = { + inlineLoader: true, + url: '/providers/' + fltrObj.provider.id + '/tag-mappings' + }; + genSevs.promiseGet(param).then(function (tagResult) { + $scope.newEnt = tagResult; + disTgMap.getAllTags(); + }); + } + }; + disTgMap.getAllTags =function () { //$scope.newEnt.providerId = fltrObj.provider.id; $scope.isLoadingTag = true; var param = { @@ -24,10 +34,18 @@ genSevs.promiseGet(param).then(function (tagResult) { $scope.isLoadingTag = false; disTgMap.tagOption = tagResult; + if($scope.newEnt.businessGroup.tagName){ + disTgMap.getTagValues('busTag',$scope.newEnt.businessGroup.tagName,'businessGroup',true) + } + if($scope.newEnt.project.tagName){ + disTgMap.getTagValues('projTag',$scope.newEnt.project.tagName,'project',true) + } + if($scope.newEnt.environment.tagName){ + disTgMap.getTagValues('EnvTag',$scope.newEnt.environment.tagName,'environment',true) + } }); - } }; - disTgMap.getTagValues= function (type,tagName,valueType) { + disTgMap.getTagValues= function (type,tagName,valueType,selectType) { if(tagName) { var param = { inlineLoader: true, @@ -35,10 +53,11 @@ }; genSevs.promiseGet(param).then(function (tagResult) { $scope.isLoadingTagValue = false; - for (var key in $scope.newEnt[valueType].catalystEntityMapping) { - $scope.newEnt[valueType].catalystEntityMapping[key].tagValues = []; + if(!selectType) { + for (var key in $scope.newEnt[valueType].catalystEntityMapping) { + $scope.newEnt[valueType].catalystEntityMapping[key].tagValues = []; + } } - ; disTgMap[type] = tagResult.values; }); } @@ -47,18 +66,19 @@ console.log($scope.newEnt); var param = { inlineLoader: true, - url: '/providers/' + fltrObj.provider.id + '/tags-mappings', + url: '/providers/' + fltrObj.provider.id + '/tag-mappings', data:$scope.newEnt }; genSevs.promisePost(param).then(function (tagResult) { console.log(tagResult); + toastr.success('Successfully updated.','Update'); }); }; $rootScope.applyFilter =function(filterApp,period){ analyticsServices.applyFilter(true,null); - disTgMap.getAllTags(); + disTgMap.getTagMapping(); }; - disTgMap.getAllTags(); + disTgMap.getTagMapping(); }]); })(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html index 17680da44..e73f9f3d7 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html @@ -11,7 +11,7 @@
    - @@ -55,7 +55,7 @@
    - @@ -99,7 +99,7 @@
    - From 842ee22a35cd67ef60adb941b097423f13950bbd Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Mon, 26 Dec 2016 14:02:46 +0530 Subject: [PATCH 033/110] update tag mapping --- client/cat3/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/client/cat3/package.json b/client/cat3/package.json index 25f4063eb..bec38a050 100644 --- a/client/cat3/package.json +++ b/client/cat3/package.json @@ -18,7 +18,6 @@ "url": "https://github.com/RLOpenCatalyst/core.git" }, "dependencies": { - "firebase": "^3.6.4", "grunt": "^0.4.x", "grunt-bower-task": "~0.4.0", "grunt-concurrent": "^2.x.x", From 7561b3414e9060ee366ea3f4f912aa26de99d5d6 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Mon, 26 Dec 2016 14:22:08 +0530 Subject: [PATCH 034/110] changed to tagName --- .../controller/discoveryResourcesCtrl.js | 19 ++++++++++++------- .../analytics/view/analyticsTreeMenu.html | 16 ++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index f723aa90b..e65659b61 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -3,20 +3,25 @@ angular.module('dashboard.analytics') .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){ var disResrc=this; - $scope.TangName={ + $scope.TagName={ environment:[], bg:[], project:[] }; // get gat name Start disResrc.getAllTagNames=function () { + $scope.TagName={ + environment:[], + bg:[], + project:[] + }; // environment var param = { url: '/providers/' + fltrObj.provider.id + '/tag-mappings/environment' }; genSevs.promiseGet(param).then(function (instResult) { angular.forEach(instResult.tagValues,function(val){ - $scope.TangName.environment.push({id:val,name:val}) + $scope.TagName.environment.push({id:val,name:val}) }); }); // Bu @@ -25,7 +30,7 @@ }; genSevs.promiseGet(param).then(function (instResult) { angular.forEach(instResult.tagValues,function(val){ - $scope.TangName.bg.push({id:val,name:val}) + $scope.TagName.bg.push({id:val,name:val}) }); }); // project @@ -34,7 +39,7 @@ }; genSevs.promiseGet(param).then(function (instResult) { angular.forEach(instResult.tagValues,function(val){ - $scope.TangName.project.push({id:val,name:val}) + $scope.TagName.project.push({id:val,name:val}) }); }); @@ -52,13 +57,13 @@ { 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.TangName.bg, editDropdownIdLabel: 'name', + editDropdownOptionsArray:$scope.TagName.bg, editDropdownIdLabel: 'name', editDropdownValueLabel: 'id'}, { name: 'Project Tag Value', enableCellEdit: true,editableCellTemplate: 'ui-grid/dropdownEditor', - editDropdownOptionsArray:$scope.TangName.project, editDropdownIdLabel: 'name', + editDropdownOptionsArray:$scope.TagName.project, editDropdownIdLabel: 'name', editDropdownValueLabel: 'id'}, { name: 'Env. Tag Value', enableCellEdit: true,editableCellTemplate: 'ui-grid/dropdownEditor', - editDropdownOptionsArray:$scope.TangName.environment, editDropdownIdLabel: 'name', + editDropdownOptionsArray:$scope.TagName.environment, editDropdownIdLabel: 'name', editDropdownValueLabel: 'id'} ] }; 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 16f1c72a9..a0790b787 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html @@ -65,14 +65,14 @@
    -
  • -
    -
    - - Resources -
    -
    -
    • + + + + + + + +
    From 2eb49829e4f9887fa8be52839c155fb57208060e Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 26 Dec 2016 16:46:32 +0530 Subject: [PATCH 035/110] Resolved BOTs Issue --- .../dashboard/bots/controller/libraryCtrl.js | 16 ++-- .../catalyst-scheduler/catalystScheduler.js | 37 ---------- .../aws-blueprint/aws-blueprint.js | 8 +- server/app/model/bots/bots.js | 6 +- server/app/model/classes/tasks/tasks.js | 35 +++++---- server/app/routes/v1.0/routes_bots.js | 2 +- server/app/services/botsService.js | 40 ++++++++-- server/app/services/schedulerService.js | 8 +- server/app/services/taskService.js | 73 +++++++++++++------ server/install.js | 1 + 10 files changed, 125 insertions(+), 101 deletions(-) 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 e6845f740..e95247cd3 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -437,8 +437,8 @@ }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { - if(response.data){ - $scope.taskHistoryChefData = response.data; + if(response.botHistory){ + $scope.taskHistoryChefData = response.botHistory; $scope.ischefTaskHistoryPageLoading = false; }else if(response){ $scope.taskHistoryChefData = response; @@ -497,8 +497,8 @@ }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { - if(response.data){ - $scope.taskHistoryJenkinsData = response.data; + if(response.botHistory){ + $scope.taskHistoryJenkinsData = response.botHistory; $scope.isjenkinsTaskHistoryPageLoading = false; }else if(response){ $scope.taskHistoryJenkinsData = response; @@ -548,8 +548,8 @@ }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { - if(response.data){ - $scope.taskHistoryScriptData = response.data; + if(response.botHistory){ + $scope.taskHistoryScriptData = response.botHistory; $scope.isscriptTaskHistoryPageLoading = false; }else if(response){ $scope.taskHistoryScriptData = response; @@ -598,8 +598,8 @@ }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { - if(response.data){ - $scope.botHistoryBlueprintData = response.data; + if(response.botHistory){ + $scope.botHistoryBlueprintData = response.botHistory; $scope.isBlueprintBotHistoryPageLoading = false; }else if(response){ $scope.botHistoryBlueprintData = response; diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index 0cea183c5..d05439767 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -87,43 +87,6 @@ catalystSync.executeParallelScheduledTasks = function executeParallelScheduledTa }); } -catalystSync.executeParallelScheduledTasks = function executeParallelScheduledTasks() { - taskDao.getScheduledTasks('PARALLEL',function(err, tasks) { - if (err) { - logger.error("Failed to fetch tasks: ", err); - return; - } - if (tasks && tasks.length) { - var parallelTaskList=[]; - for (var i = 0; i < tasks.length; i++) { - (function(task) { - if(task.cronJobId && task.cronJobId !== null){ - cronTab.cancelJob(task.cronJobId); - } - parallelTaskList.push(function(callback){schedulerService.executeParallelScheduledTasks(task,callback);}); - if(parallelTaskList.length === tasks.length){ - if(parallelTaskList.length > 0) { - async.parallel(parallelTaskList, function (err, results) { - if (err) { - logger.error(err); - return; - } - logger.debug("Task Scheduler Completed for Parallel"); - return; - }) - }else{ - logger.debug("There is no Parallel scheduled Task right now."); - return; - } - } - })(tasks[i]); - } - }else{ - logger.debug("There is no Parallel scheduled Task right now."); - return; - } - }); -} catalystSync.executeSerialScheduledTasks = function executeSerialScheduledTasks() { taskDao.getScheduledTasks('SERIAL',function(err, tasks) { diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js index 9bc3c078d..e13863891 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js @@ -93,7 +93,6 @@ var AWSInstanceBlueprintSchema = new Schema({ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { var self = this; var domainName = launchParams.domainName; - logger.debug("launchParams------------->", JSON.stringify(launchParams)); VMImage.getImageById(self.imageId, function (err, anImage) { if (err) { logger.error(err); @@ -103,11 +102,6 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { return; } logger.debug("Loaded Image -- : >>>>>>>>>>> %s", anImage.providerId); - // //determining osType and decrypting the password field if windows found - // if(anImage.osType === 'windows'){ - // anImage.instancePassword = - // } - AWSProvider.getAWSProviderById(anImage.providerId, function (err, aProvider) { if (err) { logger.error(err); @@ -556,6 +550,8 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { jsonAttributes: jsonAttributes, instancePassword: decryptedCredentials.password }; + console.log("****************************"); + console.log("params>>>>>>>>",JSON.stringify(bootstrapInstanceParams)); launchParams.infraManager.bootstrapInstance(bootstrapInstanceParams, function (err, code) { if (decryptedCredentials.pemFileLocation) { diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 4e03b12de..5d09add38 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -178,8 +178,8 @@ var BotsSchema = new Schema ({ default: false }, version: { - type: Number, - default: 1 + type: String, + trim: true }, domainNameCheck: { type: Boolean, @@ -336,7 +336,7 @@ BotsSchema.statics.updateBotsScheduler = function updateBotsScheduler(botId, cal "_id": new ObjectId(botId), }, { $set: { - isBotBScheduled: false + isBotScheduled: false } }, { upsert: false diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index c6c061b9d..de67c8971 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -421,10 +421,20 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b taskHistory = new TaskHistory(taskHistoryData); taskHistory.save(); } - var resultBots = { - "actionLogId":taskHistory.nodeIdsWithActionLog[0].actionLogId, - "auditTrailConfig.nodeIdsWithActionLog":taskHistory.nodeIdsWithActionLog - }; + var resultBots = null; + if(taskHistoryData.taskType === TASK_TYPE.JENKINS_TASK){ + resultBots = { + "actionLogId":taskHistory.jenkinsServerId, + "auditTrailConfig.jenkinsBuildNumber":taskHistory.buildNumber, + "auditTrailConfig.jenkinsJobName":taskHistory.jobName, + "auditTrailConfig.jobResultURL":taskHistory.jobResultURL + }; + }else { + resultBots = { + "actionLogId": taskHistory.nodeIdsWithActionLog[0].actionLogId, + "auditTrailConfig.nodeIdsWithActionLog": taskHistory.nodeIdsWithActionLog + }; + } if(auditTrailId !== null && resultBots !== null){ auditTrailService.updateAuditTrail('BOTs',auditTrailId,resultBots,function(err,auditTrail){ if (err) { @@ -616,7 +626,6 @@ taskSchema.statics.createNew = function(taskData, callback) { var that = this; var task = new that(taskObj); logger.debug('saved task:' + JSON.stringify(task)); - task.save(function(err, data) { if (err) { logger.error(err); @@ -1082,24 +1091,22 @@ function filterScriptTaskData(data,callback){ if ((task.taskType === 'script') && ('scriptDetails' in task.taskConfig) && (task.taskConfig.scriptDetails.length > 0)) { + var scriptCount = 0; for (var j = 0; j < task.taskConfig.scriptDetails.length; j++) { (function (scriptTask) { if (scriptTask.scriptParameters.length > 0) { - var count = 0; + scriptCount++; for (var k = 0; k < scriptTask.scriptParameters.length; k++) { - (function (params) { - count++; - scriptTask.scriptParameters[k] = ''; - if (count === scriptTask.scriptParameters.length) { - taskList.push(task) - } - })(scriptTask.scriptParameters[k]); + scriptTask.scriptParameters[k] = ''; } } else { - taskList.push(task) + scriptCount++; } })(task.taskConfig.scriptDetails[j]); } + if(scriptCount === task.taskConfig.scriptDetails.length) { + taskList.push(task); + } } else { taskList.push(task); } diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index b97724390..3ad275cb5 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -48,7 +48,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }); app.get('/bots/:botId/bots-history',function(req,res){ - botsService.getBotsHistory(req.params.botId, function(err,data){ + botsService.getBotsHistory(req.params.botId,req.query, function(err,data){ if (err) { return res.status(500).send(err); } else { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 713850460..a9535b752 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -55,6 +55,13 @@ botsService.createOrUpdateBots = function createOrUpdateBots(botsDetail,linkedCa domainNameCheck:botsDetail.domainNameCheck ? botsDetail.domainNameCheck : false, createdOn: new Date().getTime() }; + var versionsList = []; + var versionOptional; + if(botsDetail.blueprintConfig && botsDetail.blueprintConfig.infraManagerData && botsDetail.blueprintConfig.infraManagerData.versionsList){ + versionsList = botsDetail.blueprintConfig.infraManagerData.versionsList; + versionOptional = versionsList[versionsList.length-1].ver; + botsObj.version = versionOptional; + } bots.getBotsById(botsDetail._id,function(err,data){ if(err){ callback(err,null); @@ -92,6 +99,10 @@ botsService.createOrUpdateBots = function createOrUpdateBots(botsDetail,linkedCa botsService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,callback) { if(botObj.botScheduler && botObj.botScheduler !== null && Object.keys(botObj.botScheduler).length !== 0) { botObj.botScheduler = apiUtil.createCronJobPattern(botObj.botScheduler); + botObj.isBotScheduled =true; + }else{ + botObj.botScheduler ={}; + botObj.isBotScheduled =false; } bots.updateBotsDetail(botId,botObj,function(err,data){ if(err){ @@ -154,8 +165,7 @@ botsService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) if(actionStatus !== null){ var query = { auditType: 'BOTs', - actionStatus: actionStatus, - auditCategory: 'Task' + actionStatus: actionStatus }; var botsIds = []; auditTrail.getAuditTrails(query, function(err,botsAudits){ @@ -250,14 +260,32 @@ botsService.removeBotsById = function removeBotsById(botId,callback){ }); } -botsService.getBotsHistory = function getBotsHistory(botId,callback){ - auditTrailService.getBotsAuditTrailHistory(botId,function(err,data){ - if(err){ +botsService.getBotsHistory = function getBotsHistory(botId,botsQuery,callback){ + var reqData = {}; + async.waterfall([ + function(next) { + apiUtil.paginationRequest(botsQuery, 'botHistory', next); + }, + function(paginationReq, next) { + paginationReq['searchColumns'] = ['status', 'action', 'user', 'actionStatus', 'auditTrailConfig.name','masterDetails.orgName', 'masterDetails.bgName', 'masterDetails.projectName', 'masterDetails.envName']; + reqData = paginationReq; + apiUtil.databaseUtil(paginationReq, next); + }, + function(queryObj, next) { + queryObj.queryObj.auditId = botId; + queryObj.queryObj.auditType = 'BOTs'; + auditTrail.getAuditTrailList(queryObj,next) + }, + function(auditTrailList, next) { + apiUtil.paginationResponse(auditTrailList, reqData, next); + } + ],function(err, results) { + if (err){ logger.error(err); callback(err,null); return; } - callback(null,data); + callback(null,results) return; }); } diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index 8f7d1df35..0ef61c106 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -102,7 +102,7 @@ schedulerService.executeSchedulerForInstances = function executeSchedulerForInst schedulerService.executeParallelScheduledTasks = function executeParallelScheduledTasks(task,callback) { logger.debug("Task Scheduler is started for Parallel Task. "+task.name); - var currentDate = new Date(); + var currentDate = new Date().getTime(); if(currentDate >= task.taskScheduler.cronEndOn){ crontab.cancelJob(task.cronJobId); taskDao.updateTaskScheduler(task._id,function(err, updatedData) { @@ -139,7 +139,7 @@ schedulerService.executeParallelScheduledTasks = function executeParallelSchedul schedulerService.executeScheduledBots = function executeScheduledBots(bots,callback) { logger.debug("Bots Scheduler is started for - "+bots.botName); - var currentDate = new Date(); + var currentDate = new Date().getTime(); if(currentDate >= bots.botScheduler.cronEndOn){ crontab.cancelJob(bots.cronJobId); botsDao.updateBotsScheduler(bots._id,function(err, updatedData) { @@ -173,7 +173,7 @@ schedulerService.executeScheduledBots = function executeScheduledBots(bots,callb schedulerService.executeSerialScheduledTasks = function executeSerialScheduledTasks(task,callback) { logger.debug("Task Scheduler is started for Serial Task. "+task.name); - var currentDate = new Date(); + var currentDate = new Date().getTime(); if(currentDate >= task.taskScheduler.cronEndOn){ crontab.cancelJob(task.cronJobId); taskDao.updateTaskScheduler(task._id,function(err, updatedData) { @@ -218,7 +218,7 @@ schedulerService.startStopInstance= function startStopInstance(instanceId,catUse instancesDao.getInstanceById(instanceId, next); }, function(instanceDetails,next){ - var currentDate = new Date(); + var currentDate = new Date().getTime(); if(instanceDetails[0].instanceState === 'terminated'){ callback({ errCode:201, diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 630d79e4d..a38f0e902 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -24,6 +24,7 @@ var instancesDao = require('_pr/model/classes/instance/instance'); var auditTrailService = require('_pr/services/auditTrailService'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); var async = require('async'); +var crontab = require('node-crontab'); const errorType = 'taskService'; @@ -158,11 +159,6 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic }else{ taskExecutionCount = 1; } - taskDao.updateTaskExecutionCount(task._id,taskExecutionCount,function(err,data){ - if(err){ - logger.error("Error while updating Task Execution Count"); - } - }); if(task.serviceDeliveryCheck === true){ var actionObj={ auditType:'BOTs', @@ -186,25 +182,58 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic if(err){ logger.error(err); }else if(data.length > 0){ - var botExecutionCount = data[0].executionCount + 1; - bots.updateBotsExecutionCount(task._id,botExecutionCount,function(err,data){ - if(err){ - logger.error("Error while updating Bot Execution Count"); + var currentDate = new Date().getTime(); + if(((data[0].isBotScheduled === false || (data[0].botScheduler.cronEndOn && currentDate >= data[0].botScheduler.cronEndOn)) || + (data[0].isBotScheduled === true && data[0].botScheduler.cronEndOn && currentDate >= data[0].botScheduler.cronEndOn) || + (task.isTaskScheduled === true && task.taskScheduler.cronEndOn && currentDate >= task.taskScheduler.cronEndOn)) && user === 'system'){ + crontab.cancelJob(data[0].cronJobId); + bots.updateBotsScheduler(data[0]._id,function(err, updatedData) { + if (err) { + logger.error("Failed to update Bots Scheduler: ", err); + callback(err,null); + return; + } + logger.debug("Scheduler is ended on for Bots. "+data[0].botName); + callback(null,updatedData); + return; + }); + crontab.cancelJob(task.cronJobId); + taskDao.updateTaskScheduler(task._id,function(err, updatedData) { + if (err) { + logger.error("Failed to update Task Scheduler: ", err); + callback(err,null); + return; + } + logger.debug("Scheduler is ended on for Task. "+task.name); + callback(null,updatedData); + return; + }); + }else { + var botExecutionCount = data[0].executionCount + 1; + taskDao.updateTaskExecutionCount(task._id,taskExecutionCount,function(err,data){ + if(err){ + logger.error("Error while updating Task Execution Count"); + } + }); + bots.updateBotsExecutionCount(task._id, botExecutionCount, function (err, data) { + if (err) { + logger.error("Error while updating Bot Execution Count"); + } + }); + var reqBody = { + userName: user, + hostProtocol: hostProtocol, + choiceParam: choiceParam, + appData: appData, + tagServer: botTagServer, + paramOptions: paramOptions } - }); - var reqBody = { - userName: user, - hostProtocol: hostProtocol, - choiceParam: choiceParam, - appData: appData, - tagServer: botTagServer, - paramOptions:paramOptions + bots.updateBotsDetail(task._id, {runTimeParams: reqBody}, function (err, data) { + if (err) { + logger.error("Error while updating Bots Configuration"); + } + }); } - bots.updateBotsDetail(task._id,{runTimeParams:reqBody},function(err,data){ - if(err){ - logger.error("Error while updating Bots Configuration"); - } - }); }else{ logger.debug("There is no BOTs data present in DB"); } diff --git a/server/install.js b/server/install.js index 390085f4d..06b7d6b7b 100755 --- a/server/install.js +++ b/server/install.js @@ -106,6 +106,7 @@ function getDefaultsConfig() { "resources":"createdOn", "instanceLogs":"createdOn", "auditTrails":"startedOn", + "botHistory":"startedOn", "taskLogs":"timestampStarted", "unassignedInstances":"state", "unassignedInstances":"state", From 032b4178bce6fb43baba954ec5d680df387178a7 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Mon, 26 Dec 2016 17:00:41 +0530 Subject: [PATCH 036/110] inline edit for instance --- client/cat3/src/main.js | 2 +- client/cat3/src/partials/global.scss | 4 + .../controller/discoveryResourcesCtrl.js | 129 +++++++++++++----- .../analytics/view/analyticsTreeMenu.html | 16 +-- .../analytics/view/discoveryResources.html | 16 ++- .../sections/dashboard/genericServices.js | 15 ++ 6 files changed, 138 insertions(+), 44 deletions(-) diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js index 389caf669..2720b2867 100644 --- a/client/cat3/src/main.js +++ b/client/cat3/src/main.js @@ -28,7 +28,7 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr','fireb 'ui.grid.resizeColumns', 'global.uiGridOptions', 'global.messages', - 'ui.grid.selection' + 'ui.grid.selection','ui.grid.cellNav' ]); angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window', diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss index 74db63c13..2fd74e367 100644 --- a/client/cat3/src/partials/global.scss +++ b/client/cat3/src/partials/global.scss @@ -754,6 +754,10 @@ accordion .panel-heading { /* global styles for logs display across workzone ends here*/ /*ui grid css starts here*/ +.editCell .ui-grid-cell-contents { + background: #b3c4c7 !important; + cursor: pointer; +} .ui-grid { font-size: 14px; text-align: center; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index e65659b61..00ab7dc95 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -1,25 +1,31 @@ (function (angular) { "use strict"; angular.module('dashboard.analytics') - .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){ + .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','toastr', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,toastr){ var disResrc=this; $scope.TagName={ environment:[], bg:[], - project:[] + project:[] ,bgTag:'', + environmentTag:'', + projectTag:'' }; // get gat name Start disResrc.getAllTagNames=function () { $scope.TagName={ environment:[], bg:[], - project:[] + project:[], + bgTag:'', + environmentTag:'', + projectTag:'' }; // environment var param = { url: '/providers/' + fltrObj.provider.id + '/tag-mappings/environment' }; genSevs.promiseGet(param).then(function (instResult) { + $scope.TagName.environmentTag=instResult.tagName; angular.forEach(instResult.tagValues,function(val){ $scope.TagName.environment.push({id:val,name:val}) }); @@ -29,6 +35,7 @@ url: '/providers/' + fltrObj.provider.id + '/tag-mappings/bgName' }; genSevs.promiseGet(param).then(function (instResult) { + $scope.TagName.bgTag=instResult.tagName; angular.forEach(instResult.tagValues,function(val){ $scope.TagName.bg.push({id:val,name:val}) }); @@ -38,6 +45,7 @@ url: '/providers/' + fltrObj.provider.id + '/tag-mappings/project' }; genSevs.promiseGet(param).then(function (instResult) { + $scope.TagName.projectTag=instResult.tagName; angular.forEach(instResult.tagValues,function(val){ $scope.TagName.project.push({id:val,name:val}) }); @@ -47,36 +55,93 @@ // get gat name End########## }; disResrc.init=function () { - disResrc.getAllTagNames(); - $timeout(function () { - 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.TagName.bg, editDropdownIdLabel: 'name', - editDropdownValueLabel: 'id'}, - { name: 'Project Tag Value', enableCellEdit: true,editableCellTemplate: 'ui-grid/dropdownEditor', - editDropdownOptionsArray:$scope.TagName.project, editDropdownIdLabel: 'name', - editDropdownValueLabel: 'id'}, - { name: 'Env. Tag Value', enableCellEdit: true,editableCellTemplate: 'ui-grid/dropdownEditor', - editDropdownOptionsArray:$scope.TagName.environment, editDropdownIdLabel: 'name', - editDropdownValueLabel: 'id'} - ] - }; - disResrc.gridOptionInstances.data=[]; - if(fltrObj && fltrObj.provider && fltrObj.provider.id) { - var param = { - url: '/providers/' + fltrObj.provider.id +'/'+ $rootScope.organNewEnt.instanceType + if(fltrObj && fltrObj.provider && fltrObj.provider.id) { + disResrc.getAllTagNames(); + $timeout(function () { + console.log( $scope.TagName); + disResrc.gridOptionInstances = { + columnDefs: [ + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + enableCellEdit: false}, + {name: 'os', displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, + {name: 'privateIpAddress', displayName: 'IP Address',enableCellEditOnFocus: false, + enableCellEdit: false}, + {name: 'state', displayName: 'Status',enableCellEditOnFocus: false, + enableCellEdit: false}, + { + name: 'Region', + displayName: 'Region', + field: 'providerData.region_name', + cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + }, + {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false}, + { + name: 'aa', + displayName: 'BG Tag Value', + width: 200, + cellClass: 'editCell', + enableCellEditOnFocus: true, + enableCellEdit: true, + editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray: $scope.TagName.bg, + editDropdownIdLabel: 'name', + editDropdownValueLabel: 'id' + }, + { + name: $scope.TagName.projectTag, + displayName: 'Project Tag Value', + cellClass: 'editCell', + width: 200, + enableCellEditOnFocus: true, + enableCellEdit: true, + editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray: $scope.TagName.project, + editDropdownIdLabel: 'name', + editDropdownValueLabel: 'id' + }, + { + name: $scope.TagName.environmentTag, + displayName: 'Env Tag Value', + cellClass: 'editCell', + width: 200, + enableCellEditOnFocus: true, + enableCellEdit: true, + editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray: $scope.TagName.environment, + editDropdownIdLabel: 'name', + editDropdownValueLabel: 'id' + } + ], + onRegisterApi: function (gridApi) { + gridApi.edit.on.afterCellEdit($scope, function (rowEntity, colDef, newValue, oldValue) { + var param = { + url: '/providers/' + fltrObj.provider.id + '/unassigned-instances/' + rowEntity._id, + data: { + "tags": { + "environment": newValue, + "application": colDef.name + } + } + }; + if(newValue !== oldValue) { + genSevs.promisePatch(param).then(function () { + toastr.success('Successfully updated.', 'Update'); + }); + } + }); + } }; - genSevs.promiseGet(param).then(function (instResult) { - disResrc.gridOptionInstances.data=instResult.data; - }); - } - },200); + disResrc.gridOptionInstances.data = []; + var param = { + url: '/providers/' + fltrObj.provider.id + '/' + $rootScope.organNewEnt.instanceType + }; + genSevs.promiseGet(param).then(function (instResult) { + disResrc.gridOptionInstances.data = instResult.data; + }); + }, 200); + } }; $rootScope.stateItems = $state.params; 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 a0790b787..16f1c72a9 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html @@ -65,14 +65,14 @@
    - - - - - - - - +
  • +
    +
    + + Resources +
    +
    +
    • diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html index bfef10192..2569d0627 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html @@ -6,7 +6,7 @@ Instances
    No Data Found!
    -
    +
    @@ -16,7 +16,8 @@ - + + @@ -24,7 +25,8 @@ - + + @@ -33,3 +35,11 @@
    + \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js index dc6651c96..e44f4c1cd 100644 --- a/client/cat3/src/partials/sections/dashboard/genericServices.js +++ b/client/cat3/src/partials/sections/dashboard/genericServices.js @@ -55,6 +55,21 @@ }); return deferred.promise; }; + genericServices.promisePatch = function (paramsObject) { + if(!paramsObject.inlineLoader){ $rootScope.onBodyLoading=true;} + var deferred = $q.defer(); + $http.patch(paramsObject.url,paramsObject.data) + .success(function(data) { + $rootScope.onBodyLoading=false; + deferred.resolve(data); + }) + .error(function(data, status) { + $rootScope.onBodyLoading=false; + deferred.reject(); + toastr.error(data.message, status); + }); + return deferred.promise; + }; genericServices.promiseDelete= function (paramsObject) { $rootScope.onBodyLoading=true; var deferred = $q.defer(); From 750c7871e8e25e5516d356907d1202736633e662 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Mon, 26 Dec 2016 17:26:24 +0530 Subject: [PATCH 037/110] Resolved CAT-2554,2571 --- .../design/controllers/blueprintCreateCtrl.js | 7 ++++- .../design/view/blueprintCreate.html | 26 +++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js index f20c69a4e..81866451f 100755 --- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js @@ -62,7 +62,7 @@ $scope.templateList = data; for(var i=0;i<$scope.templateList.length;i++){ if($scope.templateList[i].templatesicon_filePath){ - $scope.filePath = '/d4dMasters/image/' + $scope.templateList[i].templatesicon_filePath; + $scope.templateList[i].templatesicon_filePath = '/d4dMasters/image/' + $scope.templateList[i].templatesicon_filePath; } } }); @@ -361,6 +361,7 @@ }; blueprintCreation.showRepoServers = function() { + $scope.showNexusDocker = true; if(blueprintCreation.newEnt.appDeployCheck_isChecked) { bpCreateSer.getNexusServerList().then(function(data){ blueprintCreation.serverRepos = data; @@ -368,6 +369,10 @@ bpCreateSer.getDockerList().then(function(data){ blueprintCreation.serverRepos = blueprintCreation.serverRepos.concat(data); }); + } else { + $scope.showNexusDocker = false; + blueprintCreation.newEnt.nexusDockerServer = null + blueprintCreation.serverRepos = []; } }; 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 8987d07e3..456db2dde 100755 --- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html +++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html @@ -11,7 +11,7 @@
    • - templateLogo + templateLogo
    • {{templateDetail.templatename}}
      • @@ -32,7 +32,7 @@
      • - templateLogo + templateLogo
      • @@ -382,7 +382,7 @@
      -
      +
      @@ -393,7 +393,7 @@
      -
      +
      @@ -402,25 +402,25 @@
      -
      +
      -
      +
      -
      +
      -
      -
      +
      +
      @@ -431,7 +431,7 @@
      -
      +
      @@ -442,7 +442,7 @@
      -
      +
      @@ -453,7 +453,7 @@
      -
      +
      @@ -464,7 +464,7 @@
      -
      +
      From 9f7bdfaaec513db180d175be6358ecdd879f10e5 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 26 Dec 2016 18:53:49 +0530 Subject: [PATCH 038/110] Resolved BOTs Issue --- .../sections/dashboard/bots/controller/libraryCtrl.js | 2 +- server/app/model/classes/tasks/tasks.js | 10 ++++++++-- server/app/services/schedulerService.js | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) 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 82fde006e..305420cf8 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -489,7 +489,7 @@ $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 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()}}
      '}, diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index de67c8971..8ab7b742e 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -431,11 +431,14 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b }; }else { resultBots = { - "actionLogId": taskHistory.nodeIdsWithActionLog[0].actionLogId, - "auditTrailConfig.nodeIdsWithActionLog": taskHistory.nodeIdsWithActionLog + "actionLogId": taskHistory.nodeIdsWithActionLog[0].actionLogId, + "auditTrailConfig.nodeIdsWithActionLog": taskHistory.nodeIdsWithActionLog }; } if(auditTrailId !== null && resultBots !== null){ + if(taskHistory.id){ + resultBots.auditHistoryId=taskHistory.id; + } auditTrailService.updateAuditTrail('BOTs',auditTrailId,resultBots,function(err,auditTrail){ if (err) { logger.error("Failed to create or update bots Log: ", err); @@ -472,6 +475,9 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b "auditTrailConfig.nodeIdsWithActionLog":taskHistory.nodeIdsWithActionLog }; } + if(taskHistory.id){ + resultTaskExecution.auditHistoryId=taskHistory.id; + } if(auditTrailId !== null && resultTaskExecution !== null){ auditTrailService.updateAuditTrail('BOTs',auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index 0ef61c106..c3aecfbde 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -122,7 +122,7 @@ schedulerService.executeParallelScheduledTasks = function executeParallelSchedul logger.error("Error in updating cron job Ids. "+err); } }) - taskService.executeTask(task._id, "system", "", "", "","","",function(err, historyData) { + taskService.executeTask(task._id, "system", "undefined", "undefined", "undefined","undefined","undefined",function(err, historyData) { if (err === 404) { logger.error("Task not found.", err); return; @@ -193,7 +193,7 @@ schedulerService.executeSerialScheduledTasks = function executeSerialScheduledTa logger.error("Error in updating cron job Ids. "+err); } }) - taskService.executeTask(task._id, "system", "", "", "","","",function(err, historyData) { + taskService.executeTask(task._id, "system", "undefined", "undefined", "undefined","undefined","undefined",function(err, historyData) { if (err === 404) { logger.error("Task not found.", err); callback(err,null); From b1d001305b44c8c9520a01fbb3ade22b2405d9e0 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Mon, 26 Dec 2016 22:33:05 +0530 Subject: [PATCH 039/110] Resolved QA issue. --- .../dashboard/bots/controller/editParamsCtrl.js | 6 ++++++ .../dashboard/bots/view/editParams.html | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) 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 cbdcbe568..2f8032361 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -29,6 +29,12 @@ } } $scope.isChefattributesLoading = true; + + $scope.totalCount = 0; + $scope.countInit = function() { + return $scope.totalCount++; + } + if (items.botLinkedSubCategory === 'chef') { $scope.chefComponentSelectorList = responseFormatter.findDataForEditValue(items.botConfig.runlist); var nodesList = responseFormatter.chefRunlistFormatter($scope.chefComponentSelectorList); diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 2106a5dc3..0e9447cc6 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -86,12 +86,17 @@

      Add Parameters:

      Value - - - {{param}} - - - + + + + + + + + + + + From 34eb0e8db41704af5f58e245f74ef6161e44128d Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 11:24:18 +0530 Subject: [PATCH 040/110] update tag --- .../controller/discoveryTagMappingCtrl.js | 15 ++------------- .../analytics/view/discoveryTagMapping.html | 12 ++++++------ 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index 70af8e932..237d8c648 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -34,18 +34,9 @@ genSevs.promiseGet(param).then(function (tagResult) { $scope.isLoadingTag = false; disTgMap.tagOption = tagResult; - if($scope.newEnt.businessGroup.tagName){ - disTgMap.getTagValues('busTag',$scope.newEnt.businessGroup.tagName,'businessGroup',true) - } - if($scope.newEnt.project.tagName){ - disTgMap.getTagValues('projTag',$scope.newEnt.project.tagName,'project',true) - } - if($scope.newEnt.environment.tagName){ - disTgMap.getTagValues('EnvTag',$scope.newEnt.environment.tagName,'environment',true) - } }); }; - disTgMap.getTagValues= function (type,tagName,valueType,selectType) { + disTgMap.getTagValues= function (tagName,valueType,selectType) { if(tagName) { var param = { inlineLoader: true, @@ -53,12 +44,10 @@ }; genSevs.promiseGet(param).then(function (tagResult) { $scope.isLoadingTagValue = false; - if(!selectType) { for (var key in $scope.newEnt[valueType].catalystEntityMapping) { $scope.newEnt[valueType].catalystEntityMapping[key].tagValues = []; } - } - disTgMap[type] = tagResult.values; + $scope.newEnt[valueType].tagValues = tagResult.values; }); } }; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html index e73f9f3d7..3a7f07d64 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html @@ -11,7 +11,7 @@
      - @@ -33,7 +33,7 @@
      + suggestions-arr="newEnt.businessGroup.tagValues">
      @@ -55,7 +55,7 @@
      - @@ -79,7 +79,7 @@
      + suggestions-arr="newEnt.project.tagValues">
      @@ -99,7 +99,7 @@
      - @@ -120,7 +120,7 @@
      + suggestions-arr="newEnt.environment.tagValues">
      From fd51ab4c1d2344605de42e314079d5b54dc6c402 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 11:25:49 +0530 Subject: [PATCH 041/110] update tag --- .../dashboard/analytics/controller/discoveryTagMappingCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index 237d8c648..b22db6034 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -36,7 +36,7 @@ disTgMap.tagOption = tagResult; }); }; - disTgMap.getTagValues= function (tagName,valueType,selectType) { + disTgMap.getTagValues= function (tagName,valueType) { if(tagName) { var param = { inlineLoader: true, From c0dc2c63f00b3896fad9ac7f75aa095570d1399e Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 11:36:57 +0530 Subject: [PATCH 042/110] save tag --- .../dashboard/analytics/controller/discoveryTagMappingCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index b22db6034..d8c359a78 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -19,7 +19,7 @@ url: '/providers/' + fltrObj.provider.id + '/tag-mappings' }; genSevs.promiseGet(param).then(function (tagResult) { - $scope.newEnt = tagResult; + //$scope.newEnt = tagResult; disTgMap.getAllTags(); }); } From 05e2e69286a90926b7a37a9e62a634e4e6b3ba90 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 11:43:22 +0530 Subject: [PATCH 043/110] revert back --- .../dashboard/analytics/controller/discoveryTagMappingCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index d8c359a78..b22db6034 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -19,7 +19,7 @@ url: '/providers/' + fltrObj.provider.id + '/tag-mappings' }; genSevs.promiseGet(param).then(function (tagResult) { - //$scope.newEnt = tagResult; + $scope.newEnt = tagResult; disTgMap.getAllTags(); }); } From aebf4793b1a8a2c2ef0cbf87b4a005331ee85ed4 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 12:16:48 +0530 Subject: [PATCH 044/110] css changed , remove the tag mapping from setting --- .../sections/dashboard/analytics/analytics.scss | 2 +- .../analytics/controller/discoveryResourcesCtrl.js | 4 ++-- .../analytics/controller/discoveryTagMappingCtrl.js | 13 +++++++++++-- .../htmls/private/ajax/Settings/ProvidersList.html | 6 +++--- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index 4769ac191..862344302 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -360,5 +360,5 @@ .autocomplete-list { width: calc(37% + 3px) !important; left: 40% !important; - z-index: 100; + z-index: 999999; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index 00ab7dc95..cbf028f29 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -32,7 +32,7 @@ }); // Bu var param = { - url: '/providers/' + fltrObj.provider.id + '/tag-mappings/bgName' + url: '/providers/' + fltrObj.provider.id + '/tag-mappings/businessGroup' }; genSevs.promiseGet(param).then(function (instResult) { $scope.TagName.bgTag=instResult.tagName; @@ -78,7 +78,7 @@ {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false}, { - name: 'aa', + name: $scope.TagName.bgTag, displayName: 'BG Tag Value', width: 200, cellClass: 'editCell', diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index b22db6034..9ddcc973e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -16,10 +16,19 @@ if(fltrObj && fltrObj.provider && fltrObj.provider.id) { var param = { inlineLoader: true, - url: '/providers/' + fltrObj.provider.id + '/tag-mappings' + // url: '/providers/' + fltrObj.provider.id + '/tag-mappings' + url:'src/partials/sections/dashboard/analytics/data/tag.json' }; genSevs.promiseGet(param).then(function (tagResult) { - $scope.newEnt = tagResult; + angular.forEach(tagResult,function (val,key) { + if(key === 'environment'){ + $scope.newEnt.environment=val; + } else if(key === 'businessGroup'){ + $scope.newEnt.businessGroup=val; + } else if(key === 'project'){ + $scope.newEnt.project=val; + } + }); disTgMap.getAllTags(); }); } diff --git a/client/htmls/private/ajax/Settings/ProvidersList.html b/client/htmls/private/ajax/Settings/ProvidersList.html index 768be2bbc..bc6351dc6 100755 --- a/client/htmls/private/ajax/Settings/ProvidersList.html +++ b/client/htmls/private/ajax/Settings/ProvidersList.html @@ -20,7 +20,7 @@
      + New @@ -52,9 +52,9 @@
      - + From 8aaf67040fa9d6b9bc16db8cb93ad468511a1c05 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 12:18:44 +0530 Subject: [PATCH 045/110] API changed --- .../dashboard/analytics/controller/discoveryTagMappingCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index 9ddcc973e..b52694666 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -16,8 +16,8 @@ if(fltrObj && fltrObj.provider && fltrObj.provider.id) { var param = { inlineLoader: true, - // url: '/providers/' + fltrObj.provider.id + '/tag-mappings' - url:'src/partials/sections/dashboard/analytics/data/tag.json' + url: '/providers/' + fltrObj.provider.id + '/tag-mappings' + //url:'src/partials/sections/dashboard/analytics/data/tag.json' }; genSevs.promiseGet(param).then(function (tagResult) { angular.forEach(tagResult,function (val,key) { From b6cf87db05cf669827d9b44d2d8e0133cc50091f Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Tue, 27 Dec 2016 12:21:21 +0530 Subject: [PATCH 046/110] Create DB Migration Script of BOTs --- server/app/db-script/bots-model.js | 234 +++++++++++++++++++++++++++++ server/app/services/taskService.js | 5 + 2 files changed, 239 insertions(+) create mode 100644 server/app/db-script/bots-model.js diff --git a/server/app/db-script/bots-model.js b/server/app/db-script/bots-model.js new file mode 100644 index 000000000..c0214c5f5 --- /dev/null +++ b/server/app/db-script/bots-model.js @@ -0,0 +1,234 @@ + + +var logger = require('_pr/logger')(module); +var mongodbConnect = require('_pr/lib/mongodb'); +var appConfig = require('_pr/config'); +var taskDao = require('_pr/model/classes/tasks/tasks.js'); +var taskHistoryDao = require('_pr/model/classes/tasks/taskHistory.js'); +var blueprintDao = require('_pr/model/blueprint/blueprint.js'); +var botService = require('_pr/services/botsService.js'); +var masterUtil = require('_pr/lib/utils/masterUtil.js'); +var botAuditTrail = require('_pr/model/audit-trail/bot-audit-trail.js'); +var async = require('async'); + +var dbOptions = { + host: appConfig.db.host, + port: appConfig.db.port, + dbName: appConfig.db.dbName +}; +mongodbConnect(dbOptions, function(err) { + if (err) { + logger.error("Unable to connect to mongo db >>" + err); + process.exit(); + } else { + logger.debug('connected to mongodb - host = %s, port = %s, database = %s', dbOptions.host, dbOptions.port, dbOptions.dbName); + } +}); + +async.parallel({ + taskSync: function(callback){ + taskDao.getAllServiceDeliveryTask(true,function(err,tasks){ + if(err){ + logger.error("Failed to fetch BOTs Task", err); + callback(err,null); + }else if(tasks.length > 0){ + var count = 0; + for(var i = 0 ; i < tasks.length;i++){ + (function(task){ + botService.createOrUpdateBots(task, 'Task', task.taskType, function (err, data) { + if (err) { + logger.error("Error in creating bots entry." + err); + } + count++; + logger.debug("Successfully added Task data for Bots.") + if(count ===tasks.length){ + callback(null,tasks); + return; + } + }); + })(tasks[i]); + } + + }else{ + logger.debug("There is no BOTs task in DB."); + callback(null,tasks); + } + }) + }, + blueprintSync: function(callback){ + blueprintDao.getAllServiceDeliveryBlueprint(true,function(err,blueprints){ + if(err){ + logger.error("Failed to fetch BOTs Blueprint", err); + callback(err,null); + }else if(blueprints.length > 0){ + var count = 0; + for(var i = 0 ; i < blueprints.length;i++){ + (function(blueprint){ + masterUtil.getParticularProject(blueprint.projectId, function (err, project) { + if (err) { + logger.error(err); + count++; + if(count ===blueprints.length){ + callback(null,blueprints); + return; + } + } else if (project.length > 0) { + blueprint.orgName = project[0].orgname; + blueprint.bgName = project[0].productgroupname; + blueprint.projectName = project[0].projectname; + botService.createOrUpdateBots(blueprint, 'Blueprint', blueprint.blueprintType, function (err, botsData) { + if (err) { + logger.error("Error in creating bots entry. " + err); + } + count++; + logger.debug("Successfully added Blueprint data for Bots.") + if(count ===blueprints.length){ + callback(null,blueprints); + return; + } + }); + } else { + logger.debug("Unable to find Project Information from project id:"); + count++; + if(count ===blueprints.length){ + callback(null,blueprints); + return; + } + } + }); + })(blueprints[i]); + } + + }else{ + logger.debug("There is no BOTs Nlueprint in DB."); + callback(null,blueprints); + } + }) + }, + botsAuditTrailSync: function(callback){ + taskDao.getAllServiceDeliveryTask(true,function(err,tasks){ + if(err){ + logger.error("Failed to fetch BOTs Task", err); + callback(err,null); + }else if(tasks.length > 0){ + var count = 0; + for(var i = 0 ; i < tasks.length;i++){ + (function(task){ + var queryObj = { + taskId:task._id + } + taskHistoryDao.getTaskHistory(queryObj,function(err,taskHistories){ + if(err){ + count++; + logger.error("Failed to fetch BOTs Task History", err); + if(count ===tasks.length){ + callback(null,tasks); + return; + } + }else if(taskHistories.length > 0){ + count++; + var taskHistoryCount = 0; + for(var i = 0; i < taskHistories.length;i++){ + (function(taskHistory){ + var auditTrailObj = { + auditId: task._id, + auditType: 'BOTs', + masterDetails:{ + orgId: task.orgId, + orgName: task.orgName, + bgId: task.bgId, + bgName: task.bgName, + projectId: task.projectId, + projectName: task.projectName, + envId: task.envId, + envName: task.envName + }, + status: taskHistory.status, + auditCategory:'Task', + actionStatus: taskHistory.status, + user: 'superadmin', + startedOn: taskHistory.timestampStarted, + endedOn: taskHistory.timestampEnded, + action: 'BOTs Task Execution', + auditTrailConfig:{ + nodeIds:task.taskConfig.nodeIds, + name:task.name, + type:task.botType, + description:task.shortDesc, + category:task.botCategory, + executionType:task.taskType, + manualExecutionTime:task.manualExecutionTime, + nodeIdsWithActionLog:taskHistory.nodeIdsWithActionLog + }, + auditHistoryId:taskHistory._id, + actionLogId: taskHistory.nodeIdsWithActionLog[0].actionLogId, + }; + if(task.taskType ==='jenkins'){ + auditTrailObj.actionLogId =taskHistory.jenkinsServerId; + auditTrailObj.auditTrailConfig.jenkinsBuildNumber=taskHistory.buildNumber; + auditTrailObj.auditTrailConfig.jenkinsJobName=taskHistory.jobName; + auditTrailObj.auditTrailConfig.jobResultURL=taskHistory.jobResultURL; + botAuditTrail.createNew(auditTrailObj,function(err,data){ + if(err){ + logger.error(err); + taskHistoryCount++; + if(count ===tasks.length && taskHistoryCount === taskHistories.length){ + callback(null,tasks); + return; + } + }else{ + taskHistoryCount++; + if(count ===tasks.length && taskHistoryCount === taskHistories.length){ + callback(null,tasks); + return; + } + } + }); + }else{ + botAuditTrail.createNew(auditTrailObj,function(err,data){ + if(err){ + logger.error(err); + taskHistoryCount++; + if(count ===tasks.length && taskHistoryCount === taskHistories.length){ + callback(null,tasks); + return; + } + }else{ + taskHistoryCount++; + if(count ===tasks.length && taskHistoryCount === taskHistories.length){ + callback(null,tasks); + return; + } + } + }); + } + })(taskHistories[i]); + } + }else{ + count++; + logger.debug("There is no BOTs task History in DB."); + if(count ===tasks.length){ + callback(null,tasks); + return; + } + } + }) + })(tasks[i]); + } + }else{ + logger.debug("There is no BOTs task in DB."); + callback(null,tasks); + } + }) + }, +},function(err,results){ + if(err){ + logger.error("Failed to sync Bots with Task and Blueprint ", err); + process.exit(); + }else{ + logger.debug("Bots Sync is Done with Task and Blueprint "); + process.exit(); + } +}) + + diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index a38f0e902..3c2a154d1 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -262,6 +262,11 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic }); }); }else{ + taskDao.updateTaskExecutionCount(task._id,taskExecutionCount,function(err,data){ + if(err){ + logger.error("Error while updating Task Execution Count"); + } + }); task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId,auditTrailId,function(err, taskRes, historyData) { if (err) { var error = new Error('Failed to execute task.'); From cd67f78a35baca96ba942e27c4a430ba7c11559d Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Tue, 27 Dec 2016 12:49:10 +0530 Subject: [PATCH 047/110] Create DB Migration Script of BOTs --- server/app/services/taskService.js | 50 +++++++++++++++++++----------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 3c2a154d1..0bbeb18d4 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -197,7 +197,7 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic callback(null,updatedData); return; }); - crontab.cancelJob(task.cronJobId); + crontab.cancelJob(task.cronJobId); taskDao.updateTaskScheduler(task._id,function(err, updatedData) { if (err) { logger.error("Failed to update Task Scheduler: ", err); @@ -262,23 +262,37 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic }); }); }else{ - taskDao.updateTaskExecutionCount(task._id,taskExecutionCount,function(err,data){ - if(err){ - logger.error("Error while updating Task Execution Count"); - } - }); - task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId,auditTrailId,function(err, taskRes, historyData) { - if (err) { - var error = new Error('Failed to execute task.'); - error.status = 500; - return callback(error, null); - } - if (historyData) { - taskRes.historyId = historyData.id; - } - callback(null, taskRes); - return; - }); + if((task.isTaskScheduled === false || (task.isTaskScheduled === true && task.taskScheduler.cronEndOn && currentDate >= task.taskScheduler.cronEndOn)) && user === 'system') { + crontab.cancelJob(task.cronJobId); + taskDao.updateTaskScheduler(task._id, function (err, updatedData) { + if (err) { + logger.error("Failed to update Task Scheduler: ", err); + callback(err, null); + return; + } + logger.debug("Scheduler is ended on for Task. " + task.name); + callback(null, updatedData); + return; + }); + }else { + taskDao.updateTaskExecutionCount(task._id, taskExecutionCount, function (err, data) { + if (err) { + logger.error("Error while updating Task Execution Count"); + } + }); + task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId, auditTrailId, function (err, taskRes, historyData) { + if (err) { + var error = new Error('Failed to execute task.'); + error.status = 500; + return callback(error, null); + } + if (historyData) { + taskRes.historyId = historyData.id; + } + callback(null, taskRes); + return; + }); + } } } else { From a61322ce1b72a762f3876ed8d6a8b07e4e8f060c Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 15:30:05 +0530 Subject: [PATCH 048/110] css changed --- .../dashboard/analytics/analytics.html | 6 ++-- .../sections/dashboard/analytics/analytics.js | 6 ++-- .../dashboard/analytics/analyticsServices.js | 4 +-- .../controller/discoveryResourcesCtrl.js | 36 +++++++++++++++---- client/cat3/styles/bootstrap.min.css | 2 +- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index e8610f1b3..937d36807 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 @@
      diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 86888270a..2697c6580 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -207,7 +207,7 @@ $scope.getResourse = function(instType) { $rootScope.filterNewEnt.resources=[]; $scope.selectedResources=[]; - if(instType === 'managedInstances') { + if(instType === 'Managed') { workzoneServices.getManagedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.managedInstances && response.data.managedInstances.length >0){ $scope.resourceList = response.data.managedInstances; @@ -218,7 +218,7 @@ toastr.error(error); }); } - if(instType === 'unmanagedInstances') { + if(instType === 'Assigned') { workzoneServices.getAssignedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.unmanagedInstances.length >0){ $scope.resourceList = response.data.unmanagedInstances; @@ -230,7 +230,7 @@ toastr.error(error); }); } - if(instType === 'unassigned-instances') { + if(instType === 'Unassigned') { 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/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js index 06cb441b0..fc2b31619 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js @@ -64,8 +64,8 @@ $rootScope.organNewEnt = {}; if($state.current.name === "dashboard.analytics.usage"){ $rootScope.organNewEnt.provider='0'; - $rootScope.organNewEnt.instanceType='unassigned-instances'; - $rootScope.$emit('INI_usage', 'unassigned-instances'); + $rootScope.organNewEnt.instanceType='Unassigned'; + $rootScope.$emit('INI_usage', 'Unassigned'); } $rootScope.organNewEnt.org = or; } diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index cbf028f29..db71f2dba 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -3,6 +3,7 @@ angular.module('dashboard.analytics') .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','toastr', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,toastr){ var disResrc=this; + $scope.instanceType=null; $scope.TagName={ environment:[], bg:[], @@ -25,7 +26,7 @@ url: '/providers/' + fltrObj.provider.id + '/tag-mappings/environment' }; genSevs.promiseGet(param).then(function (instResult) { - $scope.TagName.environmentTag=instResult.tagName; + $scope.TagName.environmentTag=instResult.tagName+'-en'; angular.forEach(instResult.tagValues,function(val){ $scope.TagName.environment.push({id:val,name:val}) }); @@ -35,7 +36,7 @@ url: '/providers/' + fltrObj.provider.id + '/tag-mappings/businessGroup' }; genSevs.promiseGet(param).then(function (instResult) { - $scope.TagName.bgTag=instResult.tagName; + $scope.TagName.bgTag=instResult.tagName+'-bu'; angular.forEach(instResult.tagValues,function(val){ $scope.TagName.bg.push({id:val,name:val}) }); @@ -45,7 +46,7 @@ url: '/providers/' + fltrObj.provider.id + '/tag-mappings/project' }; genSevs.promiseGet(param).then(function (instResult) { - $scope.TagName.projectTag=instResult.tagName; + $scope.TagName.projectTag=instResult.tagName+'-pr'; angular.forEach(instResult.tagValues,function(val){ $scope.TagName.project.push({id:val,name:val}) }); @@ -121,7 +122,7 @@ data: { "tags": { "environment": newValue, - "application": colDef.name + "application": colDef.name.substring(0, colDef.name.length-3) } } }; @@ -134,11 +135,25 @@ } }; disResrc.gridOptionInstances.data = []; + if($rootScope.organNewEnt.instanceType === 'Managed') { + $scope.instanceType= 'unmanagedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + $scope.instanceType= 'unmanagedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + $scope.instanceType= 'unassigned-instances'; + } var param = { - url: '/providers/' + fltrObj.provider.id + '/' + $rootScope.organNewEnt.instanceType + url: '/providers/' + fltrObj.provider.id + '/' + $scope.instanceType }; genSevs.promiseGet(param).then(function (instResult) { - disResrc.gridOptionInstances.data = instResult.data; + if($rootScope.organNewEnt.instanceType === 'Managed') { + disResrc.gridOptionInstances.data = instResult.managedInstances; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + disResrc.gridOptionInstances.data = instResult.unmanagedInstances; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + disResrc.gridOptionInstances.data = instResult.data; + } + }); }, 200); } @@ -146,7 +161,14 @@ $rootScope.stateItems = $state.params; $rootScope.organNewEnt.provider='0'; - $rootScope.organNewEnt.instanceType='unassigned-instances'; + $rootScope.organNewEnt.instanceType='Unassigned'; + if($rootScope.organNewEnt.instanceType === 'Managed') { + $scope.instanceType= 'unmanagedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + $scope.instanceType= 'unmanagedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + $scope.instanceType= 'unassigned-instances'; + } analyticsServices.applyFilter(true,null); var treeNames = ['Cloud Management','Discovery','Resources']; $rootScope.$emit('treeNameUpdate', treeNames); diff --git a/client/cat3/styles/bootstrap.min.css b/client/cat3/styles/bootstrap.min.css index d65c66b1b..9554561a6 100644 --- a/client/cat3/styles/bootstrap.min.css +++ b/client/cat3/styles/bootstrap.min.css @@ -2,4 +2,4 @@ * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-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}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} \ No newline at end of file + *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(./fonts/glyphicons-halflings-regular.eot);src:url(./fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(./fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(./fonts/glyphicons-halflings-regular.woff) format('woff'),url(./fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(./fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-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}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} \ No newline at end of file From 7afef16b3ca0c398bf88127ff8c8525f47617fd0 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 17:50:18 +0530 Subject: [PATCH 049/110] bug fix --- .../controller/discoveryResourcesCtrl.js | 6 ++-- .../controller/discoveryTagMappingCtrl.js | 29 ++++++++++++++----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index db71f2dba..a4944b6b8 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -17,9 +17,9 @@ environment:[], bg:[], project:[], - bgTag:'', - environmentTag:'', - projectTag:'' + bgTag:'bg', + environmentTag:'env', + projectTag:'pro' }; // environment var param = { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index b52694666..f4c53750d 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -12,6 +12,17 @@ $scope.newEnt={}; var fltrObj=$rootScope.filterNewEnt; disTgMap.tagOption=[]; + function checkid(id,array) { + var rt=false; + angular.forEach(array,function (v,k) { + if(id !== k){ + rt= true; + } else { + rt= false; + } + }); + return rt; + } disTgMap.getTagMapping=function () { if(fltrObj && fltrObj.provider && fltrObj.provider.id) { var param = { @@ -21,13 +32,17 @@ }; genSevs.promiseGet(param).then(function (tagResult) { angular.forEach(tagResult,function (val,key) { - if(key === 'environment'){ - $scope.newEnt.environment=val; - } else if(key === 'businessGroup'){ - $scope.newEnt.businessGroup=val; - } else if(key === 'project'){ - $scope.newEnt.project=val; - } + + $scope.newEnt[key].tagName=val.tagName; + $scope.newEnt[key].tagValues=val.tagValues; + $scope.newEnt[key].catalystEntityType=val.catalystEntityType; + angular.forEach(val.catalystEntityMapping,function (v,k) { + $scope.newEnt[key].catalystEntityMapping[k]={ + tagValues:v.tagValues, + catalystEntityId:v.catalystEntityId, + catalystEntityName:v.catalystEntityName + } + }); }); disTgMap.getAllTags(); }); From 2080cd95abbb29f6714b9c9f33471fba0f69abd1 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 27 Dec 2016 17:52:27 +0530 Subject: [PATCH 050/110] bug fix --- .../analytics/controller/discoveryTagMappingCtrl.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index f4c53750d..2762be8e5 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -12,17 +12,6 @@ $scope.newEnt={}; var fltrObj=$rootScope.filterNewEnt; disTgMap.tagOption=[]; - function checkid(id,array) { - var rt=false; - angular.forEach(array,function (v,k) { - if(id !== k){ - rt= true; - } else { - rt= false; - } - }); - return rt; - } disTgMap.getTagMapping=function () { if(fltrObj && fltrObj.provider && fltrObj.provider.id) { var param = { From ab567f8faad3614e43599a96f07946baf356f9ab Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Wed, 28 Dec 2016 12:37:53 +0530 Subject: [PATCH 051/110] Fix to allocate resource on tag mapping with new schema --- .../cronjobs/provider-sync/AWSProviderSync.js | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js index a203438a2..9d1b326ee 100644 --- a/server/app/cronjobs/provider-sync/AWSProviderSync.js +++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js @@ -235,10 +235,11 @@ function tagMappingForInstances(instances,provider,next){ 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) { + if ((instance.tags[bgTag.name] !== '') + && ('tagValues' in entityMappingArray[y]) + && (entityMappingArray[y].tagValues.indexOf(instance.tags[bgTag.name]) >= 0)) { catalystBgId = entityMappingArray[y].catalystEntityId; catalystBgName = entityMappingArray[y].catalystEntityName; break; @@ -249,10 +250,12 @@ function tagMappingForInstances(instances,provider,next){ 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) { + if ((instance.tags[projectTag.name] !== '') + && ('tagValues' in entityMappingArray[y]) + && (entityMappingArray[y].tagValues.indexOf(instance.tags[projectTag.name]) + >= 0)) { catalystProjectId = entityMappingArray[y].catalystEntityId; catalystProjectName = entityMappingArray[y].catalystEntityName; break; @@ -263,10 +266,12 @@ function tagMappingForInstances(instances,provider,next){ 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) { + if ((instance.tags[environmentTag.name] !== '') + && ('tagValues' in entityMappingArray[y]) + && (entityMappingArray[y].tagValues.indexOf(instance.tags[environmentTag.name]) + >= 0)) { catalystEnvironmentId = entityMappingArray[y].catalystEntityId; catalystEnvironmentName = entityMappingArray[y].catalystEntityName; break; From 3c74a59eeee2d1adb3ff515984d0cb015434a764 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 28 Dec 2016 13:08:15 +0530 Subject: [PATCH 052/110] CAT-2592 Fixed --- .../cronjobs/provider-sync/AWSProviderSync.js | 151 +++++++++++++++++- .../unmanaged-instance/unmanaged-instance.js | 30 +++- 2 files changed, 178 insertions(+), 3 deletions(-) diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js index a203438a2..0584f8a28 100644 --- a/server/app/cronjobs/provider-sync/AWSProviderSync.js +++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js @@ -73,13 +73,16 @@ function awsProviderSyncForProvider(provider,orgName) { assignedInstance: function(callback){ async.waterfall([ function(next){ - unassignedInstancesModel.getUnAssignedInstancesByProviderId(provider._id,next) + unassignedInstancesModel.getUnAssignedInstancesByProviderId(provider._id,next); }, function(unassignedInstances,next){ tagMappingForInstances(unassignedInstances,provider,next); }, function(assignedInstances,next){ saveAssignedInstances(assignedInstances,next); + }, + function(instances,next){ + assignedInstancesDao.getInstanceByProviderId(provider._id,next); } ],function(err,results){ if(err){ @@ -95,6 +98,9 @@ function awsProviderSyncForProvider(provider,orgName) { next(null,results); }); }, + function(assignedInstances,next){ + syncAssignedInstancesWithTagMapping(assignedInstances.assignedInstance,provider.next); + } ],function (err, results) { if (err) { logger.error(err); @@ -192,7 +198,6 @@ function saveEC2Data(ec2Info,provider, callback){ }; }; -//@TODO To be re-factored function tagMappingForInstances(instances,provider,next){ tagsModel.getTagsByProviderId(provider._id, function (err, tagDetails) { if (err) { @@ -363,6 +368,148 @@ function saveAssignedInstances(assignedInstances,callback){ } }else{ callback(null,assignedInstances); + return; + } +} + +function syncAssignedInstancesWithTagMapping(assignedInstances,provider,callback){ + if(assignedInstances.length > 0){ + tagsModel.getTagsByProviderId(provider._id, function (err, tagDetails) { + if (err) { + logger.error("Unable to get tags", err); + callback(err); + return; + } + var projectTag = null; + var environmentTag = null; + var bgTag = null; + var count = 0; + if (tagDetails.length > 0) { + 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') { + environmentTag = tagDetails[i]; + } else if (('catalystEntityType' in tagDetails[i]) + && tagDetails[i].catalystEntityType == 'businessGroup') { + bgTag = tagDetails[i]; + } + } + for(var j = 0; j < assignedInstances.length; j++){ + (function(assignedInstance){ + var catalystProjectId = null; + var catalystProjectName = null; + var catalystEnvironmentId = null; + var catalystEnvironmentName = null; + var catalystBgId = null; + var catalystBgName = null; + if(bgTag !== null && bgTag.name in assignedInstance.tags) { + 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 !== '' && assignedInstance.tags[bgTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && assignedInstance.tags[bgTag.name] in entityMappingArray[y].tagValues) { + catalystBgId = entityMappingArray[y].catalystEntityId; + catalystBgName = entityMappingArray[y].catalystEntityName; + break; + } + } + } + if(projectTag !== null && projectTag.name in assignedInstance.tags) { + 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 !== '' && assignedInstance.tags[projectTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && assignedInstance.tags[projectTag.name] in entityMappingArray[y].tagValues) { + catalystProjectId = entityMappingArray[y].catalystEntityId; + catalystProjectName = entityMappingArray[y].catalystEntityName; + break; + } + } + } + if(environmentTag !== null && environmentTag.name in assignedInstance.tags) { + 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 !== '' && assignedInstance.tags[environmentTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && assignedInstance.tags[environmentTag.name] in entityMappingArray[y].tagValues) { + catalystEnvironmentId = entityMappingArray[y].catalystEntityId; + catalystEnvironmentName = entityMappingArray[y].catalystEntityName; + break; + } + } + } + if (catalystBgId !== null || catalystProjectId !== null || catalystEnvironmentId !== null) { + var masterDetails= { + bgId: catalystBgId, + bgName: catalystBgName, + projectId: catalystProjectId, + projectName: catalystProjectName, + environmentId: catalystEnvironmentId, + environmentName: catalystEnvironmentName + }; + assignedInstancesDao.updateInstanceMasterDetails(assignedInstance._id,masterDetails,function(err,data){ + if(err){ + logger.error("Unable to update master details of assigned Instance", err); + count++; + if(count === assignedInstances.length){ + callback(null,assignedInstances); + return; + } + }else{ + count++; + if(count === assignedInstances.length){ + callback(null,assignedInstances); + return; + } + } + }); + }else{ + assignedInstancesDao.removeInstanceByInstanceId(assignedInstance._id,function(err,data){ + if(err){ + logger.error("Unable to remove assigned Instance", err); + count++; + if(count === assignedInstances.length){ + callback(null,assignedInstances); + return; + } + }else{ + count++; + if(count === assignedInstances.length){ + callback(null,assignedInstances); + return; + } + } + }); + } + + })(assignedInstances[j]); + } + } else { + logger.info("There is no Tag Mapping"); + assignedInstancesDao.removeInstancesByProviderId(provider._id,function(err,data){ + if(err){ + logger.error("Unable to remove assigned Instance", err); + callback(err); + return; + }else{ + callback(null, data); + return; + } + }); + } + }) + }else{ + logger.info("There is no Assigned Instances for Tag Mapping Sync"); + callback(null,assignedInstances); + return; } } diff --git a/server/app/model/unmanaged-instance/unmanaged-instance.js b/server/app/model/unmanaged-instance/unmanaged-instance.js index 562900b54..6321c1e6c 100644 --- a/server/app/model/unmanaged-instance/unmanaged-instance.js +++ b/server/app/model/unmanaged-instance/unmanaged-instance.js @@ -112,6 +112,25 @@ UnmanagedInstanceSchema.statics.updateInstance = function updateInstance(instanc }); }; +UnmanagedInstanceSchema.statics.updateInstanceMasterDetails = function updateInstanceMasterDetails(instanceId,masterDetails,callBack) { + this.update({ + "platformId": instanceId, + }, { + $set: masterDetails + }, function(err, data) { + if (err) { + logger.error("Failed to update Unmanaged Instance data", err); + if (typeof callBack == 'function') { + callBack(err, null); + } + return; + } + if (typeof callBack == 'function') { + callBack(null, data); + } + }); +}; + UnmanagedInstanceSchema.statics.getAll = function getAll(query, callback) { query.queryObj.isDeleted = false; this.paginate(query.queryObj, query.options, @@ -148,6 +167,16 @@ UnmanagedInstanceSchema.statics.removeInstancesByProviderId = function(providerI }); }; +UnmanagedInstanceSchema.statics.removeInstanceByInstanceId = function(instanceId,callback) { + this.remove({_id: new ObjectId(instanceId)}, function(err, data) { + if (err) { + return callback(err, null); + } else { + callback(null, data); + } + }); +}; + UnmanagedInstanceSchema.statics.getInstanceTagByOrgProviderId = function(opts,callback) { this.find({"orgId": opts.orgId, "providerId": opts.providerId @@ -189,7 +218,6 @@ UnmanagedInstanceSchema.statics.getInstanceByProviderId = function(providerId, c } logger.debug("Exit getInstanceByProviderId (%s)", providerId); callback(null, data); - }); }; From 879ba3f69f92f0e885260aaff9c34b30b0dd77ee Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Wed, 28 Dec 2016 13:11:49 +0530 Subject: [PATCH 053/110] Fix to allocate S3 and RDS resources based on tag mapping --- .../AWSRDSS3ProviderSync.js | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js index 49917db7f..0f81d38f1 100644 --- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js +++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js @@ -16,6 +16,8 @@ AWSRDSS3ProviderSync.execute = awsRDSS3ProviderSync; module.exports = AWSRDSS3ProviderSync; +AWSRDSS3ProviderSync.execute() + function awsRDSS3ProviderSync() { MasterUtils.getAllActiveOrg(function(err, orgs) { if(err) { @@ -335,7 +337,7 @@ function tagMappingForResources(resources,provider,next){ projectTag = tagDetails[i]; }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]; } } @@ -353,33 +355,48 @@ function tagMappingForResources(resources,provider,next){ var catalystBgId = null; var catalystBgName = null; var assignmentFound = false; - if ((bgTag !== null || projectTag !== null || environmentTag !== null) && (resources[j].isDeleted === false)){ + if ((bgTag !== null || projectTag !== null || environmentTag !== null) + && (resources[j].isDeleted === false)){ + if(bgTag !== null && bgTag.name in resources[j].tags) { - for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { - if (bgTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[bgTag.name] !== '' - && bgTag.catalystEntityMapping[y].tagValue === resources[j].tags[bgTag.name]) { - catalystBgId = bgTag.catalystEntityMapping[y].catalystEntityId; - catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; + var bgEntityMappings = Object.keys(bgTag.catalystEntityMapping).map( + function(k){return bgTag.catalystEntityMapping[k]}); + + for (var y = 0; y < bgEntityMappings.length; y++) { + if ((resources[j].tags[bgTag.name] !== '') && ('tagValues' in bgEntityMappings[y]) + && (bgEntityMappings[y].tagValues.indexOf(resources[j].tags[bgTag.name]) + >= 0)) { + catalystBgId = bgEntityMappings[y].catalystEntityId; + catalystBgName = bgEntityMappings[y].catalystEntityName; break; } } } if(projectTag !== null && projectTag.name in resources[j].tags) { - for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { - if (projectTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[projectTag.name] !== '' && - projectTag.catalystEntityMapping[y].tagValue === resources[j].tags[projectTag.name]) { - catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; - catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; + var projectEntityMappings = Object.keys(projectTag.catalystEntityMapping).map( + function(k){return projectTag.catalystEntityMapping[k]}); + + for (var y = 0; y < projectEntityMappings.length; y++) { + if ((resources[j].tags[bgTag.name] !== '') && ('tagValues' in projectEntityMappings[y]) + && (projectEntityMappings[y].tagValues.indexOf(resources[j].tags[projectTag.name]) + >= 0)) { + catalystProjectId = projectEntityMappings[y].catalystEntityId; + catalystProjectName = projectEntityMappings[y].catalystEntityName; break; } } } if(environmentTag !== null && environmentTag.name in resources[j].tags) { + var environmentEntityMappings = Object.keys(environmentTag.catalystEntityMapping).map( + function(k){return environmentTag.catalystEntityMapping[k]}); + for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { - if (environmentTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[environmentTag.name] !== '' && - environmentTag.catalystEntityMapping[y].tagValue === resources[j].tags[environmentTag.name]) { - catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; - catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; + if ((resources[j].tags[bgTag.name] !== '') + && ('tagValues' in environmentEntityMappings[y]) + && (environmentEntityMappings[y].tagValues.indexOf( + resources[j].tags[environmentTag.name]) >= 0)) { + catalystEnvironmentId = environmentEntityMappings[y].catalystEntityId; + catalystEnvironmentName = environmentEntityMappings[y].catalystEntityName; break; } } From f354e7e53e0e7377bd048a67e621ddfc899630f3 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Wed, 28 Dec 2016 13:12:41 +0530 Subject: [PATCH 054/110] Default run of resource allocation cron job disabled --- .../app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js index 0f81d38f1..32b83f1b7 100644 --- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js +++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js @@ -16,8 +16,6 @@ AWSRDSS3ProviderSync.execute = awsRDSS3ProviderSync; module.exports = AWSRDSS3ProviderSync; -AWSRDSS3ProviderSync.execute() - function awsRDSS3ProviderSync() { MasterUtils.getAllActiveOrg(function(err, orgs) { if(err) { From f6366661f5349d198891161465f8c070de236641 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Wed, 28 Dec 2016 14:09:26 +0530 Subject: [PATCH 055/110] Assigned resources --- .../dashboard/analytics/analytics.scss | 4 +- .../controller/discoveryResourcesCtrl.js | 92 +++++++++++++------ 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index 862344302..aae9a132a 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -358,7 +358,7 @@ } .autocomplete-list { - width: calc(37% + 3px) !important; - left: 40% !important; + width: calc(94% + 2px) !important; + left: 3% !important; z-index: 999999; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index a4944b6b8..e20357e1e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -58,10 +58,73 @@ disResrc.init=function () { if(fltrObj && fltrObj.provider && fltrObj.provider.id) { disResrc.getAllTagNames(); + $timeout(function () { console.log( $scope.TagName); disResrc.gridOptionInstances = { - columnDefs: [ + columnDefs: [], + onRegisterApi: function (gridApi) { + gridApi.edit.on.afterCellEdit($scope, function (rowEntity, colDef, newValue, oldValue) { + var param = { + url: '/providers/' + fltrObj.provider.id + '/unassigned-instances/' + rowEntity._id, + data: { + "tags": { + "environment": newValue, + "application": colDef.name.substring(0, colDef.name.length-3) + } + } + }; + if(newValue !== oldValue) { + genSevs.promisePatch(param).then(function () { + toastr.success('Successfully updated.', 'Update'); + }); + } + }); + } + }; + disResrc.gridOptionInstances.data = []; + if($rootScope.organNewEnt.instanceType === 'Managed') { + $scope.instanceType= 'unmanagedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + disResrc.gridOptionInstances.columnDefs=[ + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + enableCellEdit: false}, + {name: 'os', displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, + {name: 'privateIpAddress', displayName: 'IP Address',enableCellEditOnFocus: false, + enableCellEdit: false}, + {name: 'state', displayName: 'Status',enableCellEditOnFocus: false, + enableCellEdit: false}, + { + name: 'Region', + displayName: 'Region', + field: 'providerData.region_name', + cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + }, + {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false}, + { + name: 'bgName', + displayName: 'BG Name', + field: 'bgName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + }, + { + name: 'projectName', + displayName: 'Project Name', + field: 'projectName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + }, + { + name: 'environmentName', + displayName: 'Env Name', + field: 'environmentName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + } + ]; + $scope.instanceType= 'unmanagedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + disResrc.gridOptionInstances.columnDefs= [ {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, enableCellEdit: false}, {name: 'os', displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, @@ -114,32 +177,7 @@ editDropdownIdLabel: 'name', editDropdownValueLabel: 'id' } - ], - onRegisterApi: function (gridApi) { - gridApi.edit.on.afterCellEdit($scope, function (rowEntity, colDef, newValue, oldValue) { - var param = { - url: '/providers/' + fltrObj.provider.id + '/unassigned-instances/' + rowEntity._id, - data: { - "tags": { - "environment": newValue, - "application": colDef.name.substring(0, colDef.name.length-3) - } - } - }; - if(newValue !== oldValue) { - genSevs.promisePatch(param).then(function () { - toastr.success('Successfully updated.', 'Update'); - }); - } - }); - } - }; - disResrc.gridOptionInstances.data = []; - if($rootScope.organNewEnt.instanceType === 'Managed') { - $scope.instanceType= 'unmanagedInstances'; - } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ - $scope.instanceType= 'unmanagedInstances'; - } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + ] $scope.instanceType= 'unassigned-instances'; } var param = { From 9fbec4fb8a80c0dd5b0575f49f3ad27bc56856ea Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 28 Dec 2016 14:37:03 +0530 Subject: [PATCH 056/110] CAT-2592 Fixed --- server/app/cronjobs/provider-sync/AWSProviderSync.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js index 3b4dc7f49..ddc513a11 100644 --- a/server/app/cronjobs/provider-sync/AWSProviderSync.js +++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js @@ -99,7 +99,7 @@ function awsProviderSyncForProvider(provider,orgName) { }); }, function(assignedInstances,next){ - syncAssignedInstancesWithTagMapping(assignedInstances.assignedInstance,provider.next); + syncAssignedInstancesWithTagMapping(assignedInstances.assignedInstance,provider,next); } ],function (err, results) { if (err) { From 1ba3c7d0f02c9f64ed783a9614cef54611a2e88f Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 28 Dec 2016 15:09:52 +0530 Subject: [PATCH 057/110] CAT-2592 Fixed --- .../AWSRDSS3ProviderSync.js | 305 +++++++++++++----- .../cronjobs/provider-sync/AWSProviderSync.js | 14 +- server/app/model/resources/resources.js | 34 +- 3 files changed, 268 insertions(+), 85 deletions(-) diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js index 32b83f1b7..8cee4082c 100644 --- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js +++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js @@ -94,10 +94,16 @@ function awsRDSS3ProviderSyncForProvider(provider,orgName) { }); }, function(resourcesDetails,next){ - resourceModel.getAllUnassignedResources(provider._id,next); + resourceModel.getAllResourcesByCategory(provider._id,'unassigned',next); }, function(resources,next){ tagMappingForResources(resources,provider,next); + }, + function(resources,next){ + resourceModel.getAllResourcesByCategory(provider._id,'assigned',next); + }, + function(assignedResources,next){ + syncAssignedResourcesWithTagMapping(assignedResources,provider,next); } ], function (err, results) { if (err) { @@ -345,98 +351,106 @@ function tagMappingForResources(resources,provider,next){ var count = 0; if(resources.length > 0) { for (var j = 0; j < resources.length; j++) { - if (resources[j].tags) { - var catalystProjectId = null; - var catalystProjectName = null; - var catalystEnvironmentId = null; - var catalystEnvironmentName = null; - var catalystBgId = null; - var catalystBgName = null; - var assignmentFound = false; - if ((bgTag !== null || projectTag !== null || environmentTag !== null) - && (resources[j].isDeleted === false)){ + (function(resource) { + if (resource.tags) { + var catalystProjectId = null; + var catalystProjectName = null; + var catalystEnvironmentId = null; + var catalystEnvironmentName = null; + var catalystBgId = null; + var catalystBgName = null; + var assignmentFound = false; + if ((bgTag !== null || projectTag !== null || environmentTag !== null) + && (resource.isDeleted === false)) { - if(bgTag !== null && bgTag.name in resources[j].tags) { - var bgEntityMappings = Object.keys(bgTag.catalystEntityMapping).map( - function(k){return bgTag.catalystEntityMapping[k]}); + if (bgTag !== null && bgTag.name in resource.tags) { + var bgEntityMappings = Object.keys(bgTag.catalystEntityMapping).map( + function (k) { + return bgTag.catalystEntityMapping[k] + }); - for (var y = 0; y < bgEntityMappings.length; y++) { - if ((resources[j].tags[bgTag.name] !== '') && ('tagValues' in bgEntityMappings[y]) - && (bgEntityMappings[y].tagValues.indexOf(resources[j].tags[bgTag.name]) - >= 0)) { - catalystBgId = bgEntityMappings[y].catalystEntityId; - catalystBgName = bgEntityMappings[y].catalystEntityName; - break; + for (var y = 0; y < bgEntityMappings.length; y++) { + if ((resource.tags[bgTag.name] !== '') && ('tagValues' in bgEntityMappings[y]) + && (bgEntityMappings[y].tagValues.indexOf(resource.tags[bgTag.name]) + >= 0)) { + catalystBgId = bgEntityMappings[y].catalystEntityId; + catalystBgName = bgEntityMappings[y].catalystEntityName; + break; + } } } - } - if(projectTag !== null && projectTag.name in resources[j].tags) { - var projectEntityMappings = Object.keys(projectTag.catalystEntityMapping).map( - function(k){return projectTag.catalystEntityMapping[k]}); + if (projectTag !== null && projectTag.name in resource.tags) { + var projectEntityMappings = Object.keys(projectTag.catalystEntityMapping).map( + function (k) { + return projectTag.catalystEntityMapping[k] + }); - for (var y = 0; y < projectEntityMappings.length; y++) { - if ((resources[j].tags[bgTag.name] !== '') && ('tagValues' in projectEntityMappings[y]) - && (projectEntityMappings[y].tagValues.indexOf(resources[j].tags[projectTag.name]) - >= 0)) { - catalystProjectId = projectEntityMappings[y].catalystEntityId; - catalystProjectName = projectEntityMappings[y].catalystEntityName; - break; + for (var y = 0; y < projectEntityMappings.length; y++) { + if ((resource.tags[projectTag.name] !== '') && ('tagValues' in projectEntityMappings[y]) + && (projectEntityMappings[y].tagValues.indexOf(resource.tags[projectTag.name]) + >= 0)) { + catalystProjectId = projectEntityMappings[y].catalystEntityId; + catalystProjectName = projectEntityMappings[y].catalystEntityName; + break; + } } } - } - if(environmentTag !== null && environmentTag.name in resources[j].tags) { - var environmentEntityMappings = Object.keys(environmentTag.catalystEntityMapping).map( - function(k){return environmentTag.catalystEntityMapping[k]}); + if (environmentTag !== null && environmentTag.name in resource.tags) { + var environmentEntityMappings = Object.keys(environmentTag.catalystEntityMapping).map( + function (k) { + return environmentTag.catalystEntityMapping[k] + }); - for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { - if ((resources[j].tags[bgTag.name] !== '') - && ('tagValues' in environmentEntityMappings[y]) - && (environmentEntityMappings[y].tagValues.indexOf( - resources[j].tags[environmentTag.name]) >= 0)) { - catalystEnvironmentId = environmentEntityMappings[y].catalystEntityId; - catalystEnvironmentName = environmentEntityMappings[y].catalystEntityName; - break; + for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { + if ((resource.tags[environmentTag.name] !== '') + && ('tagValues' in environmentEntityMappings[y]) + && (environmentEntityMappings[y].tagValues.indexOf( + resource.tags[environmentTag.name]) >= 0)) { + catalystEnvironmentId = environmentEntityMappings[y].catalystEntityId; + catalystEnvironmentName = environmentEntityMappings[y].catalystEntityName; + break; + } } } - } - if (catalystBgId !== null || catalystProjectId !== null || catalystEnvironmentId !== null) { - assignmentFound = true; - } - if (assignmentFound === true) { - count++; - var masterDetails = { - orgId: resources[j].masterDetails.orgId, - orgName: resources[j].masterDetails.orgName, - bgId: catalystBgId, - bgName: catalystBgName, - projectId: catalystProjectId, - projectName: catalystProjectName, - envId: catalystEnvironmentId, - envName: catalystEnvironmentName + if (catalystBgId !== null || catalystProjectId !== null || catalystEnvironmentId !== null) { + assignmentFound = true; } - resourceModel.updateResourcesForAssigned(resources[j]._id, masterDetails, function (err, data) { - if (err) { - logger.error(err); - return; - } else { - masterDetails = {}; + if (assignmentFound === true) { + count++; + var masterDetails = { + orgId:resource.masterDetails.orgId, + orgName:resource.masterDetails.orgName, + bgId: catalystBgId, + bgName: catalystBgName, + projectId: catalystProjectId, + projectName: catalystProjectName, + envId: catalystEnvironmentId, + envName: catalystEnvironmentName } - }) + resourceModel.updateResourcesForAssigned(resource._id, masterDetails, function (err, data) { + if (err) { + logger.error(err); + return; + } else { + masterDetails = {}; + } + }) + } else { + count++; + } } else { count++; } + if (count === resources.length) { + next(null, resources); + } } else { count++; + if (count === resources.length) { + next(null, resources); + } } - if (count === resources.length) { - next(null, resources); - } - }else{ - count++; - if (count === resources.length) { - next(null, resources); - } - } + })(resources[j]); } }else{ logger.info("Please configure Resources for Tag Mapping"); @@ -445,6 +459,147 @@ function tagMappingForResources(resources,provider,next){ }); } +function syncAssignedResourcesWithTagMapping(assignedResources,provider,callback){ + if(assignedResources.length > 0){ + tagsModel.getTagsByProviderId(provider._id, function (err, tagDetails) { + if (err) { + logger.error("Unable to get tags", err); + callback(err); + return; + } + var projectTag = null; + var environmentTag = null; + var bgTag = null; + var count = 0; + if (tagDetails.length > 0) { + 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') { + environmentTag = tagDetails[i]; + } else if (('catalystEntityType' in tagDetails[i]) + && tagDetails[i].catalystEntityType == 'businessGroup') { + bgTag = tagDetails[i]; + } + } + for(var j = 0; j < assignedResources.length; j++){ + (function(assignedResource){ + var catalystProjectId = null; + var catalystProjectName = null; + var catalystEnvironmentId = null; + var catalystEnvironmentName = null; + var catalystBgId = null; + var catalystBgName = null; + if(bgTag !== null && bgTag.name in assignedResource.tags) { + 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 !== '' && assignedResource.tags[bgTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && assignedResource.tags[bgTag.name] in entityMappingArray[y].tagValues) { + catalystBgId = entityMappingArray[y].catalystEntityId; + catalystBgName = entityMappingArray[y].catalystEntityName; + break; + } + } + } + if(projectTag !== null && projectTag.name in assignedResource.tags) { + 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 !== '' && assignedResource.tags[projectTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && assignedResource.tags[projectTag.name] in entityMappingArray[y].tagValues) { + catalystProjectId = entityMappingArray[y].catalystEntityId; + catalystProjectName = entityMappingArray[y].catalystEntityName; + break; + } + } + } + if(environmentTag !== null && environmentTag.name in assignedResource.tags) { + 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 !== '' && assignedResource.tags[environmentTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && assignedResource.tags[environmentTag.name] in entityMappingArray[y].tagValues) { + catalystEnvironmentId = entityMappingArray[y].catalystEntityId; + catalystEnvironmentName = entityMappingArray[y].catalystEntityName; + break; + } + } + } + if (catalystBgId !== null || catalystProjectId !== null || catalystEnvironmentId !== null) { + var masterDetails= { + "masterDetails.bgId": catalystBgId, + "masterDetails.bgName": catalystBgName, + "masterDetails.projectId": catalystProjectId, + "masterDetails.projectName": catalystProjectName, + "masterDetails.envId": catalystEnvironmentId, + "masterDetails.envName": catalystEnvironmentName + }; + resourceModel.updateResourceMasterDetails(assignedResource._id,masterDetails,function(err,data){ + if(err){ + logger.error("Unable to update master details of assigned Resource", err); + count++; + if(count === assignedResources.length){ + callback(null,assignedResources); + return; + } + }else{ + count++; + if(count === assignedResources.length){ + callback(null,assignedResources); + return; + } + } + }); + }else{ + resourceModel.removeResourceById(assignedResource._id,function(err,data){ + if(err){ + logger.error("Unable to remove assigned Resource", err); + count++; + if(count === assignedResources.length){ + callback(null,assignedResources); + return; + } + }else{ + count++; + if(count === assignedResources.length){ + callback(null,assignedResources); + return; + } + } + }); + } + + })(assignedResources[j]); + } + } else { + logger.info("There is no Tag Mapping"); + resourceModel.removeResourcesByProviderId(provider._id,function(err,data){ + if(err){ + logger.error("Unable to remove assigned Resource", err); + callback(err); + return; + }else{ + callback(null, data); + return; + } + }); + } + }) + }else{ + logger.info("There is no Assigned Resource for Tag Mapping Sync"); + callback(null,assignedResources); + return; + } +} + function bucketNameList(s3Info,callback){ var bucketNames=[]; for(var i = 0; i < s3Info.length; i++){ diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js index ddc513a11..1e87e22d9 100644 --- a/server/app/cronjobs/provider-sync/AWSProviderSync.js +++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js @@ -227,14 +227,14 @@ function tagMappingForInstances(instances,provider,next){ if(instances.length > 0) { for (var i = 0; i < instances.length; i++) { (function(instance) { - var catalystProjectId = null; - var catalystProjectName = null; - var catalystEnvironmentId = null; - var catalystEnvironmentName = null; - var catalystBgId = null; - var catalystBgName = null; - var assignmentFound = false; if(instance.tags) { + var catalystProjectId = null; + var catalystProjectName = null; + var catalystEnvironmentId = null; + var catalystEnvironmentName = null; + var catalystBgId = null; + var catalystBgName = null; + var assignmentFound = false; if ((bgTag !== null || projectTag !== null || environmentTag !== null) && (instance.isDeleted === false)){ if(bgTag !== null && bgTag.name in instance.tags) { var entityMappingArray diff --git a/server/app/model/resources/resources.js b/server/app/model/resources/resources.js index 4bd9cbe06..8b24b9ca6 100644 --- a/server/app/model/resources/resources.js +++ b/server/app/model/resources/resources.js @@ -98,6 +98,18 @@ ResourceSchema.statics.deleteResourcesById = function(resourceId,callback) { }); }; +ResourceSchema.statics.removeResourceById = function(resourceId,callback) { + Resources.remove({ + _id: new ObjectId(resourceId) + }, function(err, data) { + if (err) { + return callback(err, null); + } else { + callback(null, data); + } + }); +}; + ResourceSchema.statics.removeResourcesByProviderId = function(providerId,callback) { var queryObj={}; queryObj['providerDetails.id'] =providerId; @@ -189,13 +201,29 @@ ResourceSchema.statics.updateResourcesForAssigned = function(resourceId,masterD }); }; -ResourceSchema.statics.getAllUnassignedResources=function(providerId,callback){ +ResourceSchema.statics.updateResourceMasterDetails = function(resourceId,masterDetails,callback){ + Resources.update({ + _id: new ObjectId(resourceId) + }, { + $set:masterDetails + }, { + upsert: false + }, function(err, data) { + if (err) { + return callback(err, null); + } else { + callback(null, data); + } + }); +}; + +ResourceSchema.statics.getAllResourcesByCategory=function(providerId,category,callback){ var queryObj={}; queryObj['providerDetails.id'] =providerId; - queryObj['category'] ='unassigned'; + queryObj['category'] =category; Resources.find(queryObj, function(err, data) { if (err) { - logger.error("Failed to getAllUnassignedResources", err); + logger.error("Failed to getAllResourcesByCategory", err); callback(err, null); return; } From a4a6a532f7e394f13e25c6c9bf38797688dba27b Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 28 Dec 2016 18:29:32 +0530 Subject: [PATCH 058/110] QA Bugs resolved --- .../design/controllers/blueprintCreateCtrl.js | 2 +- .../design/view/blueprintCreate.html | 11 +++-- .../workzone/instance/popups/instanceSSH.html | 2 +- .../orchestration/popups/newTaskCtrl.js | 40 +++++++++---------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js index 81866451f..639d1138d 100755 --- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js @@ -869,7 +869,7 @@ var modalOptions = { closeButtonText: 'Cancel', actionButtonText: 'Submit', - actionButtonStyle: 'bp-btn-create', + actionButtonStyle: 'btn cat-btn-update', headerText: 'Confirm Blueprint Creation', bodyText: 'Are you sure want to submit this Blueprint Data? Press Ok to Continue' }; 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 456db2dde..7db32927b 100755 --- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html +++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html @@ -216,9 +216,11 @@
      - +
    - + Maximum 10 resources allowed.
    - +
    @@ -107,7 +106,7 @@
      -
    • {{stateItems.otherTab}}
      • +
    • {{stateItems.otherTab}}
    • Dashboard
    • Reports
    • diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index aae9a132a..932b37ba7 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -361,4 +361,7 @@ width: calc(94% + 2px) !important; left: 3% !important; z-index: 999999; +} +label { + font-weight: 400 !important; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index e20357e1e..b3c89c1e2 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -1,9 +1,10 @@ (function (angular) { "use strict"; angular.module('dashboard.analytics') - .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','toastr', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,toastr){ + .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','toastr','$modal', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,toastr,$modal){ var disResrc=this; $scope.instanceType=null; + $scope.selectInstanceRow=[]; $scope.TagName={ environment:[], bg:[], @@ -62,6 +63,9 @@ $timeout(function () { console.log( $scope.TagName); disResrc.gridOptionInstances = { + allowCellFocus : false, + paginationPageSizes: [25, 50, 100], + paginationPageSize:25, columnDefs: [], onRegisterApi: function (gridApi) { gridApi.edit.on.afterCellEdit($scope, function (rowEntity, colDef, newValue, oldValue) { @@ -80,43 +84,61 @@ }); } }); + gridApi.selection.on.rowSelectionChanged($scope,function(row){ + if(row.isSelected){ + $scope.selectInstanceRow.push(row.entity._id); + } else { + $scope.selectInstanceRow.splice(row.entity._id,1); + } + + }); + gridApi.selection.on.rowSelectionChangedBatch($scope,function(rows){ + angular.forEach(rows,function(row){ + if(row.isSelected){ + $scope.selectInstanceRow.push(row.entity._id); + } else { + $scope.selectInstanceRow.splice(row.entity._id,1); + } + }); + }); } }; disResrc.gridOptionInstances.data = []; if($rootScope.organNewEnt.instanceType === 'Managed') { - $scope.instanceType= 'unmanagedInstances'; + $scope.instanceType= 'managedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + disResrc.gridOptionInstances.enableFiltering=true; disResrc.gridOptionInstances.columnDefs=[ {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + enableCellEdit: false,enableFiltering: true}, + {name: 'os', enableFiltering: true,displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, + {name: 'privateIpAddress',enableFiltering: true, displayName: 'IP Address',enableCellEditOnFocus: false, enableCellEdit: false}, - {name: 'os', displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, - {name: 'privateIpAddress', displayName: 'IP Address',enableCellEditOnFocus: false, - enableCellEdit: false}, - {name: 'state', displayName: 'Status',enableCellEditOnFocus: false, + {name: 'state',enableFiltering: true, displayName: 'Status',enableCellEditOnFocus: false, enableCellEdit: false}, { - name: 'Region', + name: 'Region',enableFiltering: true, displayName: 'Region', field: 'providerData.region_name', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false }, - {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true,enableCellEditOnFocus: false, + {name: 'orgName', enableFiltering: true,displayName: 'Org Name', field: 'orgName', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false}, { name: 'bgName', - displayName: 'BG Name', + displayName: 'BG Name',enableFiltering: true, field: 'bgName', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false }, { - name: 'projectName', + name: 'projectName',enableFiltering: true, displayName: 'Project Name', field: 'projectName', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false }, { - name: 'environmentName', + name: 'environmentName',enableFiltering: true, displayName: 'Env Name', field: 'environmentName', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false @@ -124,6 +146,7 @@ ]; $scope.instanceType= 'unmanagedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + disResrc.gridOptionInstances.enableFiltering=false; disResrc.gridOptionInstances.columnDefs= [ {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, enableCellEdit: false}, @@ -177,7 +200,7 @@ editDropdownIdLabel: 'name', editDropdownValueLabel: 'id' } - ] + ]; $scope.instanceType= 'unassigned-instances'; } var param = { @@ -191,12 +214,36 @@ } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ disResrc.gridOptionInstances.data = instResult.data; } - + disResrc.gridOptionInstances.isRowSelectable = function(row){ + if(row.entity.state !== 'running'){ + return false; + } else { + return true; + } + }; }); }, 200); } }; + disResrc.importInstance =function ($event) { + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/analytics/view/instanceManage.html', + controller: 'instanceManageCtrl as insMang', + backdrop: 'static', + keyboard: false, + resolve: { + items: function() { + return $scope.selectInstanceRow; + } + } + }); + modalInstance.result.then(function() { + + }, function() { + }); + }; $rootScope.stateItems = $state.params; $rootScope.organNewEnt.provider='0'; $rootScope.organNewEnt.instanceType='Unassigned'; @@ -217,5 +264,21 @@ }; disResrc.init(); - }]); + }]).controller('instanceManageCtrl',['$scope','$rootScope','items','$modalInstance','genericServices',function ($scope,$rootScope,items,$modalInstance,genericServices) { + $scope.items=items; + $scope.IMGNewEnt={ + passType:'password', + org:$rootScope.organObject[0] + }; + //get configmanagement + var params={ + url:'/organization/'+$scope.IMGNewEnt.org.orgid+'/configmanagement/list' + } + genericServices.promiseGet(params).then(function (list) { + $scope.configOptions=list; + }); + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + }]); })(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 index 2762be8e5..06c765ca9 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -16,24 +16,32 @@ if(fltrObj && fltrObj.provider && fltrObj.provider.id) { var param = { inlineLoader: true, - url: '/providers/' + fltrObj.provider.id + '/tag-mappings' + url: '/providers/' + fltrObj.provider.id + '/tag-mappings' //url:'src/partials/sections/dashboard/analytics/data/tag.json' }; genSevs.promiseGet(param).then(function (tagResult) { - angular.forEach(tagResult,function (val,key) { + $scope.newEnt.project.tagName=''; + $scope.newEnt.businessGroup.tagName=''; + $scope.newEnt.environment.tagName=''; + disTgMap.getTagValues('','businessGroup'); + disTgMap.getTagValues('','environment'); + disTgMap.getTagValues('','project'); - $scope.newEnt[key].tagName=val.tagName; - $scope.newEnt[key].tagValues=val.tagValues; - $scope.newEnt[key].catalystEntityType=val.catalystEntityType; - angular.forEach(val.catalystEntityMapping,function (v,k) { - $scope.newEnt[key].catalystEntityMapping[k]={ - tagValues:v.tagValues, - catalystEntityId:v.catalystEntityId, - catalystEntityName:v.catalystEntityName + angular.forEach(tagResult, function (val, key) { + $scope.newEnt[key].tagName = val.tagName; + $scope.newEnt[key].tagValues = val.tagValues; + $scope.newEnt[key].catalystEntityType = val.catalystEntityType; + angular.forEach(val.catalystEntityMapping, function (v, k) { + $scope.newEnt[key].catalystEntityMapping[k] = { + tagValues: v.tagValues, + catalystEntityId: v.catalystEntityId, + catalystEntityName: v.catalystEntityName } }); - }); + }); + disTgMap.getAllTags(); + }); } }; @@ -62,6 +70,10 @@ } $scope.newEnt[valueType].tagValues = tagResult.values; }); + } else{ + for (var key in $scope.newEnt[valueType].catalystEntityMapping) { + $scope.newEnt[valueType].catalystEntityMapping[key].tagValues = []; + } } }; disTgMap.save =function(){ diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html index 2569d0627..4ec836139 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html @@ -5,8 +5,14 @@ Instances + + + +
      No Data Found!
      -
      +
      @@ -41,5 +47,11 @@ padding: 2px 10px; font-size: 12px; line-height: 1; + } + + .ui-grid-viewport { + overflow-x: hidden !important; + } + \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html b/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html new file mode 100644 index 000000000..a7370a495 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html @@ -0,0 +1,105 @@ + +
      +
      + × +

      Import Instance

      +
      + +
      +
      + +
      + + +
      +
      +
      + +
      + + +
      +
      +
      + +
      + + +
      +
      +
      + +
      + + +
      +
      +
      + +
      + + +
      +
      +
      + +
      + +
      +
      +
      + +
      + + +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      + +
      +
      +
      +
      {{authMsg}}
      + + +
      +
      + diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html index 0648ff0c7..f9aa25aae 100644 --- a/client/htmls/private/index.html +++ b/client/htmls/private/index.html @@ -50,7 +50,7 @@
      • From 93a4848d224500efa75d70d9b19bc82fbfd7055b Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 30 Dec 2016 11:27:27 +0530 Subject: [PATCH 063/110] Resolved CAT-2519,2556 --- .../ajax/Settings/CreateNexusServer.html | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/client/htmls/private/ajax/Settings/CreateNexusServer.html b/client/htmls/private/ajax/Settings/CreateNexusServer.html index 21f5d99fc..bcda8b0ba 100755 --- a/client/htmls/private/ajax/Settings/CreateNexusServer.html +++ b/client/htmls/private/ajax/Settings/CreateNexusServer.html @@ -258,6 +258,7 @@

      }); $('#repoanchorDetails').click(function(e){ + $("#repodetailsModal").show(); getNexusRepoDetails(); }); //nexus/userName/:userName/nexusPassword/:nexusPassword/hostName/:hostName/repositories @@ -431,18 +432,23 @@

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

      + Importing Instance +

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

      Import Instance

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

    Import Instance

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

    Import Instance

    - + + +
    - + From a8d17c9f8d551a4542486933d8c51c4a2cafdb4e Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 3 Jan 2017 12:08:39 +0530 Subject: [PATCH 087/110] CAT-2606 , select row remove --- .../sections/dashboard/analytics/analytics.scss | 2 +- .../controller/discoveryResourcesCtrl.js | 17 ++++++++++------- .../controller/discoveryTagMappingCtrl.js | 14 ++++++++++---- .../analytics/view/discoveryResources.html | 3 +++ .../analytics/view/discoveryTagMapping.html | 3 +++ 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index 932b37ba7..4335ee085 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -328,7 +328,7 @@ } .btnFoot{ float: right; - width: 51%; + width: 57%; } .form-control{ height: 29px; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index 032d19fa5..5d36104d3 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -114,19 +114,20 @@ }; disResrc.gridOptionInstances.data = []; if($rootScope.organNewEnt.instanceType === 'Managed') { - $scope.colArray=['platformId','privateIpAddress','os','state']; + disResrc.gridOptionInstances.enableRowHeaderSelection= false; + $scope.colArray=['platformId','privateIpAddress','instanceState','region']; disResrc.gridOptionInstances.columnDefs=[ - {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, cellTooltip: true, enableCellEdit: false,enableFiltering: true}, - {name: 'os', enableFiltering: true,displayName: 'OS', enableCellEdit: false,enableCellEditOnFocus: false}, + {name: 'os', enableFiltering: true,displayName: 'os', field:'hardware.os',enableCellEdit: false,enableCellEditOnFocus: false}, {name: 'privateIpAddress',enableFiltering: true, displayName: 'IP Address',enableCellEditOnFocus: false, enableCellEdit: false}, - {name: 'state',enableFiltering: true, displayName: 'Status',enableCellEditOnFocus: false, + {name: 'instanceState',enableFiltering: true, displayName: 'Status',enableCellEditOnFocus: false, enableCellEdit: false}, { name: 'Region',enableFiltering: true, displayName: 'Region', - field: 'providerData.region_name', + field: 'region', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false }, @@ -155,7 +156,7 @@ } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ $scope.colArray=['platformId','privateIpAddress','os','state']; disResrc.gridOptionInstances.columnDefs=[ - {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, cellTooltip: true, enableCellEdit: false,enableFiltering: true}, {name: 'os', enableFiltering: true,displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, {name: 'privateIpAddress',enableFiltering: true, displayName: 'IP Address',enableCellEditOnFocus: false, @@ -192,9 +193,10 @@ ]; $scope.instanceType= 'unmanagedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + disResrc.gridOptionInstances.enableRowHeaderSelection= false; $scope.colArray=['platformId','privateIpAddress','os','state']; disResrc.gridOptionInstances.columnDefs= [ - {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, cellTooltip: true, enableCellEdit: false}, {name: 'os', displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, {name: 'privateIpAddress', displayName: 'IP Address',enableCellEditOnFocus: false, @@ -256,6 +258,7 @@ var param = { inlineLoader:true, url: '/providers/' + fltrObj.provider.id + '/' + $scope.instanceType + // url:'src/partials/sections/dashboard/analytics/data/ins.json' }; genSevs.promiseGet(param).then(function (instResult) { if($rootScope.organNewEnt.instanceType === 'Managed') { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index 06c765ca9..a34125ee8 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -21,11 +21,14 @@ }; genSevs.promiseGet(param).then(function (tagResult) { $scope.newEnt.project.tagName=''; + $scope.newEnt.project.tagValues=[]; + $scope.newEnt.businessGroup.tagValues=[]; $scope.newEnt.businessGroup.tagName=''; - $scope.newEnt.environment.tagName=''; - disTgMap.getTagValues('','businessGroup'); - disTgMap.getTagValues('','environment'); - disTgMap.getTagValues('','project'); + $scope.newEnt.environment.tagName='' + $scope.newEnt.environment.tagValues=[];; + disTgMap.getTagValues(false,'businessGroup'); + disTgMap.getTagValues(false,'environment'); + disTgMap.getTagValues(false,'project'); angular.forEach(tagResult, function (val, key) { $scope.newEnt[key].tagName = val.tagName; @@ -45,6 +48,9 @@ }); } }; + disTgMap.reset =function () { + disTgMap.getTagMapping(); + }; disTgMap.getAllTags =function () { //$scope.newEnt.providerId = fltrObj.provider.id; $scope.isLoadingTag = true; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html index e4118ea44..2f9485c64 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html @@ -12,8 +12,11 @@     + +
    +
    No Data Found!
    diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html index 3a7f07d64..d27b67904 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html @@ -135,6 +135,9 @@
    + From e889cb84cba1f8aa658b71d9edc18fc60858e724 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 3 Jan 2017 14:20:35 +0530 Subject: [PATCH 088/110] change the filter --- .../dashboard/analytics/analytics.html | 3 +- .../sections/dashboard/analytics/analytics.js | 13 +++--- .../analytics/controller/capacityCtrl.js | 42 ++++++++++++++----- .../analytics/controller/costCtrl.js | 4 +- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index f69b0326f..6c2df7210 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html @@ -47,7 +47,7 @@
    - @@ -88,6 +88,7 @@
  • {{resource.platformId}}
    • + Maximum 10 resources allowed. diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 2697c6580..f25220e0e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -196,12 +196,13 @@ }; $scope.getAllRegionsList(); - $scope.fnProviderChange = function() { + $scope.ProviderChange = function(val) { $scope.filter.regionId = ''; $scope.filter.vpcId = ''; $scope.regions = []; - if ($scope.filter.providerId && $scope.filter.providerId !== '') { - $scope.getProviderRegions(); + $scope.filter.providerId=$rootScope.providers[val]._id; + if ($scope.filter.providerId) { + $scope.getResourse($rootScope.organNewEnt.instanceType); } }; $scope.getResourse = function(instType) { @@ -211,6 +212,7 @@ workzoneServices.getManagedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.managedInstances && response.data.managedInstances.length >0){ $scope.resourceList = response.data.managedInstances; + $scope.toggleResourceSelection($scope.resourceList[0]._id,$scope.resourceList[0].platformId); } else{ $scope.resourceList=[]; } @@ -222,6 +224,7 @@ workzoneServices.getAssignedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.unmanagedInstances.length >0){ $scope.resourceList = response.data.unmanagedInstances; + $scope.toggleResourceSelection($scope.resourceList[0]._id,$scope.resourceList[0].platformId); } else{ $scope.resourceList = []; } @@ -234,7 +237,7 @@ workzoneServices.getUnassignedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.data && response.data.data.length >0){ $scope.resourceList = response.data.data; - $scope.selectedResources.push(response.data.data[0]._id); + $scope.toggleResourceSelection(response.data.data[0]._id,response.data.data[0].platformId); $rootScope.filterNewEnt.resources=$scope.selectedResources; $rootScope.filterNewEnt.platformId[response.data.data[0]._id]=response.data.data[0].platformId; } else { @@ -252,7 +255,7 @@ var idx = $scope.selectedResources.indexOf(resourceId); if(idx > -1) { $scope.selectedResources.splice(idx, 1); - + } else { if($scope.selectedResources.length === 10){ console.log($scope.selectedResources.length); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js index 789d15ea9..500014e5a 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js @@ -121,7 +121,7 @@ genSevs.promiseGet(param).then(function (result) { capaCtr.chartData=result; $rootScope.splitUpCapacities=[]; - if(result.splitUpCapacities) { + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) { angular.forEach(result.splitUpCapacities, function (val, key) { var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) { return str.toUpperCase(); @@ -152,12 +152,19 @@ // create bar //if(viewType === 'ProviderView'){ capaCtr.capaGridOptions.data = result.splitUpCapacities[viewType]; - angular.forEach(result.splitUpCapacities[viewType], function (value) { + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0 ) { + angular.forEach(result.splitUpCapacities[viewType], function (value) { + capaCtr.pieChat.data.push({ + key: value.name, + value: value.capacity.totalCapacity + }); + }); + } else{ capaCtr.pieChat.data.push({ - key: value.name, - value: value.capacity.totalCapacity + key: result.entity.name, + value: result.capacity.totalCapacity }); - }); + } if(result.capacity && result.capacity.AWS && result.capacity.AWS.services) { capaCtr.serviceCapacity = result.capacity.AWS.services; angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) { @@ -166,20 +173,35 @@ name: keyChild, field: 'capacity.AWS.services.' + keyChild }); - angular.forEach(result.splitUpCapacities[viewType], function (valBar) { + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0 ) { + angular.forEach(result.splitUpCapacities[viewType], function (valBar) { + var chVal = ''; + if (valBar.capacity.AWS.services[keyChild]) { + chVal = valBar.capacity.AWS.services[keyChild]; + } else { + chVal = 0; + } + va.push( + { + "label": valBar.name, + "value": chVal + } + ); + }); + } else { var chVal = ''; - if (valBar.capacity.AWS.services[keyChild]) { - chVal = valBar.capacity.AWS.services[keyChild]; + if (result.capacity.AWS.services[keyChild]) { + chVal =result.capacity.AWS.services[keyChild]; } else { chVal = 0; } va.push( { - "label": valBar.name, + "label": result.entity.name, "value": chVal } ); - }); + } capaCtr.barChat.data.push({ "key": keyChild, "values": va diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js index 04ea6c7b8..17d145288 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js @@ -146,8 +146,9 @@ costObj.barChat.data = []; // create bar //if(viewType === 'ProviderView'){ - costObj.costGridOptions.data = result.splitUpCosts[viewType]; + if(result.splitUpCosts && Object.keys(result.splitUpCosts).length >0 ) { + costObj.costGridOptions.data = result.splitUpCosts[viewType]; angular.forEach(result.splitUpCosts[viewType], function (value) { costObj.pieChat.data.push({ key: value.name, @@ -155,6 +156,7 @@ }); }); } else { + costObj.costGridOptions.data = result; costObj.pieChat.data.push({ key: result.entity.name, value: result.cost.totalCost From 8ad71eeccc689899e358719410e6af4ea7a29c5f Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 3 Jan 2017 15:29:20 +0530 Subject: [PATCH 089/110] css changed --- .../sections/dashboard/analytics/view/discoveryResources.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html index 2f9485c64..ebb6c2e1d 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html @@ -5,7 +5,7 @@ Instances - + From 321086c0054c2bcb551324797a6df41186eed514 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Tue, 3 Jan 2017 18:41:28 +0530 Subject: [PATCH 090/110] BOTs Implementation --- .../bots/controller/editParamsCtrl.js | 19 +- .../dashboard/bots/view/editParams.html | 4 +- .../orchestration/popups/addScriptParams.html | 7 + .../orchestration/popups/newTask.html | 6 +- .../private/ajax/Settings/scriptList.html | 5 + .../app/model/classes/tasks/taskTypeScript.js | 10 +- server/app/model/classes/tasks/tasks.js | 48 +-- server/app/routes/v1.0/routes_bots.js | 10 +- server/app/routes/v1.0/routes_d4dMasters.js | 302 +++++++++--------- server/app/routes/v1.0/routes_tasks.js | 28 +- server/app/services/botsService.js | 70 +++- 11 files changed, 300 insertions(+), 209 deletions(-) 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 2f8032361..1f938fed8 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -108,7 +108,24 @@ $scope.executeBot=function(){ if (items.botConfig && items.botConfig.taskType === 'script') { - scriptParams = $scope.parameters; + /*for(var i = 0; i < $scope.scriptparams.length; i++){ + var scriptObj = {}; + var scriptParamList = []; + if($scope.scriptparams[i].scriptParameters.length > 0){ + for(var j = 0; j<$scope.scriptparams[i].scriptParameters.length;j++){ + scriptParamList.push($scope.scriptparams[i].scriptParameters[j].paramVal); + } + if($scope.scriptparams[i].scriptParameters.length === scriptParamList.length){ + scriptObj[$scope.scriptparams[i].scriptId] = scriptParamList; + scriptParams.push(scriptObj); + } + }else{ + scriptObj[$scope.scriptparams[i].scriptId] = []; + scriptParams.push(scriptObj); + } + }*/ + + scriptParams = $scope.scriptparams; } if (items.botConfig && items.botConfig.taskType === 'chef') { cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes); diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 0e9447cc6..4c81a396a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -95,7 +95,9 @@

    Add Parameters:

    - + + + diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html index f5834fe6c..052d788a5 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html @@ -14,6 +14,7 @@

    Add Script Params

    Key Value Description + Type @@ -22,6 +23,12 @@

    Add Script Params

    + diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 09dbc49f8..c28c6c900 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -573,14 +573,16 @@
    Script Details
    Parameter Description + Type Action - {{param.paramVal}} - ..... + {{param.paramVal}} + ..... {{param.paramDesc}} + {{param.paramType}} diff --git a/client/htmls/private/ajax/Settings/scriptList.html b/client/htmls/private/ajax/Settings/scriptList.html index 1e7d4c93c..921bc9224 100644 --- a/client/htmls/private/ajax/Settings/scriptList.html +++ b/client/htmls/private/ajax/Settings/scriptList.html @@ -125,6 +125,11 @@

    + + + + +

    diff --git a/server/app/model/classes/tasks/taskTypeScript.js b/server/app/model/classes/tasks/taskTypeScript.js index 96e5942c2..6d496cc5a 100644 --- a/server/app/model/classes/tasks/taskTypeScript.js +++ b/server/app/model/classes/tasks/taskTypeScript.js @@ -188,15 +188,15 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu } else { if (scripts.type === 'Bash') { var params = script.scriptParameters; - if (self.botParams && self.botParams.scriptParams) { + /*if (self.botParams && self.botParams.scriptParams) { params = self.botParams.scriptParams; - } + }*/ executeScriptOnNode(scripts, sshOptions, logsReferenceIds, params, instanceLog,'bash'); } else if (scripts.type === 'Python') { var params = script.scriptParameters; - if (self.botParams && self.botParams.scriptParams) { + /*if (self.botParams && self.botParams.scriptParams) { params = self.botParams.scriptParams; - } + }*/ executeScriptOnNode(scripts, sshOptions, logsReferenceIds, params, instanceLog,'python'); } else { return; @@ -292,7 +292,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu var cmdLine = scriptType +' /tmp/' + fileName; } for (var j = 0; j < scriptParameters.length; j++) { - var decryptedText = cryptography.decryptText(scriptParameters[j].paramVal ? scriptParameters[j].paramVal : scriptParameters[j], cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + var decryptedText = cryptography.decryptText(scriptParameters[j].paramVal, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); cmdLine = cmdLine + ' "' + decryptedText + '"'; } sshExec.exec(cmdLine, function (err, retCode) { diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index af33c8d27..1f24c7d8a 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -360,36 +360,6 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b }); }); } - if (taskHistoryData.taskType === TASK_TYPE.SCRIPT_TASK && self.botParams.scriptParams) { - var taskConfig = self.taskConfig; - for(var i = 0; i < taskConfig.scriptDetails.length; i++){ - for(var j = 0; j < taskConfig.scriptDetails[i].scriptParameters.length; j++){ - taskConfig.scriptDetails[i].scriptParameters[j].paramVal = self.botParams.scriptParams[j]; - } - } - Tasks.update({ - "_id": new ObjectId(self._id) - }, { - $set: { - taskConfig: taskConfig - } - }, { - upsert: false - }, function(err, data) { - if (err) { - logger.error("Unable to update Script task."); - return; - } - logger.debug("Script task updated"); - bots.updateBotsDetail(self._id,{botConfig:taskConfig},function(err,botsData){ - if (err) { - logger.error("Unable to update Bots"); - } - logger.debug("Bots updated"); - }); - }); - } - if (taskHistoryData.taskType === TASK_TYPE.CHEF_TASK && self.botParams.cookbookAttributes) { var taskConfig = self.taskConfig; taskConfig.attributes=self.botParams.cookbookAttributes; @@ -753,6 +723,18 @@ taskSchema.statics.getTaskById = function(taskId, callback) { }); }; +taskSchema.statics.updateTaskDetail = function(taskId,taskDetail,callback){ + this.update({"_id": new ObjectId(taskId)},{$set:taskDetail},{upsert:false}, function(err, updateTask) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, updateTask); + }); +}; + // get task by ids taskSchema.statics.getTaskByIds = function(taskIds, callback) { if (!(taskIds && taskIds.length)) { @@ -1107,12 +1089,8 @@ function filterScriptTaskData(data,callback){ if (scriptTask.scriptParameters.length > 0) { scriptCount++; for (var k = 0; k < scriptTask.scriptParameters.length; k++) { - if(scriptTask.scriptParameters[k].paramType === 'default' || scriptTask.scriptParameters[k].paramType === 'password'){ - scriptTask.scriptParameters[k].paramVal = cryptography.decryptText(scriptTask.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, + scriptTask.scriptParameters[k].paramVal = cryptography.decryptText(scriptTask.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - }else { - scriptTask.scriptParameters[k] = ''; - } } } else { scriptCount++; diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 3ad275cb5..066a04e49 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -94,9 +94,13 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { hostProtocol: req.protocol + '://' + req.get('host'), choiceParam: req.body.choiceParam, appData: req.body.appData, - tagServer: req.body.tagServer + tagServer: req.body.tagServer, + paramOptions:{ + cookbookAttributes: req.body.cookbookAttributes, + scriptParams: req.body.scriptParams + } } - var paramOptions = { + /*var paramOptions = { cookbookAttributes: req.body.cookbookAttributes, scriptParams: req.body.scriptParams }; @@ -112,7 +116,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { } paramOptions.scriptParams = encryptedParams; } - reqBody.paramOptions=paramOptions; + reqBody.paramOptions=paramOptions;*/ } if(reqBody !== null) { botsService.executeBots(req.params.botId, reqBody, function (err, data) { diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 3a198057b..3940c0647 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -2519,162 +2519,178 @@ module.exports.setRoutes = function (app, sessionVerification) { if (!editMode) { //push new values only when not in edit mode // Start Auto create Team if (req.params.id === '1') { - var orgData = { - "orgname": bodyJson['orgname'], - "domainname": bodyJson['domainname'], - "rowid": bodyJson['rowid'], - "plannedCost": bodyJson['plannedCost'], - "id": "1" - } - var orgObj = new d4dModelNew.d4dModelMastersOrg(orgData); - orgObj.save(function (err, anOrg) { + d4dModelNew.d4dModelMastersOrg.find({ + orgname: bodyJson["orgname"] + }, function (err, orgs) { if (err) { - res.status(500).send("Failed to save Org."); + logger.error('Hit error while check org is exist with Org Name', err); + res.send(500); return; - } - async.parallel({ - template: function (callback) { - for (var x1 = 0; x1 < 6; x1++) { - (function (x1) { - var templatetypename; - var designtemplateicon_filename; - var templatetype; - var providerType; - if (x1 === 0) { - templatetypename = "Docker"; - designtemplateicon_filename = "Docker.png"; - templatetype = "docker"; - providerType = ['aws', 'azure', 'openstack', 'vmware']; - } else if (x1 === 1) { - templatetypename = "OSImage"; - designtemplateicon_filename = "Desktop Provisining.png"; - templatetype = "ami"; - providerType = ['aws', 'azure', 'openstack', 'vmware']; - } else if (x1 === 2) { - templatetypename = "SoftwareStack"; - designtemplateicon_filename = "Appfactory.png"; - templatetype = "chef"; - providerType = ['aws', 'azure', 'openstack', 'vmware']; - } else if (x1 === 3) { - templatetypename = "CloudFormation"; - designtemplateicon_filename = "CloudFormation.png"; - templatetype = "cft"; - providerType = ['aws']; - - } else if (x1 === 4) { - templatetypename = "ARMTemplate"; - designtemplateicon_filename = "CloudFormation.png"; - templatetype = "arm"; - providerType = ['azure']; - } else { - templatetypename = "Composite"; - designtemplateicon_filename = "composite.png"; - templatetype = "composite"; - providerType = ['aws']; - } - - var templateTypeData = { - "templatetypename": templatetypename, - "orgname": bodyJson["orgname"], - "orgname_rowid": bodyJson["rowid"], - "rowid": uuid.v4(), - "id": "16", - "templatetype": templatetype, - "providerType": providerType + } else if (orgs.length > 0) { + logger.error('Org Name already exists. Please enter different Org Name'); + res.status(400).send("Org Name already exists.Please enter different Org Name"); + return; + } else { - }; - var templateTypeModel = new d4dModelNew.d4dModelMastersDesignTemplateTypes(templateTypeData); - templateTypeModel.save(function (err, aTemplateType) { - if (err) { - logger.debug("Failed to save TemplateType."); - } - logger.debug("Default TemplateType created."); - if (x1 === 5) { - callback(null, aTemplateType); - return; - } - }); - })(x1); + var orgData = { + "orgname": bodyJson['orgname'], + "domainname": bodyJson['domainname'], + "rowid": bodyJson['rowid'], + "plannedCost": bodyJson['plannedCost'], + "id": "1" + } + var orgObj = new d4dModelNew.d4dModelMastersOrg(orgData); + orgObj.save(function (err, anOrg) { + if (err) { + res.status(500).send("Failed to save Org."); + return; } - }, - team: function (callback) { - for (var x = 0; x < 4; x++) { - (function (x) { - var teamName; - var descriptions; - if (x === 0) { - teamName = bodyJson["orgname"] + "_Admins"; - descriptions = "Team For " + teamName; - } else if (x === 1) { - teamName = bodyJson["orgname"] + "_DEV"; - descriptions = "Team For " + teamName; - } else if (x === 2) { - teamName = bodyJson["orgname"] + "_QA"; - descriptions = "Team For " + teamName; - } else { - teamName = bodyJson["orgname"] + "_DevOps"; - descriptions = "Team For " + teamName; + async.parallel({ + template: function (callback) { + for (var x1 = 0; x1 < 6; x1++) { + (function (x1) { + var templatetypename; + var designtemplateicon_filename; + var templatetype; + var providerType; + if (x1 === 0) { + templatetypename = "Docker"; + designtemplateicon_filename = "Docker.png"; + templatetype = "docker"; + providerType = ['aws', 'azure', 'openstack', 'vmware']; + } else if (x1 === 1) { + templatetypename = "OSImage"; + designtemplateicon_filename = "Desktop Provisining.png"; + templatetype = "ami"; + providerType = ['aws', 'azure', 'openstack', 'vmware']; + } else if (x1 === 2) { + templatetypename = "SoftwareStack"; + designtemplateicon_filename = "Appfactory.png"; + templatetype = "chef"; + providerType = ['aws', 'azure', 'openstack', 'vmware']; + } else if (x1 === 3) { + templatetypename = "CloudFormation"; + designtemplateicon_filename = "CloudFormation.png"; + templatetype = "cft"; + providerType = ['aws']; + + } else if (x1 === 4) { + templatetypename = "ARMTemplate"; + designtemplateicon_filename = "CloudFormation.png"; + templatetype = "arm"; + providerType = ['azure']; + } else { + templatetypename = "Composite"; + designtemplateicon_filename = "composite.png"; + templatetype = "composite"; + providerType = ['aws']; + } + + var templateTypeData = { + "templatetypename": templatetypename, + "orgname": bodyJson["orgname"], + "orgname_rowid": bodyJson["rowid"], + "rowid": uuid.v4(), + "id": "16", + "templatetype": templatetype, + "providerType": providerType + + }; + + var templateTypeModel = new d4dModelNew.d4dModelMastersDesignTemplateTypes(templateTypeData); + templateTypeModel.save(function (err, aTemplateType) { + if (err) { + logger.debug("Failed to save TemplateType."); + } + logger.debug("Default TemplateType created."); + if (x1 === 5) { + callback(null, aTemplateType); + return; + } + }); + })(x1); } + }, + team: function (callback) { + for (var x = 0; x < 4; x++) { + (function (x) { + var teamName; + var descriptions; + if (x === 0) { + teamName = bodyJson["orgname"] + "_Admins"; + descriptions = "Team For " + teamName; + } else if (x === 1) { + teamName = bodyJson["orgname"] + "_DEV"; + descriptions = "Team For " + teamName; + } else if (x === 2) { + teamName = bodyJson["orgname"] + "_QA"; + descriptions = "Team For " + teamName; + } else { + teamName = bodyJson["orgname"] + "_DevOps"; + descriptions = "Team For " + teamName; + } + + var teamData = { + "teamname": teamName, + "description": descriptions, + "orgname": bodyJson["orgname"], + "orgname_rowid": bodyJson["rowid"], + "rowid": uuid.v4(), + "id": "21", + "loginname": "", + "loginname_rowid": "", + "projectname": "", + "projectname_rowid": "" + + }; + var teamModel = new d4dModelNew.d4dModelMastersTeams(teamData); + teamModel.save(function (err, aTeam) { + if (err) { + logger.debug("Failed to save Team."); + } + logger.debug("Auto created Team: ", JSON.stringify(aTeam)); + if (x === 3) { + callback(null, aTeam); + return; + } + }); + })(x); - var teamData = { - "teamname": teamName, - "description": descriptions, - "orgname": bodyJson["orgname"], - "orgname_rowid": bodyJson["rowid"], - "rowid": uuid.v4(), - "id": "21", - "loginname": "", - "loginname_rowid": "", - "projectname": "", - "projectname_rowid": "" - - }; - var teamModel = new d4dModelNew.d4dModelMastersTeams(teamData); - teamModel.save(function (err, aTeam) { + } + }, + wizard: function (callback) { + var settingWizardSteps = appConfig.settingWizardSteps; + var currentStep = settingWizardSteps[1]; + if (currentStep.nestedSteps) { + currentStep.nestedSteps[0].isCompleted = true; + } + var wizardBody = { + orgId: bodyJson["rowid"], + orgName: bodyJson["orgname"], + previousStep: settingWizardSteps[0], + currentStep: currentStep, + nextStep: settingWizardSteps[2] + } + settingWizard.createSettingWizard(wizardBody, function (err, data) { if (err) { - logger.debug("Failed to save Team."); - } - logger.debug("Auto created Team: ", JSON.stringify(aTeam)); - if (x === 3) { - callback(null, aTeam); - return; + logger.debug("Failed to save Setting Wizard."); } + logger.debug("Setting Wizard created."); + callback(null, data); + return; }); - })(x); - - } - }, - wizard: function (callback) { - var settingWizardSteps = appConfig.settingWizardSteps; - var currentStep = settingWizardSteps[1]; - if (currentStep.nestedSteps) { - currentStep.nestedSteps[0].isCompleted = true; - } - var wizardBody = { - orgId: bodyJson["rowid"], - orgName: bodyJson["orgname"], - previousStep: settingWizardSteps[0], - currentStep: currentStep, - nextStep: settingWizardSteps[2] - } - settingWizard.createSettingWizard(wizardBody, function (err, data) { + } + }, function (err, results) { if (err) { - logger.debug("Failed to save Setting Wizard."); + res.status(500).send("Failed to save template/Team/Wizard."); + return; } - logger.debug("Setting Wizard created."); - callback(null, data); + res.send(200); return; - }); - } - }, function (err, results) { - if (err) { - res.status(500).send("Failed to save template/Team/Wizard."); - return; - } - res.send(200); - return; - }) + }) + }); + } }); } else if (req.params.id === '7') { authUtil.hashPassword(bodyJson["password"], function (err, hashedPassword) { diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index 14ed8a4f6..b92e70f64 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -545,7 +545,7 @@ module.exports.setRoutes = function(app, sessionVerification) { res.status(500).send(errorResponses.db.error); return; } - encryptedParam(taskData.scriptDetails, scriptTask.taskConfig.scriptDetails, function(err, encryptedParam) { + encryptedParam(taskData.scriptDetails,function(err, encryptedParam) { if (err) { logger.error(err); res.status(500).send("Failed to encrypted script parameters: ", err); @@ -684,30 +684,24 @@ module.exports.setRoutes = function(app, sessionVerification) { }; -function encryptedParam(paramDetails, existingParams, callback) { +function encryptedParam(paramDetails, callback) { var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); var count = 0; var encryptedList = []; for (var i = 0; i < paramDetails.length; i++) { - (function(paramDetail) { + (function (paramDetail) { if (paramDetail.scriptParameters.length > 0) { count++; for (var j = 0; j < paramDetail.scriptParameters.length; j++) { - (function(scriptParameter) { - if (scriptParameter === '') { - encryptedList.push(existingParams[i].scriptParameters[j]); - } else if (scriptParameter.paramVal === existingParams[i].scriptParameters[j].paramVal) { - encryptedList.push(scriptParameter); - } else { - var encryptedText = cryptography.encryptText(scriptParameter.paramVal, cryptoConfig.encryptionEncoding, - cryptoConfig.decryptionEncoding); - encryptedList.push({ - paramVal:encryptedText, - paramDesc:scriptParameter.paramDesc, - paramType:scriptParameter.paramType - }); - } + (function (scriptParameter) { + var encryptedText = cryptography.encryptText(scriptParameter.paramVal, cryptoConfig.encryptionEncoding, + cryptoConfig.decryptionEncoding); + encryptedList.push({ + paramVal: encryptedText, + paramDesc: scriptParameter.paramDesc, + paramType: scriptParameter.paramType + }); if (encryptedList.length === paramDetail.scriptParameters.length) { paramDetail.scriptParameters = encryptedList; encryptedList = []; diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index d13f6da21..902571d19 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -327,7 +327,37 @@ botsService.getPerticularBotsHistory = function getPerticularBotsHistory(botId,h botsService.executeBots = function executeBots(botId,reqBody,callback){ async.waterfall([ function(next){ - bots.getBotsById(botId,next); + if(reqBody.paramOptions.scriptParams){ + encryptedParam(reqBody.paramOptions.scriptParams,next); + }else{ + next([],next); + } + }, + function(encryptedParamList,next) { + if (encryptedParamList.length > 0){ + async.parallel({ + bot: function (callback) { + var botObj = { + 'botConfig.scriptDetails':encryptedParamList + } + bots.updateBotsDetail(botId,botObj,callback); + }, + task: function (callback) { + var taskObj = { + 'taskConfig.scriptDetails':encryptedParamList + } + tasks.updateTaskDetail(botId,taskObj,callback); + } + }, function (err, data) { + if (err) { + next(err); + } else { + bots.getBotsById(botId, next); + } + }) + }else{ + bots.getBotsById(botId, next); + } }, function(bots,next){ if(bots.length > 0){ @@ -373,7 +403,7 @@ function filterScriptBotsData(data,callback){ scriptBot.scriptParameters[k].paramVal = cryptography.decryptText(scriptBot.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); }else { - scriptBot.scriptParameters[k] = ''; + scriptBot.scriptParameters[k].paramVal = ''; } } } else { @@ -396,5 +426,41 @@ function filterScriptBotsData(data,callback){ } } +function encryptedParam(paramDetails, callback) { + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var count = 0; + var encryptedList = []; + for (var i = 0; i < paramDetails.length; i++) { + (function (paramDetail) { + if (paramDetail.scriptParameters.length > 0) { + count++; + for (var j = 0; j < paramDetail.scriptParameters.length; j++) { + (function (scriptParameter) { + var encryptedText = cryptography.encryptText(scriptParameter.paramVal, cryptoConfig.encryptionEncoding, + cryptoConfig.decryptionEncoding); + encryptedList.push({ + paramVal: encryptedText, + paramDesc: scriptParameter.paramDesc, + paramType: scriptParameter.paramType + }); + if (encryptedList.length === paramDetail.scriptParameters.length) { + paramDetail.scriptParameters = encryptedList; + encryptedList = []; + } + })(paramDetail.scriptParameters[j]); + } + } else { + count++; + } + if (count === paramDetails.length) { + callback(null, paramDetails); + return; + } + })(paramDetails[i]); + } +} + + From b4cd8c62bd66ace3a2ebe9a093c948be8db17fe3 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Wed, 4 Jan 2017 11:27:49 +0530 Subject: [PATCH 091/110] New UI for Bot summary section, added scheduled bots option & API integration for the same. --- .../sections/dashboard/bots/bots.scss | 182 ++++++++---------- .../dashboard/bots/controller/libraryCtrl.js | 43 ++++- .../sections/dashboard/bots/view/library.html | 153 ++++++++++----- 3 files changed, 210 insertions(+), 168 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index 96a95bfa1..90c6f8aa1 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -36,115 +36,56 @@ height: 50px; } -#botAuditTrailPage { - .ui-grid-column-menu-button { - display: none; - } -} - #botLibraryPage, #botAuditTrailPage { .page-name { - font-size: 18px; - margin: 5px 0 5px 10px; + font-size: 18px; + margin: 5px 0 5px 10px; } .btn-xs { - padding: 1px 5px; - font-size: 12px; + padding: 1px 5px; + font-size: 12px; } .refresh-btn { margin: 2px 10px 0 0; } - .borderTop { - border-top: 1px dashed #ddd; - } -} - -#botLibraryPage { - .summary-container { - width: 100%; - } - - .selected { - height: 92px !important; - margin-top: 14px !important; + .search-text { + font-weight: normal; } - .selected-blue { - color: #00c0ef !important; - border: 1px solid #00c0ef !important; + .bot-search { + -webkit-appearance: textfield !important; } - .selected-green { - color: #00a65a !important; - border: 1px solid #00a65a !important; - } - - .selected-red { - color: #dd4b39 !important; - border: 1px solid #dd4b39 !important; + .borderTop { + border-top: 1px dashed #ddd; } +} - .info-box { - display: block; - min-height: 90px; - background: #fff; +#botLibraryPage { + .summary-container { width: 100%; - box-shadow: 0 1px 1px rgba(0,0,0,0.1); - margin: 15px 0; - border: 1px solid #ccc; - } - - .info-box-content { - padding: 5px 10px; - margin-left: 90px; } - .info-box-text { - text-transform: uppercase; + .bot-library-search { + height: 33px; + margin-right: 12px; } - .info-box-text { - display: block; - font-size: 13px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - .info-box-number { - display: block; - font-weight: bold; - font-size: 20px; - } - - .info-box-icon { - display: block; - float: left; - height: 88px; - width: 88px; - text-align: center; - font-size: 45px; - line-height: 90px; - background: rgba(0,0,0,0.2); - } - - .bg-aqua { - background-color: #00c0ef !important; - } - - .bg-green { - background-color: #00a65a !important; + .section-bottom-glyph { + position: absolute; + top: 140px; + left: 97px; + font-size: 22px; + display: none; } - .bg-red { - background-color: #dd4b39 !important; + .selected-section { + display: block !important; } -} -#botLibraryPage{ .circle-tile { margin-bottom: 15px; text-align: center; @@ -152,21 +93,22 @@ .circle-tile-heading { position: relative; - width: 80px; - height: 80px; - margin: 10px auto -40px; - border: 3px solid rgba(255,255,255,0.3); + width: 65px; + height: 65px; + margin: 10px auto -35px; + border: 3px solid rgba(255, 255, 255, 0.3); border-radius: 100%; color: #fff; - padding-top: 16px; + padding-top: 15px; transition: all ease-in-out .3s; } .circle-tile-number { - padding: 5px 0 15px; + padding: 5px 0 6px; font-size: 26px; font-weight: 700; line-height: 1; + height: 37px; } .circle-tile-content { @@ -186,6 +128,14 @@ background-color: #00c0ef; } + .dark-blue-glyph { + color: #00c0ef; + } + + .green-glyph { + color: #00a65a; + } + .green { background-color: #00a65a; } @@ -194,10 +144,34 @@ background-color: #f39c12; } - .red { + .redcard { background-color: #e74c3c; } + .redcard-glyph { + color: #e74c3c; + } + + .bg-blue { + background-color: #2980b9; + } + + .bg-blue-glyph { + color: #2980b9; + } + + .font-size-16 { + font-size: 16px; + } + + a.cursor { + padding: 0 5px; + } + + .margin-21 { + margin: 0 20px; + } + #botLibraryPage .selected-blue { border: none !important; } @@ -205,27 +179,21 @@ .ui-grid-cell{ border-right:none !important; } - - /*global css*/ - .ui-grid .ui-grid-row { - border-bottom: 1px solid #ccc; - } } -.bot-library-search { - height: 33px; - margin-right: 12px; -} -.bot-audit-trail-search { - height: 31px; - margin: 6px 9px 0 0px; -} +#botAuditTrailPage { + .bot-audit-trail-search { + height: 31px; + margin: 6px 9px 0 0px; + } -.search-text { - font-weight: normal; + .ui-grid-column-menu-button { + display: none; + } } -.bot-search { - -webkit-appearance: textfield !important; +/*global css*/ +.ui-grid .ui-grid-row { + border-bottom: 1px solid #ccc; } \ 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 305420cf8..cec610bc3 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -34,14 +34,15 @@ { name: 'description',field:'botDesc',cellTooltip: true}, { name: 'Organization',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 Action',width:200,displayName: 'BOT Action',cellTemplate: + // ''+ + ''+ + ''+ + //''+ + '' + + '' + + //'' + + '' } ] $scope.botLibGridOptions.data=[]; @@ -127,7 +128,7 @@ $scope.errorMessage = "No Records found"; }); }; - var gridBottomSpace = 225; + var gridBottomSpace = 265; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; $scope.launchInstance = function(launch){ if(launch.botLinkedCategory === 'Task'){ @@ -214,6 +215,8 @@ $scope.botLibraryGridView(); } else if($scope.runningBotsselected) { $scope.showBotsRunning(); + } else if($scope.scheduledBotsSelected) { + $scope.showScheduledBots(); } else if($scope.failedBotsselected) { $scope.showFailedBots(); } else { @@ -236,6 +239,8 @@ $scope.botLibraryGridView(); } else if($scope.runningBotsselected) { $scope.showBotsRunning(); + } else if($scope.scheduledBotsSelected) { + $scope.showScheduledBots(); } else if($scope.failedBotsselected) { $scope.showFailedBots(); } else { @@ -246,6 +251,7 @@ $scope.totalBotsSelected = true; $scope.runningBotsselected = false; $scope.failedBotsselected = false; + $scope.scheduledBotsSelected = false; lib.summary(); $scope.botLibraryGridView(); }; @@ -253,6 +259,7 @@ $scope.runningBotsselected = true; $scope.totalBotsSelected = false; $scope.failedBotsselected = false; + $scope.scheduledBotsSelected = false; lib.gridOptions.data=[]; var param={ url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder @@ -269,6 +276,7 @@ $scope.failedBotsselected = true; $scope.runningBotsselected = false; $scope.totalBotsSelected = false; + $scope.scheduledBotsSelected = false; lib.gridOptions.data=[]; var param={ url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder @@ -281,6 +289,23 @@ }); lib.summary(); }; + $scope.showScheduledBots = function() { + $scope.failedBotsselected = false; + $scope.runningBotsselected = false; + $scope.totalBotsSelected = false; + $scope.scheduledBotsSelected = true; + lib.gridOptions.data=[]; + var param={ + url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&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={ 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 720eca00a..58328222c 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -3,58 +3,108 @@
    BOTs Library  - -
    -
    + + +
    +
    +
    -
    -
    -
    - - - -
    - Total Number of BOTs - {{botSummary.totalNoOfBots}} -
    -
    -
    -
    -
    - - - -
    - Number of BOTs running - {{botSummary.totalNoOfRunningBots}} -
    -
    -
    -
    -
    - - - -
    - Total Time saved - {{totalSavedTimeForBots}} mins -
    -
    -
    -
    -
    - - - -
    - Number of failed runs - {{botSummary.totalNoOfFailedBots}} -
    -
    -
    -
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + Total BOTs +
    +
    + {{botSummary.totalNoOfBots}} +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + Running BOTs +
    +
    + {{botSummary.totalNoOfRunningBots}} +
    + +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + Time saved +
    +
    + {{totalSavedTimeForBots}} mins +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + Scheduled BOTs +
    +
    + {{botSummary.totalNoOfScheduledBots}} +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + Failed BOTs +
    +
    + {{botSummary.totalNoOfFailedBots}} +
    + +
    +
    +
    +
    @@ -65,8 +115,7 @@
    - -
    +
    No data Available
    From 82346b56ad0c430036cff04fe3152cc62af9d898 Mon Sep 17 00:00:00 2001 From: Udesh Date: Wed, 4 Jan 2017 12:31:59 +0530 Subject: [PATCH 092/110] fixed sensu cookbook install issue for chef import --- server/app/routes/v1.0/routes_chef.js | 47 ++++++++++++++++----------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/server/app/routes/v1.0/routes_chef.js b/server/app/routes/v1.0/routes_chef.js index c9a42a677..2943a4623 100755 --- a/server/app/routes/v1.0/routes_chef.js +++ b/server/app/routes/v1.0/routes_chef.js @@ -260,7 +260,7 @@ module.exports.setRoutes = function (app, verificationFunc) { credentials = { username: appConfig.aws.instanceUserName, pemFileLocation: tempPemFileLocation - } + }; callback(null, credentials); }); } else { @@ -350,25 +350,34 @@ module.exports.setRoutes = function (app, verificationFunc) { //install sensu client if monitoring server configured if (instance.monitor && instance.monitor.parameters.transportProtocol === 'rabbitmq') { - var sensuCookBooks = MasterUtils.getSensuCookbooks(); - var runlist = sensuCookBooks; - var jsonAttributes = {}; - jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id); - - runOptions = { - privateKey: credentials.pemFileLocation, - username: credentials.username, - host: instance.instanceIP, - instanceOS: instance.hardware.os, - port: 22, - runlist: runlist, - overrideRunlist: false, - jsonAttributes: JSON.stringify(jsonAttributes) - }; - chef.runClient(runOptions, function (err, retCode) { - logger.debug("knife ret code", retCode); + credentialCryptography.decryptCredential(instance.credentials, function (err, decryptedCredentials) { + if (err) { + logger.error("Unable to decrypt pem file. client run failed: ", err); + } else { + var sensuCookBooks = MasterUtils.getSensuCookbooks(); + var runlist = sensuCookBooks; + var jsonAttributes = {}; + jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id); + + runOptions = { + username: decryptedCredentials.username, + host: instance.instanceIP, + instanceOS: instance.hardware.os, + port: 22, + runlist: runlist, + overrideRunlist: false, + jsonAttributes: JSON.stringify(jsonAttributes) + }; + if (decryptedCredentials.pemFileLocation) { + runOptions.privateKey = decryptedCredentials.pemFileLocation; + } else { + runOptions.password = decryptedCredentials.password; + } + chef.runClient(runOptions, function (err, retCode) { + logger.debug("knife ret code", retCode); + }); + } }); - } From 6548cf1bb3756f952312c713958057dec55d8b72 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 12:40:23 +0530 Subject: [PATCH 093/110] BOTs Implementation --- server/app/model/classes/tasks/tasks.js | 6 +++- server/app/routes/v1.0/routes_tasks.js | 38 +++++++++++++++++++------ server/app/services/botsService.js | 2 +- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 1f24c7d8a..9b87b7a7f 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -1089,8 +1089,12 @@ function filterScriptTaskData(data,callback){ if (scriptTask.scriptParameters.length > 0) { scriptCount++; for (var k = 0; k < scriptTask.scriptParameters.length; k++) { - scriptTask.scriptParameters[k].paramVal = cryptography.decryptText(scriptTask.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, + if(scriptTask.scriptParameters[k].paramType === '' || scriptTask.scriptParameters[k].paramType === 'Default' || scriptTask.scriptParameters[k].paramType === 'Password'){ + scriptTask.scriptParameters[k].paramVal = cryptography.decryptText(scriptTask.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + }else { + scriptTask.scriptParameters[k].paramVal = ''; + } } } else { scriptCount++; diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index b92e70f64..9d6928efa 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -545,7 +545,7 @@ module.exports.setRoutes = function(app, sessionVerification) { res.status(500).send(errorResponses.db.error); return; } - encryptedParam(taskData.scriptDetails,function(err, encryptedParam) { + encryptedParam(taskData.scriptDetails,scriptTask.taskConfig.scriptDetails,function(err, encryptedParam) { if (err) { logger.error(err); res.status(500).send("Failed to encrypted script parameters: ", err); @@ -684,7 +684,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }; -function encryptedParam(paramDetails, callback) { +function encryptedParam(paramDetails,existingParams, callback) { var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); var count = 0; @@ -695,13 +695,33 @@ function encryptedParam(paramDetails, callback) { count++; for (var j = 0; j < paramDetail.scriptParameters.length; j++) { (function (scriptParameter) { - var encryptedText = cryptography.encryptText(scriptParameter.paramVal, cryptoConfig.encryptionEncoding, - cryptoConfig.decryptionEncoding); - encryptedList.push({ - paramVal: encryptedText, - paramDesc: scriptParameter.paramDesc, - paramType: scriptParameter.paramType - }); + if(scriptParameter.paramType ==='Restricted' && scriptParameter.paramVal ===''){ + if(paramDetails.length === existingParams.length && paramDetail.scriptId ===existingParams[i].scriptId) { + encryptedList.push({ + paramVal: existingParams[i].scriptParameters[j].paramVal, + paramDesc: scriptParameter.paramDesc, + paramType: scriptParameter.paramType + }); + }else{ + for(var k = 0; k < existingParams.length; k++){ + if(paramDetail.scriptId === existingParams[k].scriptId){ + encryptedList.push({ + paramVal: existingParams[k].scriptParameters[j].paramVal, + paramDesc: scriptParameter.paramDesc, + paramType: scriptParameter.paramType + }); + } + } + } + }else { + var encryptedText = cryptography.encryptText(scriptParameter.paramVal, cryptoConfig.encryptionEncoding, + cryptoConfig.decryptionEncoding); + encryptedList.push({ + paramVal: encryptedText, + paramDesc: scriptParameter.paramDesc, + paramType: scriptParameter.paramType + }); + } if (encryptedList.length === paramDetail.scriptParameters.length) { paramDetail.scriptParameters = encryptedList; encryptedList = []; diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 902571d19..5e784d442 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -399,7 +399,7 @@ function filterScriptBotsData(data,callback){ if (scriptBot.scriptParameters.length > 0) { scriptCount++; for (var k = 0; k < scriptBot.scriptParameters.length; k++) { - if(scriptBot.scriptParameters[k].paramType === 'Default' || scriptBot.scriptParameters[k].paramType === 'Password'){ + if(scriptBot.scriptParameters[k].paramType === '' || scriptBot.scriptParameters[k].paramType === 'Default' || scriptBot.scriptParameters[k].paramType === 'Password'){ scriptBot.scriptParameters[k].paramVal = cryptography.decryptText(scriptBot.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); }else { From 2a51d785be1ca49dc7582707bbf38cd967f1b827 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Wed, 4 Jan 2017 13:09:31 +0530 Subject: [PATCH 094/110] chenged the json --- .../dashboard/analytics/controller/discoveryResourcesCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index 5d36104d3..aea9af083 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -115,7 +115,7 @@ disResrc.gridOptionInstances.data = []; if($rootScope.organNewEnt.instanceType === 'Managed') { disResrc.gridOptionInstances.enableRowHeaderSelection= false; - $scope.colArray=['platformId','privateIpAddress','instanceState','region']; + $scope.colArray=['platformId','privateIpAddress','instanceState']; disResrc.gridOptionInstances.columnDefs=[ {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, cellTooltip: true, enableCellEdit: false,enableFiltering: true}, @@ -127,7 +127,7 @@ { name: 'Region',enableFiltering: true, displayName: 'Region', - field: 'region', + field: 'providerData.region', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false }, From 1cce31d79b3ddd231a1cd6fe34d95c751edc3fe8 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 13:11:06 +0530 Subject: [PATCH 095/110] BOTs Implementation --- .../sections/dashboard/bots/view/editParams.html | 4 ++-- .../workzone/orchestration/popups/addScriptParams.html | 9 ++++----- .../dashboard/workzone/orchestration/popups/newTask.html | 5 +++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 4c81a396a..4f6c2e5f2 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -89,13 +89,13 @@

    Add Parameters:

    - + - + diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html index 052d788a5..9595ac27b 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html @@ -11,7 +11,7 @@

    Add Script Params

    - + @@ -20,12 +20,11 @@

    Add Script Params

    - + - diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index c28c6c900..98a6df5bf 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -579,10 +579,11 @@
    Script Details
    - + - + + From a29eec147b57a1e0f47dae78ff021e37004dbc93 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 13:23:48 +0530 Subject: [PATCH 096/110] CAT-2613 Unable to Execute Chef task & Jenkins JOB from BOTS --- server/app/services/botsService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 5e784d442..134f3008a 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -330,7 +330,7 @@ botsService.executeBots = function executeBots(botId,reqBody,callback){ if(reqBody.paramOptions.scriptParams){ encryptedParam(reqBody.paramOptions.scriptParams,next); }else{ - next([],next); + next(null,[]); } }, function(encryptedParamList,next) { From 150c70b791c43c1a36d09d4cda874bddb3672364 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 4 Jan 2017 13:44:50 +0530 Subject: [PATCH 097/110] Added monitoring for chef import in cloud --- .../analytics/controller/discoveryResourcesCtrl.js | 13 ++++++++++++- .../dashboard/analytics/view/instanceManage.html | 12 +++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index 5cd124ef8..40e389edb 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -343,6 +343,8 @@ $scope.items=items; var fltrObj=$rootScope.filterNewEnt; var reqBody = {}; + $scope.monitorList = []; + $scope.monitorId = 'null'; $scope.IMGNewEnt={ passType:'password', org:$rootScope.organObject[0] @@ -355,6 +357,14 @@ $scope.configOptions=list; }); + //get monitors + var monitorParam={ + url:'/monitors?filterBy=orgId:' + $scope.IMGNewEnt.org.orgid + } + genericServices.promiseGet(monitorParam).then(function (list) { + $scope.monitorList = list; + }); + $scope.pemFileSelection = function($event) { if (FileReader) { var fileContent = new FileReader(); @@ -381,7 +391,8 @@ reqBody.projectName = $scope.IMGNewEnt.proj.name; reqBody.environmentName = $scope.IMGNewEnt.env.name; reqBody.configManagmentId = $scope.IMGNewEnt.serverTypeInd; - + reqBody.monitorId = $scope.monitorId; + reqBody.credentials = {}; reqBody.credentials.username = $scope.IMGNewEnt.userName; reqBody.instanceIds = []; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html b/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html index 0713256a5..b7c5466f0 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html @@ -89,7 +89,17 @@

    Import Instance

    - +
    +
    + + +
    +
    From 7069957d36688f794c136e5d76a73a704c72ddb0 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Wed, 4 Jan 2017 14:25:06 +0530 Subject: [PATCH 098/110] Resolved CAT-2612 & added internal scrollbar for edit params popup. --- .../partials/sections/dashboard/bots/bots.scss | 9 +++++++++ .../sections/dashboard/bots/view/editParams.html | 15 ++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index 90c6f8aa1..6e59fdb63 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -16,6 +16,10 @@ padding-bottom: 10px; } +.paddingbottom20 { + padding-bottom: 20px; +} + .margintop8 { margin-top: 8px; } @@ -36,6 +40,11 @@ height: 50px; } +.param-table { + max-height: 400px; + overflow-y: auto; +} + #botLibraryPage, #botAuditTrailPage { .page-name { font-size: 18px; diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 4c81a396a..18d05e419 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -1,6 +1,7 @@
    +
    ×

      Execute BOT - {{botName}}

    @@ -8,7 +9,7 @@

      Execute
    -
    +
    @@ -19,7 +20,7 @@

      Execute

    -
    +

    Edit Parameters:

     @@ -74,7 +75,7 @@

    Edit Parameters:

    -
    +

    Add Parameters:

    @@ -95,9 +96,9 @@

    Add Parameters:

    - - - + + + @@ -112,7 +113,7 @@

    Add Parameters:

    -
    From 108ae616cd8d1299092f8b4e51d56951d70a1f41 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 15:16:16 +0530 Subject: [PATCH 099/110] BOTs Search Issue --- .../dashboard/bots/view/editParams.html | 6 +- server/app/lib/utils/apiUtil.js | 5 +- server/app/routes/v1.0/routes_bots.js | 17 ----- server/app/services/botsService.js | 63 ++++++++++--------- 4 files changed, 38 insertions(+), 53 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 6bc3ca30d..050684498 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -96,9 +96,9 @@

    Add Parameters:

    - - - + + + diff --git a/server/app/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js index 2c285dbb8..24326b86e 100644 --- a/server/app/lib/utils/apiUtil.js +++ b/server/app/lib/utils/apiUtil.js @@ -253,10 +253,7 @@ var ApiUtil = function() { } if(data.search){ - var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - var encrypt=cryptography.encryptText(data.search, cryptoConfig.encryptionEncoding,cryptoConfig.decryptionEncoding); - var decrypt=cryptography.decryptText(encrypt, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - request['search']=decrypt; + request['search']=data.search; } if (typeof callback === 'function') { callback(null, request); diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 066a04e49..fd662e3e1 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -100,23 +100,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { scriptParams: req.body.scriptParams } } - /*var paramOptions = { - cookbookAttributes: req.body.cookbookAttributes, - scriptParams: req.body.scriptParams - }; - - if (paramOptions.scriptParams && paramOptions.scriptParams.length) { - var cryptoConfig = appConfig.cryptoSettings; - var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - var encryptedParams = []; - for (var i = 0; i < paramOptions.scriptParams.length; i++) { - var encryptedText = cryptography.encryptText(paramOptions.scriptParams[i], cryptoConfig.encryptionEncoding, - cryptoConfig.decryptionEncoding); - encryptedParams.push(encryptedText); - } - paramOptions.scriptParams = encryptedParams; - } - reqBody.paramOptions=paramOptions;*/ } if(reqBody !== null) { botsService.executeBots(req.params.botId, reqBody, function (err, data) { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 134f3008a..5677b1069 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -388,40 +388,45 @@ function filterScriptBotsData(data,callback){ var botsList = []; var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - for(var i = 0; i < data.docs.length; i++){ - (function(bots){ - if ((bots.botLinkedSubCategory === 'script') - && ('scriptDetails' in bots.botConfig) - && (bots.botConfig.scriptDetails.length > 0)) { - var scriptCount = 0; - for (var j = 0; j < bots.botConfig.scriptDetails.length; j++) { - (function (scriptBot) { - if (scriptBot.scriptParameters.length > 0) { - scriptCount++; - for (var k = 0; k < scriptBot.scriptParameters.length; k++) { - if(scriptBot.scriptParameters[k].paramType === '' || scriptBot.scriptParameters[k].paramType === 'Default' || scriptBot.scriptParameters[k].paramType === 'Password'){ - scriptBot.scriptParameters[k].paramVal = cryptography.decryptText(scriptBot.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, - cryptoConfig.encryptionEncoding); - }else { - scriptBot.scriptParameters[k].paramVal = ''; + if(data.docs.length === 0){ + callback(null,data); + return; + }else { + for (var i = 0; i < data.docs.length; i++) { + (function (bots) { + if ((bots.botLinkedSubCategory === 'script') + && ('scriptDetails' in bots.botConfig) + && (bots.botConfig.scriptDetails.length > 0)) { + var scriptCount = 0; + for (var j = 0; j < bots.botConfig.scriptDetails.length; j++) { + (function (scriptBot) { + if (scriptBot.scriptParameters.length > 0) { + scriptCount++; + for (var k = 0; k < scriptBot.scriptParameters.length; k++) { + if (scriptBot.scriptParameters[k].paramType === '' || scriptBot.scriptParameters[k].paramType === 'Default' || scriptBot.scriptParameters[k].paramType === 'Password') { + scriptBot.scriptParameters[k].paramVal = cryptography.decryptText(scriptBot.scriptParameters[k].paramVal, cryptoConfig.decryptionEncoding, + cryptoConfig.encryptionEncoding); + } else { + scriptBot.scriptParameters[k].paramVal = ''; + } } + } else { + scriptCount++; } - } else { - scriptCount++; - } - })(bots.botConfig.scriptDetails[j]); - } - if(scriptCount === bots.botConfig.scriptDetails.length) { + })(bots.botConfig.scriptDetails[j]); + } + if (scriptCount === bots.botConfig.scriptDetails.length) { + botsList.push(bots); + } + } else { botsList.push(bots); } - } else { - botsList.push(bots); + })(data.docs[i]); + if (botsList.length === data.docs.length) { + data.docs = botsList; + callback(null, data); + return; } - })(data.docs[i]); - if(botsList.length === data.docs.length){ - data.docs = botsList; - callback(null,data); - return; } } } From b1c4dc53ba1683d6f4fa0bc3e5baadf9a046ee82 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Wed, 4 Jan 2017 15:35:22 +0530 Subject: [PATCH 100/110] UI fixes. --- .../sections/dashboard/analytics/view/discoveryResources.html | 4 ++-- .../src/partials/sections/dashboard/bots/view/audittrail.html | 3 ++- .../src/partials/sections/dashboard/bots/view/library.html | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html index ebb6c2e1d..22df9ae4d 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html @@ -5,8 +5,8 @@ Instances - - diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html index c0cff4e84..29efcc402 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html @@ -12,7 +12,8 @@
    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 58328222c..b41c3409a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -110,7 +110,8 @@
    From 0741ddafb030fabb0be6d111f65f4221828ec66a Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Wed, 4 Jan 2017 15:45:58 +0530 Subject: [PATCH 101/110] Added font awesome icons for search. --- client/cat3/src/partials/sections/dashboard/bots/bots.scss | 5 +++++ .../partials/sections/dashboard/bots/view/audittrail.html | 2 +- .../src/partials/sections/dashboard/bots/view/library.html | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index 6e59fdb63..d25a3f146 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -51,6 +51,11 @@ margin: 5px 0 5px 10px; } + .search-icon { + margin-left: -26px; + cursor: pointer; + } + .btn-xs { padding: 1px 5px; font-size: 12px; diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html index 29efcc402..ea1254eac 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html @@ -13,7 +13,7 @@
    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 b41c3409a..683e46691 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -111,7 +111,7 @@
    From e67e0abab8f1067d6725227695198879abfb6c19 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 16:26:44 +0530 Subject: [PATCH 102/110] BOTs Scheduler Issue --- server/app/services/botsService.js | 15 +++++++++++---- server/app/services/schedulerService.js | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 5677b1069..a3dfaf218 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -327,7 +327,10 @@ botsService.getPerticularBotsHistory = function getPerticularBotsHistory(botId,h botsService.executeBots = function executeBots(botId,reqBody,callback){ async.waterfall([ function(next){ - if(reqBody.paramOptions.scriptParams){ + if(typeof reqBody !== 'undefined' && reqBody !== null + && reqBody.paramOptions + && reqBody.paramOptions.scriptParams + && reqBody.paramOptions.scriptParams !== null){ encryptedParam(reqBody.paramOptions.scriptParams,next); }else{ next(null,[]); @@ -362,9 +365,13 @@ 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.userName : 'system',reqBody.hostProtocol ? reqBody.hostProtocol : 'undefined', - reqBody.choiceParam ? reqBody.choiceParam : 'undefined',reqBody.appData ? reqBody.appData : 'undefined',reqBody.paramOptions ? reqBody.paramOptions : 'undefined', - reqBody.tagServer ? reqBody.tagServer : 'undefined', callback); + if(typeof reqBody === 'undefined') { + taskService.executeTask(botId, 'system', 'undefined', 'undefined', 'undefined', 'undefined', 'undefined', callback); + }else{ + taskService.executeTask(botId, reqBody.userName ? reqBody.userName : 'system', reqBody.hostProtocol ? reqBody.hostProtocol : 'undefined', + reqBody.choiceParam ? reqBody.choiceParam : 'undefined', reqBody.appData ? reqBody.appData : 'undefined', reqBody.paramOptions ? reqBody.paramOptions : 'undefined', + reqBody.tagServer ? reqBody.tagServer : 'undefined', callback); + } }else{ blueprintService.launch(botId,reqBody,callback) } diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index c3aecfbde..393c5f0a5 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -159,7 +159,7 @@ schedulerService.executeScheduledBots = function executeScheduledBots(bots,callb logger.error("Error in updating cron job Ids. "+err); } }) - botsService.executeBots(bots.botId,bots.botConfig,function(err, historyData) { + botsService.executeBots(bots.botId,bots.runTimeParams,function(err, historyData) { if (err) { logger.error("Failed to execute Bots.", err); return; From 8ad8cc3848e8b405e5f7fb21263e67b35df0dd1f Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Wed, 4 Jan 2017 16:33:54 +0530 Subject: [PATCH 103/110] Added internal scroll for bot info page. --- .../sections/dashboard/bots/bots.scss | 5 + .../sections/dashboard/bots/view/botInfo.html | 290 +++++++++--------- 2 files changed, 151 insertions(+), 144 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index d25a3f146..ed52f151a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -45,6 +45,11 @@ overflow-y: auto; } +.bot-info-wrapper { + max-height: 450px; + overflow-y: auto; +} + #botLibraryPage, #botAuditTrailPage { .page-name { font-size: 18px; diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html index e60f7e55c..36f44ca01 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -8,150 +8,152 @@

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParametersValues
    BOT Name - -
    Task Type: - -
    Blueprint Type - - - - - - -
    Bot Type - -
    BOT Category - -
    BOT Description - -
    Runlist - -
    Attribute{{$index+1}} - -
    Attribute - -
    Job Name - -
    Job URL - -
    Bot Parameter Type - -
    Bot Parameter Name - -
    Bot Parameter Values - -
    Bot Parameter Description - -
    Script Type Name - -
    Script Parameter Description - -
    Script Parameter{{$index+1}} Description - -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParametersValues
    BOT Name + +
    Task Type: + +
    Blueprint Type + + + + + + +
    Bot Type + +
    BOT Category + +
    BOT Description + +
    Runlist + +
    Attribute{{$index+1}} + +
    Attribute + +
    Job Name + +
    Job URL + +
    Bot Parameter Type + +
    Bot Parameter Name + +
    Bot Parameter Values + +
    Bot Parameter Description + +
    Script Type Name + +
    Script Parameter Description + +
    Script Parameter{{$index+1}} Description + +
    +
    From 6d5a939f09a632c859a293f5baf1309a0d680570 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 16:39:13 +0530 Subject: [PATCH 104/110] CAT-2615 Fixed --- .../dashboard/design/services/blueprintCreateServices.js | 2 +- server/app/routes/v1.0/routes_d4dMasters.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js b/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js index d09acea38..e9f3595b8 100755 --- a/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js +++ b/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js @@ -294,7 +294,7 @@ //listing down docker templates blueprintServices.getDockerTemplates = function(dockerTemplate,repoName) { var params = { - url: '/d4dmasters/getdockertags/' + encodeURIComponent(dockerTemplate) + '/' + repoName, + url: '/d4dmasters/getdockertags?repopath='+encodeURIComponent(dockerTemplate)+'&dockerreponame=' + repoName, inlineLoader:true }; return genericServices.promiseGet(params); diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 3940c0647..0faf7e75b 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -159,12 +159,12 @@ module.exports.setRoutes = function (app, sessionVerification) { }); }); //d4dmasters/getdockertags/centos/null - app.get('/d4dmasters/getdockertags/:repopath/:dockerreponame', function (req, res) { - logger.debug("Enter get() for /d4dmasters/getdockertags/%s/%s", req.params.repopath, req.params.dockerreponame); + app.get('/d4dmasters/getdockertags', function (req, res) { + logger.debug("Enter get() for /d4dmasters/getdockertags/%s/%s", req.query.repopath, req.query.dockerreponame); //fetch the username and password from //Need to populate dockerrowid in template card. - done logger.debug('hit getdockertags'); - configmgmtDao.getMasterRow(18, 'dockerreponame', req.params.dockerreponame, function (err, data) { + configmgmtDao.getMasterRow(18, 'dockerreponame', req.query.dockerreponame, function (err, data) { if (!err) { logger.debug('data rcvd:' + data == ''); logger.debug(data); @@ -188,7 +188,7 @@ module.exports.setRoutes = function (app, sessionVerification) { // Tried with http rest call but api did not working from docker side, so commenting and keeping old code: Gobinda - var dockerUrl = 'https://registry.hub.docker.com/v1/repositories/' + req.params.repopath.replace(/\$\$/g, '/') + '/tags'; + var dockerUrl = 'https://registry.hub.docker.com/v1/repositories/' + req.query.repopath.replace(/\$\$/g, '/') + '/tags'; //https://index.docker.io/v1/repositories/ logger.debug('dockerurl:' + dockerUrl); client.registerMethod("jsonMethod", dockerUrl, "GET"); From 6ae766e0a688169070f3d5d8aad2593b586785ae Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 19:35:45 +0530 Subject: [PATCH 105/110] CAT-2617 Fixed --- .../catalyst-scheduler/catalystScheduler.js | 60 ++++++++++++++----- server/app/services/botsService.js | 4 +- server/app/services/schedulerService.js | 25 +++++--- server/app/services/taskService.js | 13 ---- 4 files changed, 64 insertions(+), 38 deletions(-) diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index d05439767..4a1c554dc 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -3,6 +3,7 @@ var instancesDao = require('_pr/model/classes/instance/instance'); var taskDao = require('_pr/model/classes/tasks/tasks.js'); var botsDao = require('_pr/model/bots/bots.js'); var schedulerService = require('_pr/services/schedulerService'); +var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); var async = require('async'); var cronTab = require('node-crontab'); var catalystSync = module.exports = {}; @@ -144,28 +145,37 @@ catalystSync.executeScheduledBots = function executeScheduledBots() { return; } if (bots && bots.length) { - var botsList=[]; + var botsList=[],count = 0; for (var i = 0; i < bots.length; i++) { (function(bot) { - if(bot.cronJobId && bot.cronJobId !== null){ - cronTab.cancelJob(bot.cronJobId); - } - botsList.push(function(callback){schedulerService.executeScheduledBots(bot,callback);}); - if(botsList.length === bots.length){ - if(botsList.length > 0) { - async.parallel(botsList, function (err, results) { - if (err) { - logger.error(err); + var query = { + auditType: 'BOTs', + actionStatus: 'running', + auditId:bot.botId + }; + auditTrail.getAuditTrails(query, function(err,botsAudits){ + if(err){ + logger.error("Failed to fetch running Bots",err); + count++ + return; + }else if(botsAudits.length > 0){ + count++; + }else{ + botsList.push(function(callback){schedulerService.executeScheduledBots(bot,callback);}); + count++; + } + if(count===bots.length){ + executeBots(botsList,function(err,data){ + if(err) { + logger.error("Error while executing BOTs Scheduler"); + return; + }else{ + logger.debug("Bots Scheduler Completed"); return; } - logger.debug("Bots Scheduler Completed"); - return; }) - }else{ - logger.debug("There is no scheduled Bots right now."); - return; } - } + }); })(bots[i]); } }else{ @@ -175,6 +185,24 @@ catalystSync.executeScheduledBots = function executeScheduledBots() { }); } +function executeBots(botsList,callback){ + if(botsList.length > 0) { + async.parallel(botsList, function (err, results) { + if (err) { + logger.error(err); + callback(err,null); + return; + } + callback(null,results); + return; + }) + }else{ + logger.debug("There is no scheduled Bots right now."); + callback(null,botsList); + return; + } +} + function cancelOldCronJobs(ids){ if(ids.length > 0){ var count = 0; diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index a3dfaf218..f6847d0ee 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -327,7 +327,7 @@ botsService.getPerticularBotsHistory = function getPerticularBotsHistory(botId,h botsService.executeBots = function executeBots(botId,reqBody,callback){ async.waterfall([ function(next){ - if(typeof reqBody !== 'undefined' && reqBody !== null + if(reqBody !== null && reqBody.paramOptions && reqBody.paramOptions.scriptParams && reqBody.paramOptions.scriptParams !== null){ @@ -365,7 +365,7 @@ botsService.executeBots = function executeBots(botId,reqBody,callback){ function(bots,next){ if(bots.length > 0){ if(bots[0].botLinkedCategory === 'Task'){ - if(typeof reqBody === 'undefined') { + if(reqBody === null) { taskService.executeTask(botId, 'system', 'undefined', 'undefined', 'undefined', 'undefined', 'undefined', callback); }else{ taskService.executeTask(botId, reqBody.userName ? reqBody.userName : 'system', reqBody.hostProtocol ? reqBody.hostProtocol : 'undefined', diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index 393c5f0a5..e4d0c5801 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -159,14 +159,25 @@ schedulerService.executeScheduledBots = function executeScheduledBots(bots,callb logger.error("Error in updating cron job Ids. "+err); } }) - botsService.executeBots(bots.botId,bots.runTimeParams,function(err, historyData) { - if (err) { - logger.error("Failed to execute Bots.", err); + if(bots.botLinkedCategory === 'Blueprint') { + botsService.executeBots(bots.botId, bots.runTimeParams, function (err, historyData) { + if (err) { + logger.error("Failed to execute Bots.", err); + return; + } + logger.debug("Bots Execution Success for - ", bots.botName); return; - } - logger.debug("Bots Execution Success for - ", bots.botName); - return; - }); + }); + }else{ + botsService.executeBots(bots.botId,null,function (err, historyData) { + if (err) { + logger.error("Failed to execute Bots.", err); + return; + } + logger.debug("Bots Execution Success for - ", bots.botName); + return; + }); + } }); } } diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 0bbeb18d4..106c8d95d 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -220,19 +220,6 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic logger.error("Error while updating Bot Execution Count"); } }); - var reqBody = { - userName: user, - hostProtocol: hostProtocol, - choiceParam: choiceParam, - appData: appData, - tagServer: botTagServer, - paramOptions: paramOptions - } - bots.updateBotsDetail(task._id, {runTimeParams: reqBody}, function (err, data) { - if (err) { - logger.error("Error while updating Bots Configuration"); - } - }); } }else{ logger.debug("There is no BOTs data present in DB"); From 4e1f3075df58212921e9260f91604a445f244a31 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 20:11:53 +0530 Subject: [PATCH 106/110] CAT-2617 Fixed --- .../catalyst-scheduler/catalystScheduler.js | 60 +++++-------------- server/app/services/botsService.js | 39 +++++++----- 2 files changed, 39 insertions(+), 60 deletions(-) diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index 4a1c554dc..d05439767 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -3,7 +3,6 @@ var instancesDao = require('_pr/model/classes/instance/instance'); var taskDao = require('_pr/model/classes/tasks/tasks.js'); var botsDao = require('_pr/model/bots/bots.js'); var schedulerService = require('_pr/services/schedulerService'); -var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); var async = require('async'); var cronTab = require('node-crontab'); var catalystSync = module.exports = {}; @@ -145,37 +144,28 @@ catalystSync.executeScheduledBots = function executeScheduledBots() { return; } if (bots && bots.length) { - var botsList=[],count = 0; + var botsList=[]; for (var i = 0; i < bots.length; i++) { (function(bot) { - var query = { - auditType: 'BOTs', - actionStatus: 'running', - auditId:bot.botId - }; - auditTrail.getAuditTrails(query, function(err,botsAudits){ - if(err){ - logger.error("Failed to fetch running Bots",err); - count++ - return; - }else if(botsAudits.length > 0){ - count++; - }else{ - botsList.push(function(callback){schedulerService.executeScheduledBots(bot,callback);}); - count++; - } - if(count===bots.length){ - executeBots(botsList,function(err,data){ - if(err) { - logger.error("Error while executing BOTs Scheduler"); - return; - }else{ - logger.debug("Bots Scheduler Completed"); + if(bot.cronJobId && bot.cronJobId !== null){ + cronTab.cancelJob(bot.cronJobId); + } + botsList.push(function(callback){schedulerService.executeScheduledBots(bot,callback);}); + if(botsList.length === bots.length){ + if(botsList.length > 0) { + async.parallel(botsList, function (err, results) { + if (err) { + logger.error(err); return; } + logger.debug("Bots Scheduler Completed"); + return; }) + }else{ + logger.debug("There is no scheduled Bots right now."); + return; } - }); + } })(bots[i]); } }else{ @@ -185,24 +175,6 @@ catalystSync.executeScheduledBots = function executeScheduledBots() { }); } -function executeBots(botsList,callback){ - if(botsList.length > 0) { - async.parallel(botsList, function (err, results) { - if (err) { - logger.error(err); - callback(err,null); - return; - } - callback(null,results); - return; - }) - }else{ - logger.debug("There is no scheduled Bots right now."); - callback(null,botsList); - return; - } -} - function cancelOldCronJobs(ids){ if(ids.length > 0){ var count = 0; diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index f6847d0ee..4dc732a6b 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -117,31 +117,38 @@ botsService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,call logger.error(err); } else if(botsData.length > 0){ if (botsData[0].isBotScheduled === true) { - var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); - catalystSync.executeScheduledBots(); - if(botsData[0].botLinkedCategory === 'Task'){ - tasks.getTaskById(botId,function(err,task){ - if(err){ - logger.error("Error in fetching Task details",err); - }else if(task.isTaskScheduled === true){ - tasks.updateTaskScheduler(botId,function(err,updateData){ - if(err){ - logger.error("Error in Updating Task details",err); + var schedulerService = require('_pr/services/schedulerService.js'); + schedulerService.executeScheduledBots(botsData[0],function(err,data){ + if(err){ + logger.error("Error in executing BOTs Scheduler"); + } + }); + if (botsData[0].botLinkedCategory === 'Task') { + tasks.getTaskById(botId, function (err, task) { + if (err) { + logger.error("Error in fetching Task details", err); + } else if (task.isTaskScheduled === true) { + tasks.updateTaskScheduler(botId, function (err, updateData) { + if (err) { + logger.error("Error in Updating Task details", err); } }); - if(task.cronJobId && task.cronJobId !== null){ + if (task.cronJobId && task.cronJobId !== null) { var cronTab = require('node-crontab'); cronTab.cancelJob(task.cronJobId); } } }); } - } 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 "); + }else{ + var schedulerService = require('_pr/services/schedulerService.js'); + schedulerService.executeScheduledBots(botsData[0],function(err,data){ + if(err){ + logger.error("Error in executing BOTs Scheduler"); + } + }); } + } else{ logger.debug("There is no Bots "); } From 1b3cb8ce7fadbccfeb3ebcc0f94078fe20d3bcee Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Thu, 5 Jan 2017 12:57:03 +0530 Subject: [PATCH 107/110] GitHub UI integration in settings --- .../private/ajax/Settings/githubList.html | 577 ++++++++++++++++++ client/htmls/private/index.html | 8 + 2 files changed, 585 insertions(+) create mode 100644 client/htmls/private/ajax/Settings/githubList.html diff --git a/client/htmls/private/ajax/Settings/githubList.html b/client/htmls/private/ajax/Settings/githubList.html new file mode 100644 index 000000000..71aeac21c --- /dev/null +++ b/client/htmls/private/ajax/Settings/githubList.html @@ -0,0 +1,577 @@ + + +
    +
    +
    +
    +
    + List of GitHub Repo +
    +
    + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + +
    +
    + +
    + +
    + +
    + +
    + + + + + + + \ No newline at end of file diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html index f9aa25aae..5e9d9d7be 100644 --- a/client/htmls/private/index.html +++ b/client/htmls/private/index.html @@ -1135,6 +1135,14 @@

    "selectable": true, "icon": "fa fa-lg fa-fw fa-link" + },{ + "name": "organizations", + "text": "Github", + "borderColor": "#000", + "href": "#ajax/Settings/githubList.html", + "selectable": true, + "icon": "fa fa-lg fa-fw fa-github" + }], "borderColor": "#000", "selectable": false, From 6d805411e3011c4566919c5109033425f4ccda0e Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Thu, 5 Jan 2017 13:20:24 +0530 Subject: [PATCH 108/110] Refactored code --- client/htmls/private/ajax/Settings/githubList.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/htmls/private/ajax/Settings/githubList.html b/client/htmls/private/ajax/Settings/githubList.html index 71aeac21c..bf46d1d9b 100644 --- a/client/htmls/private/ajax/Settings/githubList.html +++ b/client/htmls/private/ajax/Settings/githubList.html @@ -353,7 +353,15 @@

    $editModal.find('#protocolPassword').val(githubDetails.repositoryPassword); } //please put the response for fileId @Durgesh. - } + } else { + $('#isAuthenticated').prop("checked",false); + $('.isAunthenticatedSection').addClass('hidden'); + $("#authenticationType").val($("#authenticationType option:first").val()); + $editModal.find('#protocolUser').val(''); + $editModal.find('#protocolPassword').val(''); + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + } $editModal.find('#orgName').empty().append('').attr('disabled','disabled'); $editModal.find('#gitRepoName').val(githubDetails.repositoryName); From 24865b65e938f878a58b9a38342c73ed1d2cdfa8 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 5 Jan 2017 15:28:09 +0530 Subject: [PATCH 109/110] confirm box added for edit tag value --- .../controller/discoveryResourcesCtrl.js | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index aea9af083..79e65dbd6 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -1,7 +1,7 @@ (function (angular) { "use strict"; angular.module('dashboard.analytics') - .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','toastr','$modal', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,toastr,$modal){ + .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','toastr','$modal','confirmbox', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,toastr,$modal,confirmbox){ var disResrc=this; $scope.gridApi=null; disResrc.filterValue=''; @@ -77,21 +77,51 @@ gridApi.grid.registerRowsProcessor( $scope.singleFilter, 200 ); $scope.gridApi=gridApi; gridApi.edit.on.afterCellEdit($scope, function (rowEntity, colDefa, newValue, oldValue) { - console.log( colDefa.name,'---',colDefa.name.substring(0, colDefa.name.length-3)); - var tagna=colDefa.name.substring(0, colDefa.name.length-3); + console.log(rowEntity); + confirmbox.showModal({}, { + closeButtonText: 'Cancel', + actionButtonText: 'Yes', + actionButtonStyle: 'cat-btn-update', + headerText: 'Update tag value', + bodyText: 'Are you sure you want to Update tag value?' + }).then(function() { + var tagna=colDefa.name.substring(0, colDefa.name.length-3); var param = { url: '/providers/' + fltrObj.provider.id + '/unassigned-instances/' + rowEntity._id, data: { tags:{} } }; - param.data.tags[tagna]=newValue; - console.log(param); - if(newValue !== oldValue) { - genSevs.promisePatch(param).then(function () { - toastr.success('Successfully updated.', 'Update'); + param.data.tags[tagna]=newValue; + console.log(param); + if(newValue !== oldValue) { + genSevs.promisePatch(param).then(function () { + toastr.success('Successfully updated.', 'Update'); + }); + } + },function() { + var param = { + url: '/providers/' + fltrObj.provider.id + '/' + $scope.instanceType + // url:'src/partials/sections/dashboard/analytics/data/ins.json' + }; + genSevs.promiseGet(param).then(function (instResult) { + if($rootScope.organNewEnt.instanceType === 'Managed') { + disResrc.gridOptionInstances.data = instResult.managedInstances; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + disResrc.gridOptionInstances.data = instResult.unmanagedInstances; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + disResrc.gridOptionInstances.data = instResult.data; + } + disResrc.gridOptionInstances.isRowSelectable = function(row){ + if(row.entity.state !== 'running'){ + return false; + } else { + return true; + } + }; }); - } + }); + }); gridApi.selection.on.rowSelectionChanged($scope,function(row){ if(row.isSelected){ From 9549e0ecb0462155057d0aaf523e24d814362f1c Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 5 Jan 2017 17:09:06 +0530 Subject: [PATCH 110/110] message changed --- .../dashboard/analytics/controller/discoveryResourcesCtrl.js | 2 +- .../dashboard/analytics/controller/discoveryTagMappingCtrl.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index 79e65dbd6..270dc92d2 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -83,7 +83,7 @@ actionButtonText: 'Yes', actionButtonStyle: 'cat-btn-update', headerText: 'Update tag value', - bodyText: 'Are you sure you want to Update tag value?' + bodyText: 'Are you sure you want to Update ?' }).then(function() { var tagna=colDefa.name.substring(0, colDefa.name.length-3); var param = { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index a34125ee8..c6855d481 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -20,6 +20,7 @@ //url:'src/partials/sections/dashboard/analytics/data/tag.json' }; genSevs.promiseGet(param).then(function (tagResult) { + disTgMap.getAllTags(); $scope.newEnt.project.tagName=''; $scope.newEnt.project.tagValues=[]; $scope.newEnt.businessGroup.tagValues=[]; @@ -42,8 +43,6 @@ } }); }); - - disTgMap.getAllTags(); }); }