X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fresources%2FMETA-INF%2Fresources%2Fdesigner%2Fpartials%2Fportfolios%2Ftca_properties.html;h=8332e696293a26c9b0fe015e1cce68e6e63f8e82;hb=52c98dd27b8803d782a7da7611438d97838a1c77;hp=cfb4432d5f5b0cbac0204549c3f7349ac436c9a5;hpb=e13fc3ec06368e94daffd8cd2290a3f763744cd7;p=clamp.git

diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/tca_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/tca_properties.html
index cfb4432d..8332e696 100644
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/tca_properties.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/tca_properties.html
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP CLAMP
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License"); 
@@ -18,7 +18,7 @@
   limitations under the License.
   ============LICENSE_END============================================
   ===================================================================
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  
   -->
 
 <style>
@@ -178,14 +178,6 @@
 								<input class="form-control" onkeydown="return false;" type="text" id="tuuid" name="tuuid"></input>
 							</div>
 						</div>
-						
-						<div class="col-sm-8 form-group" style="display:none;">
-							<label class="col-sm-3"> NF Code </label>
-							<div class="col-sm-9" style="padding:0px;">
-								<input class="form-control" onkeydown="return false;" type="text" id="tnfc" name="tnfc"></input>
-							</div>
-						</div>
-						
 					</div>
 					<div class="row">
 						<div class="col-sm-8 form-group">
@@ -199,8 +191,13 @@
 							<div class="col-sm-9" style="padding:0px;">
 								<select name="eventName" id="eventName" enableFilter="true"></select>
 							</div>
-						</div>            
-						
+						</div>
+						<div class="col-sm-8 form-group">
+							<label class="col-sm-3">Control Loop Schema Type</label>
+							<div class="col-sm-9" style="padding:0px;">
+								<select name="controlLoopSchemaType" id="controlLoopSchemaType" enableFilter="true"></select>
+							</div>
+						</div>
 						<div class="col-sm-8 form-group" style="display:none;">
 							<label class="col-sm-3"> Policy ID </label>
 							<div class="col-sm-9" style="padding:0px;">
@@ -210,7 +207,7 @@
 
 					</div>
 				</form>
-				
+
  				<div class="tcaBody row">
 					<div class="col-sm-5" style="padding:0px 5px; margin: 15px;">
 						<div class="panel panel-default" id="tcaTableHolder">
@@ -250,18 +247,12 @@
 										onkeypress="return isNumberKey(event)" id="threshold"></input>
 									</div>
 								</div>
-								<div>
-									<label class="control-label">Control Loop Schema</label>
-									<div>
-										<select id="controlLoopSchema" name="controlLoopSchema"></select>
-									</div>
-								</div>
 								<div>
 									<label class="control-label">Closed Loop Event Status</label>
 									<div>
 										<select id="closedLoopEventStatus" name="closedLoopEventStatus"></select>
 									</div>
-								</div>                
+								</div>
 							</div>
 						</div>
 					</div>
@@ -303,20 +294,19 @@
 
 
     var propertiesToString = function(formIdNum) {
-      return $('#formId'+formIdNum+' #fieldPathM').val() + ' ' +
+      return $('#formId'+formIdNum+' #fieldPathM').find(':selected').text() + ' ' +
 				$('#formId'+formIdNum+' #operator').val() + ' ' +
 				$('#formId'+formIdNum+' #threshold').val() + ' ' +
-        $('#formId'+formIdNum+' #controlLoopSchema').val() + ' ' +
         $('#formId'+formIdNum+' #closedLoopEventStatus').val();
     };
 
 		loadPropertyWindow("tca");
-		
+
 		//load dropdown with policy options
  		if (typeof allPolicies !== "undefined"){
 	       	$.each(Object.keys(allPolicies), function(val, text) {
 	       		$('#tcaPol').append($('<option></option>').val(text).html(text));
-	        });  
+	        });
 		} else if (typeof elementMap !== "undefined"){
 			for (key in elementMap){
 				if (key.indexOf("Policy")>-1){
@@ -328,28 +318,18 @@
 				}
 			}
 		}
-		
+
+		var fieldPathMLabel2Value = function(label) {
+			return Object.keys(defaults_props['tca']['fieldPathM']).find(key => defaults_props['tca']['fieldPathM'][key] == label)
+		}
+		var fieldPathMValue2Label = function(value) {
+			return defaults_props['tca']['fieldPathM'][value];
+		}
+
 		setASDCFields();
-		
-		//load metrics dropdown
-		if (elementMap["global"]){
-			for (var i = 0; i < (elementMap["global"].length); i++){
-				if ((elementMap["global"][i]["name"]) == "vf"){
-					var vfSel = elementMap["global"][i]["value"];	
-					if (vf_Services["shared"]["byVf"][vfSel]["kpi"]){
-						$.each((vf_Services["shared"]["byVf"][vfSel]["kpi"]), function(val, text) {
-			                $('#fieldPathM').append(
-			                    $('<option></option>').val(val).html(text)
-			                );
-			            });
-					}
-					break;
-				};
-			};
-		};
 
 		var arr = elementMap[lastElementSelected];
-		
+
 		if (arr !== undefined) {
 			for (var x in arr){
 				var num = add_one_more();
@@ -358,8 +338,8 @@
 					if (arr[x][i].hasOwnProperty('serviceConfigurations')){
 						for (var j=0; j<arr[x][i]["serviceConfigurations"].length; j++){
 							$("#formId" + num + " #tcaTable").prepend("<tr><td>"
-									+arr[x][i]["serviceConfigurations"][j][0]+" "
-									+(Object.keys(defaults_props['tca']['operator']).find(key => defaults_props['tca']['operator'][key] == (arr[x][i]["serviceConfigurations"][j][1])))+ " " 
+									+fieldPathMValue2Label(arr[x][i]["serviceConfigurations"][j][0])+ " "
+									+(Object.keys(defaults_props['tca']['operator']).find(key => defaults_props['tca']['operator'][key] == (arr[x][i]["serviceConfigurations"][j][1])))+ " "
 									+arr[x][i]["serviceConfigurations"][j][2]+" "
 									+arr[x][i]["serviceConfigurations"][j][3]+" "
 									+arr[x][i]["serviceConfigurations"][j][4]+"</td></tr>");
@@ -371,7 +351,10 @@
 				$('#go_properties_tab'+num).text($('#formId' +num+ ' #tname').val());
 				$("#formId"+num + " #properties_tab").invisible();
 			}
-		} 
+		} else {
+      var count = add_one_more();
+      generateTUUID(count);
+    }
 	
 		$("#savePropsBtn").click(function(event) {
 			var num = 1
@@ -390,23 +373,11 @@
 					var header = $(this).find('.tcaParentItems').serializeArray();
 					var sconf = {};
 					var sconfa = [];
-					var checkNF = true;
 					$('#formId' +count+' #tcaTable tr').each(function(){
 						$('td', this).each(function(){
 							var splitTd = $(this).text().split(' ');
+              splitTd[0]=fieldPathMLabel2Value(splitTd[0]);
 							splitTd[1]=defaults_props['tca']['operator'][splitTd[1]];
-							var checkByKpi = vf_Services["shared"]["byKpi"][splitTd[0].replace(/\s/g, "")];
-							if (checkByKpi["fieldPath"]){
-								splitTd.push(Object.keys(vf_Services["shared"]["byKpi"][splitTd[0].replace(/\s/g, "")]["fieldPath"])[0]);
-							};
-							if ((checkByKpi["nfNamingCode"]) && (checkNF)){
-								$.grep(header, function(e,i){ 
-									if (e.name == "tnfc"){
-										header[i]["value"] = (Object.keys(checkByKpi["nfNamingCode"])[0]);
-									}
-								});
-								checkNF = false;
-							}
 							sconfa.push(splitTd);
 						});
 						
@@ -533,19 +504,18 @@
 					var str = $(this).text().split(' ');
 					$('#formId'+count + ' #properties_tab').visible();
 					if (str.length == 5){
-						$('#formId'+count+' #fieldPathM').val(str[0]).multiselect('refresh');
+						$('#formId'+count+' #fieldPathM').val(fieldPathMLabel2Value(str[0])).multiselect('refresh');
 						$('#formId'+count+' #operator').val(str[1]).multiselect('refresh');
 						$('#formId'+count+' #threshold').val(str[2]);
-            $('#formId'+count+' #controlLoopSchema').val(str[3]).multiselect('refresh');
-            $('#formId'+count+' #closedLoopEventStatus').val(str[4]).multiselect('refresh');
+            $('#formId'+count+' #closedLoopEventStatus').val(str[3]).multiselect('refresh');
 					}
-					
-					if ((!(readOnly||readMOnly)) && ($('#formId'+count + ' #deleteThresh').prop('disabled'))) {
+
+					if ((!(readMOnly)) && ($('#formId'+count + ' #deleteThresh').prop('disabled'))) {
 						$('#formId'+count + ' #deleteThresh').prop('disabled', false);
 					}
 				}
 			});
-			
+
 			$('#formId'+count+' #deleteThresh').on('click', function(){
 				$('#formId'+num+' .tcaErr').hide();
 				$('#formId'+count+ ' #properties_tab').invisible();
@@ -571,15 +541,14 @@
 					$('#formId'+count+' #fieldPathM').prop("selectedIndex", 0).multiselect('refresh');
 					$('#formId'+count+' #operator').prop("selectedIndex", 0).multiselect('refresh');
 					$('#formId'+count+' #threshold').val("");
-          $('#formId'+count+' #controlLoopSchema').prop("selectedIndex", 0).multiselect('refresh');
-          $('#formId'+count+' #closedLoopEventStatus').prop("selectedIndex", 0).multiselect('refresh');
-					
+					$('#formId'+count+' #closedLoopEventStatus').prop("selectedIndex", 0).multiselect('refresh');
+
 					if ($('#formId'+count + ' #deleteThresh').prop('disabled')) {
 						$('#formId'+count + ' #deleteThresh').prop('disabled', false);
 					}
 				}
 			});
-			
+
 			$('#formId'+count+' #tname').on('change',function(){
 				$('#go_properties_tab'+count).text($('#formId'+count+' #tname').val())
 			});