Filter out non-team members from invite to channel modal (#4312)

store/sql_user_store.go

@@ -621,6 +621,7 @@ func (us SqlUserStore) GetProfilesNotInChannel(teamId string, channelId string,
             INNER JOIN TeamMembers tm
                 ON tm.UserId = u.Id
                 AND tm.TeamId = :TeamId
+                AND tm.DeleteAt = 0
             LEFT JOIN ChannelMembers cm
                 ON cm.UserId = u.Id
                 AND cm.ChannelId = :ChannelId
@@ -1146,6 +1147,7 @@ func (us SqlUserStore) SearchNotInChannel(teamId string, channelId string, term
 			INNER JOIN TeamMembers tm
 				ON tm.UserId = u.Id
 				AND tm.TeamId = :TeamId
+				AND tm.DeleteAt = 0
 			LEFT JOIN ChannelMembers cm
 				ON cm.UserId = u.Id
 				AND cm.ChannelId = :ChannelId

webapp/components/channel_invite_modal.jsx

@@ -46,7 +46,6 @@ export default class ChannelInviteModal extends React.Component {
             TeamStore.addStatsChangeListener(this.onChange);
             ChannelStore.addStatsChangeListener(this.onChange);
             UserStore.addNotInChannelChangeListener(this.onChange);
-            UserStore.addStatusesChangeListener(this.onChange);
 
             this.onChange();
             AsyncClient.getProfilesNotInChannel(this.props.channel.id, 0);
@@ -55,7 +54,6 @@ export default class ChannelInviteModal extends React.Component {
             TeamStore.removeStatsChangeListener(this.onChange);
             ChannelStore.removeStatsChangeListener(this.onChange);
             UserStore.removeNotInChannelChangeListener(this.onChange);
-            UserStore.removeStatusesChangeListener(this.onChange);
         }
     }
 

webapp/components/channel_members_modal.jsx

@@ -47,14 +47,12 @@ export default class ChannelMembersModal extends React.Component {
         if (!this.props.show && nextProps.show) {
             ChannelStore.addStatsChangeListener(this.onChange);
             UserStore.addInChannelChangeListener(this.onChange);
-            UserStore.addStatusesChangeListener(this.onChange);
 
             this.onChange();
             AsyncClient.getProfilesInChannel(this.props.channel.id, 0);
         } else if (this.props.show && !nextProps.show) {
             ChannelStore.removeStatsChangeListener(this.onChange);
             UserStore.removeInChannelChangeListener(this.onChange);
-            UserStore.removeStatusesChangeListener(this.onChange);
         }
     }
 

webapp/components/member_list_team.jsx

@@ -38,7 +38,6 @@ export default class MemberListTeam extends React.Component {
 
     componentDidMount() {
         UserStore.addInTeamChangeListener(this.onChange);
-        UserStore.addStatusesChangeListener(this.onChange);
         TeamStore.addChangeListener(this.onChange);
         TeamStore.addStatsChangeListener(this.onStatsChange);
 
@@ -48,7 +47,6 @@ export default class MemberListTeam extends React.Component {
 
     componentWillUnmount() {
         UserStore.removeInTeamChangeListener(this.onChange);
-        UserStore.removeStatusesChangeListener(this.onChange);
         TeamStore.removeChangeListener(this.onChange);
         TeamStore.removeStatsChangeListener(this.onStatsChange);
     }

webapp/components/team_members_dropdown.jsx

@@ -37,6 +37,7 @@ export default class TeamMembersDropdown extends React.Component {
             role: null
         };
     }
+
     handleMakeMember() {
         const me = UserStore.getCurrentUser();
         if (this.props.user.id === me.id) {
@@ -56,11 +57,14 @@ export default class TeamMembersDropdown extends React.Component {
             );
         }
     }
+
     handleRemoveFromTeam() {
         removeUserFromTeam(
             this.props.teamMember.team_id,
             this.props.user.id,
             () => {
+                UserStore.removeProfileFromTeam(this.props.teamMember.team_id, this.props.user.id);
+                UserStore.emitInTeamChange();
                 AsyncClient.getTeamStats(this.props.teamMember.team_id);
             },
             (err) => {
@@ -68,6 +72,7 @@ export default class TeamMembersDropdown extends React.Component {
             }
         );
     }
+
     handleMakeActive() {
         Client.updateActive(this.props.user.id, true,
             () => {
@@ -80,6 +85,7 @@ export default class TeamMembersDropdown extends React.Component {
             }
         );
     }
+
     handleMakeNotActive() {
         Client.updateActive(this.props.user.id, false,
             () => {
@@ -92,6 +98,7 @@ export default class TeamMembersDropdown extends React.Component {
             }
         );
     }
+
     handleMakeAdmin() {
         const me = UserStore.getCurrentUser();
         if (this.props.user.id === me.id) {
@@ -111,6 +118,7 @@ export default class TeamMembersDropdown extends React.Component {
             );
         }
     }
+
     handleDemote(user, role, newRole) {
         this.setState({
             serverError: this.state.serverError,
@@ -120,6 +128,7 @@ export default class TeamMembersDropdown extends React.Component {
             newRole
         });
     }
+
     handleDemoteCancel() {
         this.setState({
             serverError: null,
@@ -129,6 +138,7 @@ export default class TeamMembersDropdown extends React.Component {
             newRole: null
         });
     }
+
     handleDemoteSubmit() {
         Client.updateTeamMemberRoles(
             this.props.teamMember.team_id,
@@ -150,6 +160,7 @@ export default class TeamMembersDropdown extends React.Component {
             }
         );
     }
+
     render() {
         let serverError = null;
         if (this.state.serverError) {