[MM-10455] Include "id" to data for UserTypes actions - RECEIVED_PROF…

…ILE_(NOT)_IN_TEAM / RECEIVED_PROFILE_(NOT)_IN_CHANNEL (mattermost#1214) * include "id" to data for UserTypes actions - RECEIVED_PROFILE_(NOT)_IN_TEAM / RECEIVED_PROFILE_(NOT)_IN_CHANNEL * update commit of mattermost-redux
Revanth47 · May 15, 2018 · feadd71 · feadd71
1 parent 33979b9
commit feadd71
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/actions/websocket_actions.jsx b/actions/websocket_actions.jsx
@@ -376,8 +376,7 @@ function handleLeaveTeamEvent(msg) {
  dispatch(batchActions([
  {
  type: UserTypes.RECEIVED_PROFILE_NOT_IN_TEAM,
- data: {user_id: msg.data.user_id},
- id: msg.data.team_id,
+ data: {id: msg.data.team_id, user_id: msg.data.user_id},
  },
  {
  type: TeamTypes.REMOVE_MEMBER_FROM_TEAM,
@@ -464,8 +463,7 @@ function handleUserAddedEvent(msg) {
  getChannelStats(ChannelStore.getCurrentId())(dispatch, getState);
  dispatch({
  type: UserTypes.RECEIVED_PROFILE_IN_CHANNEL,
- data: {user_id: msg.data.user_id},
- id: msg.broadcast.channel_id,
+ data: {id: msg.broadcast.channel_id, user_id: msg.data.user_id},
  });
  }
 
@@ -503,8 +501,7 @@ function handleUserRemovedEvent(msg) {
  getChannelStats(ChannelStore.getCurrentId())(dispatch, getState);
  dispatch({
  type: UserTypes.RECEIVED_PROFILE_NOT_IN_CHANNEL,
- data: {user_id: msg.data.user_id},
- id: msg.broadcast.channel_id,
+ data: {id: msg.broadcast.channel_id, user_id: msg.data.user_id},
  });
  }
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
  "localforage": "1.5.6",
  "localforage-observable": "1.4.0",
  "marked": "mattermost/marked#4bc7e5f00c324d2eadec6b932224871497af6f7c",
- "mattermost-redux": "github:mattermost/mattermost-redux#b1bb31daf58d5ec88f4f14627d6fe655d1570c03",
+ "mattermost-redux": "github:mattermost/mattermost-redux#50222617bbbe6381b4777c091720c6f6d833adbe",
  "moment-timezone": "0.5.14",
  "pdfjs-dist": "2.0.290",
  "perfect-scrollbar": "0.8.1",

diff --git a/stores/user_store.jsx b/stores/user_store.jsx
@@ -328,8 +328,7 @@ class UserStoreClass extends EventEmitter {
  removeProfileFromTeam(teamId, userId) {
  store.dispatch({
  type: UserTypes.RECEIVED_PROFILE_NOT_IN_TEAM,
- data: {user_id: userId},
- id: teamId,
+ data: {id: teamId, user_id: userId},
  });
  }
 
@@ -364,8 +363,7 @@ class UserStoreClass extends EventEmitter {
  removeProfileNotInTeam(teamId, userId) {
  store.dispatch({
  type: UserTypes.RECEIVED_PROFILE_IN_TEAM,
- data: {user_id: userId},
- id: teamId,
+ data: {id: teamId, user_id: userId},
  });
  }
 
@@ -374,24 +372,21 @@ class UserStoreClass extends EventEmitter {
  saveProfileInChannel(channelId = ChannelStore.getCurrentId(), profile) {
  store.dispatch({
  type: UserTypes.RECEIVED_PROFILE_IN_CHANNEL,
- data: {user_id: profile.id},
- id: channelId,
+ data: {id: channelId, user_id: profile.id},
  });
  }
 
  saveUserIdInChannel(channelId = ChannelStore.getCurrentId(), userId) {
  store.dispatch({
  type: UserTypes.RECEIVED_PROFILE_IN_CHANNEL,
- data: {user_id: userId},
- id: channelId,
+ data: {id: channelId, user_id: userId},
  });
  }
 
  removeProfileInChannel(channelId, userId) {
  store.dispatch({
  type: UserTypes.RECEIVED_PROFILE_NOT_IN_CHANNEL,
- data: {user_id: userId},
- id: channelId,
+ data: {id: channelId, user_id: userId},
  });
  }
 
@@ -404,16 +399,14 @@ class UserStoreClass extends EventEmitter {
  saveProfileNotInChannel(channelId = ChannelStore.getCurrentId(), profile) {
  store.dispatch({
  type: UserTypes.RECEIVED_PROFILE_NOT_IN_CHANNEL,
- data: {user_id: profile.id},
- id: channelId,
+ data: {id: channelId, user_id: profile.id},
  });
  }
 
  removeProfileNotInChannel(channelId, userId) {
  store.dispatch({
  type: UserTypes.RECEIVED_PROFILE_IN_CHANNEL,
- data: {user_id: userId},
- id: channelId,
+ data: {id: channelId, user_id: userId},
  });
  }