From cbd82bcf6a6266e3aec5e619c1f4b0e8b43fc555 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 25 Sep 2024 17:42:21 +0200
Subject: [PATCH] Format strings

---
 .../src/components/grid/stores/rows.js          |  4 ++--
 .../frontend-core/src/utils/relatedColumns.js   | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js
index 9d4608776f..3e2b59c633 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.js
@@ -56,11 +56,11 @@ export const deriveStores = context => {
         ...row,
         __idx: idx,
         ...customColumns.reduce((acc, c) => {
-          const isSingle =
+          const fromSingle =
             $enrichedSchema[c.related.field].relationshipType ===
             RelationshipType.ONE_TO_MANY
 
-          acc[c.name] = getRelatedTableValues(row, c, isSingle)
+          acc[c.name] = getRelatedTableValues(row, c, fromSingle)
           return acc
         }, {}),
       }))
diff --git a/packages/frontend-core/src/utils/relatedColumns.js b/packages/frontend-core/src/utils/relatedColumns.js
index e7271e5a26..f7298614ed 100644
--- a/packages/frontend-core/src/utils/relatedColumns.js
+++ b/packages/frontend-core/src/utils/relatedColumns.js
@@ -61,10 +61,10 @@ export function enrichSchemaWithRelColumns(schema) {
   return result
 }
 
-export function getRelatedTableValues(row, field, isSingle) {
+export function getRelatedTableValues(row, field, fromSingle) {
   let result = ""
   try {
-    if (isSingle) {
+    if (fromSingle) {
       result = row[field.related.field]?.[0]?.[field.related.subField]
     } else {
       const parser =
@@ -75,7 +75,18 @@ export function getRelatedTableValues(row, field, isSingle) {
             parser(r[field.related.subField], field)
           )
         )
-      ).join(", ")
+      )
+
+      if (
+        [
+          FieldType.STRING,
+          FieldType.NUMBER,
+          FieldType.BIGINT,
+          FieldType.BOOLEAN,
+        ].includes(field.type)
+      ) {
+        result = result.join(", ")
+      }
     }
   } catch (e) {
     result = "Not rendable"