chef import and bug fixes

client/cat3/main.html

@@ -67,7 +67,7 @@
 			            </span>
 					</div>
 				</div>
-				<div id="breadcrumb-nav" class="col-lg-10 col-md-10 col-sm-10 col-xs-10">
+				<div id="breadcrumb-nav" class="col-lg-10 col-md-10 col-sm-10 col-xs-10 no-padding">
 					<ul>
 						<li ng-cloak ng-repeat="item in breadcrumbData">{{item}} {{$last ? "" : " &raquo; "}}</li>
 					</ul>

client/cat3/src/factory/workzoneServices.js

@@ -542,20 +542,6 @@
 				getBotCategoryList:function () {
 					var url ='/config-data/category-type';
 					return $http.get(fullUrl(url),Auth.getHeaderObject());
-				},
-				deleteBotTask: function (taskId) {
-					return $http({
-						method: "delete",
-						url: fullUrl('/tasks/serviceDelivery/' + taskId),
-						async: false
-					});
-				},
-				deleteBotBP: function (blueprintId) {
-					return $http({
-						method: "delete",
-						url: fullUrl('/blueprints/serviceDelivery/' + blueprintId),
-						async: false
-					});
 				}
 			};
 			return serviceInterface;

client/cat3/src/partials/global.scss

@@ -107,8 +107,8 @@ $imagePath : "../../../../../../cat3/images";
 }
 
 #breadcrumb-nav {
-    padding-top: 6px;
-    padding-left: 60px;
+    padding-top: 5px;
+    padding-left: 8px;
 }
 
 #breadcrumb-block {

client/cat3/src/partials/sections/card/card.scss

@@ -350,12 +350,12 @@ $imagePath : "/cat3/images";
 
 	.bp-version-dropdown-wrapper {
 		height: 40px;
-		margin: 4px 0 0 19px;
+		margin: 4px 0 0 36px;
 	}
 
 	.bp-version-dropdown-wrapper-docker {
 		height: 31px;
-		margin: -3px 0 0 19px;
+		margin: -3px 0 0 36px;
 	}
 
 	.btnicons {
@@ -392,11 +392,11 @@ $imagePath : "/cat3/images";
     }
 
 	.blueprint-buttons {
-		margin: 0 0 0 32px;
+		margin: 0 0 0 45px;
 	}
 
 	.blueprint-buttons-docker {
-		margin: 5px 0 0 32px;
+		margin: 5px 0 0 45px;
 	}
 
 	.bp-version-dropdown {

client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js

@@ -165,7 +165,7 @@
                             capaCtr.capaGridOptions.columnDefs.push({
                                 name: keyChild,
                                 field: 'capacity.AWS.services.' + keyChild
-                            })
+                            });
                             angular.forEach(result.splitUpCapacities[viewType], function (valBar) {
                                 var chVal = '';
                                 if (valBar.capacity.AWS.services[keyChild]) {

client/cat3/src/partials/sections/dashboard/bots/bots.scss

@@ -21,98 +21,86 @@
 }
 
 #botLibraryPage {
-  .summary-container {
-    width: 100%;
-    margin: 15px 0 0 0px;
+  .page-name {
+      font-size: 18px;
+      margin: 5px 0 5px 10px;
   }
 
-  .panel-heading {
-    font-weight: bold;
+  .borderTop {
+      border-top: 1px dashed #ddd;
   }
 
-  .col-md-4ths {
-    width: 25%;
-    float: left;
+  .btn-xs {
+      padding: 1px 5px;
+      font-size: 12px;
   }
 
-  .col-md-4ths {
-    position: relative;
-    min-height: 1px;
-    padding-right: 10px;
-    padding-left: 10px;
-    color: #fff;
+  .refresh-btn {
+    margin: 2px 10px 0 0;
   }
 
-  .small-box {
-    border-radius: 2px;
-    position: relative;
-    display: block;
-    margin-bottom: 15px;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+  .summary-container {
+    width: 100%;
   }
 
-  .bg-aqua {
-    background-color: #00c0ef !important;
+  .selected {
+    border: 2px solid #000;
+    height: 94px !important;
+    margin-top: 13px !important;
   }
 
-  .small-box .icon {
-    -webkit-transition: all 0.3s linear;
-    -o-transition: all 0.3s linear;
-    transition: all 0.3s linear;
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    z-index: 0;
-    font-size: 90px;
-    color: rgba(0, 0, 0, 0.15);
+  .info-box {
+    display: block;
+    min-height: 90px;
+    background: #ecf0f5;
+    width: 100%;
+    box-shadow: 0 1px 1px rgba(0,0,0,0.1);
+    margin: 15px 0;
   }
 
-  .small-box h3 {
-    font-size: 38px;
-    font-weight: bold;
-    margin: 0 0 10px 0;
-    white-space: nowrap;
-    padding: 0;
-    text-align: left;
+  .info-box-content {
+    padding: 5px 10px;
+    margin-left: 90px;
   }
 
+  .info-box-text {
+    text-transform: uppercase;
+  }
 
-  .small-box p {
+  .info-box-text {
+    display: block;
     font-size: 13px;
-    text-align: left;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
-  .small-box > .inner {
-    padding: 10px;
+  .info-box-number {
+    display: block;
+    font-weight: bold;
+    font-size: 20px;
   }
 
-  .small-box > .small-box-footer {
-    position: relative;
-    text-align: center;
-    padding: 3px 0;
-    color: #fff;
-    color: rgba(255, 255, 255, 0.8);
+  .info-box-icon {
     display: block;
-    z-index: 10;
-    background: rgba(0, 0, 0, 0.1);
-    text-decoration: none;
-    cursor: pointer;
-    height: 27px;
+    float: left;
+    height: 90px;
+    width: 90px;
+    text-align: center;
+    font-size: 45px;
+    line-height: 90px;
+    background: rgba(0,0,0,0.2);
+  }
+
+  .bg-aqua {
+    background-color: #00c0ef !important;
   }
 
-  .small-box .icon {
-    -webkit-transition: all 0.3s linear;
-    -o-transition: all 0.3s linear;
-    transition: all 0.3s linear;
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    z-index: 0;
-    font-size: 90px;
-    color: rgba(0, 0, 0, 0.15);
+  .bg-green {
+    background-color: #00a65a !important;
   }
 
-  .small-box .icon {
-    color: rgba(0, 0, 0, 0.15) !important;
+  .bg-red {
+    background-color: #dd4b39 !important;
   }
 }

client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js

@@ -8,8 +8,10 @@
 (function (angular) {
     "use strict";
     angular.module('dashboard.bots')
-    .controller('audittrailCtrl',['$scope', '$rootScope', '$http', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', 
-    function ($scope, $rootScope, $http, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) {
+    .controller('audittrailCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', 
+    function ($scope, $rootScope, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) {
+        var treeNames = ['Bots','Audit Trail'];
+        $rootScope.$emit('treeNameUpdate', treeNames);
         var audit=this;
         audit.gridOptions={
             gridOption:{
@@ -24,6 +26,10 @@
                 { name: 'End Time',field:'endedOn',
                     cellTemplate:'<span title="{{row.entity.endedOn  | timestampToLocaleTime}}">{{row.entity.endedOn  | timestampToLocaleTime}}</span>', cellTooltip: true},
                 { name: 'BOT Type',displayName: 'BOT Type',field:'auditTrailConfig.type'},
+                { name:'Task Type',field:'auditTrailConfig.executionType' ,cellTemplate:'<img src="images/orchestration/chef.png" ng-show="row.entity.auditTrailConfig.executionType==\'chef\'" alt="row.entity.taskType" title="Chef" class="task-type-img" />'+
+                    '<img src="images/orchestration/jenkins.png" ng-show="row.entity.auditTrailConfig.executionType==\'jenkins\'" alt="row.entity.taskType" title="Jenkins" class="task-type-img" />'+
+                    '<img src="images/orchestration/script.jpg" ng-show="row.entity.auditTrailConfig.executionType==\'script\'" alt="row.entity.auditTrailConfig.executionType" title="Script" class="task-type-img" />'+
+                    '<img src="images/devops-roles/devopsRole1.png" ng-show="row.entity.action==\'BOTs Blueprint Execution\'" alt="row.entity.botType" title="Blueprint" class="task-type-img" />',cellTooltip: true},
                 { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name'},
                 { name: 'Status',field:'status',
                   cellTemplate:'<img class="bot-status-icon" src="images/instance-states/aws-started.png" ng-show="row.entity.status === \'success\'" title="{{row.entity.status}}">' +
@@ -51,7 +57,7 @@
                 keyboard: false,
                 resolve: {
                     items: function() {
-                        return hist
+                        return hist;
                     }
                 }
             });
@@ -64,10 +70,12 @@
 
         audit.init =function(){
             audit.gridOptions.data=[];
-            var url = '/audit-trail?filterBy=auditType:BOTs';
-            $http.get(url).then(function (data) {
-                angular.forEach(data,function () {
-                    audit.gridOptions.data=data.data.auditTrails;
+            var param={
+                url:'/audit-trail?filterBy=auditType:BOTs'
+            };
+            genSevs.promiseGet(param).then(function (response) {
+                angular.forEach(response,function () {
+                    audit.gridOptions.data=response.auditTrails;
                 });
             });
         };

client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js

@@ -8,7 +8,7 @@
 (function (angular) {
     "use strict";
     angular.module('library.bots',[])
-    .controller('botLogsCtrl',['$scope', '$rootScope', '$http', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, $http, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
+    .controller('botLogsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
         $scope.botName = items.auditTrailConfig.name;
         $scope.nodeIds = items.auditTrailConfig.nodeIds;
         $scope.taskType = items.auditTrailConfig.executionType;
@@ -34,9 +34,11 @@
         };
         $scope.instanceChange =function(){
             $scope.botLogs=[];
-            var url = '/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs';
-            $http.get(url).then(function (result) {
-                $scope.botLogs = result.data;
+            var param={
+                url:'/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs'
+            };
+            genSevs.promiseGet(param).then(function (response) {
+                $scope.botLogs = response;
                 $scope.isBotLogsLoading = false;
             });
         };
@@ -45,14 +47,12 @@
         var requestObj = {
             "instanceIds": nodeIds
         };
-        var bluePrintJob = false;
         workzoneServices.postRetrieveDetailsForInstanceNames(requestObj).then(function (response) {
             var _jobInstances = response.data;
             for (var k = 0; k < $scope.nodeIdsWithActionLog.length; k++) {
                 for (var l = 0; l < _jobInstances.length; l++) {
                     if ($scope.nodeIdsWithActionLog[k].nodeId === _jobInstances[l]._id) {
                         $scope.nodeIdsWithActionLog[k].uiNodeName = _jobInstances[l].name;
-                        console.log($scope.nodeIdsWithActionLog[k].uiNodeName);
                     }
                 }
             }
@@ -64,20 +64,22 @@
             console.log(error);
         });
         if($scope.taskType === 'jenkins') {
-            var url = '/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output';
-            $http.get(url).then(function (result) {
-                if (result.data) {
-                    $scope.jenkinsLogs = helper.formatLogs(result.data.output);
+            var param={
+                url:'/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output'
+            };
+            genSevs.promiseGet(param).then(function (response) {
+                if (response.data) {
+                    $scope.jenkinsLogs = helper.formatLogs(response.data.output);
                     $scope.isBotLogsLoading = false;
                 } else {
-                    $scope.jenkinsLogs = helper.formatLogs(result.output);
+                    $scope.jenkinsLogs = helper.formatLogs(response.output);
                     $scope.isBotLogsLoading = false;
                 }
             });
         }
 
         $scope.cancel = function() {
             $modalInstance.dismiss('cancel');
-        }
+        };
     }]);
 })(angular);

client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js

@@ -70,7 +70,6 @@
         $scope.jenkinsparams = items.taskConfig.parameterized;
         $scope.scriptparams = items.taskConfig.scriptDetails;
         $scope.parameters=[''];
-        var taskData={};
         var cookbookAttributes = [];
         var scriptParams = [];
         var choiceParam = {};