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
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e83ba9a4a7
Коммит
67e2715274
@@ -181,14 +181,13 @@ export function openDirectChannelToUser(userId, success, error) {
|
|||||||
|
|
||||||
export function openGroupChannelToUsers(userIds, success, error) {
|
export function openGroupChannelToUsers(userIds, success, error) {
|
||||||
ChannelActions.createGroupChannel(userIds)(dispatch, getState).then(
|
ChannelActions.createGroupChannel(userIds)(dispatch, getState).then(
|
||||||
(data) => {
|
(result) => {
|
||||||
loadProfilesForSidebar();
|
loadProfilesForSidebar();
|
||||||
if (data && success) {
|
if (result.data && success) {
|
||||||
success(data, false);
|
success(result.data, false);
|
||||||
} else if (data == null && error) {
|
} else if (result.error && error) {
|
||||||
browserHistory.push(TeamStore.getCurrentTeamUrl());
|
browserHistory.push(TeamStore.getCurrentTeamUrl());
|
||||||
const serverError = getState().requests.channels.createChannel.error;
|
error({id: result.error.server_error_id, ...result.error});
|
||||||
error({id: serverError.server_error_id, ...serverError});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -45,9 +45,11 @@ export function emitChannelClickEvent(channel) {
|
|||||||
const currentUserId = UserStore.getCurrentId();
|
const currentUserId = UserStore.getCurrentId();
|
||||||
const otherUserId = Utils.getUserIdFromChannelName(chan);
|
const otherUserId = Utils.getUserIdFromChannelName(chan);
|
||||||
createDirectChannel(currentUserId, otherUserId)(dispatch, getState).then(
|
createDirectChannel(currentUserId, otherUserId)(dispatch, getState).then(
|
||||||
(data) => {
|
(result) => {
|
||||||
if (data) {
|
const receivedChannel = result.data;
|
||||||
success(data);
|
|
||||||
|
if (receivedChannel) {
|
||||||
|
success(receivedChannel);
|
||||||
} else {
|
} else {
|
||||||
fail();
|
fail();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5004,7 +5004,7 @@ math-expression-evaluator@^1.2.14:
|
|||||||
|
|
||||||
mattermost-redux@mattermost/mattermost-redux#master:
|
mattermost-redux@mattermost/mattermost-redux#master:
|
||||||
version "0.0.1"
|
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:
|
dependencies:
|
||||||
deep-equal "1.0.1"
|
deep-equal "1.0.1"
|
||||||
harmony-reflect "1.5.1"
|
harmony-reflect "1.5.1"
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user