MM-13209: fix textbox to bind channel from props

This avoids relying on a global notion of the current channel, which only applies to the centre and not the RHS.

actions/views/channel.js

@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import {leaveChannel as leaveChannelRedux, joinChannel, unfavoriteChannel} from 'mattermost-redux/actions/channels';
-import {getChannel, getChannelByName, getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
+import {getChannel, getChannelByName} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentRelativeTeamUrl, getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {getCurrentUserId, getUserByUsername} from 'mattermost-redux/selectors/entities/users';
 import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
@@ -102,13 +102,12 @@ export function leaveChannel(channelId) {
  };
 }
 
-export function autocompleteUsersInChannel(prefix) {
+export function autocompleteUsersInChannel(prefix, channelId) {
  return async (dispatch, getState) => {
  const state = getState();
  const currentTeamId = getCurrentTeamId(state);
- const currentChannelId = getCurrentChannelId(state);
 
- return dispatch(autocompleteUsers(prefix, currentTeamId, currentChannelId));
+ return dispatch(autocompleteUsers(prefix, currentTeamId, channelId));
  };
 }
 

components/textbox/index.js

@@ -4,21 +4,26 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getCurrentUserId, getProfilesInCurrentChannel, getProfilesNotInCurrentChannel} from 'mattermost-redux/selectors/entities/users';
+import {getCurrentUserId, makeGetProfilesInChannel, makeGetProfilesNotInChannel} from 'mattermost-redux/selectors/entities/users';
 
 import {autocompleteUsersInChannel} from 'actions/views/channel';
 
 import Textbox from './textbox.jsx';
 
-const mapStateToProps = (state) => ({
- currentUserId: getCurrentUserId(state),
- profilesInChannel: getProfilesInCurrentChannel(state),
- profilesNotInChannel: getProfilesNotInCurrentChannel(state),
-});
+const mapStateToProps = () => {
+ const getProfilesInChannel = makeGetProfilesInChannel();
+ const getProfilesNotInChannel = makeGetProfilesNotInChannel();
+
+ return (state, ownProps) => ({
+ currentUserId: getCurrentUserId(state),
+ profilesInChannel: getProfilesInChannel(state, ownProps.channelId, true),
+ profilesNotInChannel: getProfilesNotInChannel(state, ownProps.channelId, true),
+ });
+};
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch, ownProps) => ({
  actions: bindActionCreators({
- autocompleteUsersInChannel,
+ autocompleteUsersInChannel: (prefix) => autocompleteUsersInChannel(prefix, ownProps.channelId),
  }, dispatch),
 });