From 9ba968ce3354b1a8ab307ecc4cc785bdee16f914 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Wed, 1 Feb 2017 08:57:16 +0900
Subject: Use consistent Display Name sorting code throughout the webapp #5159
 (#5213)

* Use consistent Display Name sorting code throughout the webapp #5159

* fixed broken sorting of teams and channels
---
 webapp/components/admin_console/select_team_modal.jsx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'webapp/components/admin_console/select_team_modal.jsx')

diff --git a/webapp/components/admin_console/select_team_modal.jsx b/webapp/components/admin_console/select_team_modal.jsx
index 14448d753..68e20f852 100644
--- a/webapp/components/admin_console/select_team_modal.jsx
+++ b/webapp/components/admin_console/select_team_modal.jsx
@@ -3,18 +3,17 @@
 
 import ReactDOM from 'react-dom';
 import {FormattedMessage} from 'react-intl';
-
 import {Modal} from 'react-bootstrap';
-
 import React from 'react';
 
+import {sortTeamsByDisplayName} from 'utils/utils.jsx';
+
 export default class SelectTeamModal extends React.Component {
     constructor(props) {
         super(props);
 
         this.doSubmit = this.doSubmit.bind(this);
         this.doCancel = this.doCancel.bind(this);
-        this.compare = this.compare.bind(this);
     }
 
     doSubmit(e) {
@@ -25,24 +24,19 @@ export default class SelectTeamModal extends React.Component {
         this.props.onModalDismissed();
     }
 
-    compare(a, b) {
-        return a.display_name.localeCompare(b.display_name);
-    }
-
     render() {
         if (this.props.teams == null) {
             return <div/>;
         }
 
         const options = [];
-        const teamsArray = [];
+        let teamsArray = [];
 
         Reflect.ownKeys(this.props.teams).forEach((key) => {
             teamsArray.push(this.props.teams[key]);
         });
 
-        teamsArray.sort(this.compare);
-
+        teamsArray = teamsArray.sort(sortTeamsByDisplayName);
         for (let i = 0; i < teamsArray.length; i++) {
             const team = teamsArray[i];
             options.push(
-- 
cgit v1.2.3-1-g7c22