From 89cf9b54c1ff59d6632eee1f1cf3c436f29516d2 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 12 Aug 2025 19:32:44 +0530
Subject: [PATCH] update: handle query on custom page as well.

---
 .../table-[table]/spreadsheet.svelte          | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
index 67c25486b..a2920de18 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
@@ -553,26 +553,19 @@
         }
     }
 
+    function getCorrectOrderQuery() {
+        return $sortState?.column && $sortState?.direction !== 'default'
+            ? $sortState.direction === 'asc'
+                ? Query.orderAsc($sortState.column)
+                : Query.orderDesc($sortState.column)
+            : Query.orderDesc('');
+    }
+
     async function loadPage(pageNumber: number): Promise<boolean> {
         if (pageNumber < 1 || pageNumber > totalPages || $paginatedRows.hasPage(pageNumber)) {
             return false;
         }
 
-        let order = Query.orderDesc('');
-        if ($sortState?.column && $sortState?.direction) {
-            switch ($sortState.direction) {
-                case 'asc':
-                    order = Query.orderAsc($sortState.column);
-                    break;
-                case 'desc':
-                    order = Query.orderDesc($sortState.column);
-                    break;
-                case 'default':
-                    order = Query.orderDesc('');
-                    break;
-            }
-        }
-
         $paginatedRowsLoading = true;
         const loadedRows = await sdk
             .forProject(page.params.region, page.params.project)
@@ -580,7 +573,7 @@
                 databaseId,
                 tableId,
                 queries: [
-                    order,
+                    getCorrectOrderQuery(),
                     Query.limit(SPREADSHEET_PAGE_LIMIT),
                     Query.offset(pageToOffset(pageNumber, SPREADSHEET_PAGE_LIMIT))
                 ]
@@ -611,7 +604,7 @@
                     databaseId,
                     tableId,
                     queries: [
-                        Query.orderDesc(''),
+                        getCorrectOrderQuery(),
                         Query.limit(SPREADSHEET_PAGE_LIMIT),
                         Query.offset(pageToOffset(targetPageNum, SPREADSHEET_PAGE_LIMIT))
                     ]