Revert "fix: revert parse-community#1706 which introduced new database index requirements for pagination (parse-community#1800)"

This reverts commit 689df7c.

Author: muhleder

CHANGELOG.md

@@ -4,9 +4,27 @@ Changelogs are separated by release type for better overview.
 
 ## ✅ [Stable Releases][log_release]
 
+<<<<<<< HEAD
 These are the official, stable releases that you can use in your production environments.
 
 > ### “Stable for production!”
+=======
+## Improvements
+- Update sass to 5.0.0 and make docker image use node:lts-alpine (Corey Baker) [#1792](https://github.com/parse-community/parse-dashboard/pull/1792)
+- Docker image use now node 12 version [#1788](https://github.com/parse-community/parse-dashboard/pull/1788)
+- CI now pushes docker images to Docker Hub (Corey Baker) [#1781](https://github.com/parse-community/parse-dashboard/pull/1781)
+- Add CI check to add changelog entry (Manuel Trezza) [#1764](https://github.com/parse-community/parse-dashboard/pull/1764)
+- Refactor: uniform issue templates across repos (Manuel Trezza) [#1767](https://github.com/parse-community/parse-dashboard/pull/1767)
+- fix: date cell value not selected on double clicks (fn-faisal) [#1730](https://github.com/parse-community/parse-dashboard/pull/1730)
+
+## Fixes
+- Fixed bug after creating new class, wrong CLP was shown for that class [#1784](https://github.com/parse-community/parse-dashboard/issues/1784)  (Prerna Mehra) [#1785](https://github.com/parse-community/parse-dashboard/pull/1785)
+- Fixed bug when opening a big modal, modal content is not visible due to Sidebar (Prerna Mehra) [#1777](https://github.com/parse-community/parse-dashboard/pull/1778)
+- Fixed UI for a field containing an array of pointers (Prerna Mehra) [#1776](https://github.com/parse-community/parse-dashboard/pull/1776)
+- Fixed bug when editing or copying a field containing an array of pointers [#1770](https://github.com/parse-community/parse-dashboard/issues/1770) (Prerna Mehra) [#1771](https://github.com/parse-community/parse-dashboard/pull/1771)
+- Modernize CI (Manuel Trezza) [#1789](https://github.com/parse-community/parse-dashboard/pull/1789)
+- ci: Remove parse-server dev dependency (Manuel Trezza) [#1796](https://github.com/parse-community/parse-dashboard/pull/1796)
+>>>>>>> parent of 689df7c (fix: revert #1706 which introduced new database index requirements for pagination (#1800))
 
 Details:
 - Stability: *stable*

src/dashboard/Data/Browser/Browser.react.js

@@ -706,6 +706,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);
 
@@ -783,37 +791,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);