From 1ab7034574de2229d3cfc49391e6579db37a3064 Mon Sep 17 00:00:00 2001
From: Antti Ahti <antti.ahti@gmail.com>
Date: Wed, 14 Oct 2015 18:27:03 +0300
Subject: [PATCH] Use team display name in team switcher menu

- /teams/find_teams returns team objects instead of just team names
- use display_name in UI instead of name in the team switch menu
---
 api/team.go                              |  8 +++-----
 api/team_test.go                         |  9 ++++++---
 model/client.go                          |  2 +-
 web/react/components/navbar_dropdown.jsx | 13 ++++++++-----
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/api/team.go b/api/team.go
index 6aa5ec1bb2..7148caac3e 100644
--- a/api/team.go
+++ b/api/team.go
@@ -409,14 +409,12 @@ func findTeams(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	} else {
 		teams := result.Data.([]*model.Team)
-
-		s := make([]string, 0, len(teams))
-
+		m := make(map[string]*model.Team)
 		for _, v := range teams {
-			s = append(s, v.Name)
+			m[v.Id] = v
 		}
 
-		w.Write([]byte(model.ArrayToJson(s)))
+		w.Write([]byte(model.TeamMapToJson(m)))
 	}
 }
 
diff --git a/api/team_test.go b/api/team_test.go
index 9b701911b9..507f4252a3 100644
--- a/api/team_test.go
+++ b/api/team_test.go
@@ -121,9 +121,12 @@ func TestFindTeamByEmail(t *testing.T) {
 	if r1, err := Client.FindTeams(user.Email); err != nil {
 		t.Fatal(err)
 	} else {
-		domains := r1.Data.([]string)
-		if domains[0] != team.Name {
-			t.Fatal(domains)
+		teams := r1.Data.(map[string]*model.Team)
+		if teams[team.Id].Name != team.Name {
+			t.Fatal()
+		}
+		if teams[team.Id].DisplayName != team.DisplayName {
+			t.Fatal()
 		}
 	}
 
diff --git a/model/client.go b/model/client.go
index 77b0aaad28..19c99df729 100644
--- a/model/client.go
+++ b/model/client.go
@@ -185,7 +185,7 @@ func (c *Client) FindTeams(email string) (*Result, *AppError) {
 	} else {
 
 		return &Result{r.Header.Get(HEADER_REQUEST_ID),
-			r.Header.Get(HEADER_ETAG_SERVER), ArrayFromJson(r.Body)}, nil
+			r.Header.Get(HEADER_ETAG_SERVER), TeamMapFromJson(r.Body)}, nil
 	}
 }
 
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index 49d517419e..b3f8e44188 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -145,7 +145,7 @@ export default class NavbarDropdown extends React.Component {
 
         var teams = [];
 
-        if (this.state.teams.length > 1) {
+        if (Object.keys(this.state.teams).length > 1) {
             teams.push(
                 <li
                     className='divider'
@@ -154,11 +154,14 @@ export default class NavbarDropdown extends React.Component {
                 </li>
             );
 
-            this.state.teams.forEach((teamName) => {
-                if (teamName !== this.props.teamName) {
-                    teams.push(<li key={teamName}><a href={Utils.getWindowLocationOrigin() + '/' + teamName}>{'Switch to ' + teamName}</a></li>);
+            for (let teamId in this.state.teams) {
+                if (this.state.teams.hasOwnProperty(teamId)) {
+                    let team = this.state.teams[teamId];
+                    if (team.name !== this.props.teamName) {
+                        teams.push(<li key={team.name}><a href={Utils.getWindowLocationOrigin() + '/' + team.name}>{'Switch to ' + team.display_name}</a></li>);
+                    }
                 }
-            });
+            }
         }
 
         if (global.window.config.EnableTeamCreation === 'true') {