From 0679ec89931879158f2ef3fd43bc9de89540321b Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Wed, 2 Oct 2024 10:36:45 +0100
Subject: [PATCH] Make sure calculation views are created and returned
 correctly.

---
 .../src/api/routes/tests/viewV2.spec.ts       |  4 ++-
 packages/server/src/sdk/app/views/index.ts    | 31 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 954047d536..669d35ba5b 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -542,7 +542,7 @@ describe.each([
         })
       })
 
-      it.only("can create a view with calculation fields", async () => {
+      it("can create a view with calculation fields", async () => {
         let view = await config.api.viewV2.create({
           tableId: table._id!,
           name: generator.guid(),
@@ -555,6 +555,8 @@ describe.each([
           },
         })
 
+        expect(Object.keys(view.schema!)).toHaveLength(1)
+
         let sum = view.schema!.sum as ViewCalculationFieldMetadata
         expect(sum).toBeDefined()
         expect(sum.calculationType).toEqual(CalculationType.SUM)
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 24e4da3172..d218a3c7e8 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -258,19 +258,12 @@ export async function enrichSchema(
   view: ViewV2,
   tableSchema: TableSchema
 ): Promise<ViewV2Enriched> {
-  const tableCache: Record<string, Table> = {}
-
   async function populateRelTableSchema(
     tableId: string,
     viewFields: Record<string, RelationSchemaField>
   ) {
-    if (!tableCache[tableId]) {
-      tableCache[tableId] = await sdk.tables.getTable(tableId)
-    }
-    const relTable = tableCache[tableId]
-
+    const relTable = await sdk.tables.getTable(tableId)
     const result: Record<string, ViewV2ColumnEnriched> = {}
-
     for (const relTableFieldName of Object.keys(relTable.schema)) {
       const relTableField = relTable.schema[relTableFieldName]
       if ([FieldType.LINK, FieldType.FORMULA].includes(relTableField.type)) {
@@ -299,15 +292,22 @@ export async function enrichSchema(
 
   const viewSchema = view.schema || {}
   const anyViewOrder = Object.values(viewSchema).some(ui => ui.order != null)
-  for (const key of Object.keys(tableSchema).filter(
-    k => tableSchema[k].visible !== false
-  )) {
+
+  const visibleSchemaFields = Object.keys(viewSchema).filter(
+    key => viewSchema[key].visible !== false
+  )
+  const visibleTableFields = Object.keys(tableSchema).filter(
+    key => tableSchema[key].visible !== false
+  )
+  const visibleFields = new Set([...visibleSchemaFields, ...visibleTableFields])
+
+  for (const key of visibleFields) {
     // if nothing specified in view, then it is not visible
     const ui = viewSchema[key] || { visible: false }
     schema[key] = {
-      ...tableSchema[key],
+      ...(tableSchema[key] || {}),
       ...ui,
-      order: anyViewOrder ? ui?.order ?? undefined : tableSchema[key].order,
+      order: anyViewOrder ? ui?.order ?? undefined : tableSchema[key]?.order,
       columns: undefined,
     }
 
@@ -319,10 +319,7 @@ export async function enrichSchema(
     }
   }
 
-  return {
-    ...view,
-    schema: schema,
-  }
+  return { ...view, schema }
 }
 
 export function syncSchema(