From 853e8916646ce35f71da2899961e04a0d19730dc Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 6 Aug 2024 11:58:12 +0100
Subject: [PATCH] Fixes for Single select and Single user pickers. Now
 displaying binding status correctly

---
 .../SetupPanel/RowSelectorTypes.svelte        |  4 ++--
 .../backend/DataTable/RowFieldControl.svelte  |  2 +-
 .../common/LinkedRowSelector.svelte           | 23 ++++++++++++++-----
 .../common/bindings/DrawerBindableSlot.svelte |  3 ++-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 85d57e665a..ee9fd12c0c 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -157,7 +157,7 @@
   </span>
 {:else if schema.type === "link"}
   <LinkedRowSelector
-    linkedRows={fieldData}
+    linkedData={fieldData}
     {schema}
     on:change={e =>
       onChange({
@@ -169,7 +169,7 @@
   />
 {:else if schema.type === "bb_reference" || schema.type === "bb_reference_single"}
   <LinkedRowSelector
-    linkedRows={fieldData}
+    linkedData={fieldData}
     {schema}
     linkedTableId={"ta_users"}
     on:change={e =>
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index b012766171..745f29d56a 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -146,7 +146,7 @@
 {:else if type === "link"}
   <LinkedRowSelector
     {error}
-    linkedRows={value}
+    linkedData={value}
     schema={meta}
     on:change={e => (value = e.detail)}
   />
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index 8db4a7dc03..dc094bc1ab 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -6,7 +6,7 @@
   import { createEventDispatcher } from "svelte"
 
   export let schema
-  export let linkedRows = []
+  export let linkedData
   export let useLabel = true
   export let linkedTableId
   export let label
@@ -15,14 +15,25 @@
   let rows = []
   let linkedIds = []
 
-  $: linkedIds = (Array.isArray(linkedRows) ? linkedRows : [])?.map(
-    row => row?._id || row
-  )
+  $: fieldValue = getFieldValue(linkedData)
   $: label = label || capitalise(schema.name)
   $: linkedTableId = linkedTableId || schema.tableId
   $: linkedTable = $tables.list.find(table => table._id === linkedTableId)
   $: fetchRows(linkedTableId)
 
+  const getFieldValue = val => {
+    const linkedIds = (Array.isArray(val) ? val : [])?.map(
+      row => row?._id || row
+    )
+    if (schema.relationshipType === "one-to-many") {
+      return linkedIds?.[0]
+    } else if (schema.type === "bb_reference_single") {
+      return val
+    } else {
+      return linkedIds
+    }
+  }
+
   async function fetchRows(linkedTableId) {
     try {
       rows = await API.fetchTableData(linkedTableId)
@@ -45,7 +56,7 @@
   </Label>
 {:else if schema.relationshipType === "one-to-many" || schema.type === "bb_reference_single"}
   <Select
-    value={linkedIds?.[0]}
+    value={fieldValue}
     options={rows}
     getOptionLabel={getPrettyName}
     getOptionValue={row => row._id}
@@ -58,7 +69,7 @@
   />
 {:else}
   <Multiselect
-    value={linkedIds}
+    value={fieldValue}
     label={useLabel ? label : null}
     options={rows}
     getOptionLabel={getPrettyName}
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
index 3180ceb960..81c3bca3d3 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
@@ -8,7 +8,7 @@
 
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
-  import { isJSBinding } from "@budibase/string-templates"
+  import { isJSBinding, findHBSBlocks } from "@budibase/string-templates"
 
   export let panel = ClientBindingPanel
   export let value = ""
@@ -109,6 +109,7 @@
     array: hasValidOptions,
     longform: value => !isJSBinding(value),
     json: value => !isJSBinding(value),
+    options: value => !isJSBinding(value) && !findHBSBlocks(value)?.length,
     boolean: isValidBoolean,
     attachment: false,
     attachment_single: false,