From 6b20a432a2d959c6841a1ee8d9db35486a8d1046 Mon Sep 17 00:00:00 2001 From: xg353y Date: Mon, 20 May 2019 15:38:54 +0200 Subject: Fix issues in Operational Policy UI Add prefix for Guard Policy Id; display attributes correctly when guard type is FrequencyLimiter; initialize guard policy type accordingly; add default value for guard active start/end attributes; Issue-ID: CLAMP-386, CLAMP-387 Change-Id: I4c57ddcfccba207429fb1e75d9d2a4d6b0f15e8a Signed-off-by: xg353y --- .../portfolios/operational_policy_window.html | 32 +++++++++++++------ .../designer/scripts/OperationalPolicyCtrl.js | 37 ++++++++++++++++++++++ 2 files changed, 59 insertions(+), 10 deletions(-) (limited to 'src/main') diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html index fc6cc4dc4..3e9586685 100644 --- a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html +++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html @@ -58,6 +58,16 @@ label { margin-bottom: 0px; } +.withnote { + margin-bottom: 0px; +} + +.note { + font-size:10px; + margin-left: 250px; + font-weight: normal; +} + #policyTable { cursor: pointer; width: 100%; @@ -365,7 +375,7 @@ label { @@ -374,12 +384,15 @@ label {
-
+
- +
+
+ +
@@ -428,6 +441,7 @@ label {
+
+
+
- +
@@ -452,13 +464,13 @@ label { Guard Active Start
+ id="guardActiveStart" value="00:00:00Z"/>
+ id="guardActiveEnd" value="00:00:01Z"/>
diff --git a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js index f474cf413..95fc42038 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js +++ b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js @@ -214,12 +214,24 @@ app $("#formId" + formNum + " .guardProperties").find("#" + guardPropElemValue.id).val( guardElemValue[guardPropElemValue.id]); }); + iniGuardPolicyType(guardElemId, formNum); // And finally enable the flag $("#formId" + formNum + " #enableGuardPolicy").prop("checked", true); } }); }); } + function iniGuardPolicyType (guardPolicyId, formNum) { + if(guardPolicyId.indexOf('guard.minmax.') !== -1) { + $("#formId" + formNum + " #minMaxGuardPolicyDiv").show(); + $("#formId" + formNum + " #frequencyLimiterGuardPolicyDiv").hide(); + $("#formId" + formNum + " #guardPolicyType").val("GUARD_MIN_MAX"); + } else if (guardPolicyId.indexOf('guard.frequency.') !== -1) { + $("#formId" + formNum + " #minMaxGuardPolicyDiv").hide(); + $("#formId" + formNum + " #frequencyLimiterGuardPolicyDiv").show(); + $("#formId" + formNum + " #guardPolicyType").val("GUARD_YAML"); + } + } function initTargetResourceIdOptions (targetType, formNum) { var recipe = $("#formId" + formNum + "#recipe").val(); $("#formId" + formNum + " #resourceId").empty(); @@ -263,6 +275,30 @@ app initTargetResourceIdOptions(type, formNum); } + $scope.changeGuardId = function(formItemActive) { + if (formItemActive === undefined) { + formItemActive = searchActiveFormId(); + if (formItemActive === undefined) { + return; + } + } + var oldValue = $("#" + formItemActive.id + " .guardProperties #id").val(); + // remove old prefix + if(oldValue.indexOf('guard.minmax.') !== -1) { + oldValue = oldValue.substr(oldValue.indexOf('guard.minmax.') + 13); + } else if (oldValue.indexOf('guard.frequency.') !== -1) { + oldValue = oldValue.substr(oldValue.indexOf('guard.frequency.') + 16); + } + + var prefix = "guard."; + if ($("#" + formItemActive.id + " #guardPolicyType").val() === "GUARD_MIN_MAX") { + prefix = prefix + "minmax."; + } else if ($("#" + formItemActive.id + " #guardPolicyType").val() === "GUARD_YAML") { + prefix = prefix + "frequency."; + } + $("#" + formItemActive.id + " .guardProperties #id").val(prefix+oldValue); + } + $scope.changeTargetResourceId = function(event) { var formNum = $(event.target).closest('.formId').attr('id').substring(6); initTargetModelAttributes(formNum); @@ -298,6 +334,7 @@ app $("#" + formItemActive.id + " #minMaxGuardPolicyDiv").hide(); $("#" + formItemActive.id + " #frequencyLimiterGuardPolicyDiv").show(); } + $scope.changeGuardId(formItemActive); } $scope.initPolicySelect = function() { -- cgit 1.2.3-korg