From b07f8272d6a99db2b7d4094961ffe0650b282bb7 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 28 Apr 2016 10:53:52 -0400 Subject: Change footer links to a tags instead of Link tags (#2815) --- webapp/components/header_footer_template.jsx | 29 +++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/webapp/components/header_footer_template.jsx b/webapp/components/header_footer_template.jsx index ce2f59541..76061d532 100644 --- a/webapp/components/header_footer_template.jsx +++ b/webapp/components/header_footer_template.jsx @@ -5,7 +5,6 @@ import $ from 'jquery'; import {FormattedMessage} from 'react-intl'; import React from 'react'; -import {Link} from 'react-router'; export default class NotLoggedIn extends React.Component { componentDidMount() { @@ -30,34 +29,38 @@ export default class NotLoggedIn extends React.Component {
{'© 2015 Mattermost, Inc.'} - - - + - - + - - + - +
-- cgit v1.2.3-1-g7c22 From 65a2427b90f3261d895f6b64a771d2362e896cb6 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 28 Apr 2016 10:55:07 -0400 Subject: Update {user} is typing.. based on display name setting (#2817) --- webapp/stores/user_typing_store.jsx | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/webapp/stores/user_typing_store.jsx b/webapp/stores/user_typing_store.jsx index ab0a9af1d..85c10bfbe 100644 --- a/webapp/stores/user_typing_store.jsx +++ b/webapp/stores/user_typing_store.jsx @@ -33,16 +33,16 @@ class UserTypingStoreClass extends EventEmitter { this.removeListener(CHANGE_EVENT, callback); } - usernameFromId(userId) { - let username = Utils.localizeMessage('msg_typing.someone', 'Someone'); + nameFromId(userId) { + let name = Utils.localizeMessage('msg_typing.someone', 'Someone'); if (UserStore.hasProfile(userId)) { - username = UserStore.getProfile(userId).username; + name = Utils.displayUsername(userId); } - return username; + return name; } userTyping(channelId, userId, postParentId) { - const username = this.usernameFromId(userId); + const name = this.nameFromId(userId); // Key representing a location where users can type const loc = channelId + postParentId; @@ -53,15 +53,15 @@ class UserTypingStoreClass extends EventEmitter { } // If we already have this user, clear it's timeout to be deleted - if (this.typingUsers[loc][username]) { - clearTimeout(this.typingUsers[loc][username].timeout); + if (this.typingUsers[loc][name]) { + clearTimeout(this.typingUsers[loc][name].timeout); } // Set the user and a timeout to remove it - this.typingUsers[loc][username] = setTimeout(() => { - delete this.typingUsers[loc][username]; + this.typingUsers[loc][name] = setTimeout(() => { + Reflect.deleteProperty(this.typingUsers[loc], name); if (this.typingUsers[loc] === {}) { - delete this.typingUsers[loc]; + Reflect.deleteProperty(this.typingUsers, loc); } this.emitChange(); }, Constants.UPDATE_TYPING_MS); @@ -76,14 +76,14 @@ class UserTypingStoreClass extends EventEmitter { } userPosted(userId, channelId, postParentId) { - const username = this.usernameFromId(userId); + const name = this.nameFromId(userId); const loc = channelId + postParentId; if (this.typingUsers[loc]) { - clearTimeout(this.typingUsers[loc][username]); - delete this.typingUsers[loc][username]; + clearTimeout(this.typingUsers[loc][name]); + Reflect.deleteProperty(this.typingUsers[loc], name); if (this.typingUsers[loc] === {}) { - delete this.typingUsers[loc]; + Reflect.deleteProperty(this.typingUsers, loc); } this.emitChange(); } -- cgit v1.2.3-1-g7c22 From 3dbb5ab4cca74de7d7a00909927e1f034949052d Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 28 Apr 2016 10:55:50 -0400 Subject: Only cache 3 post views at a time (#2818) --- webapp/components/posts_view_container.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/webapp/components/posts_view_container.jsx b/webapp/components/posts_view_container.jsx index a49c77f8d..edfa314f8 100644 --- a/webapp/components/posts_view_container.jsx +++ b/webapp/components/posts_view_container.jsx @@ -16,6 +16,8 @@ import {createChannelIntroMessage} from 'utils/channel_intro_messages.jsx'; import React from 'react'; +const MAXIMUM_CACHED_VIEWS = 3; + export default class PostsViewContainer extends React.Component { constructor() { super(); @@ -105,6 +107,12 @@ export default class PostsViewContainer extends React.Component { let newIndex = channels.indexOf(channelId); if (newIndex === -1) { + if (channels.length >= MAXIMUM_CACHED_VIEWS) { + channels.shift(); + atTop.shift(); + postLists.shift(); + } + newIndex = channels.length; channels.push(channelId); atTop[newIndex] = PostStore.getVisibilityAtTop(channelId); @@ -172,7 +180,7 @@ export default class PostsViewContainer extends React.Component { const isActive = (channels[i] === currentChannelId); postListCtls.push( Date: Thu, 28 Apr 2016 10:56:19 -0400 Subject: Don't return error if already part of channel being joined (#2814) --- Makefile | 2 +- api/channel.go | 13 +++++++++++-- api/channel_test.go | 4 ++-- i18n/en.json | 4 ++++ store/sql_channel_store.go | 11 ++++++++--- webapp/components/notify_counts.jsx | 8 ++++++-- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 0d22d392d..f1300176b 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ check-style: test: start-docker @echo Running tests - $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=240s ./api || exit 1 + $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=340s ./api || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1 diff --git a/api/channel.go b/api/channel.go index 4b0e99b20..5f0d03246 100644 --- a/api/channel.go +++ b/api/channel.go @@ -513,9 +513,18 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user_to_channel.type.app_error", nil, "") } + if result := <-Srv.Store.Channel().GetMember(channel.Id, user.Id); result.Err != nil { + if result.Err.Id != store.MISSING_MEMBER_ERROR { + return nil, result.Err + } + } else { + channelMember := result.Data.(model.ChannelMember) + return &channelMember, nil + } + newMember := &model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps()} - if cmresult := <-Srv.Store.Channel().SaveMember(newMember); cmresult.Err != nil { - l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, cmresult.Err) + if result := <-Srv.Store.Channel().SaveMember(newMember); result.Err != nil { + l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, result.Err) return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user.to.channel.failed.app_error", nil, "") } diff --git a/api/channel_test.go b/api/channel_test.go index 8ac785f77..a70e5532a 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -691,8 +691,8 @@ func TestAddChannelMember(t *testing.T) { t.Fatal("Should have errored, bad user id") } - if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err == nil { - t.Fatal("Should have errored, user already a member") + if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err != nil { + t.Fatal(err) } if _, err := Client.AddChannelMember("sgdsgsdg", user2.Id); err == nil { diff --git a/i18n/en.json b/i18n/en.json index 4b67d8c78..e8e20a12a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2851,6 +2851,10 @@ "id": "store.sql_channel.get_for_export.app_error", "translation": "We couldn't get all the channels" }, + { + "id": "store.sql_channel.get_member.missing.app_error", + "translation": "No channel member found for that user id and channel id" + }, { "id": "store.sql_channel.get_member.app_error", "translation": "We couldn't get the channel member" diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 46f56e7eb..6d549c7f0 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -12,6 +12,7 @@ import ( const ( MISSING_CHANNEL_ERROR = "store.sql_channel.get_by_name.missing.app_error" + MISSING_MEMBER_ERROR = "store.sql_channel.get_member.missing.app_error" ) type SqlChannelStore struct { @@ -572,9 +573,13 @@ func (s SqlChannelStore) GetMember(channelId string, userId string) StoreChannel result := StoreResult{} var member model.ChannelMember - err := s.GetReplica().SelectOne(&member, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId = :UserId", map[string]interface{}{"ChannelId": channelId, "UserId": userId}) - if err != nil { - result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + + if err := s.GetReplica().SelectOne(&member, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId = :UserId", map[string]interface{}{"ChannelId": channelId, "UserId": userId}); err != nil { + if err == sql.ErrNoRows { + result.Err = model.NewLocAppError("SqlChannelStore.GetMember", MISSING_MEMBER_ERROR, nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + } else { + result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + } } else { result.Data = member } diff --git a/webapp/components/notify_counts.jsx b/webapp/components/notify_counts.jsx index 9238c8736..8f9eadab7 100644 --- a/webapp/components/notify_counts.jsx +++ b/webapp/components/notify_counts.jsx @@ -9,8 +9,12 @@ function getCountsStateFromStores() { var channels = ChannelStore.getAll(); var members = ChannelStore.getAllMembers(); - channels.forEach(function setChannelInfo(channel) { + channels.forEach((channel) => { var channelMember = members[channel.id]; + if (channelMember == null) { + return; + } + if (channel.type === 'D') { count += channel.total_msg_count - channelMember.msg_count; } else if (channelMember.mention_count > 0) { @@ -20,7 +24,7 @@ function getCountsStateFromStores() { } }); - return {count: count}; + return {count}; } import React from 'react'; -- cgit v1.2.3-1-g7c22 From 938caa061d4f5aad00133926c86d3d6f4485b3a2 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 28 Apr 2016 23:52:22 +0500 Subject: Fixing long usernames (#2821) * Submitting a fix for popover titles * Fixing heading for channels * Fixing other minor corner cases for long username --- webapp/sass/components/_popover.scss | 3 +++ webapp/sass/layout/_headers.scss | 9 ++++++++- webapp/sass/layout/_navigation.scss | 4 ++++ webapp/sass/responsive/_mobile.scss | 4 ++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/webapp/sass/components/_popover.scss b/webapp/sass/components/_popover.scss index 0b2769f77..7526fcb5a 100644 --- a/webapp/sass/components/_popover.scss +++ b/webapp/sass/components/_popover.scss @@ -18,7 +18,10 @@ .popover-title { background: alpha-color($black, .05); + max-width: 100%; + overflow: hidden; padding: 8px 10px; + text-overflow: ellipsis; } .popover-content { diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index 950588df5..b4b6e9cbc 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -82,6 +82,12 @@ .channel-intro-profile { margin-left: 63px; margin-top: 5px; + + .user-popover { + max-width: calc(100% - 100px); + overflow: hidden; + text-overflow: ellipsis; + } } .channel-intro-img { @@ -106,6 +112,7 @@ .channel-intro-text { margin-top: 35px; + word-break: break-all; } } @@ -308,7 +315,7 @@ font-size: 1.3em; font-weight: 600; margin: 0 4px 0 0; - max-width: 100%; + max-width: calc(100% - 50px); overflow: hidden; text-overflow: ellipsis; vertical-align: middle; diff --git a/webapp/sass/layout/_navigation.scss b/webapp/sass/layout/_navigation.scss index 3daf6e56b..2008b247a 100644 --- a/webapp/sass/layout/_navigation.scss +++ b/webapp/sass/layout/_navigation.scss @@ -70,8 +70,12 @@ .heading { color: $white; + display: inline-block; font-weight: 600; margin-right: 3px; + overflow: hidden; + vertical-align: top; + width: calc(100% - 200px); } .header-dropdown__icon { diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index f2a1cf819..3a4cd3b89 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -11,6 +11,10 @@ } } + .user-popover { + pointer-events: none; + } + .signup-team__container { font-size: 1em; } -- cgit v1.2.3-1-g7c22 From f3fa435a1b35c2ada4cd9a81744a41904fe97909 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 28 Apr 2016 16:29:13 -0400 Subject: Fixing slack import. (#2819) --- api/import.go | 10 +++++----- api/slackimport.go | 25 ++++++++++++++++++++++++- api/team.go | 4 ++-- i18n/en.json | 12 ++++++++++++ webapp/client/client.jsx | 5 ++--- webapp/components/team_import_tab.jsx | 6 +++--- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/api/import.go b/api/import.go index c39ec5220..59d098d93 100644 --- a/api/import.go +++ b/api/import.go @@ -22,7 +22,7 @@ func ImportPost(post *model.Post) { } } -func ImportUser(teamId string, user *model.User) *model.User { +func ImportUser(team *model.Team, user *model.User) *model.User { user.MakeNonNil() if result := <-Srv.Store.User().Save(user); result.Err != nil { @@ -31,14 +31,14 @@ func ImportUser(teamId string, user *model.User) *model.User { } else { ruser := result.Data.(*model.User) - if err := JoinDefaultChannels(teamId, ruser, ""); err != nil { - l4g.Error(utils.T("api.import.import_user.joining_default.error"), ruser.Id, teamId, err) - } - if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { l4g.Error(utils.T("api.import.import_user.set_email.error"), cresult.Err) } + if err := JoinUserToTeam(team, user); err != nil { + l4g.Error(utils.T("api.import.import_user.join_team.error"), err) + } + return ruser } } diff --git a/api/slackimport.go b/api/slackimport.go index 4319fe409..df43e1a8b 100644 --- a/api/slackimport.go +++ b/api/slackimport.go @@ -99,6 +99,16 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map log.WriteString("===============\r\n\r\n") addedUsers := make(map[string]*model.User) + + // Need the team + var team *model.Team + if result := <-Srv.Store.Team().Get(teamId); result.Err != nil { + log.WriteString(utils.T("api.slackimport.slack_import.team_fail")) + return addedUsers + } else { + team = result.Data.(*model.Team) + } + for _, sUser := range slackusers { firstName := "" lastName := "" @@ -119,7 +129,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map Password: password, } - if mUser := ImportUser(teamId, &newUser); mUser != nil { + if mUser := ImportUser(team, &newUser); mUser != nil { addedUsers[sUser.Id] = mUser log.WriteString(utils.T("api.slackimport.slack_add_users.email_pwd", map[string]interface{}{"Email": newUser.Email, "Password": password})) } else { @@ -173,6 +183,18 @@ func SlackAddPosts(channel *model.Channel, posts []SlackPost, users map[string]* } } +func addSlackUsersToChannel(members []string, users map[string]*model.User, channel *model.Channel, log *bytes.Buffer) { + for _, member := range members { + if user, ok := users[member]; !ok { + log.WriteString(utils.T("api.slackimport.slack_add_channels.failed_to_add_user", map[string]interface{}{"Username": "?"})) + } else { + if _, err := AddUserToChannel(user, channel); err != nil { + log.WriteString(utils.T("api.slackimport.slack_add_channels.failed_to_add_user", map[string]interface{}{"Username": user.Username})) + } + } + } +} + func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[string][]SlackPost, users map[string]*model.User, log *bytes.Buffer) map[string]*model.Channel { // Write Header log.WriteString(utils.T("api.slackimport.slack_add_channels.added")) @@ -199,6 +221,7 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str log.WriteString(utils.T("api.slackimport.slack_add_channels.merge", map[string]interface{}{"DisplayName": newChannel.DisplayName})) } } + addSlackUsersToChannel(sChannel.Members, users, mChannel, log) log.WriteString(newChannel.DisplayName + "\r\n") addedChannels[sChannel.Id] = mChannel SlackAddPosts(mChannel, posts[sChannel.Name], users) diff --git a/api/team.go b/api/team.go index eefdc3d85..6db8bc245 100644 --- a/api/team.go +++ b/api/team.go @@ -40,8 +40,8 @@ func InitTeam() { BaseRoutes.NeedTeam.Handle("/add_user_to_team", ApiUserRequired(addUserToTeam)).Methods("POST") // These should be moved to the global admain console - BaseRoutes.Teams.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST") - BaseRoutes.Teams.Handle("/export_team", ApiUserRequired(exportTeam)).Methods("GET") + BaseRoutes.NeedTeam.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST") + BaseRoutes.NeedTeam.Handle("/export_team", ApiUserRequired(exportTeam)).Methods("GET") BaseRoutes.Teams.Handle("/add_user_to_team_from_invite", ApiUserRequired(addUserToTeamFromInvite)).Methods("POST") } diff --git a/i18n/en.json b/i18n/en.json index e8e20a12a..5cc2ec9f6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -667,6 +667,10 @@ "id": "api.import.import_user.set_email.error", "translation": "Failed to set email verified err=%v" }, + { + "id": "api.import.import_user.join_team.error", + "translation": "Failed to join team when importing err=%v" + }, { "id": "api.license.add_license.array.app_error", "translation": "Empty array under 'license' in request" @@ -995,6 +999,10 @@ "id": "api.slackimport.slack_add_channels.merge", "translation": "Merged with existing channel: {{.DisplayName}}\r\n" }, + { + "id": "api.slackimport.slack_add_channels.failed_to_add_user", + "translation": "Failed to add user to channel: {{.Username}}\r\n" + }, { "id": "api.slackimport.slack_add_posts.bot.warn", "translation": "Slack bot posts are not imported yet" @@ -1035,6 +1043,10 @@ "id": "api.slackimport.slack_import.log", "translation": "Mattermost Slack Import Log\r\n" }, + { + "id": "api.slackimport.slack_import.team_fail", + "translation": "Failed to get team to import into.\r\n" + }, { "id": "api.slackimport.slack_import.note1", "translation": "- Some posts may not have been imported because they where not supported by this importer.\r\n" diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 53a514082..6a7c5de40 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -348,10 +348,9 @@ export default class Client { importSlack = (fileData, success, error) => { request. - post(`${this.getTeamsRoute()}/import_team`). + post(`${this.getTeamNeededRoute()}/import_team`). set(this.defaultHeaders). - type('application/json'). - accept('application/json'). + accept('application/octet-stream'). send(fileData). end(this.handleResponse.bind(this, 'importSlack', success, error)); } diff --git a/webapp/components/team_import_tab.jsx b/webapp/components/team_import_tab.jsx index 03d35bb3f..782273c5a 100644 --- a/webapp/components/team_import_tab.jsx +++ b/webapp/components/team_import_tab.jsx @@ -33,8 +33,8 @@ class TeamImportTab extends React.Component { this.setState({status: 'fail', link: ''}); } - onImportSuccess(data) { - this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(data)}); + onImportSuccess(data, res) { + this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(res.text)}); } doImportSlack(file) { @@ -167,4 +167,4 @@ TeamImportTab.propTypes = { intl: intlShape.isRequired }; -export default injectIntl(TeamImportTab); \ No newline at end of file +export default injectIntl(TeamImportTab); -- cgit v1.2.3-1-g7c22