Skip to content

[FIX] Team's channel search not working properly #3044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 1 commit into from
Apr 7, 2021
Merged

[FIX] Team's channel search not working properly #3044

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions app/views/TeamChannelsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { showErrorAlert } from '../utils/info';
import { goRoom } from '../utils/goRoom';
import I18n from '../i18n';

const API_FETCH_COUNT = 50;
const API_FETCH_COUNT = 25;

const getItemLayout = (data, index) => ({
length: data.length,
Expand Down Expand Up @@ -57,10 +57,10 @@ class TeamChannelsView extends React.Component {
loading: true,
loadingMore: false,
data: [],
total: -1,
isSearching: false,
searchText: '',
search: []
search: [],
end: false
};
this.loadTeam();
}
Expand Down Expand Up @@ -91,11 +91,11 @@ class TeamChannelsView extends React.Component {

load = debounce(async() => {
const {
loadingMore, total, data, search, isSearching, searchText
loadingMore, data, search, isSearching, searchText, end
} = this.state;

const length = isSearching ? search.length : data.length;
if (loadingMore || length === total) {
if (loadingMore || end) {
return;
}

Expand All @@ -113,7 +113,7 @@ class TeamChannelsView extends React.Component {
const newState = {
loading: false,
loadingMore: false,
total: result.total
end: result.rooms.length < API_FETCH_COUNT
};
const rooms = result.rooms.map((room) => {
const record = this.teamChannels?.find(c => c.rid === room._id);
Expand Down Expand Up @@ -219,7 +219,7 @@ class TeamChannelsView extends React.Component {

onSearchChangeText = debounce((searchText) => {
this.setState({
searchText, search: [], loading: !!searchText, loadingMore: false, total: -1
searchText, search: [], loading: !!searchText, loadingMore: false, end: false
}, () => {
if (searchText) {
this.load();
Expand All @@ -234,7 +234,9 @@ class TeamChannelsView extends React.Component {
return;
}
Keyboard.dismiss();
this.setState({ isSearching: false, search: [] }, () => {
this.setState({
searchText: null, isSearching: false, search: [], loadingMore: false, end: false
}, () => {
this.setHeader();
});
};
Expand Down