From d79af79bf1b2339ee81e8d41bd03fb052b650823 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 13:05:08 +0100 Subject: [PATCH] Comment --- packages/frontend-core/src/fetch/DataFetch.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js index cc931bfe06..18a00c08d5 100644 --- a/packages/frontend-core/src/fetch/DataFetch.js +++ b/packages/frontend-core/src/fetch/DataFetch.js @@ -367,14 +367,8 @@ export default class DataFetch { let { cursors } = get(this.store) const { pageNumber } = get(this.store) - const currentNextCursor = cursors[pageNumber + 1] - if (currentNextCursor != cursor) { - // If the current cursor changed, all the next pages need to be updated, so we mark them as stale - cursors = cursors.slice(0, pageNumber + 1) - cursors[pageNumber + 1] = cursor - } - if (!rows.length && pageNumber > 0) { + // If the full page is gone but we have previous pages, navigate to the previous page this.store.update($store => ({ ...$store, loading: false, @@ -383,6 +377,13 @@ export default class DataFetch { return await this.prevPage() } + const currentNextCursor = cursors[pageNumber + 1] + if (currentNextCursor != cursor) { + // If the current cursor changed, all the next pages need to be updated, so we mark them as stale + cursors = cursors.slice(0, pageNumber + 1) + cursors[pageNumber + 1] = cursor + } + this.store.update($store => ({ ...$store, rows,