From ae74c2498c23a1152b9b76d25717bc74c31ea75f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 11 Jun 2024 14:38:56 +0100
Subject: [PATCH 1/3] small change to ensure that name of datasources is
 available in dropdown to prevent dupes

---
 .../controls/DataSourceSelect/DataSourceCategory.svelte       | 4 ++--
 .../controls/DataSourceSelect/DataSourceSelect.svelte         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
index 71de1716f2..6d0e5ef9e7 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
@@ -28,8 +28,8 @@
       tabindex="0"
       on:click={() => onSelect(data)}
     >
-      <span class="spectrum-Menu-itemLabel">
-        {data.label}
+      <span class="spectum-Menu-itemLabel">
+        {data.datasource?.name ? `${data.datasource.name} -` : ""} {data.label}
       </span>
       <svg
         class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index e247e4cc88..a3ea677df9 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -55,6 +55,7 @@
     label: m.name,
     tableId: m._id,
     type: "table",
+    datasource: $datasources.list.find(ds => ds._id === m.sourceId || m.datasourceId),
   }))
   $: viewsV1 = $viewsStore.list.map(view => ({
     ...view,

From f8f05a59d46869dc22f93a7917d068ab948a7046 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 11 Jun 2024 14:38:56 +0100
Subject: [PATCH 2/3] small change to ensure that name of datasources is
 available in dropdown to prevent dupes

---
 .../controls/DataSourceSelect/DataSourceCategory.svelte         | 2 +-
 .../settings/controls/DataSourceSelect/DataSourceSelect.svelte  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
index 71de1716f2..8e4ce3b4c3 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
@@ -29,7 +29,7 @@
       on:click={() => onSelect(data)}
     >
       <span class="spectrum-Menu-itemLabel">
-        {data.label}
+        {data.datasource?.name ? `${data.datasource.name} -` : ""} {data.label}
       </span>
       <svg
         class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index e247e4cc88..a3ea677df9 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -55,6 +55,7 @@
     label: m.name,
     tableId: m._id,
     type: "table",
+    datasource: $datasources.list.find(ds => ds._id === m.sourceId || m.datasourceId),
   }))
   $: viewsV1 = $viewsStore.list.map(view => ({
     ...view,

From 9fcefb18b4adfc9da33d7a79d19ced2761e1f996 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Tue, 11 Jun 2024 16:09:13 +0100
Subject: [PATCH 3/3] Update
 packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte

Co-authored-by: Andrew Kingston <andrew@kingston.dev>
---
 .../controls/DataSourceSelect/DataSourceCategory.svelte         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
index 8e4ce3b4c3..fa6f477ed9 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
@@ -29,7 +29,7 @@
       on:click={() => onSelect(data)}
     >
       <span class="spectrum-Menu-itemLabel">
-        {data.datasource?.name ? `${data.datasource.name} -` : ""} {data.label}
+        {data.datasource?.name ? `${data.datasource.name} - ` : ""}{data.label}
       </span>
       <svg
         class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"