[trafficcontrol] branch master updated: Added description and priority order for Layered Profile in server's form. (#7295)

[oc...@apache.org]

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

ocket8888 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 c6f3a49b73 Added description and priority order for Layered Profile in server's form. (#7295)
c6f3a49b73 is described below

commit c6f3a49b732ca1469ccb1672ea1f0b0af98077a6
Author: Rima Shah <22...@users.noreply.github.com>
AuthorDate: Mon Jan 23 14:35:27 2023 -0700

    Added description and priority order for Layered Profile in server's form. (#7295)
    
    * Added description and priority order for LP in server's form.
    
    * review feedback.
---
 CHANGELOG.md                                                 |  1 +
 .../app/src/common/modules/form/server/form.server.tpl.html  | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4d3bb296e..23f76fcbfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 ### Added
+- [#7295](https://github.com/apache/trafficcontrol/pull/7295) *Traffic Portal* Added description and priority order for Layered Profile on server form.
 - [#6234](https://github.com/apache/trafficcontrol/issues/6234) *Traffic Ops, Traffic Portal* Added description field to Server Capabilities
 - [#6033](https://github.com/apache/trafficcontrol/issues/6033) *Traffic Ops, Traffic Portal* Added ability to assign multiple servers per capability.
 - [#7081](https://github.com/apache/trafficcontrol/issues/7081) *Traffic Router* Added better log messages for TR connection exceptions.
diff --git a/traffic_portal/app/src/common/modules/form/server/form.server.tpl.html b/traffic_portal/app/src/common/modules/form/server/form.server.tpl.html
index 7d4e0a6096..22247902cf 100644
--- a/traffic_portal/app/src/common/modules/form/server/form.server.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/server/form.server.tpl.html
@@ -111,8 +111,16 @@ under the License.
             </div>
 
             <fieldset>
-                <legend>Profiles<button name="addProfileBtn" class="btn btn-primary right-button btn-xs" type="button" title="add a new profile to the server" ng-click="addProfile()"><i class="fa fa-plus"></i></button></legend>
-                <fieldset ng-repeat="profile in server.profileNames track by $index">
+                <legend title="Layered Profiles for a given server."> Profiles
+                    <button name="addProfileBtn" class="btn btn-primary right-button btn-xs" type="button" title="add new profile(s) to the server" ng-click="addProfile()"><i class="fa fa-plus"></i></button>
+                </legend>
+                <p>
+                    <b>Note:</b> The profile with the highest priority (<b>1 - highest</b>), will take precedence (in terms of parameters).
+                    <br>
+                    For example, P1 and P2 are two profiles associated with a server, S1. Parameters of P1 will have a <u>higher</u> priority over that of P2.
+                    And if there exists parameters with same name but different values, then P1's parameters will <b>not</b> be overwritten.
+                </p>
+                <fieldset ng-repeat="profile in server.profileNames track by $index"> {{$index + 1}}
                     <select ng-class="{'has-error': hasPropertyError(serverForm['activeProfile-'+$index], 'required'), 'has-feedback': hasPropertyError(serverForm['activeProfile-'+$index], 'required')}"
                             id="activeProfile-{{$index}}" name="activeProfile-{{$index}}" class="form-control" ng-model="server.profileNames[$index]"
                             ng-options="profile.name as profile.name for profile in profiles|excludeFilter:profile:server.profileNames" required>