From 73ec0bbf09d9b54ff06dfa70c7b8b29791da237e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 28 Aug 2024 18:08:07 +0200
Subject: [PATCH] Renames

---
 packages/server/src/api/controllers/row/staticFormula.ts | 5 +----
 packages/server/src/db/linkedRows/index.ts               | 6 +++---
 packages/server/src/utilities/rowProcessor/index.ts      | 5 +----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts
index a6a02952d3..2e913c2b96 100644
--- a/packages/server/src/api/controllers/row/staticFormula.ts
+++ b/packages/server/src/api/controllers/row/staticFormula.ts
@@ -154,9 +154,6 @@ export async function finaliseRow(
   if (updateFormula) {
     await updateRelatedFormula(table, enrichedRow)
   }
-  const squashed = await linkRows.squashLinksToPrimaryDisplay(
-    table,
-    enrichedRow
-  )
+  const squashed = await linkRows.squashLinks(table, enrichedRow)
   return { row: enrichedRow, squashed, table }
 }
diff --git a/packages/server/src/db/linkedRows/index.ts b/packages/server/src/db/linkedRows/index.ts
index a0dbb1c2da..fe1d534f9f 100644
--- a/packages/server/src/db/linkedRows/index.ts
+++ b/packages/server/src/db/linkedRows/index.ts
@@ -247,10 +247,10 @@ function getPrimaryDisplayValue(row: Row, table?: Table) {
  * @param enriched The pre-enriched rows (full docs) which are to be squashed.
  * @returns The rows after having their links squashed to only contain the ID and primary display.
  */
-export async function squashLinksToPrimaryDisplay(
+export async function squashLinks<T = Row[] | Row>(
   table: Table,
-  enriched: Row[] | Row
-) {
+  enriched: T
+): Promise<T> {
   // will populate this as we find them
   const linkedTables = [table]
   const isArray = Array.isArray(enriched)
diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts
index 795f6970ab..0055bd5370 100644
--- a/packages/server/src/utilities/rowProcessor/index.ts
+++ b/packages/server/src/utilities/rowProcessor/index.ts
@@ -343,10 +343,7 @@ export async function outputProcessing<T extends Row[] | Row>(
   enriched = await processFormulas(table, enriched, { dynamic: true })
 
   if (opts.squash) {
-    enriched = (await linkRows.squashLinksToPrimaryDisplay(
-      table,
-      enriched
-    )) as Row[]
+    enriched = await linkRows.squashLinks(table, enriched)
   }
   // remove null properties to match internal API
   const isExternal = isExternalTableID(table._id!)