From 95faefcb87d9a6fd7a214abd30a9a760407348bd Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 9 May 2024 12:28:44 +0200
Subject: [PATCH] DRY

---
 .../DataTable/modals/CreateEditColumn.svelte  | 12 +++++-----
 .../grid/cells/BBReferenceCell.svelte         | 22 ++++++-------------
 .../src/components/grid/lib/utils.js          | 11 +++-------
 .../src/api/controllers/row/utils/basic.ts    | 10 +++------
 packages/shared-core/src/helpers/index.ts     |  1 +
 packages/shared-core/src/helpers/schema.ts    | 13 +++++++++++
 6 files changed, 33 insertions(+), 36 deletions(-)
 create mode 100644 packages/shared-core/src/helpers/schema.ts

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index b06e62613d..69aaa4cd88 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -13,7 +13,11 @@
     Layout,
     AbsTooltip,
   } from "@budibase/bbui"
-  import { SWITCHABLE_TYPES, ValidColumnNameRegex } from "@budibase/shared-core"
+  import {
+    SWITCHABLE_TYPES,
+    ValidColumnNameRegex,
+    helpers,
+  } from "@budibase/shared-core"
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
   import { tables, datasources } from "stores/builder"
@@ -361,11 +365,7 @@
   function getAllowedTypes(datasource) {
     if (originalName) {
       let possibleTypes = SWITCHABLE_TYPES[field.type] || [editableColumn.type]
-      if (
-        editableColumn.type === FieldType.BB_REFERENCE &&
-        editableColumn.subtype === BBReferenceFieldSubType.USER &&
-        editableColumn.constraints?.type !== "array"
-      ) {
+      if (helpers.schema.isDeprecatedSingleUserColumn(editableColumn)) {
         // This will handle old single users columns
         return [
           {
diff --git a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
index 138ad68834..5d98ba903b 100644
--- a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
@@ -1,5 +1,6 @@
 <script>
   import { getContext } from "svelte"
+  import { helpers } from "@budibase/shared-core"
   import RelationshipCell from "./RelationshipCell.svelte"
   import {
     BBReferenceFieldSubType,
@@ -12,26 +13,17 @@
   export let schema
 
   const { API } = getContext("grid")
-  const { type, subtype, constraints } = schema
-
-  let relationshipType
-
-  $: {
-    if (
-      type === FieldType.BB_REFERENCE_SINGLE ||
-      constraints?.type !== "array" // Handle deprecated "single" user references
-    ) {
-      relationshipType = RelationshipType.ONE_TO_MANY
-    } else {
-      relationshipType = RelationshipType.MANY_TO_MANY
-    }
-  }
+  const { type, subtype } = schema
 
   $: schema = {
     ...$$props.schema,
     // This is not really used, just adding some content to be able to render the relationship cell
     tableId: "external",
-    relationshipType,
+    relationshipType:
+      type === FieldType.BB_REFERENCE_SINGLE ||
+      helpers.schema.isDeprecatedSingleUserColumn(schema)
+        ? RelationshipType.ONE_TO_MANY
+        : RelationshipType.MANY_TO_MANY,
   }
 
   async function searchFunction(searchParams) {
diff --git a/packages/frontend-core/src/components/grid/lib/utils.js b/packages/frontend-core/src/components/grid/lib/utils.js
index 096409b925..db7a104653 100644
--- a/packages/frontend-core/src/components/grid/lib/utils.js
+++ b/packages/frontend-core/src/components/grid/lib/utils.js
@@ -1,4 +1,4 @@
-import { BBReferenceFieldSubType, FieldType } from "@budibase/types"
+import { helpers } from "@budibase/shared-core"
 import { TypeIconMap } from "../../../constants"
 
 export const getColor = (idx, opacity = 0.3) => {
@@ -13,16 +13,11 @@ export const getColumnIcon = column => {
     return "MagicWand"
   }
 
-  const { type, subtype, constraints } = column.schema
-  if (
-    type === FieldType.BB_REFERENCE &&
-    subtype === BBReferenceFieldSubType.USER &&
-    constraints?.type !== "array"
-  ) {
-    // This will handle old single users columns
+  if (helpers.schema.isDeprecatedSingleUserColumn(column.schema)) {
     return "User"
   }
 
+  const { type, subtype } = column.schema
   const result =
     typeof TypeIconMap[type] === "object" && subtype
       ? TypeIconMap[type][subtype]
diff --git a/packages/server/src/api/controllers/row/utils/basic.ts b/packages/server/src/api/controllers/row/utils/basic.ts
index 6962c13fff..0704e7db8c 100644
--- a/packages/server/src/api/controllers/row/utils/basic.ts
+++ b/packages/server/src/api/controllers/row/utils/basic.ts
@@ -1,5 +1,6 @@
 // need to handle table name + field or just field, depending on if relationships used
-import { BBReferenceFieldSubType, FieldType, Row, Table } from "@budibase/types"
+import { FieldType, Row, Table } from "@budibase/types"
+import { helpers } from "@budibase/shared-core"
 import { generateRowIdField } from "../../../../integrations/utils"
 import { CONSTANT_INTERNAL_ROW_COLS } from "../../../../db/utils"
 
@@ -111,12 +112,7 @@ export function fixArrayTypes(row: Row, table: Table) {
       try {
         row[fieldName] = JSON.parse(row[fieldName])
       } catch (err) {
-        // Handling deprecated  single user type
-        const isDeprecatedSingleUser =
-          schema.type === FieldType.BB_REFERENCE &&
-          schema.subtype === BBReferenceFieldSubType.USER &&
-          schema.constraints?.type !== "array"
-        if (!isDeprecatedSingleUser) {
+        if (!helpers.schema.isDeprecatedSingleUserColumn(schema)) {
           // couldn't convert back to array, ignore
           delete row[fieldName]
         }
diff --git a/packages/shared-core/src/helpers/index.ts b/packages/shared-core/src/helpers/index.ts
index e76022b14b..c33ff2ab1e 100644
--- a/packages/shared-core/src/helpers/index.ts
+++ b/packages/shared-core/src/helpers/index.ts
@@ -1,3 +1,4 @@
 export * from "./helpers"
 export * from "./integrations"
 export * as cron from "./cron"
+export * as schema from "./schema"
diff --git a/packages/shared-core/src/helpers/schema.ts b/packages/shared-core/src/helpers/schema.ts
new file mode 100644
index 0000000000..548a5c9766
--- /dev/null
+++ b/packages/shared-core/src/helpers/schema.ts
@@ -0,0 +1,13 @@
+import {
+  BBReferenceFieldSubType,
+  FieldSchema,
+  FieldType,
+} from "@budibase/types"
+
+export function isDeprecatedSingleUserColumn(schema: FieldSchema) {
+  const result =
+    schema.type === FieldType.BB_REFERENCE &&
+    schema.subtype === BBReferenceFieldSubType.USER &&
+    schema.constraints?.type !== "array"
+  return result
+}