From 30e31e12544076ae1813ef7f5aac82d6626f9120 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 6 Sep 2024 13:22:50 +0200
Subject: [PATCH] Enrich view columns

---
 packages/server/src/sdk/app/views/index.ts | 5 ++++-
 packages/types/src/sdk/view.ts             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index a0cffb2634..4e45fcda87 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -1,4 +1,5 @@
 import {
+  FieldSchema,
   FieldType,
   RelationSchemaField,
   RenameColumn,
@@ -176,7 +177,7 @@ export async function enrichSchema(
     }
     const relTable = tableCache[tableId]
 
-    const result: Record<string, RelationSchemaField> = {}
+    const result: Record<string, FieldSchema & RelationSchemaField> = {}
 
     for (const relTableFieldName of Object.keys(relTable.schema)) {
       const relTableField = relTable.schema[relTableFieldName]
@@ -191,6 +192,7 @@ export async function enrichSchema(
       const isVisible = !!viewFields[relTableFieldName]?.visible
       const isReadonly = !!viewFields[relTableFieldName]?.readonly
       result[relTableFieldName] = {
+        ...relTableField,
         visible: isVisible,
         readonly: isReadonly,
       }
@@ -211,6 +213,7 @@ export async function enrichSchema(
       ...tableSchema[key],
       ...ui,
       order: anyViewOrder ? ui?.order ?? undefined : tableSchema[key].order,
+      columns: undefined,
     }
 
     if (schema[key].type === FieldType.LINK) {
diff --git a/packages/types/src/sdk/view.ts b/packages/types/src/sdk/view.ts
index b330db3950..96a6807b69 100644
--- a/packages/types/src/sdk/view.ts
+++ b/packages/types/src/sdk/view.ts
@@ -3,7 +3,7 @@ import { FieldSchema, RelationSchemaField, ViewV2 } from "../documents"
 export interface ViewV2Enriched extends ViewV2 {
   schema?: {
     [key: string]: FieldSchema & {
-      columns?: Record<string, RelationSchemaField>
+      columns?: Record<string, FieldSchema & RelationSchemaField>
     }
   }
 }