From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 8 Oct 2018 12:06:09 +0000 (+0200)
Subject: Fix target resourceId
X-Git-Tag: 3.0.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=clamp.git;a=commitdiff_plain;h=e3489d939cd18a4cfa2394ab64ffdb972ddd6a86

Fix target resourceId

Fix target resource id impacted by the code change done for Guard ui bug
fix

Issue-ID: CLAMP-227
Change-Id: I73751074b7414892ed4de30f894f09be3b72eb17
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---

diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html
index 7f63a406..5a460030 100644
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html
@@ -361,8 +361,12 @@ label {
 	</div>
 
 	<script>
+		function getAllFormId() {
+			return Array.from(document.getElementsByClassName("formId"));
+		}
+
 		function searchActiveFormId() {
-			var formArray = Array.from(document.getElementsByClassName("formId"));
+			var formArray = getAllFormId();
 			for (var i=0, max=formArray.length; i < max; i++) {
 				
 				console.log("Search active FormId, current element "+formArray[i].id);
@@ -373,13 +377,13 @@ label {
 			}
 			console.log("No active formId found !");
 		}
-		
+
 		function initTargetResourceId() {
-			var formItemActive = searchActiveFormId();
 			// Set all the Resource Invariant UUID in the target resource ID list (+Empty and other) 
-			Object.keys(vf_Services["shared"]["byVf"]).forEach(function(key){
-				$("#"+formItemActive.id+" #targetResourceId").append($('<option></option>').val(key).html(key));
+			Object.keys(vf_Services["shared"]["byVf"]).forEach(function(key) {
+					$("#targetResourceId").append($('<option></option>').val(key).html(key));
 			});
+			
 		}
 		
 		function changeTargetResourceIdOther() {
@@ -914,7 +918,7 @@ label {
 		initTargetResourceId();
 		
 		//load metrics dropdown
-		if (elementMap["global"]){
+		if (elementMap["global"]) {
 			for (var i = 0; i < (elementMap["global"].length); i++){
 				if ((elementMap["global"][i]["name"]) == "actionSet"){
 					var asSel = elementMap["global"][i]["value"];