PLT-4977 Sorting teams by display name on team list at system console's menue and select team modal. (#4797)

webapp/components/admin_console/admin_navbar_dropdown.jsx

@@ -50,7 +50,8 @@ export default class AdminNavbarDropdown extends React.Component {
     }
 
     render() {
-        const teams = [];
+        var teamsArray = [];  // Array of team objects
+        var teams = [];  // Array of team components
         let switchTeams;
 
         if (this.state.teamMembers && this.state.teamMembers.length > 0) {
@@ -58,6 +59,16 @@ export default class AdminNavbarDropdown extends React.Component {
                 if (this.state.teamMembers.hasOwnProperty(index)) {
                     const teamMember = this.state.teamMembers[index];
                     const team = this.state.teams[teamMember.team_id];
+                    teamsArray.push(team);
+                }
+            }
+
+            // Sort teams alphabetically with display_name
+            teamsArray.sort((teamA, teamB) =>
+                teamA.display_name.localeCompare(teamB.display_name)
+            );
+
+            for (const team of teamsArray) {
                 teams.push(
                     <li key={'team_' + team.name}>
                         <Link
@@ -72,7 +83,6 @@ export default class AdminNavbarDropdown extends React.Component {
                     </li>
                 );
             }
-            }
 
             teams.push(
                 <li

webapp/components/admin_console/select_team_modal.jsx

@@ -26,16 +26,7 @@ export default class SelectTeamModal extends React.Component {
     }
 
     compare(a, b) {
-        const teamA = a.display_name.toLowerCase();
+        return a.display_name.localeCompare(b.display_name);
-        const teamB = b.display_name.toLowerCase();
-
-        if (teamA < teamB) {
-            return -1;
-        }
-        if (teamA > teamB) {
-            return 1;
-        }
-        return 0;
     }
 
     render() {