[PLT-7141] Fix deactivated user from appearing in channel view members list filtering (#6957)
* fix deactivated user from appearing in channel view members list filtering * add deactivated user filters to channels, teams and DM
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
3e090162aa
Коммит
41969ae66c
@@ -215,6 +215,11 @@ export default class AddUsersToTeam extends React.Component {
|
||||
/>
|
||||
);
|
||||
|
||||
let users = [];
|
||||
if (this.state.users) {
|
||||
users = this.state.users.filter((user) => user.delete_at === 0);
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal
|
||||
dialogClassName={'more-modal more-direct-channels'}
|
||||
@@ -238,7 +243,7 @@ export default class AddUsersToTeam extends React.Component {
|
||||
<Modal.Body>
|
||||
<MultiSelect
|
||||
key='addUsersToTeamKey'
|
||||
options={this.state.users}
|
||||
options={users}
|
||||
optionRenderer={this.renderOption}
|
||||
values={this.state.values}
|
||||
valueRenderer={this.renderValue}
|
||||
|
||||
@@ -143,13 +143,18 @@ export default class ChannelInviteModal extends React.Component {
|
||||
inviteError = (<label className='has-error control-label'>{this.state.inviteError}</label>);
|
||||
}
|
||||
|
||||
let users = [];
|
||||
if (this.state.users) {
|
||||
users = this.state.users.filter((user) => user.delete_at === 0);
|
||||
}
|
||||
|
||||
let content;
|
||||
if (this.state.loading) {
|
||||
content = (<LoadingScreen/>);
|
||||
} else {
|
||||
content = (
|
||||
<SearchableUserList
|
||||
users={this.state.users}
|
||||
users={users}
|
||||
usersPerPage={USERS_PER_PAGE}
|
||||
total={this.state.total}
|
||||
nextPage={this.nextPage}
|
||||
|
||||
@@ -146,7 +146,7 @@ export default class MemberListChannel extends React.Component {
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
const user = users[i];
|
||||
|
||||
if (teamMembers[user.id] && channelMembers[user.id]) {
|
||||
if (teamMembers[user.id] && channelMembers[user.id] && user.delete_at === 0) {
|
||||
usersToDisplay.push(user);
|
||||
actionUserProps[user.id] = {
|
||||
channel: this.props.channel,
|
||||
|
||||
@@ -292,6 +292,11 @@ export default class MoreDirectChannels extends React.Component {
|
||||
/>
|
||||
);
|
||||
|
||||
let users = [];
|
||||
if (this.state.users) {
|
||||
users = this.state.users.filter((user) => user.delete_at === 0);
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal
|
||||
dialogClassName={'more-modal more-direct-channels'}
|
||||
@@ -310,7 +315,7 @@ export default class MoreDirectChannels extends React.Component {
|
||||
<Modal.Body>
|
||||
<MultiSelect
|
||||
key='moreDirectChannelsList'
|
||||
options={this.state.users}
|
||||
options={users}
|
||||
optionRenderer={this.renderOption}
|
||||
values={this.state.values}
|
||||
valueRenderer={this.renderValue}
|
||||
|
||||
Ссылка в новой задаче
Block a user