Properly filter in more channels search (#6513)
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
2f88bcb223
Коммит
1c9ec861fd
@@ -43,6 +43,8 @@ import {
|
|||||||
deleteChannel as deleteChannelRedux
|
deleteChannel as deleteChannelRedux
|
||||||
} from 'mattermost-redux/actions/channels';
|
} from 'mattermost-redux/actions/channels';
|
||||||
|
|
||||||
|
import {getMyChannelMemberships} from 'mattermost-redux/selectors/entities/channels';
|
||||||
|
|
||||||
export function goToChannel(channel) {
|
export function goToChannel(channel) {
|
||||||
if (channel.fake) {
|
if (channel.fake) {
|
||||||
const user = UserStore.getProfileByUsername(channel.display_name);
|
const user = UserStore.getProfileByUsername(channel.display_name);
|
||||||
@@ -294,7 +296,9 @@ export function searchMoreChannels(term, success, error) {
|
|||||||
searchChannels(TeamStore.getCurrentId(), term)(dispatch, getState).then(
|
searchChannels(TeamStore.getCurrentId(), term)(dispatch, getState).then(
|
||||||
(data) => {
|
(data) => {
|
||||||
if (data && success) {
|
if (data && success) {
|
||||||
success(data);
|
const myMembers = getMyChannelMemberships(getState());
|
||||||
|
const channels = data.filter((c) => !myMembers[c.id]);
|
||||||
|
success(channels);
|
||||||
} else if (data == null && error) {
|
} else if (data == null && error) {
|
||||||
const serverError = getState().requests.channels.getChannels.error;
|
const serverError = getState().requests.channels.getChannels.error;
|
||||||
error({id: serverError.server_error_id, ...serverError});
|
error({id: serverError.server_error_id, ...serverError});
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user