Dev branch updated merged

client/cat3/main.html

@@ -37,6 +37,8 @@
 		<script src="lib/ng-file-upload/ng-file-upload.min.js"></script>
 		<script src="src/partials/globals/toaster/angular-toastr.tpls.js"></script>
 		<script src="src/partials/globals/drag-and-drop/angular-drag-and-drop-lists.min.js"></script>
+		<script src="https://cdn.firebase.com/js/client/1.1.1/firebase.js"></script>
+		<script src="https://cdn.firebase.com/libs/angularfire/0.8.0/angularfire.min.js"></script>
 		<!-- Application configuration -->
 		<script src="uiConfig.js"></script>
 		<script src="lib/d3/d3.js"></script>
@@ -110,15 +112,17 @@
 		<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/discoverySyncResultCtrl.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>
-		<script src="src/partials/sections/dashboard/bots/controller/botInfoCtrl.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/bots/controller/botExecutionLogsCtrl.js"></script>
+	    <script src="src/partials/sections/dashboard/bots/controller/botChefLogCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/aDesignCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/controllers/appUrlCreateCtrl.js"></script>

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,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}},
+		//params:{filterView:{analytics:true}},
 		resolve: {
 			auth: ["$q", function ($q) {
 				var deferred = $q.defer();
@@ -95,7 +93,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();

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',
@@ -28,7 +28,7 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr',
 	'ui.grid.resizeColumns',
 	'global.uiGridOptions',
 	'global.messages',
-	'ui.grid.selection'
+	'ui.grid.selection','ui.grid.cellNav'
 ]);
 
 angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window',

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;
@@ -1452,3 +1456,9 @@ div::-webkit-scrollbar-thumb
             transparent 75%,
             transparent)
 }
+.ui-grid-row.ui-grid-row-selected > [ui-grid-row] > .ui-grid-cell{
+    background-color: #E8F1F3 !important;
+}
+input[type="text"].ui-grid-filter-input{
+    color: #000000;
+}

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 {

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-cloud white"></i> Cloud
+						<i class="fa fa-cloud white"></i> CLOUD
 					</div>
 				</li>
 				<li>

client/cat3/src/partials/sections/dashboard/analytics/analytics.html

@@ -6,74 +6,73 @@
 	</div>
 
 	<div id="sidebar-wrapper" ng-class="{'show-wrapper':isOpenSidebar === true}">
-		<form>
+		<form name="filterForm">
 			<div>
                 <div class="repo-job-details-wrapper-inner marginbottom10"  >Filter:</div>
-                <div class="col-lg-12 col-md-12 form-group filter-type" ng-show="stateItems.filterView.viewBy">
+                <div class="col-lg-12 col-md-12 form-group filter-type" ng-if="stateItems.filterView.viewBy">
 					<label class="radio-inline">
 						<input type="radio" ng-model="analytic.viewByFilter" name="viewBy" value="orgView">Org
 					</label>
 					<label class="radio-inline">
 						<input type="radio" ng-model="analytic.viewByFilter" name="viewBy" value="ProviderView">Provider
 					</label>
 				</div>
-                <div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.org">
+                <div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.org">
 					<label for="">Organization</label>
-					<select  ng-model="organNewEnt.org" class="chooseProjectExisting width-100 form-control"  ng-change="getProviders(organObject[organNewEnt.org].rowid)">
+					<select  ng-model="organNewEnt.org" class="chooseProjectExisting width-100 form-control" required  ng-change="getProviders(organObject[organNewEnt.org].rowid)">
 						<option value="">Select</option>
 						<option ng-repeat="org in organObject"  value="{{organObject.indexOf(org)}}" >{{org.name}}</option>
 					</select>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.bus">
+				<div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.bus">
 					<label for="">Business Group</label>
-					<select id="bgListInputExisting" class="chooseBGExisting width-100 form-control"  ng-model="organNewEnt.buss">
+					<select id="bgListInputExisting" class="chooseBGExisting width-100 form-control"  ng-model="organNewEnt.buss" required>
 						<option value="">Select</option>
 						<option ng-repeat="buss in organObject[organNewEnt.org].businessGroups"  value="{{organObject[organNewEnt.org].businessGroups.indexOf(buss)}}" >{{buss.name}}</option>
 					</select>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.proj">
+				<div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.proj">
 					<label >Project</label>
-					<select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.proj">
+					<select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.proj" required>
 						<option value="">Select</option>
 						<option ng-repeat="proj in organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects"  value="{{organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects.indexOf(proj)}}" >{{proj.name}}</option>
 					</select>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.env">
+				<div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.env">
 					<label >Environment</label>
-					<select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.env">
+					<select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.env" required>
 						<option value="">Select</option>
 						<option ng-repeat="env in organObject[organNewEnt.org].environments" value="{{organObject[organNewEnt.org].environments.indexOf(env)}}" >{{env.name}}</option>
 					</select>
 				</div>
-                <div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.provi || analytic.ViewproviFilter">
+                <div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.provi || analytic.ViewproviFilter">
 					<label for="">Provider</label>
-					<select class="form-control select2 select2-hidden-accessible" id="selectProvider" ng-model="organNewEnt.provider" >
+					<select class="form-control select2 select2-hidden-accessible" id="selectProvider" ng-change="ProviderChange(organNewEnt.provider);" ng-model="organNewEnt.provider" required>
                         <option value=''>Select</option>
 						<option ng-repeat="provider in providers" value="{{providers.indexOf(provider)}}">{{provider.providerName}}</option>
                    </select>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.zone">
+				<div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.zone">
 					<label for="">Zone</label>
-					<select class="form-control select2 select2-hidden-accessible" id="Zone" ng-model="filter.regionId" ng-options="region.region as region.region_name +' | '+region.region for region in regions" ng-change="fnRegionChange()">
+					<select class="form-control select2 select2-hidden-accessible" id="Zone" ng-model="filter.regionId" ng-options="region.region as region.region_name +' | '+region.region for region in regions" ng-change="fnRegionChange()" required>
                         <option value=''>Select</option>
                     </select>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.region">
+				<div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.region">
 					<label for="">Region</label>
-					<select class="form-control select2 select2-hidden-accessible" id="selectRegion" ng-model="filter.regionId" ng-options="region.region as region.region_name +' | '+region.region for region in regions" ng-change="fnRegionChange()">
+					<select class="form-control select2 select2-hidden-accessible" id="selectRegion" ng-model="filter.regionId" ng-options="region.region as region.region_name +' | '+region.region for region in regions" ng-change="fnRegionChange()" required>
 						<option value=''>Select</option>
 					</select>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.instanceType">
+				<div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.instanceType">
 					<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='managedInstances'>Managed</option>
-						<option value='unmanagedInstances'>Assigned</option>
-						<option value='unassigned-instances'>Unassigned</option>
+					<select class="form-control select2 select2-hidden-accessible" ng-model="organNewEnt.instanceType"  ng-change="getResourse(organNewEnt.instanceType)" required>
+						<option value='Managed'>Managed</option>
+						<option value='Assigned'>Assigned</option>
+						<option value='Unassigned'>Unassigned</option>
 					</select>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.resources">
+				<div class="col-lg-12 col-md-12 form-group" ng-if="stateItems.filterView.resources">
 					<label for="">Resources</label>
 					<div class="panel-group">
 						<div class="panel panel-default">
@@ -89,14 +88,15 @@
 									<li class="list-group-item cursor" ng-repeat="resource in resourceList | filter:searchText.name | filter:{platformId: filters.platformId}" ng-class="{'selected':selectedResources.indexOf(resource._id)>-1}" ng-click="toggleResourceSelection(resource._id,resource.platformId);">{{resource.platformId}}</li>
 								</ul>
 							</div>
-							<span class="error red" ng-show="selectedResources.length === 10">
+							<span ng-if="!selectedResources.length >0 "><input type="hidden" ng-model="selectedResourcesLen" ng-value="selectedResources.length" required></span>
+							<span class="error red" ng-if="selectedResources.length === 10">
 								Maximum 10 resources allowed.
 							</span>
 						</div>
 					</div>
 				</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-primary" ng-disabled="filterForm.$invalid" 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>-->
 				</div>
 			</div>
@@ -107,7 +107,7 @@
 	<div class="panelRight">
 		<div id='rightPanel' class='container-fluid'>
 			<ul class="nav nav-tabs" >
-				<li ng-show="stateItems.otherTabView" class="active"><a  > {{stateItems.otherTab}}</a></li>
+				<li ng-if="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" >

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

@@ -196,32 +196,35 @@
         };
 
         $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) {
 			$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;
+						$scope.toggleResourceSelection($scope.resourceList[0]._id,$scope.resourceList[0].platformId);
 					} else{
 						$scope.resourceList=[];
 					}
 	            }, function(error) {
 	                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;
+						$scope.toggleResourceSelection($scope.resourceList[0]._id,$scope.resourceList[0].platformId);
 					} else{
 						$scope.resourceList = [];
 					}
@@ -230,11 +233,11 @@
 	                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;
-						$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);

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

@@ -328,7 +328,7 @@
   }
   .btnFoot{
     float: right;
-    width: 51%;
+    width: 57%;
   }
   .form-control{
     height: 29px;
@@ -358,7 +358,10 @@
 
 }
 .autocomplete-list {
-  width: calc(37% + 3px) !important;
-  left: 40% !important;
-  z-index: 100;
+  width: calc(94% + 2px) !important;
+  left: 3% !important;
+  z-index: 999999;
+}
+label {
+  font-weight: 400 !important;
 }

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;
                         }