This is an automated email from the ASF dual-hosted git repository.
shamrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 337ee579b8 DSR Capability Checkbox auto change (#7420)
337ee579b8 is described below
commit 337ee579b853c32e3ca732f3b76ee11c423d82fa
Author: Rima Shah <[email protected]>
AuthorDate: Wed Mar 29 15:47:22 2023 -0600
DSR Capability Checkbox auto change (#7420)
* Added isRequest for Regional Max Origin Connections
* Fixed the current and previous value box for DS capabilities.
* Addressed review comments.
---
.../form/deliveryService/FormDeliveryServiceController.js | 14 ++++++++++++++
.../form/deliveryService/form.deliveryService.DNS.tpl.html | 8 +++++++-
.../deliveryService/form.deliveryService.HTTP.tpl.html | 8 +++++++-
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
index fd9c007685..be24049365 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -132,6 +132,20 @@ var FormDeliveryServiceController =
function(deliveryService, dsCurrent, origin,
};
$scope.arrayCompare = arrayCompare;
+ /**
+ * This function is called when capability is updated on a DSR
+ */
+ function capabilityChange() {
+ const cap = [];
+ for (const [key, value] of
Object.entries($scope.selectedCapabilities)) {
+ if (value) {
+ cap.push(key);
+ }
+ }
+ deliveryService.requiredCapabilities = cap;
+ }
+ $scope.capabilityChange = capabilityChange;
+
/**
* This function is called on 'change' events for any and all TLS
Version
* inputs, and sets validity states of duplicates.
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
index 256c7e5bc7..76ce0c9d34 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
@@ -361,11 +361,12 @@ under the License.
name="capability-{{$index}}"
ng-model="selectedCapabilities[capability.name]"
ng-checked="selectedCapabilities[capability.name]"
+ ng-change="capabilityChange()"
/>
<a
ng-href="/#!/server-capabilities/edit?name={{capability.name}}"
target="_blank"> {{capability.name}}</a>
</div>
</div>
- <aside class="current-value"
ng-if="settings.isRequest"
ng-show="{{arrayCompare(deliveryService.requiredCapabilities,
dsCurrent.requiredCapabilities)}}">
+ <aside class="current-value"
ng-if="settings.isRequest"
ng-show="arrayCompare(deliveryService.requiredCapabilities,
dsCurrent.requiredCapabilities)">
<h3 ng-if="open()">Current Value</h3>
<h3 ng-if="!open()">Previous Value</h3>
<pre>{{::dsCurrent.requiredCapabilities}}</pre>
@@ -536,6 +537,11 @@ under the License.
ng-model="deliveryService.regional"
style="max-width: max-content; min-width:
1em;"
/>
+ <aside class="current-value"
ng-if="settings.isRequest" ng-show="deliveryService.regional !=
dsCurrent.regional">
+ <h3 ng-if="open()">Current Value</h3>
+ <h3 ng-if="!open()">Previous Value</h3>
+ <pre>{{::dsCurrent.regional}}</pre>
+ </aside>
</div>
</div>
<div class="form-group" ng-class="{'has-error':
hasError(cacheConfig.maxRequestHeaderBytes), 'has-feedback':
hasError(cacheConfig.maxRequestHeaderBytes)}">
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 4ff551a41f..a1b06577e1 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -361,11 +361,12 @@ under the License.
name="capability-{{$index}}"
ng-model="selectedCapabilities[capability.name]"
ng-checked="selectedCapabilities[capability.name]"
+ ng-change="capabilityChange()"
/>
<a
ng-href="/#!/server-capabilities/edit?name={{capability.name}}"
target="_blank">{{capability.name}}</a>
</div>
</div>
- <aside class="current-value"
ng-if="settings.isRequest"
ng-show="{{arrayCompare(deliveryService.requiredCapabilities,
dsCurrent.requiredCapabilities)}}">
+ <aside class="current-value"
ng-if="settings.isRequest"
ng-show="arrayCompare(deliveryService.requiredCapabilities,
dsCurrent.requiredCapabilities)">
<h3 ng-if="open()">Current Value</h3>
<h3 ng-if="!open()">Previous Value</h3>
<pre>{{::dsCurrent.requiredCapabilities}}</pre>
@@ -536,6 +537,11 @@ under the License.
ng-model="deliveryService.regional"
style="max-width: max-content; min-width:
1em;"
/>
+ <aside class="current-value"
ng-if="settings.isRequest" ng-show="deliveryService.regional !=
dsCurrent.regional">
+ <h3 ng-if="open()">Current Value</h3>
+ <h3 ng-if="!open()">Previous Value</h3>
+ <pre>{{::dsCurrent.regional}}</pre>
+ </aside>
</div>
</div>
<div class="form-group" ng-class="{'has-error':
hasError(cacheConfig.maxRequestHeaderBytes), 'has-feedback':
hasError(cacheConfig.maxRequestHeaderBytes)}">
