From db6032ca95561e612f1ed633d7962c51884e386c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 24 Sep 2021 16:13:25 +0100
Subject: [PATCH] Add a refresh action to common table searching logic

---
 .../backend/DataTable/DataTable.svelte          |  3 ++-
 packages/builder/src/helpers/fetchTableData.js  | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index e822692da5..308a57c394 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -21,7 +21,8 @@
   $: schema = $tables.selected?.schema
   $: type = $tables.selected?.type
   $: isInternal = type !== "external"
-  $: fetchTable($tables.selected?._id)
+  $: id = $tables.selected?._id
+  $: fetchTable(id)
 
   const fetchTable = tableId => {
     data.update({
diff --git a/packages/builder/src/helpers/fetchTableData.js b/packages/builder/src/helpers/fetchTableData.js
index ff7d61519f..76bd43d89f 100644
--- a/packages/builder/src/helpers/fetchTableData.js
+++ b/packages/builder/src/helpers/fetchTableData.js
@@ -22,6 +22,7 @@ export const fetchTableData = opts => {
   // Local non-observable state
   let query
   let sortType
+  let lastBookmark
 
   // Local observable state
   const store = writable({
@@ -43,6 +44,7 @@ export const fetchTableData = opts => {
   })
 
   const fetchPage = async bookmark => {
+    lastBookmark = bookmark
     const { tableId, limit, sortColumn, sortOrder, paginate } = options
     store.update($store => ({ ...$store, loading: true }))
     const res = await API.post(`/api/${options.tableId}/search`, {
@@ -126,7 +128,7 @@ export const fetchTableData = opts => {
   // Fetches the next page of data
   const nextPage = async () => {
     const state = get(derivedStore)
-    if (!options.paginate || !state.hasNextPage) {
+    if (state.loading || !options.paginate || !state.hasNextPage) {
       return
     }
 
@@ -151,7 +153,7 @@ export const fetchTableData = opts => {
   // Fetches the previous page of data
   const prevPage = async () => {
     const state = get(derivedStore)
-    if (!options.paginate || !state.hasPrevPage) {
+    if (state.loading || !options.paginate || !state.hasPrevPage) {
       return
     }
 
@@ -179,6 +181,16 @@ export const fetchTableData = opts => {
     await fetchData()
   }
 
+  // Loads the same page again
+  const refresh = async () => {
+    if (get(store).loading) {
+      return
+    }
+    console.log("refresh")
+    const page = await fetchPage(lastBookmark)
+    store.update($store => ({ ...$store, rows: page.rows }))
+  }
+
   // Initially fetch data but don't bother waiting for the result
   fetchData()
 
@@ -188,5 +200,6 @@ export const fetchTableData = opts => {
     nextPage,
     prevPage,
     update,
+    refresh,
   }
 }