From 0cbc56464e4facf7129203be148934652e145e92 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 17 Apr 2024 11:07:21 +0000
Subject: [PATCH] fix: handle pagination offset in gui

---
 packages/nc-gui/components/smartsheet/Pagination.vue |  4 +++-
 packages/nc-gui/composables/useViewData.ts           | 11 ++++++-----
 packages/nocodb/src/helpers/PagedResponse.ts         |  9 +++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Pagination.vue b/packages/nc-gui/components/smartsheet/Pagination.vue
index 8a248e18cb..65999134c2 100644
--- a/packages/nc-gui/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui/components/smartsheet/Pagination.vue
@@ -66,6 +66,8 @@ const isRTLLanguage = computed(() => isRtlLang(locale.value as keyof typeof Lang
 const renderAltOrOptlKey = () => {
   return isMac() ? '⌥' : 'ALT'
 }
+
+const tempPageVal = ref(page.value)
 </script>
 
 <template>
@@ -118,7 +120,7 @@ const renderAltOrOptlKey = () => {
       />
       <div v-else class="mx-auto flex items-center mt-n1" style="max-width: 250px">
         <span class="text-xs" style="white-space: nowrap"> Change page:</span>
-        <a-input size="small" class="ml-1 !text-xs" type="number" @keydown.enter="changePage(page)">
+        <a-input v-model:value="tempPageVal" size="small" class="ml-1 !text-xs" type="number" @keydown.enter="changePage(tempPageVal)" @blur="tempPageVal = page">
           <template #suffix>
             <component :is="iconMap.returnKey" class="mt-1" @click="changePage(page)" />
           </template>
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 0f05941f07..fcfc90e8e9 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -215,16 +215,17 @@ export function useViewData(
       return message.error(await extractSdkResponseErrorMsg(error))
     }
     formattedData.value = formatData(response.list)
-    paginationData.value = response.pageInfo || {}
+    paginationData.value = response.pageInfo || paginationData.value || {}
     isPaginationLoading.value = false
 
     // to cater the case like when querying with a non-zero offset
     // the result page may point to the target page where the actual returned data don't display on
-    const expectedPage = Math.max(1, Math.ceil(paginationData.value.totalRows! / paginationData.value.pageSize!))
-    if (expectedPage < paginationData.value.page!) {
-      await changePage(expectedPage)
+    if (paginationData.value.totalRows !== undefined && paginationData.value.totalRows !== null) {
+      const expectedPage = Math.max(1, Math.ceil(paginationData.value.totalRows! / paginationData.value.pageSize!))
+      if (expectedPage < paginationData.value.page!) {
+        await changePage(expectedPage)
+      }
     }
-
     if (viewMeta.value?.type === ViewTypes.GRID) {
       loadAggCommentsCount()
     }
diff --git a/packages/nocodb/src/helpers/PagedResponse.ts b/packages/nocodb/src/helpers/PagedResponse.ts
index ef2c6cbb87..332ff68a88 100644
--- a/packages/nocodb/src/helpers/PagedResponse.ts
+++ b/packages/nocodb/src/helpers/PagedResponse.ts
@@ -23,7 +23,7 @@ export class PagedResponseImpl<T> {
 
     this.list = list;
 
-    if (count !== null) {
+    if (count !== null && count !== undefined) {
       this.pageInfo = { totalRows: +count };
       this.pageInfo.page = offset ? offset / limit + 1 : 1;
       this.pageInfo.pageSize = limit;
@@ -37,13 +37,14 @@ export class PagedResponseImpl<T> {
         this.pageInfo.offset = offset;
         delete this.pageInfo.page;
       }
+
+      if (offset && offset >= +count) {
+        NcError.invalidOffsetValue(offset);
+      }
     }
 
     if (additionalProps) Object.assign(this, additionalProps);
 
-    if (offset && offset >= +count) {
-      NcError.invalidOffsetValue(offset);
-    }
   }
 
   list: Array<T>;