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

srijeet0406 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 8f28a9c4fd Fix sort in server's capabilities table. (#7216)
8f28a9c4fd is described below

commit 8f28a9c4fda2089b70768bb5cc9b227f1a6d8040
Author: Rima Shah <[email protected]>
AuthorDate: Mon Dec 5 15:05:09 2022 -0700

    Fix sort in server's capabilities table. (#7216)
    
    * Fix sort in server's capabilities table.
    
    * Updated changelog
---
 CHANGELOG.md                                                            | 1 +
 .../TableAssignServersPerCapabilityController.js                        | 1 +
 .../serverServerCapabilities/table.serverServerCapabilities.tpl.html    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fd3b9df92..df064c3fa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The format is based on [Keep a 
Changelog](http://keepachangelog.com/en/1.0.0/).
 - [#4654](https://github.com/apache/trafficcontrol/pull/4654) *Traffic Ops, 
Traffic Portal* Switched Delivery Service active state to a three-value system, 
adding a state that will be used to prevent cache servers from deploying DS 
configuration.
 
 ### Fixed
+- [#7216](https://github.com/apache/trafficcontrol/pull/7216) *Traffic Portal* 
Fixed sort for Server's Capabilities Table
 - [#4428](https://github.com/apache/trafficcontrol/issues/4428) *Traffic Ops* 
Fixed Internal Server Error with POST to `profileparameters` when POST body is 
empty
 - [#7179](https://github.com/apache/trafficcontrol/issues/7179) *Traffic 
Portal* Fixed search filter for Delivery Service Table
 - [#7174](https://github.com/apache/trafficcontrol/issues/7174) *Traffic 
Portal* Fixed topologies sort (table and Delivery Service's form)
diff --git 
a/traffic_portal/app/src/common/modules/table/serverCapabilityServers/TableAssignServersPerCapabilityController.js
 
b/traffic_portal/app/src/common/modules/table/serverCapabilityServers/TableAssignServersPerCapabilityController.js
index 448bc5331d..925fed3db9 100644
--- 
a/traffic_portal/app/src/common/modules/table/serverCapabilityServers/TableAssignServersPerCapabilityController.js
+++ 
b/traffic_portal/app/src/common/modules/table/serverCapabilityServers/TableAssignServersPerCapabilityController.js
@@ -32,6 +32,7 @@ var TableAssignServersPerCapabilityController = 
function(servers, serverCapabili
             field: "hostName",
             checkboxSelection: true,
             headerCheckboxSelection: true,
+            sort: "asc",
         },
         {
             headerName: "Type",
diff --git 
a/traffic_portal/app/src/common/modules/table/serverServerCapabilities/table.serverServerCapabilities.tpl.html
 
b/traffic_portal/app/src/common/modules/table/serverServerCapabilities/table.serverServerCapabilities.tpl.html
index ebcc0728e0..f48fea24cf 100644
--- 
a/traffic_portal/app/src/common/modules/table/serverServerCapabilities/table.serverServerCapabilities.tpl.html
+++ 
b/traffic_portal/app/src/common/modules/table/serverServerCapabilities/table.serverServerCapabilities.tpl.html
@@ -41,7 +41,7 @@ under the License.
             </tr>
             </thead>
             <tbody>
-            <tr ng-click="editServerCapability(sc.serverCapability)" 
ng-repeat="sc in ::serverCapabilities" context-menu="contextMenuItems">
+            <tr ng-click="editServerCapability(sc.serverCapability)" 
ng-repeat="sc in ::serverCapabilities | orderBy :'serverCapability'" 
context-menu="contextMenuItems">
                 <td name="name" 
data-search="^{{::sc.serverCapability}}$">{{::sc.serverCapability}}</td>
                 <td style="text-align: right;">
                     <a class="link action-link" title="Remove Server 
Capability" ng-click="confirmRemoveCapability(sc.serverCapability, $event)"><i 
class="fa fa-sm fa-chain-broken"></i></a>

Reply via email to