You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2018/02/21 18:27:30 UTC
[incubator-trafficcontrol] 14/33: provides a label for ds magic
numbers (i.e. protocol, geoLimit,
etc). useful when showing the diff between a ds request and a ds. magic
numbers don't make a lot of sense to humans.
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 74969f062226eac0f4b68ad89b99cf36da2f6c35
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Wed Jan 17 21:13:26 2018 -0700
provides a label for ds magic numbers (i.e. protocol, geoLimit, etc). useful when showing the diff between a ds request and a ds. magic numbers don't make a lot of sense to humans.
---
.../FormDeliveryServiceController.js | 36 +++++++++++-----------
.../form.deliveryService.DNS.tpl.html | 14 ++++-----
.../form.deliveryService.HTTP.tpl.html | 16 +++++-----
.../form.deliveryService.Steering.tpl.html | 6 ++--
.../form.deliveryService.anyMap.tpl.html | 4 +--
.../FormEditDeliveryServiceRequestController.js | 5 +++
6 files changed, 43 insertions(+), 38 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 92fe344..2cc3963 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -139,27 +139,27 @@ var FormDeliveryServiceController = function(deliveryService, type, types, $scop
];
$scope.dscps = [
- { value: 0, label: '0 - Best Effort' },
+ { value: 0, label: '0 - Best Effort' },
{ value: 10, label: '10 - AF11' },
{ value: 12, label: '12 - AF12' },
{ value: 14, label: '14 - AF13' },
- { value: 18, label: '18 - AF21' },
- { value: 20, label: '20 - AF22' },
- { value: 22, label: '22 - AF23' },
- { value: 26, label: '26 - AF31' },
- { value: 28, label: '28 - AF32' },
- { value: 30, label: '30 - AF33' },
- { value: 34, label: '34 - AF41' },
- { value: 36, label: '36 - AF42' },
- { value: 37, label: '37 - ' },
- { value: 38, label: '38 - AF43' },
- { value: 8, label: '8 - CS1' },
- { value: 16, label: '16 - CS2' },
- { value: 24, label: '24 - CS3' },
- { value: 32, label: '32 - CS4' },
- { value: 40, label: '40 - CS5' },
- { value: 48, label: '48 - CS6' },
- { value: 56, label: '56 - CS7' }
+ { value: 18, label: '18 - AF21' },
+ { value: 20, label: '20 - AF22' },
+ { value: 22, label: '22 - AF23' },
+ { value: 26, label: '26 - AF31' },
+ { value: 28, label: '28 - AF32' },
+ { value: 30, label: '30 - AF33' },
+ { value: 34, label: '34 - AF41' },
+ { value: 36, label: '36 - AF42' },
+ { value: 37, label: '37 - ' },
+ { value: 38, label: '38 - AF43' },
+ { value: 8, label: '8 - CS1' },
+ { value: 16, label: '16 - CS2' },
+ { value: 24, label: '24 - CS3' },
+ { value: 32, label: '32 - CS4' },
+ { value: 40, label: '40 - CS5' },
+ { value: 48, label: '48 - CS6' },
+ { value: 56, label: '56 - CS7' }
];
$scope.deepCachingTypes = [
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 199633d..7217c93 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
@@ -146,7 +146,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.protocol, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{dsOriginal.protocol}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{magicNumberLabel(protocols, dsOriginal.protocol)}} ]</small>
</div>
</div>
@@ -190,7 +190,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dscp, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dscp != dsOriginal.dscp">Current Value: [ {{dsOriginal.dscp}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dscp != dsOriginal.dscp">Current Value: [ {{magicNumberLabel(dscps, dsOriginal.dscp)}} ]</small>
</div>
</div>
@@ -212,7 +212,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.rangeRequestHandling, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.rangeRequestHandling != dsOriginal.rangeRequestHandling">Current Value: [ {{dsOriginal.rangeRequestHandling}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.rangeRequestHandling != dsOriginal.rangeRequestHandling">Current Value: [ {{magicNumberLabel(rrhs, dsOriginal.rangeRequestHandling)}} ]</small>
</div>
</div>
@@ -223,7 +223,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.qstringIgnore, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.qstringIgnore != dsOriginal.qstringIgnore">Current Value: [ {{dsOriginal.qstringIgnore}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.qstringIgnore != dsOriginal.qstringIgnore">Current Value: [ {{magicNumberLabel(qStrings, dsOriginal.qstringIgnore)}} ]</small>
</div>
</div>
@@ -256,7 +256,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoProvider, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{dsOriginal.geoProvider}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsOriginal.geoProvider)}} ]</small>
</div>
</div>
@@ -287,7 +287,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimit, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{dsOriginal.geoLimit}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsOriginal.geoLimit)}} ]</small>
</div>
</div>
@@ -317,7 +317,7 @@ under the License.
<select name="signingAlgorithm" class="form-control" ng-model="deliveryService.signingAlgorithm" ng-options="sa.value as sa.label for sa in signingAlgos">
<option value="">Select...</option>
</select>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.signingAlgorithm != dsOriginal.signingAlgorithm">Current Value: [ {{dsOriginal.signingAlgorithm}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.signingAlgorithm != dsOriginal.signingAlgorithm">Current Value: [ {{magicNumberLabel(signingAlgos, dsOriginal.signingAlgorithm)}} ]</small>
</div>
</div>
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 806fa25..17063d7 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
@@ -146,7 +146,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.protocol, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{dsOriginal.protocol}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{magicNumberLabel(protocols, dsOriginal.protocol)}} ]</small>
</div>
</div>
@@ -200,7 +200,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dscp, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dscp != dsOriginal.dscp">Current Value: [ {{dsOriginal.dscp}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dscp != dsOriginal.dscp">Current Value: [ {{magicNumberLabel(dscps, dsOriginal.dscp)}} ]</small>
</div>
</div>
@@ -222,7 +222,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.rangeRequestHandling, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.rangeRequestHandling != dsOriginal.rangeRequestHandling">Current Value: [ {{dsOriginal.rangeRequestHandling}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.rangeRequestHandling != dsOriginal.rangeRequestHandling">Current Value: [ {{magicNumberLabel(rrhs, dsOriginal.rangeRequestHandling)}} ]</small>
</div>
</div>
@@ -233,7 +233,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.qstringIgnore, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.qstringIgnore != dsOriginal.qstringIgnore">Current Value: [ {{dsOriginal.qstringIgnore}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.qstringIgnore != dsOriginal.qstringIgnore">Current Value: [ {{magicNumberLabel(qStrings, dsOriginal.qstringIgnore)}} ]</small>
</div>
</div>
@@ -266,7 +266,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.initialDispersion, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.initialDispersion != dsOriginal.initialDispersion">Current Value: [ {{dsOriginal.initialDispersion}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.initialDispersion != dsOriginal.initialDispersion">Current Value: [ {{magicNumberLabel(dispersions, dsOriginal.initialDispersion)}} ]</small>
</div>
</div>
@@ -288,7 +288,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoProvider, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{dsOriginal.geoProvider}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsOriginal.geoProvider)}} ]</small>
</div>
</div>
@@ -319,7 +319,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimit, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{dsOriginal.geoLimit}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsOriginal.geoLimit)}} ]</small>
</div>
</div>
@@ -349,7 +349,7 @@ under the License.
<select name="signingAlgorithm" class="form-control" ng-model="deliveryService.signingAlgorithm" ng-options="sa.value as sa.label for sa in signingAlgos">
<option value="">Select...</option>
</select>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.signingAlgorithm != dsOriginal.signingAlgorithm">Current Value: [ {{dsOriginal.signingAlgorithm}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.signingAlgorithm != dsOriginal.signingAlgorithm">Current Value: [ {{magicNumberLabel(signingAlgos, dsOriginal.signingAlgorithm)}} ]</small>
</div>
</div>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
index 23188bf..b4d495d 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
@@ -135,7 +135,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.protocol, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{dsOriginal.protocol}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{magicNumberLabel(protocols, dsOriginal.protocol)}} ]</small>
</div>
</div>
@@ -201,7 +201,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoProvider, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{dsOriginal.geoProvider}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsOriginal.geoProvider)}} ]</small>
</div>
</div>
@@ -212,7 +212,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimit, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{dsOriginal.geoLimit}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsOriginal.geoLimit)}} ]</small>
</div>
</div>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
index 224e80e..8c81c9c 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
@@ -175,7 +175,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<select name="geoProvider" class="form-control" ng-model="deliveryService.geoProvider" ng-options="gp.value as gp.label for gp in geoProviders" required></select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoProvider, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{dsOriginal.geoProvider}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsOriginal.geoProvider)}} ]</small>
</div>
</div>
@@ -186,7 +186,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimit, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{dsOriginal.geoLimit}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsOriginal.geoLimit)}} ]</small>
</div>
</div>
diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
index 9782fe5..466ddd1 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
@@ -53,6 +53,11 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
return (dsRequest.status == 'draft' || dsRequest.status == 'submitted' || dsRequest.status == 'pending');
};
+ $scope.magicNumberLabel = function(collection, magicNumber) {
+ var item = _.findWhere(collection, { value: magicNumber });
+ return item.label;
+ };
+
$scope.editStatus = function() {
var params = {
title: "Edit Delivery Service Request Status",
--
To stop receiving notification emails like this one, please contact
dewrich@apache.org.