Service Delivery

client/cat3/Gruntfile.js

@@ -89,7 +89,7 @@ module.exports = function(grunt) {
 					{'catalyst/partials/sections/dashboard/workzone/orchestration/orchestration.css':'src/partials/sections/dashboard/workzone/orchestration/orchestration.scss'},
 					{'catalyst/partials/sections/dashboard/workzone/application/application.css':'src/partials/sections/dashboard/workzone/application/application.scss'},
 					{'catalyst/partials/sections/dashboard/analytics/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'},
-					{'catalyst/partials/sections/dashboard/service/service.css':'src/partials/sections/dashboard/service/service.scss'},
+					{'catalyst/partials/sections/dashboard/bots/bots.css':'src/partials/sections/dashboard/bots/bots.scss'},
 					{'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'}
 				]
 			}

client/cat3/main.html

@@ -102,7 +102,8 @@
 		<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/usageCtrl.js"></script>
-		<script src="src/partials/sections/dashboard/service/service.js"></script>
+		<script src="src/partials/sections/dashboard/bots/botsCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/designCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/help/helpCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/setting/organization/organizationCtrl.js"></script>

client/cat3/src/clientRoutes.js

@@ -88,10 +88,10 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
 
 			}]
 		}
-	}).state('dashboard.service', {
-		url: "/service/",
-		templateUrl: "src/partials/sections/dashboard/service/service.html",
-		controller: "serviceCtrl",
+	}).state('dashboard.bots', {
+		url: "/bots",
+		templateUrl: "src/partials/sections/dashboard/bots/bots.html",
+		controller: "botsCtrl as bts",
 		resolve: {
 			auth: ["$q", function ($q) {
 				var deferred = $q.defer();

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) {
+				launchBlueprint: function (blueprintID, version, envId, stackName,domainName, tagServer) {
 					var url = '/blueprints/' + blueprintID + '/launch?version=' + version +
-							'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName;
+							'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName + '&tagServer=' + tagServer;
 					return $http.get(fullUrl(url), Auth.getHeaderObject());
 				},
 				getBlueprintById: function(blueprintId) {
@@ -527,6 +527,10 @@
 				getUnassignedInstances:function (providerId) {
 					var url ='/providers/'+providerId+'/unassigned-instances';
 					return $http.get(fullUrl(url),Auth.getHeaderObject());
+				},
+				getBotTypeList:function () {
+					var url ='/config-data/bot-type';
+					return $http.get(fullUrl(url),Auth.getHeaderObject());
 				}
 			};
 			return serviceInterface;

client/cat3/src/partials/global.scss

@@ -112,6 +112,7 @@ $imagePath : "../../../../../../cat3/images";
   z-index: 10;
   transition: all .4s ease 0s;
   left: -254px;
+    height: 100%;
 
   &.show-left-tree {
       left: 0px;
@@ -121,6 +122,7 @@ $imagePath : "../../../../../../cat3/images";
       background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
       color: #fff;
       overflow-y: auto;
+      height: 100%;
   }
 
   div[data-angular-treeview] {

client/cat3/src/partials/globals/header/header.scss

@@ -176,6 +176,30 @@
 	}
 }
 
+.header-right {
+	.dropdown {
+		margin: 11px 0px 0 10px;
+	}
+
+	.dropdown-toggle {
+		font-size: 18px; 
+		margin-top: 5px;
+	}
+
+	.dropdown-menu {
+		color: #000;
+		background: #fff;
+		padding: 6px;
+		min-width: 100px;
+		line-height: 2;
+	}
+
+	a {
+		color: #000;
+		text-decoration: none;
+	}
+}
+
 /*Styles for Logout Confirmation starts here*/
 .divMessageBox {
 	width: 100%;

client/cat3/src/partials/globals/header/headerDashboard.html

@@ -40,7 +40,7 @@
 					</div>
 				</li>
 				<li>
-					<div id="service" class="headNavigItem" ng-if="serviceBool" ui-sref='dashboard.service' ui-sref-active='activeSection'>
+					<div id="service" class="headNavigItem" ng-if="serviceBool" ui-sref='dashboard.bots' ui-sref-active='activeSection'>
 						<i class="fa fa-area-chart white"></i> BOTS
 					</div>
 				</li>

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

@@ -0,0 +1,14 @@
+<link rel='stylesheet' href='catalyst/partials/sections/dashboard/analytics/analytics.css'>
+
+<div id="analyticsPage" class='fluid-container'>
+	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-12 panelLeft no-padding'>
+		<div ng-include="'src/partials/sections/dashboard/bots/view/botsTreeMenu.html'"></div>
+	</div>
+
+
+	<div class="panelRight">
+		<div id='rightPanel' class='container-fluid'>
+			<div ui-view></div>
+		</div>
+	</div>
+</div>

client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js

@@ -0,0 +1,29 @@
+(function (angular) {
+	"use strict";
+	angular.module('dashboard.bots', ['library.bots']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) {
+			var modulePerms = modulePermissionProvider.$get();
+			$stateProvider.state('dashboard.bots.library', {
+				url: "/library",
+				templateUrl: "src/partials/sections/dashboard/bots/view/library.html",
+				controller: "libraryCtrl as libr",
+				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('botsCtrl',['$scope', '$rootScope','$state', function ($scope, $rootScope,$state) {
+		var treeNames = ['Bots'];
+		$rootScope.$emit('treeNameUpdate', treeNames);
+		$state.go('dashboard.bots.library');
+	}]);
+})(angular);

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

@@ -0,0 +1,38 @@
+(function (angular) {
+    "use strict";
+    angular.module('library.bots', [])
+        .controller('libraryCtrl',['$scope', '$rootScope','$state','genericServices', function ($scope, $rootScope,$state,genSevs) {
+            var treeNames = ['Bots','Library'];
+            $rootScope.$emit('treeNameUpdate', treeNames);
+            var lib=this;
+            lib.gridOptions={
+                gridOption:{
+                    paginationPageSizes: [25, 50, 75],
+                    paginationPageSize: 25,
+                    enableColumnMenus:false,
+                    multiSelect :false,
+                },
+                columnDefs: [
+                    { name: 'type'},
+                    { name: 'name'},
+                    { name: 'description'},
+                    { name: 'run Bot' },
+                    { name: 'history' },
+                    { name: 'last run'},
+                    { name: 'bot Action'}
+                ],
+                data:[{},{}]
+            };
+
+            lib.int =function(){
+                var param={
+                    url:'/config-data/bot-type'
+                };
+                genSevs.promiseGet(param).then(function (result) {
+
+                });
+            };
+            lib.int();
+
+        }]);
+})(angular);

client/cat3/src/partials/sections/dashboard/service/view/serviceTreeMenu.html → client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html

@@ -1,7 +1,7 @@
 <link rel="stylesheet" type="text/css" href="catalyst/partials/sections/dashboard/analytics/view/analyticsTreeMenu.css"/>
 <link rel="stylesheet" type="text/css" href="catalyst/partials/globals/treeComponent/treeDirective.css"/>
 
-<div id='analyticsTreeMenuPage' ng-controller="serviceCtrl">
+<div id='analyticsTreeMenuPage'>
 	<div id='navigPage' ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" ng-class="{'show-left-tree':showTree}">
 		<div id='navigPage-inner'>
 			<div id="treeParent">
@@ -12,7 +12,7 @@
 				        	<span>Services</span>
 				            <div 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.service" class="pointer-cursor" ui-sref-active='activeSection'>
+				                    <li ui-sref="dashboard.bots.library" class="pointer-cursor" ui-sref-active='activeSection'>
 				                        <div class="liContents">
 				                        	<div class="liContents-wrapper">
 					                        	<i class="icon fa fa-money label-spacing"></i>
@@ -21,15 +21,15 @@
 						                    </div>
 				                        </div>
 				                    </li>
-				                    <li ui-sref="dashboard.analytics.capacity" 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>Audit Trail</span>
-						                        <i class="caret-spacing fa fa-caret-left pull-right" ng-show="stateItems.filterView.capacity"></i>
-						                    </div>
-				                        </div>
-				                    </li >
+				                    <!--<li ui-sref="" 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>Audit Trail</span>-->
+						                        <!--<i class="caret-spacing fa fa-caret-left pull-right" ng-show="stateItems.filterView.capacity"></i>-->
+						                    <!--</div>-->
+				                        <!--</div>-->
+				                    <!--</li >-->
 				                </ul>
 				            </div>
 				        </div>
@@ -39,21 +39,3 @@
 		</div>
 	</div>
 </div>
-
-<script>
-	$(document).ready(function() {
-		function setHeight() {
-			var windowHeight = $(window).innerHeight();
-			var brdcrmbHeight = $('#breadcrumb-block').outerHeight();
-			var headerHeight = $('#header').outerHeight();
-			var setTreeContentHeight = windowHeight - (brdcrmbHeight + headerHeight);
-			$('#navigPage').css('height', (setTreeContentHeight) + 'px');
-			$('#navigPage-inner').css('height', (setTreeContentHeight) + 'px');
-		};
-		setHeight();
-		$(window).resize(function() {
-			setHeight();
-		});
-	});
-</script>
-

client/cat3/src/partials/sections/dashboard/bots/view/library.html

@@ -0,0 +1,2 @@
+<br />
+<div id="grid1" ui-grid="libr.gridOptions" ui-grid-pagination class="grid"></div>

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

@@ -8,7 +8,7 @@
         'dashboard.track',
         'dashboard.settings',
         'dashboard.design',
-        'dashboard.service',
+        'dashboard.bots',
         'apis.workzone','dashboard.genericServices'])
         .controller('dashboardCtrl', ['$rootScope', '$scope', '$http', 'uac', '$location', '$state', function ($rootScope, $scope, $http, uac, $location, $state) {
             $rootScope.isBreadCrumbAvailable = true;

client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js

@@ -9,6 +9,7 @@
    "use strict";
 	angular.module('workzone.blueprint')
 		.controller('blueprintLaunchCtrl', ['$scope', '$rootScope', '$modalInstance', 'bpItem', 'workzoneServices', 'workzoneEnvironment', 'instanceLogs', function($scope, $rootScope, $modalInstance, bpItem, workzoneServices, workzoneEnvironment, instanceLogs) {
+			console.log(bpItem);
 			$scope.isBPLogsLoading = true;
 			$scope.isNewInstanceLogsPromise = false;
 			var helper = {
@@ -79,7 +80,7 @@
 				versionOptional = versionsList[versionsList.length-1].ver;
 			}
 			var selectedVersionBpId = bpItem.bp.selectedVersionBpId;
-			workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName).then(function(bpLaunchResponse) {
+			workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName,bpItem.tagServer).then(function(bpLaunchResponse) {
 				$scope.isBPLogsLoading = false;
 				var launchingInstance;
 				if(bpLaunchResponse.data.id && bpLaunchResponse.data.id.length>0){

client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html

@@ -9,27 +9,48 @@ <h4 class="modal-title" ng-show="showARMInputs"> Enter ARM Deployment Name</h4>
 
 	<form name="cftForm" ng-submit="cftSubmitHandler(cftForm.$valid)" novalidate>
 		<div class="modal-body" ng-show="!isBPLogsLoading">
-			<div ng-show="!showCFTInputs && !showARMInputs && !showBlueprintInputs">Are you sure you want to launch the Blueprint? Press Ok To continue</div>
-			<div ng-show="showCFTInputs || showARMInputs" class="CFTInputs-block">
-				<span class="acknowledge-text">(Only numbers,letters allowed. No spaces and underscores)</span>
-				<span class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-					<input type="text" name="stackInpt" ng-model="stackName" ng-trim="false" ng-pattern="/^[a-zA-Z0-9]*$/" maxlength="20" class="form-control" required>
-					<div class="text-danger help-block" ng-messages="cftForm.stackInpt.$error">
-						<div ng-messages-include="src/partials/globals/formMessages/messages.html"></div>
-					</div>
-				</span>
-			</div>
-
-			<div ng-show="showBlueprintInputs" class="CFTInputs-block">
-				<span class="acknowledge-text">(Only numbers,letters allowed. No spaces and underscores)</span>
-				<span class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-					<input type="text" name="domainInpt" ng-model="domainName" ng-trim="false" ng-pattern="/^[a-zA-Z0-9]*$/" maxlength="20" class="form-control" required>
-					<div class="text-danger help-block" ng-messages="cftForm.domainInpt.$error">
+			<fieldset>
+				<div ng-show="!showCFTInputs && !showARMInputs && !showBlueprintInputs">
+					Are you sure you want to launch the Blueprint? Press Ok To continue <br />
+					<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding">
+						<label class="control-label">Tag Server: </label>
+		                <input type="checkbox" ng-model="tagServerCheck" class="checkbox-list" ng-click="tagServerChecking()" />
+		                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding" ng-show="tagServerStatus">
+		                	<span class="col-lg-3 col-md-3 col-sm-12 col-xs-12 no-padding">
+			                    <label class="control-label">Select server
+			                        <span class="control-label red">&nbsp;*</span>
+			                    </label>
+			                </span>
+		                    <span class="col-lg-6 col-md-6 col-sm-12 col-xs-12 no-padding">
+		                      <select class="form-control" ng-modal="tagServer">
+		                        <option selected="selected" value="Monitoring">Monitoring Server</option>
+		                        <option value="LDAP">LDAP Server</option>
+		                        <option value="AD">AD Server</option>
+		                      </select>
+		                    </span>
+		                </div>
+		            </div>
+				</div>
+				<div ng-show="showCFTInputs || showARMInputs" class="CFTInputs-block">
+					<span class="acknowledge-text">(Only numbers,letters allowed. No spaces and underscores)</span>
+					<span class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+						<input type="text" name="stackInpt" ng-model="stackName" ng-trim="false" ng-pattern="/^[a-zA-Z0-9]*$/" maxlength="20" class="form-control" required>
+						<div class="text-danger help-block" ng-messages="cftForm.stackInpt.$error">
 							<div ng-messages-include="src/partials/globals/formMessages/messages.html"></div>
-					</div>
-				</span>
-			</div>
+						</div>
+					</span>
+				</div>
 
+				<div ng-show="showBlueprintInputs" class="CFTInputs-block">
+					<span class="acknowledge-text">(Only numbers,letters allowed. No spaces and underscores)</span>
+					<span class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+						<input type="text" name="domainInpt" ng-model="domainName" ng-trim="false" ng-pattern="/^[a-zA-Z0-9]*$/" maxlength="20" class="form-control" required>
+						<div class="text-danger help-block" ng-messages="cftForm.domainInpt.$error">
+								<div ng-messages-include="src/partials/globals/formMessages/messages.html"></div>
+						</div>
+					</span>
+				</div>
+			</fieldset>
 		</div>
 
 		<div class="modal-footer" ng-show="!isBPLogsLoading">