IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

RN-152 Updated createGroupChannel's return value to match createDirectChannel (#7027)

Browse Source 
* RN-152 Updated createGroupChannel's return value to match createDirectChannel

* Fixed handling of results from createDirectChannel

* Updated yarn.lock
This commit is contained in:
Harrison Healey
2017-07-27 17:16:48 -04:00
committed by GitHub
parent e83ba9a4a7
commit 67e2715274
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webapp/actions/channel_actions.jsx
View File

@@ -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});
}
}
);

8
webapp/actions/global_actions.jsx
View File

@@ -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();
}

2
webapp/yarn.lock
View File

@@ -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"