diff options
| author | Debanshu Kundu <debanshu.kundu@joshtechnologygroup.com> | 2016-12-20 03:16:13 +0530 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-12-19 16:46:13 -0500 |
| commit | c8cd3d22ad8f6c184ed2c5f4b285bf939b593572 (patch) | |
| tree | 1fdd2675219b37b7b140e4b99489baa85997fee2 /webapp/components/admin_console | |
| parent | 58e8da11b1aa74327c360e7ca1e44aabee3001a3 (diff) | |
| download | chat-c8cd3d22ad8f6c184ed2c5f4b285bf939b593572.tar.gz chat-c8cd3d22ad8f6c184ed2c5f4b285bf939b593572.tar.bz2 chat-c8cd3d22ad8f6c184ed2c5f4b285bf939b593572.zip | |
PLT-4977 Sorting teams by display name on team list at system console's menue and select team modal. (#4797)
Diffstat (limited to 'webapp/components/admin_console')
| -rw-r--r-- | webapp/components/admin_console/admin_navbar_dropdown.jsx | 38 | ||||
| -rw-r--r-- | webapp/components/admin_console/select_team_modal.jsx | 11 |
2 files changed, 25 insertions, 24 deletions
diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx index 5b65868e9..07e32e658 100644 --- a/webapp/components/admin_console/admin_navbar_dropdown.jsx +++ b/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,22 +59,31 @@ 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]; - teams.push( - <li key={'team_' + team.name}> - <Link - to={'/' + team.name + '/channels/town-square'} - > - <FormattedMessage - id='navbar_dropdown.switchTo' - defaultMessage='Switch to ' - /> - {team.display_name} - </Link> - </li> - ); + 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 + to={'/' + team.name + '/channels/town-square'} + > + <FormattedMessage + id='navbar_dropdown.switchTo' + defaultMessage='Switch to ' + /> + {team.display_name} + </Link> + </li> + ); + } + teams.push( <li key='teamDiv' diff --git a/webapp/components/admin_console/select_team_modal.jsx b/webapp/components/admin_console/select_team_modal.jsx index e407e61b4..14448d753 100644 --- a/webapp/components/admin_console/select_team_modal.jsx +++ b/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(); - const teamB = b.display_name.toLowerCase(); - - if (teamA < teamB) { - return -1; - } - if (teamA > teamB) { - return 1; - } - return 0; + return a.display_name.localeCompare(b.display_name); } render() { |