From e8dd3f9d900e1f8deb1094773615e54a501a4007 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 25 Jul 2023 11:46:22 +0100
Subject: [PATCH 1/2] Remove the define relationship button in the datatable
 when relationships are unsupported

---
 .../components/backend/DataTable/DataTable.svelte | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 33db9b60e3..836ea0e696 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { datasources, tables } from "stores/backend"
+  import { datasources, tables, integrations } from "stores/backend"
   import EditRolesButton from "./buttons/EditRolesButton.svelte"
   import { TableNames } from "constants"
   import { Grid } from "@budibase/frontend-core"
@@ -27,6 +27,17 @@
   $: isUsersTable = id === TableNames.USERS
   $: isInternal = $tables.selected?.type !== "external"
 
+  $: datasource = $datasources.list.find(datasource => {
+    return datasource._id === $tables.selected.sourceId
+  })
+
+  const relationshipSupport = datasource => {
+    const integration = $integrations[datasource?.source]
+    return !isInternal && integration?.relationships !== false
+  }
+
+  $: relationshipsEnabled = relationshipSupport(datasource)
+
   const handleGridTableUpdate = async e => {
     tables.replaceTable(id, e.detail)
 
@@ -58,7 +69,7 @@
         <GridCreateViewButton />
       {/if}
       <GridManageAccessButton />
-      {#if !isInternal}
+      {#if relationshipsEnabled}
         <GridRelationshipButton />
       {/if}
       {#if isUsersTable}

From f813a26ff0674530169ea6ae1fed7723e561030c Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 25 Jul 2023 14:32:21 +0100
Subject: [PATCH 2/2] 
 packages/builder/src/components/backend/DataTable/DataTable.svelte

---
 .../src/components/backend/DataTable/DataTable.svelte       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 836ea0e696..d4c994dae5 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -28,16 +28,16 @@
   $: isInternal = $tables.selected?.type !== "external"
 
   $: datasource = $datasources.list.find(datasource => {
-    return datasource._id === $tables.selected.sourceId
+    return datasource._id === $tables.selected?.sourceId
   })
 
+  $: relationshipsEnabled = relationshipSupport(datasource)
+
   const relationshipSupport = datasource => {
     const integration = $integrations[datasource?.source]
     return !isInternal && integration?.relationships !== false
   }
 
-  $: relationshipsEnabled = relationshipSupport(datasource)
-
   const handleGridTableUpdate = async e => {
     tables.replaceTable(id, e.detail)