diff options
author | sebdet <sebastien.determe@intl.att.com> | 2018-10-08 10:03:23 +0200 |
---|---|---|
committer | sebdet <sebastien.determe@intl.att.com> | 2018-10-08 10:03:23 +0200 |
commit | bc273aca8a87a836f17c1f461492cc0f02a0ae16 (patch) | |
tree | 2ade8e84f99858e936f371f62749cfba77f420f9 /src | |
parent | dfd02c63d526af9d5270b66e462186afb382fdc0 (diff) |
Fix bug in policy UI
The notion of formId was not used , therefore only one ResourceTargetId
and Guard policytype was supported.
Issue-ID: CLAMP-227
Change-Id: Ic60f46e275f59f5598f60158988e9a2f27e20169
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html | 76 |
1 files changed, 44 insertions, 32 deletions
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 a527f53e6..7f63a406f 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 @@ -289,8 +289,7 @@ label { </div> <div class="col-sm-8"> <label for="guardPolicyType" class="col-sm-4 control-label"> - Guard Policy Type</label> - <select class="form-control" + Guard Policy Type</label> <select class="form-control" name="guardPolicyType" id="guardPolicyType" onchange="changeGuardPolicyType();"> <option value="GUARD_MIN_MAX">MinMax</option> @@ -362,34 +361,47 @@ label { </div> <script> - - function initTargetResourceId() { - // Set all the Resource Invariant UUID in the target resource ID list (+Empty and other) - Object.keys(vf_Services["shared"]["byVf"]).forEach(function(key){ - $('#targetResourceId').append($('<option></option>').val(key).html(key)); - }); - } - - function changeTargetResourceIdOther() { - if ($("#targetResourceId").val()==="Other:") { - $("#targetResourceIdOther").show(); - } else { - $("#targetResourceIdOther").hide(); - $("#targetResourceIdOther").val(""); + function searchActiveFormId() { + var formArray = Array.from(document.getElementsByClassName("formId")); + for (var i=0, max=formArray.length; i < max; i++) { + + console.log("Search active FormId, current element "+formArray[i].id); + if (formArray[i].style.display !== "none") { + console.log("Active form is:"+formArray[i].id); + return formArray[i]; + } + } + 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)); + }); } - } - - function changeGuardPolicyType() { - console.log("executing GuardPolicyType") - console.log("GuardPolicyType value:"+$("#guardPolicyType").val()) - if ($("#guardPolicyType").val()==="GUARD_MIN_MAX") { - $("#minMaxGuardPolicyDiv").show(); - $("#frequencyLimiterGuardPolicyDiv").hide(); - } else if ($("#guardPolicyType").val()==="GUARD_YAML") { - $("#minMaxGuardPolicyDiv").hide(); - $("#frequencyLimiterGuardPolicyDiv").show(); + + function changeTargetResourceIdOther() { + var formItemActive = searchActiveFormId(); + if ($("#"+formItemActive.id+" #targetResourceId").val()==="Other:") { + $("#"+formItemActive.id+" #targetResourceIdOther").show(); + } else { + $("#"+formItemActive.id+" #targetResourceIdOther").hide(); + $("#"+formItemActive.id+" #targetResourceIdOther").val(""); + } + } + + function changeGuardPolicyType() { + var formItemActive = searchActiveFormId(); + if ($("#"+formItemActive.id+" #guardPolicyType").val()==="GUARD_MIN_MAX") { + $("#"+formItemActive.id+" #minMaxGuardPolicyDiv").show(); + $("#"+formItemActive.id+" #frequencyLimiterGuardPolicyDiv").hide(); + } else if ($("#"+formItemActive.id+" #guardPolicyType").val()==="GUARD_YAML") { + $("#"+formItemActive.id+" #minMaxGuardPolicyDiv").hide(); + $("#"+formItemActive.id+" #frequencyLimiterGuardPolicyDiv").show(); + } } - } //Basically this method will add a new form. All forms share the same class. When you want one form to show(active form) the other forms get the // css attribute display:none $("#add_one_more").click(function(event) { @@ -449,10 +461,10 @@ label { } if(el[i][j].name==="targetResourceIdOther" && el[i][j].value.toString()!=='') { // Add the entry and set it - $('#targetResourceId').append($('<option></option>').val($('#targetResourceIdOther').val()).html($('#targetResourceIdOther').val())); - $('#targetResourceId').val($('#targetResourceIdOther').val()); + $("#formId" + num + " #targetResourceId").append($('<option></option>').val($("#formId" + num + " #targetResourceIdOther").val()).html($("#formId" + num + " #targetResourceIdOther").val())); + $("#formId" + num + " #targetResourceId").val($("#formId" + num + " #targetResourceIdOther").val()); } - + changeGuardPolicyType(); } } } @@ -495,7 +507,7 @@ label { }); $('input[value="multiselect-all"]').prop('disabled', true).parent('li').addClass('disabled'); } - changeGuardPolicyType(); + } function addSelectListen(count) { |