Service cost aggregation implemented for AWS providers

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) {
+				launchBlueprint: function (blueprintID, version, envId, stackName,domainName) {
 					var url = '/blueprints/' + blueprintID + '/launch?version=' + version +
-							'&envId=' + envId + '&stackName=' + stackName;
+							'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName;
 					return $http.get(fullUrl(url), Auth.getHeaderObject());
 				},
 				getBlueprintById: function(blueprintId) {

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

@@ -79,7 +79,7 @@
 				versionOptional = versionsList[versionsList.length-1].ver;
 			}
 			var selectedVersionBpId = bpItem.bp.selectedVersionBpId;
-			workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName).then(function(bpLaunchResponse) {
+			workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName).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

@@ -1,14 +1,15 @@
 <div id="blueprintLaunchParamsPage">
 	<div class="modal-header">
 		<span class="close" ng-click="cancel()">×</span>
-		<h4 class="modal-title" ng-show="!showCFTInputs && !showARMInputs"> Confirmation</h4>
+		<h4 class="modal-title" ng-show="!showCFTInputs && !showARMInputs && !showBlueprintInputs"> Confirmation</h4>
 		<h4 class="modal-title" ng-show="showCFTInputs"> Enter a Unique Stack Name</h4>
+		<h4 class="modal-title" ng-show="showBlueprintInputs"> Enter a Domain Name</h4>
 		<h4 class="modal-title" ng-show="showARMInputs"> Enter ARM Deployment Name</h4>
 	</div>
 
 	<form name="cftForm" ng-submit="cftSubmitHandler(cftForm.$valid)" novalidate>
 		<div class="modal-body" ng-show="!isBPLogsLoading">
-			<div ng-show="!showCFTInputs && !showARMInputs">Are you sure you want to launch the Blueprint? Press Ok To continue</div>
+			<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">
@@ -18,10 +19,23 @@ <h4 class="modal-title" ng-show="showARMInputs"> Enter ARM Deployment Name</h4>
 					</div>
 				</span>
 			</div>
+
+			<div ng-show="showBlueprintInputs" class="CFTInputs-block">
+				<span class="acknowledge-text">(Only 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-Z]*$/" class="form-control" required>
+					<div class="text-danger help-block" ng-messages="cftForm.domainInpt.$error">
+						<div id='messagesPage'>
+							<p ng-message="pattern">Only letters allowed. No spaces and underscores.</p>
+						</div>
+					</div>
+				</span>
+			</div>
+
 		</div>
 
 		<div class="modal-footer" ng-show="!isBPLogsLoading">
-			<div ng-show="!showCFTInputs && !showARMInputs">
+			<div ng-show="!showCFTInputs && !showARMInputs && !showBlueprintInputs">
 				<button type="button" class="btn cat-btn-cancel" ng-click="cancel()">
 					<i class="fa fa-times black"></i> Cancel
 				</button>
@@ -36,6 +50,12 @@ <h4 class="modal-title" ng-show="showARMInputs"> Enter ARM Deployment Name</h4>
 					</button>
 					<input type="submit" class="btn cat-btn-update" ng-disabled="cftForm.stackInpt.$dirty && cftForm.stackInpt.$invalid" ng-click="launchBP()" value="Ok" />
 				</div>
+				<div ng-show="showBlueprintInputs ">
+					<button type="button" class="btn cat-btn-cancel" ng-click="cancel()">
+						Cancel
+					</button>
+					<input type="button" class="btn cat-btn-update" ng-click="launchBPWithDomainName()" value="Ok" />
+				</div>
 			</div>
 		</div>
 	</form>

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

@@ -11,20 +11,22 @@
 		.controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'items', function($scope, $modalInstance, items) {
 			var launchHelper = {
 				launch : function(){
-					$modalInstance.close({bp:items,stackName:$scope.stackName});
+					$modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName});
 				}
 			};
 			$scope.stackName='';
+			$scope.domainName='';
 			$scope.cancel = function() {
 				$modalInstance.dismiss('cancel');
 			};
 			$scope.launchBP = function() {
 				if(items.blueprintType === "aws_cf") {
 					$scope.showCFTInputs = true;
-				} else if(items.blueprintType === "azure_arm") {
+				}else if(items.blueprintType === "azure_arm") {
 					$scope.showARMInputs = true;
-				} 
-				else {
+				}else if(items.domainNameCheck === true || items.domainNameCheck === "true") {
+					$scope.showBlueprintInputs = true;
+				}else {
 					launchHelper.launch();
 				}
 			};
@@ -36,6 +38,9 @@
 					$scope.confirmCFTLaunch();
 				}
 			};
+			$scope.launchBPWithDomainName = function(){
+				launchHelper.launch();
+			};
 		}
 	]);
 })(angular);

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

@@ -453,7 +453,8 @@ <h5>Script Details</h5>
 												</thead>
 												<tbody>
 												<tr ng-repeat="param in scriptParamsObj[selectedScript._id] track by $index">
-													<td>{{param}}</td>
+													<td ng-if="param !== ''">{{param}}</td>
+													<td ng-if="param === ''">.....</td>
 													<td>
 														<button title="Delete" type="button" ng-click="removeScriptParams(selectedScript._id,param);"><i class=" fa fa-trash-o"></i></button>
 													</td>
@@ -470,7 +471,6 @@ <h5>Script Details</h5>
 				</div>
 			</div>
 		</div>
-
 		<div class="modal-footer">
 			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12" >
 				<span class="pull-left inputValidationMsg" ><h5 ng-bind="inputValidationMsg"></h5></span>

client/htmls/private/ajax/Aws-Production.html

@@ -182,6 +182,17 @@ <h4 class="panel-title">
                                                   </select>
                                                 </div>
                                               </div>
+                                              <div class="col-lg-6 col-md-6 margintop15">
+                                                <label>Do you want configure Domain Name at the time of Blueprint Launch:<span class="control-label redSpan">&nbsp;*</span></label>
+                                                <div class="input-groups">
+                                                  <div class="radio">
+                                                    <label><input type="radio" value="true"  name="domainNameCheck">Yes</label>
+                                                  </div>
+                                                  <div class="radio">
+                                                    <label><input type="radio" value="false" checked="true" name="domainNameCheck">No</label>
+                                                  </div>
+                                                </div>
+                                              </div>
                                               <!--To add the Swipe Functionality-->                            
                                             </div>
                                           </div>

client/htmls/private/ajax/DesignBlueprint.html

@@ -140,6 +140,17 @@ <h4 class="panel-title">
                                                   </select>
                                                 </div>
                                               </div>
+                                              <div class="col-lg-6 col-md-6 margintop15">
+                                                <label>Do you want configure Domain Name at the time of Blueprint Launch:<span class="control-label redSpan">&nbsp;*</span></label>
+                                                <div class="input-groups">
+                                                  <div class="radio">
+                                                    <label><input type="radio" name="domainNameCheck">Yes</label>
+                                                  </div>
+                                                  <div class="radio">
+                                                    <label><input type="radio" checked="true" name="domainNameCheck">No</label>
+                                                  </div>
+                                                </div>
+                                              </div>
                                               <div class="col-lg-6 col-md-6 foraws" style="margin-top:15px;">
                                                 <label for="region">Choose Region:<span style="color:red">*</span></label>
                                                 <div class="input-groups">

client/htmls/private/ajax/DesignBlueprintAzure.html

@@ -187,6 +187,17 @@ <h4 class="panel-title">
                                                   </select>
                                                 </div>
                                               </div>
+                                              <div class="col-lg-6 col-md-6 margintop15">
+                                                <label>Do you want configure Domain Name at the time of Blueprint Launch:<span class="control-label redSpan">&nbsp;*</span></label>
+                                                <div class="input-groups">
+                                                  <div class="radio">
+                                                    <label><input type="radio" name="domainNameCheck">Yes</label>
+                                                  </div>
+                                                  <div class="radio">
+                                                    <label><input type="radio" checked="true" name="domainNameCheck">No</label>
+                                                  </div>
+                                                </div>
+                                              </div>
                                               <!--To add the Swipe Functionality-->
                                             </div>
                                           </div>

client/htmls/private/ajax/DesignBlueprintVmware.html

@@ -116,6 +116,17 @@ <h4 class="panel-title">
                                                   </select>
                                                 </div>
                                               </div>
+                                              <div class="col-lg-6 col-md-6 margintop15">
+                                                <label>Do you want configure Domain Name at the time of Blueprint Launch:<span class="control-label redSpan">&nbsp;*</span></label>
+                                                <div class="input-groups">
+                                                  <div class="radio">
+                                                    <label><input type="radio" name="domainNameCheck">Yes</label>
+                                                  </div>
+                                                  <div class="radio">
+                                                    <label><input type="radio" checked="true" name="domainNameCheck">No</label>
+                                                  </div>
+                                                </div>
+                                              </div>
                                               <div class="col-lg-6 col-md-6" style="margin-top:15px; display:none">
                                                 <label for="instanceCount">Instances to Launch:<span class="control-label redSpan">&nbsp;*</span></label>
                                                 <div class="input-groups">

client/htmls/private/ajax/Settings/CreateOrg.html

@@ -34,6 +34,14 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
                                                     <input name="ctl00$MainContent$domainname" value="" id="domainname" class="form-control" type="text"  cdata="catalyst" maxlength="35">
                                                     <span data-val-controltovalidate="domainname" id="MainContent_Req_domainname" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="visibility:hidden;">Required</span>
                                                 </div>
+												<div class="col-lg-6 col-md-6">
+													<label for="name">Planned Cost:</label>
+													<span>
+														<img data-toggle="popover" data-html="true" data-placement="left" title="Planned Cost for a Month." src="img/help.png"/>
+													</span>
+													<input name="ctl00$MainContent$plannedCost" value="" id="plannedCost" class="form-control" type="text"  cdata="catalyst" maxlength="35">
+													<span data-val-controltovalidate="plannedCost" id="MainContent_Req_plannedCost" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="visibility:hidden;">Required</span>
+												</div>
                                                 <div class="col-lg-6 orgactive hidden">
                                                     <label for="name">Organization Status:</label>
                                                     <div class="clearfix" style="border:1px solid silver" >

client/htmls/private/ajax/Settings/CreateProviders.html

@@ -222,13 +222,22 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
                                                     </div>
                                                     <div class="row">
                                                         <div class="col-lg-6 col-md-6 margintop20 foraws">
-                                                            <label for="">S3 Bucket Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                                            <label for="">S3 Bucket Name:</label>
                                                             <span>
                                                               <img data-toggle="popover" data-html="true" data-placement="left" title="S3 bucket to which AWS bills are delivered. NOTE: Detailed billing has to be enabled in AWS." src="img/help.png"/>
                                                             </span>
-                                                            <input name="s3BucketName" id="s3BucketName" class="form-control" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the S3 Bucket Name">
+                                                            <input name="s3BucketName" id="s3BucketName" class="form-control" type="text" cdata="catalyst" placeholder="Enter the S3 Bucket Name">
                                                         </div>
 
+                                                        <div class="col-lg-6 col-md-6 margintop20 foraws">
+                                                            <label for="">Planned Cost:</label>
+                                                            <span>
+                                                              <img data-toggle="popover" data-html="true" data-placement="left" title="AWS Planned Cost for a Month." src="img/help.png"/>
+                                                            </span>
+                                                            <input name="plannedCost" id="plannedCost" class="form-control" type="text" cdata="catalyst" placeholder="Enter the Planned Cost">
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
                                                         <div class="col-lg-6 col-md-6 margintop20">
                                                             <label for="name">Organization Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
                                                             <select id="orgId" name="orgId" unique="true" uniqueconditionedby="orgname" class="chooseOrganization width-100" style="vertical-align: central" cat-validation="required" cat-validation-openstack="required" cdata="catalyst" skiprowid="yes">
@@ -601,6 +610,7 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
         $('#secretKey').val(data.secretKey);
         $('#providertype').val(data.providerType).select2();
         $('#s3BucketName').val(data.s3BucketName);
+        $('#plannedCost').val(data.plannedCost);
         $('#orgId').val(data.orgId[0]).attr({
             'answer': data.orgId[0]
         }).select2().attr('disabled', 'disabled');