aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java2
-rw-r--r--src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html37
-rw-r--r--src/main/resources/META-INF/resources/designer/partials/portfolios/stringMatch_properties.html52
3 files changed, 82 insertions, 9 deletions
diff --git a/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java b/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java
index d3176715..5b9c5d36 100644
--- a/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java
+++ b/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java
@@ -463,7 +463,7 @@ public class SdcCatalogServices {
// To remove duplicate resources from serviceDetail and add valid
// vfs to service
- if (cldsSdcServiceDetail.getResources() != null) {
+ if (cldsSdcServiceDetail != null && cldsSdcServiceDetail.getResources() != null) {
List<CldsSdcResource> cldsSdcResourceList = removeDuplicateSdcResourceInstances(
cldsSdcServiceDetail.getResources());
if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) {
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 5e809ae0..4f7a77d4 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
@@ -236,7 +236,7 @@ label{
<div class="form-group clearfix" >
<label class="col-sm-4 control-label" for="recipe">Recipe</label>
<div class="col-sm-8">
- <select class="form-control" name="recipe" id="recipe" enableFilter="false"></select>
+ <select class="form-control" name="recipe" id="recipe" enableFilter="true"></select>
</div>
</div>
<div class="form-group clearfix">
@@ -270,7 +270,7 @@ label{
Parent Policy</label>
<div class="col-sm-8">
<select class="form-control" id="parentPolicy"
- name="parentPolicy" enableFilter="false"><option value=""></option></select>
+ name="parentPolicy" enableFilter="true"><option value=""></option></select>
</div>
</div>
<div class="form-group clearfix">
@@ -395,7 +395,35 @@ label{
}
}
-
+
+ function addSelectListen(count) {
+ var onSelectChange = function() {
+ var opselected = this.selectedOptions[0].text;
+
+ if (this.id == "recipe"){
+ if(opselected!==""){
+ var polCount = $(this).closest("[id^='formId']").attr("id").substring(6);
+ $(this).closest(".policyPanel").find("#go_properties_tab"+polCount).text(opselected);
+ } else {
+ $(this).closest("[id^='go_properties_tab']").text("Policy");
+ }
+ }
+
+ if (this.id=="parentPolicy"){
+ var ppCond = $(this).closest("[id^='formId']").find("#parentPolicyConditions");
+ if(opselected==""){
+ ppCond.multiselect("clearSelection");
+ ppCond.multiselect("disable");
+ } else {
+ ppCond.multiselect("enable");
+ }
+ }
+ };
+ $("#formId"+count+" select").each( function () {
+ this.change = onSelectChange;
+ });
+ }
+
//This is ensure there are no repeated keys in the map
function noRepeats(form) {
@@ -487,6 +515,7 @@ label{
$(".formId").not($("#formId" + count)).css("display", "none")
addCustListen(count)
//addTabListen(count)
+ addSelectListen(count);
// This is for when the process is not loading from map but being created
if(!loadingId){
var l=makeid()
@@ -830,4 +859,4 @@ label{
$(".policyPanel").css("display", "unset");
}
</script>
-</div> \ No newline at end of file
+</div>
diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/stringMatch_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/stringMatch_properties.html
index 018a4535..49ac07d7 100644
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/stringMatch_properties.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/stringMatch_properties.html
@@ -283,7 +283,7 @@ label{
<div class="form-group clearfix">
<label for="vfc" class="col-sm-4 control-label">Resource-VFC</label>
<div class="col-sm-8">
- <select class="form-control" id="vfc" name="vfc">
+ <select class="form-control" id="vfc" name="vfc" enableFilter="true">
</select>
@@ -292,7 +292,7 @@ label{
<div class="form-group clearfix">
<label for="alarmCondition" class="col-sm-4 control-label">Alarm Condition</label>
<div class="col-sm-8">
- <select class="form-control" id="alarmCondition" name="alarmCondition">
+ <select class="form-control" id="alarmCondition" name="alarmCondition" enableFilter="true">
</select>
</div>
@@ -350,7 +350,7 @@ label{
<div class="col-sm-8">
<select class="form-control" id="outputEventName"
- name="outputEventName" enableFilter="false"></select>
+ name="outputEventName" enableFilter="true"></select>
</div>
</div>
@@ -376,8 +376,9 @@ label{
// css attribute display:none
$("#add_one_more").click(function(event) {
event.preventDefault();
- add_one_more();
+ num = add_one_more();
setMultiSelect();
+ addSelectListen(num);
});
@@ -460,6 +461,8 @@ label{
alarm_conditions_temp="";
event_severity_temp="";
event_type_source_temp="";
+
+ addSelectListen(num);
}
//Adding all the ids for parent String options
@@ -667,6 +670,47 @@ label{
})
}
+ function addSelectListen(count) {
+ var onSelectChange = function() {
+ var opselected = this.selectedOptions[0].text;
+
+ if (this.id=="outputEventName"){
+ if(opselected!==""){
+ var stringMatchCount = $(this).closest("[id^='formId']").attr("id").substring(6);
+ $(this).closest(".stringMatchPanel").find("#go_properties_tab"+stringMatchCount).text(opselected);
+ } else {
+ $(this).closest("[id^='go_properties_tab']").text("Condition");
+ }
+ }
+
+ if (this.id=="vfc"){
+ var vfcCount = $(this).closest("[id^='formId']").attr("id").substring(6);
+ if(opselected!==""){
+ setAlarmConditions(opselected, vfcCount);
+ setAlertDescription(opselected, vfcCount);
+ } else {
+ $(this).closest(".formId").find("#eventSourceType").val("");
+ $(this).closest(".formId").find("#eventSeverity").val("");
+ }
+ }
+
+ if (this.id=="alarmCondition"){
+ var alarmCount = $(this).closest("[id^='formId']").attr("id").substring(6);
+ if(opselected!==""){
+ setEventSourceType(opselected.toString(), alarmCount, "alarm");
+ } else {
+ $(this).closest(".formId").find("#eventSourceType").val("");
+ $(this).closest(".formId").find("#eventSeverity").val("");
+ }
+ }
+
+ };
+
+ $("#formId"+count+" select").each( function () {
+ this.change = onSelectChange;
+ });
+ }
+
function addCustListen(count) {
$('#go_properties_tab' + count).click(function(event) {
$("#nav_Tabs li").removeClass("active");