From 999d1553e1ce45adf58f6082b160bc1147dc592b Mon Sep 17 00:00:00 2001 From: enahum Date: Mon, 19 Dec 2016 10:05:46 -0300 Subject: PLT-4167 Team Sidebar (#4569) * PLT-4167 Team Sidebar * Address feedback from PM * change route from my_members to members * bug fixes * Updating styles for teams sidebar (#4681) * Added PM changes * Fix corner cases * Addressing feedback * use two different endpoints * Bug fixes * Rename model and client functions, using preferences to store last team and channel viewed * Fix mobile notification count and closing the team sidebar * unit test, fixed bad merge and retrieve from cached when available * bug fixes * use id for last channel in preferences, query optimization * Updating multi team css (#4830) --- api/channel.go | 26 ++++++++++++++++++++------ api/post.go | 1 + api/team.go | 37 +++++++++++++++++++++++++++++++++++++ api/team_test.go | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 6 deletions(-) (limited to 'api') diff --git a/api/channel.go b/api/channel.go index 3e4398e72..97b604699 100644 --- a/api/channel.go +++ b/api/channel.go @@ -846,14 +846,21 @@ func setLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { Srv.Store.Channel().SetLastViewedAt(id, c.Session.UserId, newLastViewedAt) - preference := model.Preference{ + chanPref := model.Preference{ UserId: c.Session.UserId, - Category: model.PREFERENCE_CATEGORY_LAST, + Category: c.TeamId, Name: model.PREFERENCE_NAME_LAST_CHANNEL, Value: id, } - Srv.Store.Preference().Save(&model.Preferences{preference}) + teamPref := model.Preference{ + UserId: c.Session.UserId, + Category: model.PREFERENCE_CATEGORY_LAST, + Name: model.PREFERENCE_NAME_LAST_TEAM, + Value: c.TeamId, + } + + Srv.Store.Preference().Save(&model.Preferences{teamPref, chanPref}) message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, c.TeamId, "", c.Session.UserId, nil) message.Add("channel_id", id) @@ -901,14 +908,21 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { go clearPushNotification(c.Session.UserId, id) } - preference := model.Preference{ + chanPref := model.Preference{ UserId: c.Session.UserId, - Category: model.PREFERENCE_CATEGORY_LAST, + Category: c.TeamId, Name: model.PREFERENCE_NAME_LAST_CHANNEL, Value: id, } - Srv.Store.Preference().Save(&model.Preferences{preference}) + teamPref := model.Preference{ + UserId: c.Session.UserId, + Category: model.PREFERENCE_CATEGORY_LAST, + Name: model.PREFERENCE_NAME_LAST_TEAM, + Value: c.TeamId, + } + + Srv.Store.Preference().Save(&model.Preferences{teamPref, chanPref}) message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, c.TeamId, "", c.Session.UserId, nil) message.Add("channel_id", id) diff --git a/api/post.go b/api/post.go index a4a493060..7603c7955 100644 --- a/api/post.go +++ b/api/post.go @@ -824,6 +824,7 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel * message.Add("post", post.ToJson()) message.Add("channel_type", channel.Type) message.Add("channel_display_name", channel.DisplayName) + message.Add("channel_name", channel.Name) message.Add("sender_name", senderUsername) message.Add("team_id", team.Id) diff --git a/api/team.go b/api/team.go index 1d4de6b9e..f7fe9b830 100644 --- a/api/team.go +++ b/api/team.go @@ -32,6 +32,8 @@ func InitTeam() { BaseRoutes.Teams.Handle("/get_invite_info", ApiAppHandler(getInviteInfo)).Methods("POST") BaseRoutes.Teams.Handle("/find_team_by_name", ApiAppHandler(findTeamByName)).Methods("POST") BaseRoutes.Teams.Handle("/name/{team_name:[A-Za-z0-9\\-]+}", ApiAppHandler(getTeamByName)).Methods("GET") + BaseRoutes.Teams.Handle("/members", ApiUserRequired(getMyTeamMembers)).Methods("GET") + BaseRoutes.Teams.Handle("/unread", ApiUserRequired(getMyTeamsUnread)).Methods("GET") BaseRoutes.NeedTeam.Handle("/me", ApiUserRequired(getMyTeam)).Methods("GET") BaseRoutes.NeedTeam.Handle("/stats", ApiUserRequired(getTeamStats)).Methods("GET") @@ -358,6 +360,11 @@ func LeaveTeam(team *model.Team, user *model.User) *model.AppError { return uua.Err } + // delete the preferences that set the last channel used in the team and other team specific preferences + if result := <-Srv.Store.Preference().DeleteCategory(user.Id, team.Id); result.Err != nil { + return result.Err + } + RemoveAllSessionsForUserId(user.Id) InvalidateCacheForUser(user.Id) @@ -723,6 +730,32 @@ func getTeamByName(c *Context, w http.ResponseWriter, r *http.Request) { } } +func getMyTeamMembers(c *Context, w http.ResponseWriter, r *http.Request) { + if len(c.Session.TeamMembers) > 0 { + w.Write([]byte(model.TeamMembersToJson(c.Session.TeamMembers))) + } else { + if result := <-Srv.Store.Team().GetTeamsForUser(c.Session.UserId); result.Err != nil { + c.Err = result.Err + return + } else { + data := result.Data.([]*model.TeamMember) + w.Write([]byte(model.TeamMembersToJson(data))) + } + } +} + +func getMyTeamsUnread(c *Context, w http.ResponseWriter, r *http.Request) { + teamId := r.URL.Query().Get("id") + + if result := <-Srv.Store.Team().GetTeamsUnreadForUser(teamId, c.Session.UserId); result.Err != nil { + c.Err = result.Err + return + } else { + data := result.Data.([]*model.TeamUnread) + w.Write([]byte(model.TeamsUnreadToJson(data))) + } +} + func InviteMembers(team *model.Team, senderName string, invites []string) { for _, invite := range invites { if len(invite) > 0 { @@ -801,6 +834,10 @@ func updateTeam(c *Context, w http.ResponseWriter, r *http.Request) { oldTeam.Sanitize() + message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_UPDATE_TEAM, "", "", "", nil) + message.Add("team", oldTeam.ToJson()) + go Publish(message) + w.Write([]byte(oldTeam.ToJson())) } diff --git a/api/team_test.go b/api/team_test.go index 2af46f4dc..c4bcb1868 100644 --- a/api/team_test.go +++ b/api/team_test.go @@ -576,6 +576,41 @@ func TestGetTeamMembers(t *testing.T) { } } +func TestGetMyTeamMembers(t *testing.T) { + th := Setup().InitBasic() + + if result, err := th.BasicClient.GetMyTeamMembers(); err != nil { + t.Fatal(err) + } else { + members := result.Data.([]*model.TeamMember) + if len(members) == 0 { + t.Fatal("should have results") + } + } +} + +func TestGetMyTeamsUnread(t *testing.T) { + th := Setup().InitBasic() + + if result, err := th.BasicClient.GetMyTeamsUnread(""); err != nil { + t.Fatal(err) + } else { + members := result.Data.([]*model.TeamUnread) + if len(members) == 0 { + t.Fatal("should have results") + } + } + + if result, err := th.BasicClient.GetMyTeamsUnread(th.BasicTeam.Id); err != nil { + t.Fatal(err) + } else { + members := result.Data.([]*model.TeamUnread) + if len(members) != 0 { + t.Fatal("should not have results") + } + } +} + func TestGetTeamMember(t *testing.T) { th := Setup().InitBasic() -- cgit v1.2.3-1-g7c22