Merge branch 'master' into cdn_locks_fix_shared_usernames_display

srijeet0406 · web-flow · commit 8dbb83f96269 · 2022-12-05T15:10:12.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - [#7231](https://github.com/apache/trafficcontrol/pull/7231) *Traffic Ops, Traffic Portal* Fixed `sharedUserNames` display while retrieving CDN locks.
+- [#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
@@ -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
@@ -41,7 +41,7 @@
             </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>

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ var TableAssignServersPerCapabilityController = function(servers, serverCapabili`
`32`	`32`	`field: "hostName",`
`33`	`33`	`checkboxSelection: true,`
`34`	`34`	`headerCheckboxSelection: true,`
	`35`	`+ sort: "asc",`
`35`	`36`	`},`
`36`	`37`	`{`
`37`	`38`	`headerName: "Type",`