UserIndex: make search work
This commit is contained in:
parent
263dc3ed2e
commit
30b39d739f
|
@ -125,9 +125,10 @@ export function closeReports(ids) {
|
|||
return patchReports(ids, 'closed');
|
||||
}
|
||||
|
||||
export function fetchUsers(filters = [], page = 1, pageSize = 50) {
|
||||
export function fetchUsers(filters = [], page = 1, query, pageSize = 50) {
|
||||
return (dispatch, getState) => {
|
||||
const params = { filters: filters.join(), page, page_size: pageSize };
|
||||
if (query) params.query = query;
|
||||
|
||||
dispatch({ type: ADMIN_USERS_FETCH_REQUEST, filters, page, pageSize });
|
||||
return api(getState)
|
||||
|
|
|
@ -24,20 +24,22 @@ class UserIndex extends ImmutablePureComponent {
|
|||
total: Infinity,
|
||||
pageSize: 50,
|
||||
page: 0,
|
||||
query: '',
|
||||
}
|
||||
|
||||
clearState = () => {
|
||||
clearState = callback => {
|
||||
this.setState({
|
||||
isLoading: true,
|
||||
accountIds: ImmutableOrderedSet(),
|
||||
page: 0,
|
||||
});
|
||||
}, callback);
|
||||
}
|
||||
|
||||
fetchNextPage = () => {
|
||||
const { filters, page, pageSize } = this.state;
|
||||
const { filters, page, query, pageSize } = this.state;
|
||||
const nextPage = page + 1;
|
||||
|
||||
this.props.dispatch(fetchUsers(filters, nextPage, pageSize))
|
||||
this.props.dispatch(fetchUsers(filters, nextPage, query, pageSize))
|
||||
.then(({ users, count }) => {
|
||||
const newIds = users.map(user => user.id);
|
||||
|
||||
|
@ -55,12 +57,25 @@ class UserIndex extends ImmutablePureComponent {
|
|||
this.fetchNextPage();
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps, prevState) {
|
||||
const { filters, q } = this.state;
|
||||
|
||||
if (!is(filters, prevState.filters) || !is(q, prevState.q)) {
|
||||
this.clearState();
|
||||
refresh = () => {
|
||||
this.clearState(() => {
|
||||
this.fetchNextPage();
|
||||
});
|
||||
}
|
||||
|
||||
refreshDebounced = debounce(() => {
|
||||
this.refresh();
|
||||
}, 1000)
|
||||
|
||||
componentDidUpdate(prevProps, prevState) {
|
||||
const { filters, query } = this.state;
|
||||
const filtersChanged = !is(filters, prevState.filters);
|
||||
const queryChanged = query !== prevState.query;
|
||||
|
||||
if (filtersChanged) {
|
||||
this.refresh();
|
||||
} else if (queryChanged) {
|
||||
this.refreshDebounced();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -68,6 +83,10 @@ class UserIndex extends ImmutablePureComponent {
|
|||
this.fetchNextPage();
|
||||
}, 2000, { leading: true });
|
||||
|
||||
handleQueryChange = e => {
|
||||
this.setState({ query: e.target.value });
|
||||
}
|
||||
|
||||
render() {
|
||||
const { accountIds, isLoading } = this.state;
|
||||
const hasMore = accountIds.count() < this.state.total;
|
||||
|
@ -76,6 +95,7 @@ class UserIndex extends ImmutablePureComponent {
|
|||
|
||||
return (
|
||||
<Column>
|
||||
<input value={this.state.q} onChange={this.handleQueryChange} />
|
||||
<ScrollableList
|
||||
scrollKey='user-index'
|
||||
hasMore={hasMore}
|
||||
|
|
Loading…
Reference in New Issue