From c323e6ef42c2b6360a39d7176101007f4f3a426a Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Tue, 22 Nov 2016 21:12:27 +0530
Subject: [PATCH] Resolved Blueprint logs related issue, added status icons in
 audittrail page, UI modifications.

---
 .../sections/dashboard/bots/bots.html         |   2 +-
 .../sections/dashboard/bots/bots.scss         | 352 ++++--------------
 .../bots/controller/audittrailCtrl.js         |  12 +-
 .../dashboard/bots/controller/botLogsCtrl.js  |  12 +-
 .../dashboard/bots/view/audittrail.html       |  10 +-
 .../sections/dashboard/bots/view/botLogs.html |  13 +-
 .../sections/dashboard/bots/view/library.html | 108 +-----
 7 files changed, 99 insertions(+), 410 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.html b/client/cat3/src/partials/sections/dashboard/bots/bots.html
index 24e41b770..b93b09d77 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/bots.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/bots.html
@@ -1,4 +1,4 @@
-<link rel='stylesheet' href='catalyst/partials/sections/dashboard/analytics/bots.css'>
+<link rel='stylesheet' href='catalyst/partials/sections/dashboard/bots/bots.css'>
 
 <div id="botsPage" class='fluid-container'>
 	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-12 panelLeft no-padding'>
diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
index 909bf268a..48bfd70e6 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss
+++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
@@ -1,312 +1,118 @@
 @import '../../../theme';
 
-/*==== OVERRIDINGS (angular-strap-docs.css) ===========*/
-@media (max-width: 320px) {
-  #analyticsPage {
-    .panelRight {
-      padding-left: 1px;
-
-      #rightPanel {
-        padding-top: 2px;
-
-        .nav-tabs {
-          font-size: 10px;
-        }
-
-        .nav>li>a {
-          padding: 10px 8px;
-        }
-      }
-    }
-  }
-}
-
-@media (min-width: 321px) and (max-width : 480px) {
-  #analyticsPage {
-    .panelRight {
-      #rightPanel {
-        padding-top: 2px;
-
-        .nav-tabs {
-            font-size: 12px;
-        }
-
-        .nav>li>a {
-            padding: 4px 8px;
-        }
-      }
-    }
-  }
-}
-
-@media (min-width : 0px) and (max-width: 767px) {
-  #analyticsPage {
-    .panelLeft {
-      width: 100%;
-      padding-left: 0px;
-      position: absolute;
-    }
-
-    .panelRight {
-      width: 100%;
-      padding-left: 5px;
-      padding-right: 0px;
-    }
-  }
+.font-size-15{
+  font-size: 15px !important;
 }
 
-@media (min-width : 767px) {
-  .panelRight {
-    padding-left: 5px;
-  }
+.marginbottom10{
+  margin-bottom: 10px !important;
 }
 
-@media (min-width : 768px) and (max-width: 991px) {
-  #analyticsPage {
-    .panelLeft {
-      width: 254px;
-    }
-
-    .panelRight {
-      padding-left: 5px;
-      padding-right: 0px;
-      float: right;
-    }
-  }
+.margintop8 {
+  margin-top: 8px;
 }
 
-@media (min-width:1500px){
-  #section-name {
-    width: 11.2%;
-  }
-}
-#analyticsPage .nvd3 .nv-groups path.nv-line {
-  stroke-width: 3px !important;
-}
-.usage{
-    .top-stats{
-        text-align: right;
-    }
+.task-type-img, .bot-status-icon {
+  height: 30px;
 }
 
-.top-stats{
-    margin: 0px 0px 15px;
-    .box-title{
-        font-size: 16px;
-        .red{
-            font-size: 22px;
-        }
-    }
-    .badge{
-        margin-right: 2px; 
-        background: #40baf1; 
-        padding: 3px 10px;
-        margin-top: -5px;
-    }
-    .select2{
-        width: auto;
-        height: 31px;
-        display: table-cell;
-    }
+#selectInstanceFromDropdown {
+  height: 50px;
 }
 
-#analyticsPage {
-  background: #fff;
-  .panelLeft {
+#botLibraryPage {
+  .summary-container {
     width: 100%;
-    padding-left: 0px;
-  }
-
-  .panelRight {
-    width: 100%;
-    background: linear-gradient(to right, #ffffff 99%, #ffffff 100%) repeat scroll 0 0 rgba(0, 0, 0, 0);
-    padding-right: 10px;
-    height: 571px;
-    overflow-y: auto;
-  }
-
-  #rightPanel {
-    padding-top: 0px;
-
-    .nav-tabs {
-      .dropdown-menu {
-        li {
-          a:hover {
-            background: #3276b1;
-            color: #fff;
-          }
-        }
-        li.active {
-          a {
-            background: #3276b1;
-          }
-        }
-        .active>a>.fa {
-          color: #fff;
-        }
-        li>a>.fa {
-          color: #333;
-        }
-      }
-    }
+    margin: 15px 0 0 0px;
   }
 
-  #myTab3, .dropdown-menu {
-    font-size: 12px;
+  .panel-heading {
+    font-weight: bold;
   }
 
-  .nav-tabs .dropdown-menu {
-    left: 0px;
+  .col-md-4ths {
+    width: 25%;
+    float: left;
   }
 
-  #mytab3 .InfrastructureLocalStorage .dropdown-menu .nav-tabs>li.active>a {
-    margin-bottom: -1px;
-    cursor: pointer;
-    background: #40BAF1;
+  .col-md-4ths {
+    position: relative;
+    min-height: 1px;
+    padding-right: 10px;
+    padding-left: 10px;
+    color: #fff;
   }
 
-  .nav-tabs>li.active>a:first-child {
-    color: #337ab7;
+  .small-box {
+    border-radius: 2px;
+    position: relative;
+    display: block;
+    margin-bottom: 15px;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
   }
 
-  .nav-tabs {
-    border-bottom-width: 1px;
-    @include theme-border-color;
-
-    li {
-      margin-bottom: -1px;
-      cursor: pointer;
-    }
-
-    li.active {
-      a, a:hover {
-        border-bottom-width: 0px;
-        border-top-width: 3px;
-        @include theme-border-color;
-        background: #fcfcfc;
-      }
-    }
+  .bg-aqua {
+    background-color: #00c0ef !important;
   }
 
-  /*===== end of overridings =====*/
-  .tab-pane {
-    .am-fade {
-      animation-duration: .3s;
-      animation-timing-function: ease;
-      animation-fill-mode: backwards;
-      opacity: 1;
-
-      .active-remove {
-        display: none;
-      }
-
-      .active-add {
-        animation-name: fadeIn;
-      }
-    }
+  .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);
   }
-}
-
 
-#analyticsPage {
-  .filter-btn {
-    margin: 9px 10px 0 0;
+  .small-box h3 {
+    font-size: 38px;
+    font-weight: bold;
+    margin: 0 0 10px 0;
+    white-space: nowrap;
+    padding: 0;
+    text-align: left;
   }
 
-  #sidebar-wrapper {
-    padding: 10px 7px 0 7px;
-    min-height: 80%;
-    top: 121px;
-
-    .repo-job-details-wrapper {
-      padding: 0.05em 0.625em 0.25em;
-    }
-
-    .marginbottom5 {
-      margin-bottom: 5px;
-    }
-
-    .search {
-      width: 100%;
-      position: relative;
-      font-size: 18px;
-      padding-top: 0px;
-      label {
-        position: absolute;
-        left: 10px;
-        top: 4px;
-      }
-    }
-
-    .search .search-input, .search .hint {
-      padding-left: 23px;
-      padding-right: -5px;
-      border-radius: 23px;
-      height: 28px;
-      outline: none;
-      font-size: 11px;
-    }
-
-    .bp-select {
-      font-size: 11px;
-      height: 28px;
-      display: inline;
-      width: auto;
-    }
-
-    .bp-panel-body {
-      max-height: 105px;
-      min-height: 80px;
-      overflow-y: auto;
-    }
-
-    .activeLi {
-      background: #E2E2E2;
-    }
 
-    .list-resources{
-      padding: 0px; 
-      ul li {
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        padding: 3px 15px;
-      }
-    }
-
-    .panel-heading {
-      height: 40px;
-    }
-  }
-
-  .nav>li>a {
-    padding: 10px 7px;
+  .small-box p {
     font-size: 13px;
+    text-align: left;
   }
 
-  .filter-title {
-    margin-top: -13px;
-    font-size: 12px;
+  .small-box > .inner {
+    padding: 10px;
   }
 
-  .filter-name {
-    margin-top: -21px;
+  .small-box > .small-box-footer {
+    position: relative;
+    text-align: center;
+    padding: 3px 0;
+    color: #fff;
+    color: rgba(255, 255, 255, 0.8);
+    display: block;
+    z-index: 10;
+    background: rgba(0, 0, 0, 0.1);
+    text-decoration: none;
+    cursor: pointer;
+    height: 27px;
   }
 
-  .selected {
-    background: #E49C25;
+  .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);
   }
-}
-.nv-axislabel{
-  font-size: 14px !important;
-}
-.nvd3 text {
-  font: normal 10px Arial;
-}
-.font-size-15{
-  font-size: 15px !important;
-}
-.marginbottom10{
-  margin-bottom: 10px !important;
-}
 
+  .small-box .icon {
+    color: rgba(0, 0, 0, 0.15) !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 da317cc3b..bbb599063 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
@@ -25,7 +25,11 @@
                     cellTemplate:'<span title="{{row.entity.endedOn  | timestampToLocaleTime}}">{{row.entity.endedOn  | timestampToLocaleTime}}</span>', cellTooltip: true},
                 { name: 'BOT Type',displayName: 'BOT Type',field:'auditTrailConfig.type'},
                 { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name'},
-                { name: 'Status',field:'status'},
+                { 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}}">' +
+                  '<img class="bot-status-icon" src="images/instance-states/aws-stopped.png" ng-show="row.entity.status === \'failed\'" title="{{row.entity.status}}">' + 
+                  '<img class="bot-status-icon" src="images/instance-states/aws-inactive.png" ng-show="row.entity.status === \'running\'" title="{{row.entity.status}}">',
+                  cellTooltip: true},
                 { name: 'Org',field:'masterDetails.orgName'},
                 { name: 'BU',field:'masterDetails.bgName'},
                 { name: 'Project',field:'masterDetails.projectName'},
@@ -48,11 +52,7 @@
                 resolve: {
                     items: function() {
                         return {
-                            actionId: hist.actionLogId,
-                            name: hist.auditTrailConfig.name,
-                            nodeIdsWithActionLog: hist.auditTrailConfig.nodeIdsWithActionLog,
-                            nodeIds: hist.auditTrailConfig.nodeIds,
-                            taskType: hist.auditTrailConfig.executionType
+                            hist
                         };
                     }
                 }
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
index 80acd917c..90a449629 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
@@ -9,13 +9,11 @@
     "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) {
-        $scope.actionId = items.actionId;
-        $scope.botName = items.name;
-        $scope.nodeIds = items.nodeIds;
-        $scope.taskType = items.taskType;
-        $scope.nodeIdsWithActionLog = items.nodeIdsWithActionLog;
-       
-        //$scope.selectedInstance = items.nodeIds[0];
+        $scope.actionId = items.hist.actionLogId;
+        $scope.botName = items.hist.name;
+        $scope.nodeIds = items.hist.auditTrailConfig.nodeIds;
+        $scope.taskType = items.hist.auditTrailConfig.executionType;
+        $scope.nodeIdsWithActionLog = items.hist.auditTrailConfig.nodeIdsWithActionLog;
         $scope.isBotLogsLoading = true;
         var helper = {
             scrollBottom : function () {
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 1017d388c..a63c7ce99 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html
@@ -1,12 +1,8 @@
+<link rel='stylesheet' href='catalyst/partials/sections/dashboard/bots/bots.css'>
+
 <div id="botAuditTrailPage">
 	<div id="grid1" ng-if="audit.gridOptions.data.length > 0" ui-grid="audit.gridOptions" ui-grid-pagination class="grid" style="height: {{gridHeight}}px"></div>
 	<div class="alert alert-info text-center" ng-if="!audit.gridOptions.data.length > 0">
 	    No data Available
 	</div>
-</div>
-
-<style>
-	.task-type-img {
-		height: 30px;
-	}
-</style>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html
index 3b3f5679f..f4c23519f 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html
@@ -10,16 +10,13 @@ <h4 class="modal-title">
 		<div class="logsArea">
 			<loading size="large" name="isBotLogsLoading" align="center" type="block"></loading>
 			<div ng-show="!isBotLogsLoading">
-				<div ng-show="(taskType === 'chef' || taskType === 'script')">
+				<div ng-show="(taskType !== 'jenkins')">
 					<div id="selectInstanceFromDropdown">
 	                    <label class="col-md-3 col-sm-3 col-xs-4 text-padding control-label margintop8">Select Instance<sup class="red">*</sup>
 	                    </label>
 	                    <span class="col-md-4 col-sm-4 col-xs-8 no-padding">
 		                    	<select class="form-control" ng-model="selectedInstance" ng-change="instanceChange()" ng-options="chefInstance as chefInstance.uiNodeName for chefInstance in nodeIdsWithActionLog">
 	    					</select>
-	    					<!-- <select class="form-control" ng-model="selectedInstance" ng-change="instanceChange()" ng-init="selectedInstance = nodeIds[0]">
-	    						<option selected="selected" ng-repeat="nodeId in nodeIds" value="{{nodeId}}">{{nodeId}}</option>
-	    					</select> -->
 	    				</span>
 	                </div>
 				   	<div class="rowSpacing col-lg-12 col-sm-12 {{log.err ? 'logErrorMsg':'logMsg'}}" ng-repeat="log in botLogs">
@@ -42,10 +39,4 @@ <h4 class="modal-title">
 			<i class="fa fa-times black"></i> Close
 		</button>
 	</div>
-</div>
-
-<style>
-.margintop8 {
-	margin-top: 8px;
-}
-</style>
\ No newline at end of file
+</div>
\ 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 f5da99dce..ee06450b5 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
@@ -1,3 +1,5 @@
+<link rel='stylesheet' href='catalyst/partials/sections/dashboard/bots/bots.css'>
+
 <div id="botLibraryPage">
 	<div class="container summary-container">
 		<div class="panel-group text-center">
@@ -60,108 +62,4 @@ <h3 id="totalProviders">{{botSummary.totalNoOfFailedBots}}</h3>
 	<div class="alert alert-info text-center" ng-if="!libr.gridOptions.data.length > 0">
 		No data Available
 	</div>
-</div>
-
-<style>
-	.task-type-img {
-		height: 30px;
-	}
-
-	.summary-container {
-		width: 100%;
-		margin: 15px 0;
-	}
-
-	.panel-heading {
-		font-weight: bold;
-	}
-
-	.col-md-4ths {
-		width: 25%;
-		float: left;
-	}
-
-	.col-md-4ths {
-		position: relative;
-		min-height: 1px;
-		padding-right: 10px;
-		padding-left: 10px;
-		color: #fff;
-	}
-
-	.small-box {
-		border-radius: 2px;
-		position: relative;
-		display: block;
-		/* margin-bottom: 2px; */
-		margin-bottom: 15px;
-		box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-	}
-
-	.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; */
-		top: 10px;
-		right: 10px;
-		z-index: 0;
-		font-size: 90px;
-		color: rgba(0, 0, 0, 0.15);
-	}
-
-	.small-box h3 {
-		font-size: 38px;
-		font-weight: bold;
-		margin: 0 0 10px 0;
-		white-space: nowrap;
-		padding: 0;
-		text-align: left;
-	}
-
-
-	.small-box p {
-		font-size: 13px;
-		text-align: left;
-	}
-
-	.small-box > .inner {
-		padding: 10px;
-	}
-
-	.small-box > .small-box-footer {
-		position: relative;
-		text-align: center;
-		padding: 3px 0;
-		color: #fff;
-		color: rgba(255, 255, 255, 0.8);
-		display: block;
-		z-index: 10;
-		background: rgba(0, 0, 0, 0.1);
-		text-decoration: none;
-		cursor: pointer;
-		height: 27px;
-	}
-
-	.small-box .icon {
-		-webkit-transition: all 0.3s linear;
-		-o-transition: all 0.3s linear;
-		transition: all 0.3s linear;
-		position: absolute;
-		/* top: -10px; */
-		top: 10px;
-		right: 10px;
-		z-index: 0;
-		font-size: 90px;
-		color: rgba(0, 0, 0, 0.15);
-	}
-
-	.small-box .icon {
-		color: rgba(0, 0, 0, 0.15) !important;
-	}
-</style>
\ No newline at end of file
+</div>
\ No newline at end of file