Skip to content

Infinite Scroll query update #1706

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
merged 1 commit into from
May 12, 2021
Merged

Infinite Scroll query update #1706

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
49 changes: 29 additions & 20 deletions src/dashboard/Data/Browser/Browser.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,14 @@ class Browser extends DashboardView {
query.ascending(field)
}

if (field !== 'objectId') {
if (sortDir === '-') {
query.addDescending('objectId');
} else {
query.addAscending('objectId');
}
}

query.limit(MAX_ROWS_FETCHED);
this.excludeFields(query, source);

Expand Down Expand Up @@ -438,37 +446,38 @@ class Browser extends DashboardView {
let className = this.props.params.className;
let source = this.state.relation || className;
let query = queryFromFilters(source, this.state.filters);
if (this.state.ordering !== '-createdAt') {
let field = this.state.ordering;
let sortDir = field[0] === '-' ? '-' : '+';
field = field[0] === '-' ? field.slice(1) : field;
if (this.state.ordering !== '-objectId' && this.state.ordering !== 'objectId') {
// Construct complex pagination query
let equalityQuery = queryFromFilters(source, this.state.filters);
let field = this.state.ordering;
let ascending = true;
let comp = this.state.data[this.state.data.length - 1].get(field);
if (field === 'objectId' || field === '-objectId') {
comp = this.state.data[this.state.data.length - 1].id;
}
if (field[0] === '-') {
field = field.substr(1);

if (sortDir === '-') {
query.lessThan(field, comp);
ascending = false;
equalityQuery.lessThan('objectId', this.state.data[this.state.data.length - 1].id);
} else {
query.greaterThan(field, comp);
equalityQuery.greaterThan('objectId', this.state.data[this.state.data.length - 1].id);
}
if (field === 'createdAt') {
equalityQuery.greaterThan('createdAt', this.state.data[this.state.data.length - 1].get('createdAt'));
} else {
equalityQuery.lessThan('createdAt', this.state.data[this.state.data.length - 1].get('createdAt'));
equalityQuery.equalTo(field, comp);
}
equalityQuery.equalTo(field, comp);
query = Parse.Query.or(query, equalityQuery);
if (ascending) {
query.ascending(this.state.ordering);
if (sortDir === '-') {
query.descending(field);
query.addDescending('objectId');
} else {
query.descending(this.state.ordering.substr(1));
query.ascending(field);
query.addAscending('objectId');
}
} else {
query.lessThan('createdAt', this.state.data[this.state.data.length - 1].get('createdAt'));
query.addDescending('createdAt');
if (sortDir === '-') {
query.lessThan('objectId', this.state.data[this.state.data.length - 1].id);
query.addDescending('objectId');
} else {
query.greaterThan('objectId', this.state.data[this.state.data.length - 1].id);
query.addAscending('objectId');
}
}
query.limit(MAX_ROWS_FETCHED);
this.excludeFields(query, source);
Expand Down