RLOpenCatalyst · udeshrl · Dec 8, 2016 · Nov 28, 2016 · Nov 28, 2016 · Nov 28, 2016
diff --git a/client/cat3/bower.json b/client/cat3/bower.json
@@ -29,7 +29,9 @@
     "angular-ui-grid": "^3.1.1",
     "lodash": "^4.11.2",
     "ng-file-upload": "^12.0.4",
-    "angular-nvd3": "^1.0.7"
+    "angular-nvd3": "^1.0.7",
+    "angularMultipleSelect": "angular-multiple-select#^1.1.2",
+    "glyphicons-halflings": "*"
   },
   "exportsOverride": {
     "font-awesome": {

diff --git a/client/cat3/main.html b/client/cat3/main.html
@@ -16,6 +16,7 @@
 		<link rel='stylesheet' type='text/css' href='catalyst/partials/sections/login/login.css'>
 		<link rel="stylesheet" href="src/partials/globals/toaster/angular-toastr.css" />
 		<link rel="stylesheet" href="lib/nvd3/nv.d3.css" />
+		<link rel="stylesheet" href="lib/angularMultipleSelect/multiple-select.min.css" />
 		<link rel="stylesheet" href="customlib/dateTime/css/bootstrap-material-datetimepicker.css" />
 		<!-- Library scripts -->
 		<script src="lib/jquery/jquery.min.js"></script>
@@ -41,6 +42,7 @@
 		<script src="lib/d3/d3.js"></script>
 		<script src="lib/nvd3/nv.d3.js"></script>
 		<script src="lib/angular-nvd3/angular-nvd3.js"></script>
+		<script src="lib/angularMultipleSelect/multiple-select.min.js"></script>
 	</head>
 	<body ng-class="{ 'loading-body': onBodyLoading === true }">
 	<loading size="large" name="onBodyLoading"  class="onbody-loading"></loading>
@@ -114,6 +116,8 @@
 		<script src="src/partials/sections/dashboard/bots/botsCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/audittrailCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/botLogsCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/bots/controller/botInfoCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js"></script>
         <script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/editParamsCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/aDesignCtrl.js"></script>

diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js
@@ -99,9 +99,9 @@
 					var url = '/blueprints/' + blueprintID;
 					return $http.delete(fullUrl(url), Auth.getHeaderObject());
 				},
-				launchBlueprint: function (blueprintID, version, envId, stackName,domainName, tagServer) {
+				launchBlueprint: function (blueprintID, version, envId, stackName,domainName, tagServer, monitorId) {
 					var url = '/blueprints/' + blueprintID + '/launch?version=' + version +
-							'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName + '&tagServer=' + tagServer;
+							'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName + '&tagServer=' + tagServer + '&monitorId=' + monitorId;
 					return $http.get(fullUrl(url), Auth.getHeaderObject());
 				},
 				getBlueprintById: function(blueprintId) {
@@ -542,6 +542,13 @@
 				getBotCategoryList:function () {
 					var url ='/config-data/category-type';
 					return $http.get(fullUrl(url),Auth.getHeaderObject());
+				},
+				getMonitorList:function (orgId) {
+					var url = '/monitors';
+					if(orgId){
+						url += '?filterBy=orgId:' + orgId;
+					}
+					return $http.get(fullUrl(url),Auth.getHeaderObject());
 				}
 			};
 			return serviceInterface;

diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss
@@ -728,6 +728,10 @@ accordion .panel-heading {
     margin-top: 10px;
 }
 
+.margintop8 {
+    margin-top: 8px;
+}
+
 .marginleft15 {
     margin-left: 15px;
 }
@@ -740,6 +744,13 @@ accordion .panel-heading {
     margin-left: 5px;
 }
 
+#blueprintInfoPage, #botInfoPage {
+    .td-padding {
+        padding-left: 18px;
+        padding-top:16px;
+    }
+}
+
 /* global styles for logs display across workzone ends here*/
 
 /*ui grid css starts here*/

diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html
@@ -46,7 +46,7 @@
 				<li class="header-right">
 					<div id="header-menu">
 						<div id="userInfo" class="headNavigItem" title="{{appDetails.roleId}}">
-							<i class="fa fa-user white"></i> 
+							<i class="fa fa-user white"></i>
 							{{appDetails.cn | uppercase}}
 							[{{appDetails.roleId}}]
 						</div>

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html
@@ -68,9 +68,9 @@
 					<label for="">Type of Instance</label>
 					<select class="form-control select2 select2-hidden-accessible" ng-model="organNewEnt.instanceType"  ng-change="getResourse(organNewEnt.instanceType)">
 						<option value=''>Select</option>
-						<option value='Managed'>Managed</option>
-						<option value='Assigned'>Assigned</option>
-						<option value='Unassigned'>Unassigned</option>
+						<option value='managedInstances'>Managed</option>
+						<option value='unmanagedInstances'>Assigned</option>
+						<option value='unassigned-instances'>Unassigned</option>
 					</select>
 				</div>
 				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.resources">

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
@@ -1,6 +1,6 @@
 (function (angular) {
 	"use strict";
-	angular.module('dashboard.analytics', ['apis.analytics','nvd3'])
+	angular.module('dashboard.analytics', ['apis.analytics','nvd3','multipleSelect','ui.grid.edit'])
 		.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) {
 			var modulePerms = modulePermissionProvider.$get();
 			$stateProvider.state('dashboard.analytics.cost', {
@@ -79,7 +79,7 @@
 				url: "discovery/resources/",
 				templateUrl: "src/partials/sections/dashboard/analytics/view/discoveryResources.html",
 				controller: "discoveryResourcesCtrl as disResrc",
-				params:{filterView:{period:true,org:true,provi:true},dashboardHide:true,otherTab:'Resources',otherTabView:true,reportHide:true},
+				params:{filterView:{period:true,org:true,provi:true,instanceType:true},dashboardHide:true,otherTab:'Resources',otherTabView:true,reportHide:true},
 				resolve: {
 					auth: ["$q", function ($q) {
 						var deferred = $q.defer();
@@ -207,7 +207,7 @@
         $scope.getResourse = function(instType) {
 			$rootScope.filterNewEnt.resources=[];
 			$scope.selectedResources=[];
-        	if(instType === 'Managed') {
+        	if(instType === 'managedInstances') {
 	        	workzoneServices.getManagedInstances($scope.filter.providerId).then(function(response) {
 					if(response.data && response.data.managedInstances &&  response.data.managedInstances.length >0){
 						$scope.resourceList = response.data.managedInstances;
@@ -218,7 +218,7 @@
 	                toastr.error(error);
 	            });
 	        }
-	        if(instType === 'Assigned') {
+	        if(instType === 'unmanagedInstances') {
 	            workzoneServices.getAssignedInstances($scope.filter.providerId).then(function(response) {
 					if(response.data && response.data.unmanagedInstances.length >0){
 						$scope.resourceList = response.data.unmanagedInstances;
@@ -230,7 +230,7 @@
 	                toastr.error(error);
 	            });
 	        }
-	        if(instType === 'Unassigned') {
+	        if(instType === 'unassigned-instances') {
 	            workzoneServices.getUnassignedInstances($scope.filter.providerId).then(function(response) {
 					if(response.data && response.data.data && response.data.data.length >0){
 						$scope.resourceList = response.data.data;

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss
@@ -209,6 +209,13 @@
 
 
 #analyticsPage {
+  .ui-grid-row > div .ui-grid-cell {
+    float: left !important;
+    vertical-align: middle;
+    height: 40px !important;
+    padding: 0px !important;
+    overflow: hidden;
+  }
   .filter-btn {
     margin: 9px 10px 0 0;
   }
@@ -312,13 +319,46 @@
 #tagMappting{
   .saveBtn{
     position: fixed;
-    bottom: 10px;
-    left: 40%;
+    bottom: 0px;
+    display: block;
+    padding: 13px 14px 15px;
+    border-top: 1px solid rgba(0, 0, 0, .1);
+    background: rgba(249, 249, 249, .9);
+    z-index: 999;
+  }
+  .btnFoot{
+    float: right;
+    width: 51%;
   }
   .form-control{
     height: 29px;
     padding: 2px 10px;
     font-size: 12px;
     line-height: 1;
   }
+  .with250{
+    width: 250px !important;
+  }
+}
+.form-item-container {
+  .list-inline {
+    input {
+      width: 96px;
+      height: 20px;
+      border: 1px solid #ccc;
+      border-radius: 0px !important;
+    }
+    li span {
+      border: 1px solid #23a9e1;
+      border-radius: 0px !important;
+      padding: 2px 4px;
+      font-size: 12px;
+    }
+  }
+
 }
+.autocomplete-list {
+  width: calc(37% + 3px) !important;
+  left: 40% !important;
+  z-index: 100;
+}
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js
@@ -48,6 +48,8 @@
                                      id: $rootScope.organNewEnt.instanceType,
                                      title: 'Instance'
                                  };
+                             } else {
+                                 $rootScope.filterNewEnt.instanceType = {};
                              }
                             if ($rootScope.organNewEnt.provider) {
                                 $rootScope.filterNewEnt.provider = {
@@ -62,8 +64,8 @@
                             $rootScope.organNewEnt = {};
                             if($state.current.name === "dashboard.analytics.usage"){
                                 $rootScope.organNewEnt.provider='0';
-                                $rootScope.organNewEnt.instanceType='Unassigned';
-                                $rootScope.$emit('INI_usage', 'Unassigned');
+                                $rootScope.organNewEnt.instanceType='unassigned-instances';
+                                $rootScope.$emit('INI_usage', 'unassigned-instances');
                             }
                             $rootScope.organNewEnt.org = or;
                         }

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js
@@ -2,11 +2,42 @@
     "use strict";
     angular.module('dashboard.analytics')
         .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){
+            var disResrc=this;
+            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,field:'bg', enableCellEdit: true,editableCellTemplate:'<select ng-class="\'colt\' + col.index" ng-input="COL_FIELD" ng-model="COL_FIELD" ><option value="a">a</option><option value="b">b</option> </select>'},
+                { name: 'Project Tag Value', enableCellEdit: true},
+                { name: 'Env. Tag Value', enableCellEdit: true}
+            ]
+            };
             $rootScope.stateItems = $state.params;
             $rootScope.organNewEnt.provider='0';
+            $rootScope.organNewEnt.instanceType='unassigned-instances';
             analyticsServices.applyFilter(true,null);
             var treeNames = ['Cloud Management','Discovery','Resources'];
             $rootScope.$emit('treeNameUpdate', treeNames);
+            var fltrObj=$rootScope.filterNewEnt;
+            disResrc.getInstances =function () {
+                disResrc.gridOptionInstances.data=[];
+                if(fltrObj && fltrObj.provider && fltrObj.provider.id) {
+                    var param = {
+                        url: '/providers/' + fltrObj.provider.id +'/'+ $rootScope.organNewEnt.instanceType
+                    };
+                    genSevs.promiseGet(param).then(function (instResult) {
+                        disResrc.gridOptionInstances.data=instResult.data;
+                    });
+                }
+            };
+            $rootScope.applyFilter =function(filterApp,period){
+                analyticsServices.applyFilter(true,null);
+                disResrc.getInstances();
+            };
+            disResrc.getInstances();
 
         }]);
 })(angular);
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js
@@ -4,6 +4,7 @@
         .controller('discoveryTagMappingCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){
             var disTgMap=this;
             $rootScope.stateItems = $state.params;
+            $rootScope.organNewEnt.instanceType=false;
             $rootScope.organNewEnt.provider='0';
             analyticsServices.applyFilter(true,null);
             var treeNames = ['Cloud Management','Discovery','Tag Mapping'];

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
@@ -53,33 +53,23 @@
 				<ul class="tree-ul">
 					<li>
 						<div class="liContents">
-							<span class="cursor" ng-click="isTreeOpen = !isTreeOpen"><i class="fa fa-area-chart white"></i> ANALYTICS </span>
+							<span class="cursor" ng-click="isTreeOpen = !isTreeOpen"><i class="fa fa-cc-discover white"></i> Discovery </span>
 							<div ng-class="{'show-providers':isTreeOpen === true}" data-ng-hide="node.collapsed" data-tree-id="relevancelab" data-analytics-tree-model="node.nodes" data-node-id="rowid" data-node-label="text" data-node-children="nodes">
 								<ul class="tree-ul">
-									<li  class="pointer-cursor" ui-sref="dashboard.analytics.cost"  ui-sref-active='activeSection'>
-										<div class="liContents">
-											<div class="liContents-wrapper">
-												<i class="icon fa fa-money label-spacing"></i>
-												<span>Cost</span>
-												<!--<i class="caret-spacing fa fa-caret-left pull-right"></i>-->
-											</div>
-										</div>
-									</li>
-									<li  class="pointer-cursor" ui-sref="dashboard.analytics.capacity" ui-sref-active='activeSection' >
+									<li  ui-sref="dashboard.analytics.tagMapping" class="pointer-cursor" ui-sref-active='activeSection'  >
 										<div class="liContents">
 											<div class="liContents-wrapper">
-												<i class="icon fa fa-pie-chart label-spacing"></i>
-												<span>Capacity</span>
+												<i class="icon fa fa-tags label-spacing"></i>
+												<span>Tag Mapping</span>
 
 											</div>
 										</div>
 									</li>
-									<li ui-sref="dashboard.analytics.usage" class="pointer-cursor" ui-sref-active='activeSection'  >
+									<li  ui-sref="dashboard.analytics.resources" class="pointer-cursor" ui-sref-active='activeSection' >
 										<div class="liContents">
 											<div class="liContents-wrapper">
-												<i class="icon fa fa-line-chart label-spacing"></i>
-												<span>Usage</span>
-
+												<i class="icon fa fa-soundcloud label-spacing"></i>
+												<span>Resources</span>
 											</div>
 										</div>
 									</li>
@@ -89,30 +79,41 @@
 					</li>
 					<li>
 						<div class="liContents">
-							<span class="cursor" ng-click="isTreeOpen = !isTreeOpen"><i class="fa fa-cc-discover white"></i> Discovery </span>
+							<span class="cursor" ng-click="isTreeOpen = !isTreeOpen"><i class="fa fa-area-chart white"></i> ANALYTICS </span>
 							<div ng-class="{'show-providers':isTreeOpen === true}" data-ng-hide="node.collapsed" data-tree-id="relevancelab" data-analytics-tree-model="node.nodes" data-node-id="rowid" data-node-label="text" data-node-children="nodes">
 								<ul class="tree-ul">
-									<li  ui-sref="dashboard.analytics.tagMapping" class="pointer-cursor" ui-sref-active='activeSection'  >
+									<li  class="pointer-cursor" ui-sref="dashboard.analytics.cost"  ui-sref-active='activeSection'>
 										<div class="liContents">
 											<div class="liContents-wrapper">
-												<i class="icon fa fa-tags label-spacing"></i>
-												<span>Tag Mapping</span>
+												<i class="icon fa fa-money label-spacing"></i>
+												<span>Cost</span>
+												<!--<i class="caret-spacing fa fa-caret-left pull-right"></i>-->
+											</div>
+										</div>
+									</li>
+									<li  class="pointer-cursor" ui-sref="dashboard.analytics.capacity" ui-sref-active='activeSection' >
+										<div class="liContents">
+											<div class="liContents-wrapper">
+												<i class="icon fa fa-pie-chart label-spacing"></i>
+												<span>Capacity</span>
 
 											</div>
 										</div>
 									</li>
-									<li  ui-sref="dashboard.analytics.resources" class="pointer-cursor" ui-sref-active='activeSection' >
+									<li ui-sref="dashboard.analytics.usage" class="pointer-cursor" ui-sref-active='activeSection'  >
 										<div class="liContents">
 											<div class="liContents-wrapper">
-												<i class="icon fa fa-soundcloud label-spacing"></i>
-												<span>Resources</span>
+												<i class="icon fa fa-line-chart label-spacing"></i>
+												<span>Usage</span>
+
 											</div>
 										</div>
 									</li>
 								</ul>
 							</div>
 						</div>
 					</li>
+
 				</ul>
 			</div>
 		</div>