From 13163102f8c7737e2d151e1874bbbb3a2961ac14 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 23 Sep 2021 17:04:12 +0100
Subject: [PATCH] Only refresh tables when table ID changes

---
 .../backend/DataTable/DataTable.svelte         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 88f754b254..e822692da5 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -13,22 +13,24 @@
   import { fetchTableData } from "helpers/fetchTableData"
   import { Pagination } from "@budibase/bbui"
 
-  let hideAutocolumns = true
   const data = fetchTableData()
+  let hideAutocolumns = true
 
   $: isUsersTable = $tables.selected?._id === TableNames.USERS
   $: title = $tables.selected?.name
   $: schema = $tables.selected?.schema
   $: type = $tables.selected?.type
   $: isInternal = type !== "external"
+  $: fetchTable($tables.selected?._id)
 
-  // Fetch data whenever table changes
-  $: data.update({
-    tableId: $tables.selected?._id,
-    schema,
-    limit: 10,
-    paginate: true,
-  })
+  const fetchTable = tableId => {
+    data.update({
+      tableId,
+      schema,
+      limit: 10,
+      paginate: true,
+    })
+  }
 
   // Fetch data whenever sorting option changes
   const onSort = e => {