From 75bf928242386844a000a906e916ba08f8a4bbcd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 19 Apr 2024 11:08:59 +0100
Subject: [PATCH] Tidy up card binding logic

---
 .../builder/src/stores/builder/components.js  | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/builder/src/stores/builder/components.js b/packages/builder/src/stores/builder/components.js
index 33d21f57cc..c1c16193c2 100644
--- a/packages/builder/src/stores/builder/components.js
+++ b/packages/builder/src/stores/builder/components.js
@@ -321,39 +321,42 @@ export class ComponentStore extends BudiStore {
               .map(([name]) => name)
           }
 
-          // Extract good field candidates to prefil our cards with
+          // Inserts a card binding for a certain setting
+          const addBinding = (key, ...parts) => {
+            parts.unshift(`${_id}-repeater`)
+            component[key] = `{{ ${parts.map(safe).join(".")} }}`
+          }
+
+          // Extract good field candidates to prefil our cards with.
+          // Use the primary display as the best field, if it exists.
           const fields = findFieldTypes([
             FieldType.STRING,
             FieldType.OPTIONS,
             FieldType.DATETIME,
             FieldType.NUMBER,
           ])
-
-          // Use the primary display as the best field, if it exists
           if (schema?.[table?.primaryDisplay]) {
             fields.unshift(table.primaryDisplay)
           }
 
           // Fill our cards with as many bindings as we can
-          const prefix = safe(`${_id}-repeater`)
           cardKeys.forEach(key => {
-            if (!fields[0]) return
-            component[key] = `{{ ${prefix}.${safe(fields[0])} }}`
-            fields.shift()
+            if (fields[0]) {
+              addBinding(key, fields[0])
+              fields.shift()
+            }
           })
 
-          // Attempt to fill the image setting
-          let imgFields = findFieldTypes([FieldType.ATTACHMENT_SINGLE])
-          if (imgFields[0]) {
-            component.cardImageURL = `{{ ${prefix}.${safe(
-              imgFields[0]
-            )}.[url] }}`
+          // Attempt to fill the image setting.
+          // Check single attachment fields first.
+          let imgField = findFieldTypes(FieldType.ATTACHMENT_SINGLE)[0]
+          if (imgField) {
+            addBinding("cardImageURL", imgField, "url")
           } else {
-            imgFields = findFieldTypes([FieldType.ATTACHMENTS])
-            if (imgFields[0]) {
-              component.cardImageURL = `{{ ${prefix}.${safe(
-                imgFields[0]
-              )}.[0].[url] }}`
+            // Then try multi-attachment fields if no single ones exist
+            imgField = findFieldTypes(FieldType.ATTACHMENTS)[0]
+            if (imgField) {
+              addBinding("cardImageURL", imgField, 0, "url")
             }
           }
         }