Merge pull request #731 from RLOpenCatalyst/dev

moving dev to stage 3.4.1

Author: RLIndia

client/cat3/src/factory/workzoneServices.js

@@ -488,7 +488,8 @@
 					return $http.post(fullUrl(url),compositeBlueprint,Auth.getHeaderObject());
 				},
 				getAllCompsiteBlueprint:function () {
-					var url ='/composite-blueprints';
+					var p = workzoneEnvironment.getEnvParams();
+					var url ='/composite-blueprints?filterBy=organizationId:'+p.org+'+businessGroupId:'+p.bg+'+projectId:'+p.proj;
 					return $http.get(fullUrl(url),Auth.getHeaderObject());
 				},
 				getCompsiteBlueprintInfo:function (compositeBlueprintId) {

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

@@ -47,7 +47,7 @@
 							</a>
 						</div>
 						<div id="help" class="headNavigItem">
-							<a href="http://help.relevancelab.com/dokuwiki" target="_blank">
+							<a href="https://catalyst.readthedocs.org" target="_blank">
 								<i class="fa fa-question white"></i> HELP
 							</a>
 						</div>

client/cat3/src/partials/sections/card/card.scss

@@ -566,7 +566,7 @@ $imagePath : "/cat3/images";
 			font-size: 18px;
 		}
 
-		.instance-state-unknown, .instance-state-pending {
+		.instance-state-unknown, .instance-state-pending, .instance-state-shutting-down{
 			background: url("#{$imagePath}/instance-states/aws-inactive.png");
 		}
 

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

@@ -13,7 +13,7 @@
             <div class="alert alert-info text-center" ng-show="blueprints.length===0">
                 No Blueprints Available
             </div>
-            <div class="container" ng-init="getAllCompsiteBlueprint();">
+            <div class="container">
                 <accordion>
                     <div ng-if="blueprints.software_stack.length>0">
                         <accordion-group ng-init="accGroupStatus = {opened: isFirstOpen}" is-open="accGroupStatus.opened">

client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprintCtrl.js

@@ -75,6 +75,7 @@
 				$scope.requestParams=requestParams;
 				$scope.isBlueprintPageLoading = true;
 				$scope.blueprintListCards();
+				$scope.getAllCompsiteBlueprint();
 			});
 
 			angular.extend($scope, {

client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js

@@ -353,6 +353,18 @@ $imagePath : "../../../../../../images";
 			margin: 3px 0 0 0;
 		}
 	}
+
+	.paddingtop8 {
+		padding-top: 8px;
+	}
+
+	.paddingleft0 {
+		padding-left: 0px;
+	}
+
+	.paddingright15 {
+		padding-right: 15px;
+	}
 }
 
 #viewNodesPage {

client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss

@@ -80,18 +80,30 @@ <h5>Job Details</h5>
 							<!--for script adding the scriptType dropdown -->
 							<!--commented will be used in future-->
 							<div class="col-md-12 col-sm-12 col-xs-12 margintop15" ng-if="taskType==='script'">
-								<label class="control-label">Script Type
-									<span class="control-label red">&nbsp;*</span>
-									<span ng-show="newTaskForm.scriptType.$touched && newTaskForm.scriptType.$invalid" class="inputValidationMsg">required
+								<div class="col-md-6 col-sm-6 col-xs-6 margintop15 no-padding">
+									<label class="control-label">Script Type
+										<span class="control-label red">&nbsp;*</span>
+										<span ng-show="newTaskForm.scriptType.$touched && newTaskForm.scriptType.$invalid" class="inputValidationMsg">required
+										</span>
+									</label>
+									<br />
+									<span class="col-md-12 col-sm-12 col-xs-12 paddingleft0">
+										<select class="form-control" name="scriptType" ng-model="$parent.scriptTypeSelelct" ng-change="changeNodeScriptList();" required>
+											<option value="">Select</option>
+											<option value="Bash">Bash</option>
+										</select>
 									</span>
-								</label>
-								<br />
-								<span class="col-md-12 col-sm-12 col-xs-12 no-padding">
-									<select class="form-control" name="scriptType" ng-model="$parent.scriptTypeSelelct" ng-change="changeNodeScriptList();" required>
-										<option value="">Select</option>
-										<option value="Bash">Bash</option>
-									</select>
-								</span>
+								</div>
+								<div class="col-md-6 col-sm-6 col-xs-6 margintop15">
+									<label class="control-label">Run as Sudo:</label>
+									<br />
+									<div class="paddingtop8">
+										<input type="radio" ng-value="true" ng-model="$parent.isSudo" name="scriptIsSudo" />
+										<label for="scriptIsSudo" class="paddingright15">Yes</label>
+										<input type="radio" ng-value="false" ng-model="$parent.isSudo" name="scriptIsSudo" />
+										<label for="scriptIsSudo">No</label>
+									</div>
+								</div>
 							</div>
 							<!--scriptType ending here -->
 							<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 margintop15">
@@ -154,7 +166,7 @@ <h5>Chef Server Details for - RLChefServer</h5>
 											</ul>
 											<ul ng-show="targetType==='blueprint'">
 												<li ng-repeat="blueprint in chefBluePrintList">
-													<label class="checkbox check-list">
+													<label class="checkbox check-list" ng-if="blueprint.blueprintType === 'instance_launch'">
 														<input name="blueprint" ng-value="blueprint._id" type="radio" ng-model="blueprint._isBlueprintSelected" class="radiobutton-list blueprint-{{blueprint._isBlueprintSelected}}">{{blueprint.name}}
 													</label>
 												</li>
@@ -442,7 +454,9 @@ <h5>Script Details</h5>
 												<tbody>
 												<tr ng-repeat="param in scriptParamsObj[selectedScript._id] track by $index">
 													<td>{{param}}</td>
-													<td><button type="button" ng-click="removeScriptParams(selectedScript._id,param);"><i class=" fa fa-trash-o"></i></button></td>
+													<td>
+														<button title="Delete" type="button" ng-click="removeScriptParams(selectedScript._id,param);"><i class=" fa fa-trash-o"></i></button>
+													</td>
 												</tr>
 												</tbody>
 											</table>

client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html

@@ -21,6 +21,7 @@
 			$scope.scriptParamShow = false;
 			$scope.scriptSelectAll = false;
 			$scope.scriptParamsObj = {};
+			$scope.isSudo = false;
 			$scope.toggleAll = function() {
 				var toggleStatus = $scope.isAllSelected;
 				angular.forEach($scope.chefInstanceList, function(itm){ itm._isNodeSelected = toggleStatus;});
@@ -355,6 +356,7 @@
 					if ($scope.taskType === "script") {
 						taskJSON.nodeIds = [];
 						taskJSON.scriptDetails = [];
+						taskJSON.isSudo = $scope.isSudo;
 						for (var si = 0; si < $scope.chefInstanceList.length; si++) {
 							if ($scope.chefInstanceList[si]._isNodeSelected) {
 								taskJSON.nodeIds.push($scope.chefInstanceList[si]._id);
@@ -519,11 +521,13 @@
 				/*Identifying the nodes and script list and checking for task type to be script*/
 				if ($scope.taskType === "script") {
 					if($scope.isEditMode){
+						$scope.isSudo=items.taskConfig.isSudo;
 						$scope.chefInstanceList = responseFormatter.identifyAvailableChefNode(responseFormatter.getChefList(instances), items.taskConfig.nodeIds);
 						$scope.isScriptInstanceLoading = false;
 						$scope.isNewTaskPageLoading = false;
 						$scope.targetType="instance";
 					}else{
+						$scope.isSudo = false;
 						$scope.chefInstanceList = responseFormatter.identifyAvailableChefNode(responseFormatter.getChefList(instances), []);
 						$scope.isScriptInstanceLoading = false;
 						$scope.isNewTaskPageLoading = false;

client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js

@@ -64,7 +64,7 @@
 				{ name:'Job Number',field:'buildNumber',cellTemplate:'<a target="_blank" title="Jenkins" ng-href="{{grid.appScope.task.taskConfig.jobURL}}/{{row.entity.buildNumber}}">{{row.entity.buildNumber}}</a>', sort:{ direction: 'desc'}, cellTooltip: true},
 				{ name:'Job Output',cellTemplate:'<span><a target="_blank" title="{{jobResultUrlName}}" class="fa fa-file-text bigger-120 btn cat-btn-update btn-sg tableactionbutton marginbottomright3" ng-repeat="jobResultUrlName in row.entity.jobResultURL" ng-href="{{jobResultUrlName}}"></a></span>',cellTooltip: true},
 				{ name:'Log Info',width: 90,cellTemplate:'<span title="Jenkins Log" class="fa fa-list bigger-120 btn cat-btn-update btn-sg tableactionbutton" ng-click="grid.appScope.historyLogs(row.entity);"></span>',cellTooltip: true},
-				{ name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status}}">{{row.entity.status}}</div>'},
+				{ name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status.toUpperCase()}}">{{row.entity.status.toUpperCase()}}</div>'},
 				{ name:'Start Time',field:'timestampStarted',cellTemplate:'<span title="{{row.entity.timestampStarted  | timestampToLocaleTime}}">{{row.entity.timestampStarted  | timestampToLocaleTime}}</span>',cellTooltip: true},
 				{ name:'End Time',field:'timestampEnded',cellTemplate:'<span title="{{row.entity.timestampEnded  | timestampToLocaleTime}}">{{row.entity.timestampEnded  | timestampToLocaleTime}}</span>',cellTooltip: true}
 				];