You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2019/03/18 16:23:43 UTC

[trafficcontrol] branch master updated: Quality of life improvements to consistent hash regex test form (#3377)

This is an automated email from the ASF dual-hosted git repository.

mitchell852 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 c68699d  Quality of life improvements to consistent hash regex test form (#3377)
c68699d is described below

commit c68699dc51401cf677cda64c810ad1ab4b9cab61
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Mon Mar 18 10:22:59 2019 -0600

    Quality of life improvements to consistent hash regex test form (#3377)
    
    * Quality of life improvements to consistent hash regex test form
    
    Changes the `<input>` element used to display results into the
    more appropriate `<output>` element. Also applies proper `for`
    attributes to all labels, corrected a broken pattern, changed
    angular validation restrictions into their standard counterparts
    (angular not needed when the values are constant).
    
    * Removed  attribute from optional fields
---
 .../form.deliveryServiceConsistentHashRegex.tpl.html    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html
index 85827c1..4b20831 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html
@@ -28,32 +28,31 @@ under the License.
     </div>
     <div class="x_content">
         <br>
-        <form name="dsConsistentHashRegexForm" class="form-horizontal form-label-left" novalidate>
+        <form name="dsConsistentHashRegexForm" class="form-horizontal form-label-left">
             <div class="form-group" ng-class="{'has-error': hasError(dsConsistentHashRegexForm.pattern), 'has-feedback': hasError(dsConsistentHashRegexForm.pattern)}">
-                <label class="control-label col-md-2 col-sm-2 col-xs-12">Pattern *</label>
+                <label for="pattern" class="control-label col-md-2 col-sm-2 col-xs-12">Pattern</label>
                 <div class="col-md-10 col-sm-10 col-xs-12">
-                    <input name="pattern" type="text" class="form-control" ng-model="pattern" ng-maxlength="48" ng-pattern="/^\S*$/" required autofocus>
+                    <input id="pattern" name="pattern" type="text" class="form-control" ng-model="pattern" maxlength="48" autofocus>
                 </div>
             </div>
             <div class="form-group" ng-class="{'has-error': hasError(dsConsistentHashRegexForm.requestPath), 'has-feedback': hasError(dsConsistentHashRegexForm.requestPath)}">
-                <label class="control-label col-md-2 col-sm-2 col-xs-12">Request Path *</label>
+                <label class="control-label col-md-2 col-sm-2 col-xs-12" for="requestPath">Request Path</label>
                 <div class="col-md-10 col-sm-10 col-xs-12">
-                    <input name="requestPath" type="text" class="form-control" ng-model="requestPath" ng-maxlength="27" ng-pattern="/^\/*//" required autofocus>
+                    <input id="requestPath" name="requestPath" type="text" class="form-control" ng-model="requestPath" maxlength="27" pattern="/.*">
                     <small class="input-error" ng-show="hasPropertyError(dsConsistentHashRegexForm.requestPath, 'pattern')">Path Must Start With '/'</small>
-                    <small class="input-error" ng-show="hasPropertyError(dsConsistentHashRegexForm.requestPath, 'maxlength')">Too Long - Request Path length is restricted by test tool</small>
                     <span ng-show="hasError(dsConsistentHashRegexForm.requestPath)" class="form-control-feedback"><i class="fa fa-times"></i></span>
                 </div>
             </div>
 
             <div class="form-group">
-                <label class="control-label col-md-2 col-sm-2 col-xs-12">Resulting Path</label>
+                <label for="resultingPath" class="control-label col-md-2 col-sm-2 col-xs-12">Resulting Path</label>
                 <div class="col-md-10 col-sm-10 col-xs-12">
-                    <input name="resultingPath" type="text" disabled class="form-control" ng-model="resultingPath" autofocus>
+                    <output id="resultingPath" name="resultingPath" class="form-control">{{resultingPath}}</output>
                 </div>
             </div>
 
             <div class="modal-footer">
-                <button type="button" class="btn btn-success" ng-disabled="dsConsistentHashRegexForm.$invalid" ng-click="test(pattern, requestPath, deliveryService.cdnId)">Test</button>
+                <button class="btn btn-success" ng-click="test(pattern, requestPath, deliveryService.cdnId)">Test</button>
             </div>
         </form>
     </div>