RLOpenCatalyst · udeshrl · Dec 15, 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>
@@ -107,7 +109,10 @@
 		<script src="src/partials/sections/dashboard/analytics/analyticsServices.js"></script>
 		<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/analytics/controller/usageCtrl.js"></script>
+
 		<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>

diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js
@@ -73,7 +73,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
 			}]
 		}
 	}).state('dashboard.analytics', {
-		url: "/analytics/",
+		url: "/CM/",
 		templateUrl: "src/partials/sections/dashboard/analytics/analytics.html",
 		controller: "analyticsCtrl as analytic",
 		params:{filterView:{analytics:true}},

diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss
@@ -773,6 +773,12 @@ accordion .panel-heading {
     .ui-grid-cell {
         text-overflow: ellipsis;
         overflow: initial;
+        border-right: none !important;
+        border-bottom: 1px solid rgba(180, 180, 180, 0.23);
+    }
+    .ui-grid-header-cell{
+        font-size: 12px;
+        font-weight: 500;
     }
 
     ul.ng-scope {
@@ -799,6 +805,7 @@ accordion .panel-heading {
         height: auto;
         padding:6px;
         overflow: hidden;
+        font-size: 12px;
     }
 
     .ui-grid-cell-contents {
@@ -1265,6 +1272,12 @@ accordion .panel-heading {
     margin-left: 6px !important;
 }
 // ui grid style
+.ui-grid-row:nth-child(odd) .ui-grid-cell{
+    background-color: rgba(255, 255, 255, 0.43) !important;
+}
+.ui-grid-row:last-child .ui-grid-cell{
+    border-bottom-width: 1px !important;
+}
 .ui-grid-header-cell-row{
     background: #636363 !important;
     color: #FBFBFB !important;
@@ -1413,4 +1426,29 @@ label {
     -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
     -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
     transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-}
+}
+
+div::-webkit-scrollbar-track
+{
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    background-color: #F5F5F5;
+}
+
+div::-webkit-scrollbar
+{
+    width: 10px;
+    background-color: #F5F5F5;
+}
+
+div::-webkit-scrollbar-thumb
+{
+    background-color: #40BAF1;
+    background-image: -webkit-linear-gradient(45deg,
+            rgba(255, 255, 255, .2) 25%,
+            transparent 25%,
+            transparent 50%,
+            rgba(255, 255, 255, .2) 50%,
+            rgba(255, 255, 255, .2) 75%,
+            transparent 75%,
+            transparent)
+}
diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html
@@ -35,7 +35,7 @@
 				</li>
 				<li>
 					<div id="analytics" class="headNavigItem" ng-if="analyticsBool" ui-sref='dashboard.analytics' ui-sref-active='activeSection'>
-						<i class="fa fa-area-chart white" ng-class="{'header-selected-item':moduleSelection.filterView.analytics}"></i> ANALYTICS
+						<i class="fa fa-cloud white"></i> Cloud
 					</div>
 				</li>
 				<li>
@@ -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">
@@ -97,7 +97,7 @@
 				</div>
                 <div class="col-lg-12 col-md-12 marginbottom5">
 					<button type="button" class="btn btn-primary" ng-click="applyFilter(true,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Apply</button>
-					<button type="button" class="btn btn-default" ng-click="applyFilter(false,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-times fa-2" aria-hidden="true"></i>&nbsp;Clear</button>
+					<!--<button type="button" class="btn btn-default" ng-click="applyFilter(false,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-times fa-2" aria-hidden="true"></i>&nbsp;Clear</button>-->
 				</div>
 			</div>
 		</form>
@@ -107,20 +107,23 @@
 	<div class="panelRight">
 		<div id='rightPanel' class='container-fluid'>
 			<ul class="nav nav-tabs" >
-				<li ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="analytic.tabShow(true,false)"  ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
-				<li ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
+				<li ng-show="stateItems.otherTabView" class="active"><a  > {{stateItems.otherTab}}</a></li>
+				<li ng-hide="stateItems.dashboardHide" ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="analytic.tabShow(true,false)"  ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
+				<li ng-hide="stateItems.reportHide" ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
 				<li class="form-group pull-right filter-btn" >
 					<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
 						<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
 					</button>
 				</li>
 			</ul>
-			<div class="well" id="well" ng-hide="stateItems.filterView.period">
+			<div class="well" id="well" >
 				<div class="col-lg-5 col-md-5 col-sm-12 btn-group" role="group" aria-label="...">
-					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class="{'active':filterNewEnt.period === 'day'}"  ng-click="applyFilter(true,'day')">DAY</button>
-					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'week'}"  ng-click="applyFilter(true,'week')">WEEK</button>
-					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="applyFilter(true,'month')">MONTH</button>
-					<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'year'}"  ng-click="applyFilter(true,'year')">YEAR</button>
+					<span  ng-hide="stateItems.filterView.period">
+						<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class="{'active':filterNewEnt.period === 'day'}"  ng-click="applyFilter(true,'day')">DAY</button>
+						<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'week'}"  ng-click="applyFilter(true,'week')">WEEK</button>
+						<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="applyFilter(true,'month')">MONTH</button>
+						<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'year'}"  ng-click="applyFilter(true,'year')">YEAR</button>
+					</span>
 				</div>
                 <div class="col-lg-7 col-md-7 col-sm-12 filter-wrapper">
                     <span  ng-repeat="filt in filterNewEnt"  ng-if="filt !== '' && filt.title">

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
@@ -1,10 +1,10 @@
 (function (angular) {
 	"use strict";
-	angular.module('dashboard.analytics', ['apis.analytics','nvd3'])
+	angular.module('dashboard.analytics', ['apis.analytics','nvd3','multipleSelect','ui.grid.edit'])
 		.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) {
 			var modulePerms = modulePermissionProvider.$get();
 			$stateProvider.state('dashboard.analytics.cost', {
-				url: "cost/",
+				url: "analytics/cost/",
 				templateUrl: "src/partials/sections/dashboard/analytics/view/cost.html",
 				controller: "costCtrl as cost",
 				params:{filterView:{cost:true,viewBy:true,splitUpType:true,org:true}},
@@ -22,7 +22,7 @@
 					}]
 				}
 			}).state('dashboard.analytics.capacity', {
-				url: "capacity/",
+				url: "analytics/capacity/",
 				templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html",
 				controller: "capacityCtrl as capaCtr",
 				params:{filterView:{period:true,cost:true,viewBy:true,splitUpType:true,org:true}},
@@ -40,7 +40,7 @@
 					}]
 				}
 			}).state('dashboard.analytics.usage', {
-				url: "usage/",
+				url: "analytics/usage/",
 				templateUrl: "src/partials/sections/dashboard/analytics/view/usage.html",
 				controller: "usageCtrl as usage",
 				params:{filterView:{usage:true,org:true,provi:true,instanceType:true,resources:true}},
@@ -57,10 +57,47 @@
 						return deferred.promise;
 					}]
 				}
+			}).state('dashboard.analytics.tagMapping', {
+				url: "discovery/tagMapping/",
+				templateUrl: "src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html",
+				controller: "discoveryTagMappingCtrl as disTgMap",
+				params:{filterView:{period:true,org:true,provi:true},dashboardHide:true,reportHide:true,otherTab:'Tag mapping',otherTabView:true},
+				resolve: {
+					auth: ["$q", function ($q) {
+						var deferred = $q.defer();
+						// instead, go to a different page
+						if (modulePerms.analyticsBool()) {
+							// everything is fine, proceed
+							deferred.resolve();
+						} else {
+							deferred.reject({redirectTo: 'dashboard'});
+						}
+						return deferred.promise;
+					}]
+				}
+			}).state('dashboard.analytics.resources', {
+				url: "discovery/resources/",
+				templateUrl: "src/partials/sections/dashboard/analytics/view/discoveryResources.html",
+				controller: "discoveryResourcesCtrl as disResrc",
+				params:{filterView:{period:true,org:true,provi:true,instanceType:true},dashboardHide:true,otherTab:'Resources',otherTabView:true,reportHide:true},
+				resolve: {
+					auth: ["$q", function ($q) {
+						var deferred = $q.defer();
+						// instead, go to a different page
+						if (modulePerms.analyticsBool()) {
+							// everything is fine, proceed
+							deferred.resolve();
+						} else {
+							deferred.reject({redirectTo: 'dashboard'});
+						}
+						return deferred.promise;
+					}]
+				}
 			});
 		}])
 	.controller('analyticsCtrl',['$scope', '$rootScope','$state','genericServices','analyticsServices', 'workzoneServices', 'toastr', function ($scope, $rootScope, $state, genericServices,analyticsServices, workzoneServices, toastr) {
 		var analytic = this;
+		$scope.isTreeOpen = false;
 		//var splitUp=null;
 		analytic.tabShowChat=true;
 		analytic.tabShowReport=false;
@@ -170,7 +207,7 @@
         $scope.getResourse = function(instType) {
 			$rootScope.filterNewEnt.resources=[];
 			$scope.selectedResources=[];
-        	if(instType === 'Managed') {
+        	if(instType === 'managedInstances') {
 	        	workzoneServices.getManagedInstances($scope.filter.providerId).then(function(response) {
 					if(response.data && response.data.managedInstances &&  response.data.managedInstances.length >0){
 						$scope.resourceList = response.data.managedInstances;
@@ -181,7 +218,7 @@
 	                toastr.error(error);
 	            });
 	        }
-	        if(instType === 'Assigned') {
+	        if(instType === 'unmanagedInstances') {
 	            workzoneServices.getAssignedInstances($scope.filter.providerId).then(function(response) {
 					if(response.data && response.data.unmanagedInstances.length >0){
 						$scope.resourceList = response.data.unmanagedInstances;
@@ -193,7 +230,7 @@
 	                toastr.error(error);
 	            });
 	        }
-	        if(instType === 'Unassigned') {
+	        if(instType === 'unassigned-instances') {
 	            workzoneServices.getUnassignedInstances($scope.filter.providerId).then(function(response) {
 					if(response.data && response.data.data && response.data.data.length >0){
 						$scope.resourceList = response.data.data;

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss
@@ -209,6 +209,13 @@
 
 
 #analyticsPage {
+  .ui-grid-row > div .ui-grid-cell {
+    float: left !important;
+    vertical-align: middle;
+    height: 40px !important;
+    padding: 0px !important;
+    overflow: hidden;
+  }
   .filter-btn {
     margin: 9px 10px 0 0;
   }
@@ -308,4 +315,50 @@
 }
 .marginbottom10{
   margin-bottom: 10px !important;
+}
+#tagMappting{
+  .saveBtn{
+    position: fixed;
+    bottom: 0px;
+    display: block;
+    padding: 13px 14px 15px;
+    border-top: 1px solid rgba(0, 0, 0, .1);
+    background: rgba(249, 249, 249, .9);
+    z-index: 999;
+  }
+  .btnFoot{
+    float: right;
+    width: 51%;
+  }
+  .form-control{
+    height: 29px;
+    padding: 2px 10px;
+    font-size: 12px;
+    line-height: 1;
+  }
+  .with250{
+    width: 250px !important;
+  }
+}
+.form-item-container {
+  .list-inline {
+    input {
+      width: 96px;
+      height: 20px;
+      border: 1px solid #ccc;
+      border-radius: 0px !important;
+    }
+    li span {
+      border: 1px solid #23a9e1;
+      border-radius: 0px !important;
+      padding: 2px 4px;
+      font-size: 12px;
+    }
+  }
+
+}
+.autocomplete-list {
+  width: calc(37% + 3px) !important;
+  left: 40% !important;
+  z-index: 100;
 }
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/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
@@ -295,7 +295,7 @@
                 $timeout(function () {
                     $rootScope.applyFilter(true,'month');
                     capaCtr.trendsChart($rootScope.filterNewEnt);
-                    var treeNames = ['Analytics','capacity'];
+                    var treeNames = ['Cloud Management','Analytics','capacity'];
                     $rootScope.$emit('treeNameUpdate', treeNames);
                 },500);
             };

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js
@@ -290,7 +290,7 @@
                 $timeout(function () {
                     $rootScope.applyFilter(true,'month');
                     costObj.trendsChart($rootScope.filterNewEnt);
-                    var treeNames = ['Analytics','Cost'];
+                    var treeNames = ['Cloud Management','Analytics','Cost'];
                     $rootScope.$emit('treeNameUpdate', treeNames);
                 },500);
             };