summaryrefslogtreecommitdiffstats
path: root/webapp/actions
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/actions')
-rw-r--r--webapp/actions/channel_actions.jsx403
-rw-r--r--webapp/actions/global_actions.jsx15
-rw-r--r--webapp/actions/post_actions.jsx3
-rw-r--r--webapp/actions/team_actions.jsx5
-rw-r--r--webapp/actions/websocket_actions.jsx20
5 files changed, 152 insertions, 294 deletions
diff --git a/webapp/actions/channel_actions.jsx b/webapp/actions/channel_actions.jsx
index d441a0e94..79dfe3212 100644
--- a/webapp/actions/channel_actions.jsx
+++ b/webapp/actions/channel_actions.jsx
@@ -20,6 +20,29 @@ import {Constants, Preferences, ActionTypes} from 'utils/constants.jsx';
import {browserHistory} from 'react-router/es6';
+// Redux actions
+import store from 'stores/redux_store.jsx';
+const dispatch = store.dispatch;
+const getState = store.getState;
+
+import {
+ viewChannel,
+ addChannelMember,
+ removeChannelMember,
+ updateChannelMemberRoles,
+ createDirectChannel,
+ fetchMyChannelsAndMembers,
+ joinChannel as joinChannelRedux,
+ leaveChannel as leaveChannelRedux,
+ updateChannel as updateChannelRedux,
+ searchChannels,
+ updateChannelNotifyProps as updateChannelNotifyPropsRedux,
+ createChannel as createChannelRedux,
+ patchChannel,
+ getChannelMembersByIds,
+ deleteChannel as deleteChannelRedux
+} from 'mattermost-redux/actions/channels';
+
export function goToChannel(channel) {
if (channel.fake) {
const user = UserStore.getProfileByUsername(channel.display_name);
@@ -66,7 +89,7 @@ export function executeCommand(message, args, success, error) {
export function setChannelAsRead(channelIdParam) {
const channelId = channelIdParam || ChannelStore.getCurrentId();
- AsyncClient.viewChannel();
+ viewChannel(channelId)(dispatch, getState);
ChannelStore.resetCounts(channelId);
ChannelStore.emitChange();
if (channelId === ChannelStore.getCurrentId()) {
@@ -75,97 +98,52 @@ export function setChannelAsRead(channelIdParam) {
}
export function addUserToChannel(channelId, userId, success, error) {
- Client.addChannelMember(
- channelId,
- userId,
+ addChannelMember(channelId, userId)(dispatch, getState).then(
(data) => {
- UserStore.removeProfileNotInChannel(channelId, userId);
- const profile = UserStore.getProfile(userId);
- if (profile) {
- UserStore.saveProfileInChannel(channelId, profile);
- UserStore.emitInChannelChange();
- }
- UserStore.emitNotInChannelChange();
-
- if (success) {
+ if (data && success) {
success(data);
- }
- },
- (err) => {
- AsyncClient.dispatchError(err, 'addChannelMember');
-
- if (error) {
- error(err);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.addChannelMember.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function removeUserFromChannel(channelId, userId, success, error) {
- Client.removeChannelMember(
- channelId,
- userId,
+ removeChannelMember(channelId, userId)(dispatch, getState).then(
(data) => {
- UserStore.removeProfileInChannel(channelId, userId);
- const profile = UserStore.getProfile(userId);
- if (profile) {
- UserStore.saveProfileNotInChannel(channelId, profile);
- UserStore.emitNotInChannelChange();
- }
- UserStore.emitInChannelChange();
-
- ChannelStore.removeMemberInChannel(channelId, userId);
- ChannelStore.emitChange();
-
- if (success) {
+ if (data && success) {
success(data);
- }
- },
- (err) => {
- AsyncClient.dispatchError(err, 'removeChannelMember');
-
- if (error) {
- error(err);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.removeChannelMember.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function makeUserChannelAdmin(channelId, userId, success, error) {
- Client.updateChannelMemberRoles(
- channelId,
- userId,
- 'channel_user channel_admin',
- () => {
- getChannelMembersForUserIds(channelId, [userId]);
-
- if (success) {
- success();
- }
- },
- (err) => {
- if (error) {
- error(err);
+ updateChannelMemberRoles(channelId, userId, 'channel_user channel_admin')(dispatch, getState).then(
+ (data) => {
+ if (data && success) {
+ success(data);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.updateChannelMember.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function makeUserChannelMember(channelId, userId, success, error) {
- Client.updateChannelMemberRoles(
- channelId,
- userId,
- 'channel_user',
- () => {
- getChannelMembersForUserIds(channelId, [userId]);
-
- if (success) {
- success();
- }
- },
- (err) => {
- if (error) {
- error(err);
+ updateChannelMemberRoles(channelId, userId, 'channel_user')(dispatch, getState).then(
+ (data) => {
+ if (data && success) {
+ success(data);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.updateChannelMember.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
@@ -193,37 +171,15 @@ export function openDirectChannelToUser(userId, success, error) {
return;
}
- Client.createDirectChannel(
- userId,
+ createDirectChannel(UserStore.getCurrentId(), userId)(dispatch, getState).then(
(data) => {
- Client.getChannel(
- data.id,
- (data2) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_CHANNEL,
- channel: data2.channel,
- member: data2.member
- });
-
- PreferenceStore.setPreference(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, userId, 'true');
- loadProfilesForSidebar();
-
- AsyncClient.savePreference(
- Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
- userId,
- 'true'
- );
-
- if (success) {
- success(data2.channel, false);
- }
- }
- );
- },
- () => {
- browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/' + channelName);
- if (error) {
- error();
+ loadProfilesForSidebar();
+ if (data && success) {
+ success(data, false);
+ } else if (data == null && error) {
+ browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/' + channelName);
+ const serverError = getState().requests.channels.createChannel.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
@@ -283,11 +239,11 @@ export function unmarkFavorite(channelId) {
}
export function loadChannelsForCurrentUser() {
- AsyncClient.getChannels().then(() => {
- AsyncClient.getMyChannelMembers().then(() => {
+ fetchMyChannelsAndMembers(TeamStore.getCurrentId())(dispatch, getState).then(
+ () => {
loadDMsAndGMsForUnreads();
- });
- });
+ }
+ );
}
export function loadDMsAndGMsForUnreads() {
@@ -309,214 +265,125 @@ export function loadDMsAndGMsForUnreads() {
}
export function joinChannel(channel, success, error) {
- Client.joinChannel(
- channel.id,
- () => {
- ChannelStore.removeMoreChannel(channel.id);
- ChannelStore.storeChannel(channel);
-
- if (success) {
- success();
- }
- },
- () => {
- if (error) {
- error();
+ joinChannelRedux(UserStore.getCurrentId(), null, channel.id)(dispatch, getState).then(
+ (data) => {
+ if (data && success) {
+ success(data);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.joinChannel.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function updateChannel(channel, success, error) {
- Client.updateChannel(
- channel,
- () => {
- AsyncClient.getChannel(channel.id);
-
- if (success) {
- success();
- }
- },
- (err) => {
- if (error) {
- error(err);
+ updateChannelRedux(channel)(dispatch, getState).then(
+ (data) => {
+ if (data && success) {
+ success(data);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.updateChannel.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function searchMoreChannels(term, success, error) {
- Client.searchMoreChannels(
- term,
+ searchChannels(TeamStore.getCurrentId(), term)(dispatch, getState).then(
(data) => {
- if (success) {
+ if (data && success) {
success(data);
- }
- },
- (err) => {
- if (error) {
- error(err);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.getChannels.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function autocompleteChannels(term, success, error) {
- Client.autocompleteChannels(
- term,
+ searchChannels(TeamStore.getCurrentId(), term)(dispatch, getState).then(
(data) => {
- if (success) {
+ if (data && success) {
success(data);
- }
- },
- (err) => {
- AsyncClient.dispatchError(err, 'autocompleteChannels');
-
- if (error) {
- error(err);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.getChannels.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function updateChannelNotifyProps(data, options, success, error) {
- Client.updateChannelNotifyProps(Object.assign({}, data, options),
- () => {
- const member = ChannelStore.getMyMember(data.channel_id);
- member.notify_props = Object.assign(member.notify_props, options);
- ChannelStore.storeMyChannelMember(member);
-
- if (success) {
- success();
- }
- },
- (err) => {
- if (error) {
- error(err);
+ updateChannelNotifyPropsRedux(data.user_id, data.channel_id, Object.assign({}, data, options))(dispatch, getState).then(
+ (result) => {
+ if (result && success) {
+ success(result);
+ } else if (result == null && error) {
+ const serverError = getState().requests.channels.updateChannelNotifyProps.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function createChannel(channel, success, error) {
- Client.createChannel(
- channel,
+ createChannelRedux(channel)(dispatch, getState).then(
(data) => {
- const existing = ChannelStore.getChannelById(data.id);
- if (existing) {
- if (success) {
- success({channel: existing});
- }
- } else {
- Client.getChannel(
- data.id,
- (data2) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_CHANNEL,
- channel: data2.channel,
- member: data2.channel
- });
-
- if (success) {
- success(data2);
- }
- },
- (err) => {
- AsyncClient.dispatchError(err, 'getChannel');
-
- if (error) {
- error(err);
- }
- }
- );
- }
- },
- (err) => {
- if (error) {
- error(err);
- } else {
- AsyncClient.dispatchError(err, 'createChannel');
+ if (data && success) {
+ success(data);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.createChannel.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
-export function updateChannelPurpose(channelId, purposeValue, success, error) {
- Client.updateChannelPurpose(
- channelId,
- purposeValue,
- () => {
- AsyncClient.getChannel(channelId);
-
- if (success) {
- success();
- }
- },
- (err) => {
- if (error) {
- error(err);
+export function updateChannelPurpose(channelId, purpose, success, error) {
+ patchChannel(channelId, {purpose})(dispatch, getState).then(
+ (data) => {
+ if (data && success) {
+ success(data);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.updateChannel.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function updateChannelHeader(channelId, header, success, error) {
- Client.updateChannelHeader(
- channelId,
- header,
- (channelData) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_CHANNEL,
- channel: channelData
- });
-
- if (success) {
- success(channelData);
- }
- },
- (err) => {
- if (error) {
- error(err);
+ patchChannel(channelId, {header})(dispatch, getState).then(
+ (data) => {
+ if (data && success) {
+ success(data);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.updateChannel.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function getChannelMembersForUserIds(channelId, userIds, success, error) {
- Client.getChannelMembersByIds(
- channelId,
- userIds,
+ getChannelMembersByIds(channelId, userIds)(dispatch, getState).then(
(data) => {
- const memberMap = {};
- for (let i = 0; i < data.length; i++) {
- memberMap[data[i].user_id] = data[i];
- }
-
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_MEMBERS_IN_CHANNEL,
- channel_id: channelId,
- channel_members: memberMap
- });
-
- if (success) {
+ if (data && success) {
success(data);
- }
- },
- (err) => {
- AsyncClient.dispatchError(err, 'getChannelMembersByIds');
-
- if (error) {
- error(err);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.members.error;
+ error({id: serverError.server_error_id, ...serverError});
}
}
);
}
-export function leaveChannel(channelId, success, error) {
- Client.leaveChannel(channelId,
+export function leaveChannel(channelId, success) {
+ leaveChannelRedux(channelId)(dispatch, getState).then(
() => {
- loadChannelsForCurrentUser();
-
if (ChannelUtils.isFavoriteChannelId(channelId)) {
unmarkFavorite(channelId);
}
@@ -527,33 +394,19 @@ export function leaveChannel(channelId, success, error) {
if (success) {
success();
}
- },
- (err) => {
- AsyncClient.dispatchError(err, 'handleLeave');
-
- if (error) {
- error(err);
- }
}
);
}
export function deleteChannel(channelId, success, error) {
- Client.deleteChannel(
- channelId,
- () => {
- loadChannelsForCurrentUser();
-
- if (success) {
- success();
- }
- },
- (err) => {
- AsyncClient.dispatchError(err, 'handleDelete');
-
- if (error) {
- error(err);
- }
+ deleteChannelRedux(channelId)(dispatch, getState).then(
+ (data) => {
+ if (data && success) {
+ success(data);
+ } else if (data == null && error) {
+ const serverError = getState().requests.channels.members.error;
+ error({id: serverError.server_error_id, ...serverError});
}
- );
+ }
+ );
}
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index 9709f5f80..1dd5d6952 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -35,8 +35,8 @@ import {browserHistory} from 'react-router/es6';
import store from 'stores/redux_store.jsx';
const dispatch = store.dispatch;
const getState = store.getState;
-import {ChannelTypes} from 'mattermost-redux/action_types';
import {removeUserFromTeam} from 'mattermost-redux/actions/teams';
+import {viewChannel, getChannelStats, getChannelMember} from 'mattermost-redux/actions/channels';
export function emitChannelClickEvent(channel) {
function userVisitedFakeChannel(chan, success, fail) {
@@ -53,12 +53,12 @@ export function emitChannelClickEvent(channel) {
}
function switchToChannel(chan) {
const channelMember = ChannelStore.getMyMember(chan.id);
- const getMyChannelMemberPromise = AsyncClient.getChannelMember(chan.id, UserStore.getCurrentId());
+ const getMyChannelMemberPromise = getChannelMember(chan.id, UserStore.getCurrentId())(dispatch, getState);
const oldChannelId = ChannelStore.getCurrentId();
getMyChannelMemberPromise.then(() => {
- AsyncClient.getChannelStats(chan.id, true);
- AsyncClient.viewChannel(chan.id, oldChannelId);
+ getChannelStats(chan.id)(dispatch, getState);
+ viewChannel(chan.id)(dispatch, getState);
loadPosts(chan.id);
});
@@ -83,11 +83,6 @@ export function emitChannelClickEvent(channel) {
channelMember,
prev: oldChannelId
});
-
- dispatch({
- type: ChannelTypes.SELECT_CHANNEL,
- data: chan.id
- }, getState);
}
if (channel.fake) {
@@ -113,7 +108,7 @@ export function doFocusPost(channelId, postId, data) {
post_list: data
});
loadChannelsForCurrentUser();
- AsyncClient.getChannelStats(channelId);
+ getChannelStats(channelId)(dispatch, getState);
loadPostsBefore(postId, 0, Constants.POST_FOCUS_CONTEXT_RADIUS, true);
loadPostsAfter(postId, 0, Constants.POST_FOCUS_CONTEXT_RADIUS, true);
}
diff --git a/webapp/actions/post_actions.jsx b/webapp/actions/post_actions.jsx
index 36abfc2be..4b7ade862 100644
--- a/webapp/actions/post_actions.jsx
+++ b/webapp/actions/post_actions.jsx
@@ -25,6 +25,7 @@ import store from 'stores/redux_store.jsx';
const dispatch = store.dispatch;
const getState = store.getState;
import {getProfilesByIds} from 'mattermost-redux/actions/users';
+import {getChannelMember} from 'mattermost-redux/actions/channels';
export function handleNewPost(post, msg) {
let websocketMessageProps = {};
@@ -40,7 +41,7 @@ export function handleNewPost(post, msg) {
Client.setTeamId(msg.data.team_id);
}
- AsyncClient.getChannelMember(post.channel_id, UserStore.getCurrentId()).then(() => completePostReceive(post, websocketMessageProps));
+ getChannelMember(post.channel_id, UserStore.getCurrentId())(dispatch, getState).then(() => completePostReceive(post, websocketMessageProps));
}
if (msg && msg.data) {
diff --git a/webapp/actions/team_actions.jsx b/webapp/actions/team_actions.jsx
index 83fbfa0a9..44b554ded 100644
--- a/webapp/actions/team_actions.jsx
+++ b/webapp/actions/team_actions.jsx
@@ -2,8 +2,8 @@
// See License.txt for license information.
import TeamStore from 'stores/team_store.jsx';
+import ChannelStore from 'stores/channel_store.jsx';
-import * as AsyncClient from 'utils/async_client.jsx';
import Client from 'client/web_client.jsx';
import {browserHistory} from 'react-router/es6';
@@ -14,6 +14,7 @@ const dispatch = store.dispatch;
const getState = store.getState;
import {getUser} from 'mattermost-redux/actions/users';
+import {viewChannel} from 'mattermost-redux/actions/channels';
import {
createTeam as createTeamRedux,
updateTeam as updateTeamRedux,
@@ -165,7 +166,7 @@ export function inviteMembers(data, success, error) {
}
export function switchTeams(url) {
- AsyncClient.viewChannel();
+ viewChannel(ChannelStore.getCurrentId())(dispatch, getState);
browserHistory.push(url);
}
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 57f78f95f..c6de42647 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -30,6 +30,13 @@ import {ActionTypes, Constants, Preferences, SocketEvents, UserStatuses} from 'u
import {browserHistory} from 'react-router/es6';
+// Redux actions
+import store from 'stores/redux_store.jsx';
+const dispatch = store.dispatch;
+const getState = store.getState;
+import {viewChannel, getChannelAndMyMember, getChannelStats} from 'mattermost-redux/actions/channels';
+import {ChannelTypes} from 'mattermost-redux/action_types';
+
const MAX_WEBSOCKET_FAILS = 7;
export function initialize() {
@@ -241,7 +248,7 @@ function handlePostEditEvent(msg) {
// Update channel state
if (ChannelStore.getCurrentId() === msg.broadcast.channel_id) {
if (window.isActive) {
- AsyncClient.viewChannel();
+ viewChannel(ChannelStore.getCurrentId())(dispatch, getState);
}
}
}
@@ -297,18 +304,18 @@ function handleUpdateTeamEvent(msg) {
}
function handleDirectAddedEvent(msg) {
- AsyncClient.getChannel(msg.broadcast.channel_id);
+ getChannelAndMyMember(msg.broadcast.channel_id)(dispatch, getState);
PreferenceStore.setPreference(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, msg.data.teammate_id, 'true');
loadProfilesForSidebar();
}
function handleUserAddedEvent(msg) {
if (ChannelStore.getCurrentId() === msg.broadcast.channel_id) {
- AsyncClient.getChannelStats();
+ getChannelStats(ChannelStore.getCurrentId())(dispatch, getState);
}
if (TeamStore.getCurrentId() === msg.data.team_id && UserStore.getCurrentId() === msg.data.user_id) {
- AsyncClient.getChannel(msg.broadcast.channel_id);
+ getChannelAndMyMember(msg.broadcast.channel_id)(dispatch, getState);
}
}
@@ -327,7 +334,7 @@ function handleUserRemovedEvent(msg) {
$('#removed_from_channel').modal('show');
}
} else if (ChannelStore.getCurrentId() === msg.broadcast.channel_id) {
- AsyncClient.getChannelStats();
+ getChannelStats(ChannelStore.getCurrentId())(dispatch, getState);
}
}
@@ -343,7 +350,7 @@ function handleChannelCreatedEvent(msg) {
const teamId = msg.data.team_id;
if (TeamStore.getCurrentId() === teamId && !ChannelStore.getChannelById(channelId)) {
- AsyncClient.getChannel(channelId);
+ getChannelAndMyMember(channelId)(dispatch, getState);
}
}
@@ -352,6 +359,7 @@ function handleChannelDeletedEvent(msg) {
const teamUrl = TeamStore.getCurrentTeamRelativeUrl();
browserHistory.push(teamUrl + '/channels/' + Constants.DEFAULT_CHANNEL);
}
+ dispatch({type: ChannelTypes.RECEIVED_CHANNEL_DELETED, data: {id: msg.data.channel_id, team_id: msg.broadcast.team_id}}, getState);
loadChannelsForCurrentUser();
}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-07 07:17:28 +0000