Blank page in Browse Channel Modal fixed (Pagination reset on filter change) (#29921)
* Blank page in browse channel fixed (Pagination reset on filter change) * method usage for archived channel menu item fixed --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c22df96f6b
Коммит
33d207d81a
@@ -248,6 +248,12 @@ export class SearchableChannelList extends React.PureComponent<Props, State> {
|
|||||||
this.setState({page: 0});
|
this.setState({page: 0});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
filterChange = (filterType: FilterType) => {
|
||||||
|
this.props.changeFilter(filterType);
|
||||||
|
if (this.props.filter !== filterType) {
|
||||||
|
this.setState({page: 0});
|
||||||
|
}
|
||||||
|
};
|
||||||
handleChange = (e?: React.FormEvent<HTMLInputElement>) => {
|
handleChange = (e?: React.FormEvent<HTMLInputElement>) => {
|
||||||
if (e?.currentTarget) {
|
if (e?.currentTarget) {
|
||||||
this.setState({channelSearchValue: e?.currentTarget.value}, () => this.doSearch());
|
this.setState({channelSearchValue: e?.currentTarget.value}, () => this.doSearch());
|
||||||
@@ -435,7 +441,7 @@ export class SearchableChannelList extends React.PureComponent<Props, State> {
|
|||||||
<Menu.Item
|
<Menu.Item
|
||||||
key='channelsMoreDropdownAll'
|
key='channelsMoreDropdownAll'
|
||||||
id='channelsMoreDropdownAll'
|
id='channelsMoreDropdownAll'
|
||||||
onClick={() => this.props.changeFilter(Filter.All)}
|
onClick={() => this.filterChange(Filter.All)}
|
||||||
leadingElement={<GlobeCheckedIcon size={16}/>}
|
leadingElement={<GlobeCheckedIcon size={16}/>}
|
||||||
labels={
|
labels={
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
@@ -449,7 +455,7 @@ export class SearchableChannelList extends React.PureComponent<Props, State> {
|
|||||||
<Menu.Item
|
<Menu.Item
|
||||||
key='channelsMoreDropdownPublic'
|
key='channelsMoreDropdownPublic'
|
||||||
id='channelsMoreDropdownPublic'
|
id='channelsMoreDropdownPublic'
|
||||||
onClick={() => this.props.changeFilter(Filter.Public)}
|
onClick={() => this.filterChange(Filter.Public)}
|
||||||
leadingElement={<GlobeIcon size={16}/>}
|
leadingElement={<GlobeIcon size={16}/>}
|
||||||
labels={
|
labels={
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
@@ -463,7 +469,7 @@ export class SearchableChannelList extends React.PureComponent<Props, State> {
|
|||||||
<Menu.Item
|
<Menu.Item
|
||||||
key='channelsMoreDropdownPrivate'
|
key='channelsMoreDropdownPrivate'
|
||||||
id='channelsMoreDropdownPrivate'
|
id='channelsMoreDropdownPrivate'
|
||||||
onClick={() => this.props.changeFilter(Filter.Private)}
|
onClick={() => this.filterChange(Filter.Private)}
|
||||||
leadingElement={<LockOutlineIcon size={16}/>}
|
leadingElement={<LockOutlineIcon size={16}/>}
|
||||||
labels={
|
labels={
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
@@ -482,7 +488,7 @@ export class SearchableChannelList extends React.PureComponent<Props, State> {
|
|||||||
<Menu.Item
|
<Menu.Item
|
||||||
key='channelsMoreDropdownArchived'
|
key='channelsMoreDropdownArchived'
|
||||||
id='channelsMoreDropdownArchived'
|
id='channelsMoreDropdownArchived'
|
||||||
onClick={() => this.props.changeFilter(Filter.Archived)}
|
onClick={() => this.filterChange(Filter.Archived)}
|
||||||
leadingElement={<ArchiveOutlineIcon size={16}/>}
|
leadingElement={<ArchiveOutlineIcon size={16}/>}
|
||||||
labels={
|
labels={
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user