From b9c3838312768d95702685ef9832c751ef214d47 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 10 Sep 2024 13:48:58 +0200
Subject: [PATCH] Handle single

---
 .../src/components/grid/stores/rows.js        | 61 +++++++++++++------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js
index 5af3ef9d17..d501520705 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.js
@@ -5,8 +5,7 @@ import { getCellID, parseCellID } from "../lib/utils"
 import { tick } from "svelte"
 import { Helpers } from "@budibase/bbui"
 import { sleep } from "../../../utils/utils"
-import { FieldType } from "@budibase/types"
-import { processStringSync } from "@budibase/string-templates"
+import { FieldType, RelationshipType } from "@budibase/types"
 
 export const createStores = () => {
   const rows = writable([])
@@ -42,26 +41,50 @@ export const createStores = () => {
   }
 }
 
-function getRelatedTableValues(row, field) {
-  let result = ""
-  const separator = ", "
+function getRelatedTableValues(row, field, isSingle) {
+  let result = "Not rendable"
+  try {
+    if (isSingle) {
+      result = row[field.related.field]?.[0]?.[field.related.subField]
+      switch (field.type) {
+        case FieldType.JSON:
+        case FieldType.SIGNATURE_SINGLE:
+        case FieldType.ATTACHMENT_SINGLE:
+        case FieldType.ATTACHMENTS:
+        case FieldType.BB_REFERENCE:
+          result = JSON.parse(result)
+          break
 
-  switch (field.type) {
-    case FieldType.STRING:
-    case FieldType.NUMBER:
-    default:
-      result = processStringSync(
-        `{{ join (pluck ${field.related.field} '${field.related.subField}') '${separator}' }}`,
-        row
-      )
-      break
-    case FieldType.ARRAY:
-    case FieldType.OPTIONS:
+        case FieldType.LINK:
+          console.error(`${field.type} type is not rendable`)
+      }
+    } else {
+      // TODO: check all types
       result = Array.from(
         new Set(
           row[field.related.field].flatMap(r => r[field.related.subField])
         )
       )
+
+      switch (field.type) {
+        case FieldType.STRING:
+        case FieldType.NUMBER:
+        case FieldType.BIGINT:
+          result = result.join(", ")
+          break
+
+        case FieldType.JSON:
+        case FieldType.ATTACHMENTS:
+        case FieldType.SIGNATURE_SINGLE:
+          result = result.map(JSON.parse)
+          break
+
+        case FieldType.LINK:
+          console.error(`${field.type} type is not rendable`)
+      }
+    }
+  } catch (e) {
+    console.error(e.message)
   }
 
   return result
@@ -81,7 +104,11 @@ export const deriveStores = context => {
         ...row,
         __idx: idx,
         ...customColumns.reduce((acc, c) => {
-          acc[c.name] = getRelatedTableValues(row, c)
+          const isSingle =
+            $enrichedSchema[c.related.field].relationshipType ===
+            RelationshipType.ONE_TO_MANY
+
+          acc[c.name] = getRelatedTableValues(row, c, isSingle)
           return acc
         }, {}),
       }))