diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-27 17:16:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 17:16:48 -0400 |
| commit | 67e2715274dcc7869baa8b39f5c8d0baf8ea4bed (patch) | |
| tree | 63208943379a1c1fc2532db002c78ca36ec77dfe /webapp | |
| parent | e83ba9a4a720f8ec7d63cef6e6b53779ba41fb7b (diff) | |
| download | chat-67e2715274dcc7869baa8b39f5c8d0baf8ea4bed.tar.gz chat-67e2715274dcc7869baa8b39f5c8d0baf8ea4bed.tar.bz2 chat-67e2715274dcc7869baa8b39f5c8d0baf8ea4bed.zip | |
RN-152 Updated createGroupChannel's return value to match createDirectChannel (#7027)
* RN-152 Updated createGroupChannel's return value to match createDirectChannel
* Fixed handling of results from createDirectChannel
* Updated yarn.lock
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/actions/channel_actions.jsx | 11 | ||||
| -rw-r--r-- | webapp/actions/global_actions.jsx | 8 | ||||
| -rw-r--r-- | webapp/yarn.lock | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/webapp/actions/channel_actions.jsx b/webapp/actions/channel_actions.jsx index 6e529d332..39dc37591 100644 --- a/webapp/actions/channel_actions.jsx +++ b/webapp/actions/channel_actions.jsx @@ -181,14 +181,13 @@ export function openDirectChannelToUser(userId, success, error) { export function openGroupChannelToUsers(userIds, success, error) { ChannelActions.createGroupChannel(userIds)(dispatch, getState).then( - (data) => { + (result) => { loadProfilesForSidebar(); - if (data && success) { - success(data, false); - } else if (data == null && error) { + if (result.data && success) { + success(result.data, false); + } else if (result.error && error) { browserHistory.push(TeamStore.getCurrentTeamUrl()); - const serverError = getState().requests.channels.createChannel.error; - error({id: serverError.server_error_id, ...serverError}); + error({id: result.error.server_error_id, ...result.error}); } } ); diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index b3dc078c4..2b65beffd 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -45,9 +45,11 @@ export function emitChannelClickEvent(channel) { const currentUserId = UserStore.getCurrentId(); const otherUserId = Utils.getUserIdFromChannelName(chan); createDirectChannel(currentUserId, otherUserId)(dispatch, getState).then( - (data) => { - if (data) { - success(data); + (result) => { + const receivedChannel = result.data; + + if (receivedChannel) { + success(receivedChannel); } else { fail(); } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 0b6275bcf..1b7b28094 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -5004,7 +5004,7 @@ math-expression-evaluator@^1.2.14: mattermost-redux@mattermost/mattermost-redux#master: version "0.0.1" - resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/f8d106e6fde0d8633bf5d13c1ca1aaec61b0b8bb" + resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/9797cb8bd8fa61252336a7c6150bd364f7ca28b1" dependencies: deep-equal "1.0.1" harmony-reflect "1.5.1" |