Remove FieldTypeSubtypes

packages/builder/src/constants/backend/index.js

@@ -4,7 +4,6 @@ import {
   INTERNAL_TABLE_SOURCE_ID,
   AutoFieldSubType,
   Hosting,
-  FieldTypeSubtypes,
 } from "@budibase/types"
 import { Constants } from "@budibase/frontend-core"
 
@@ -162,26 +161,20 @@ export const FIELDS = {
     name: "User",
     type: FieldType.BB_REFERENCE_SINGLE,
     subtype: FieldSubtype.USER,
-    icon: TypeIconMap[FieldType.BB_REFERENCE_SINGLE][
+    icon: TypeIconMap[FieldType.BB_REFERENCE_SINGLE][FieldSubtype.USER],
-      FieldTypeSubtypes.BB_REFERENCE.USER
-    ],
   },
   // Used for display of editing existing columns
   OLD_USER: {
     name: "User",
     type: FieldType.BB_REFERENCE,
     subtype: FieldSubtype.USER,
-    icon: TypeIconMap[FieldType.BB_REFERENCE_SINGLE][
+    icon: TypeIconMap[FieldType.BB_REFERENCE_SINGLE][FieldSubtype.USER],
-      FieldTypeSubtypes.BB_REFERENCE.USER
-    ],
   },
   USERS: {
     name: "User List",
     type: FieldType.BB_REFERENCE,
     subtype: FieldSubtype.USERS,
-    icon: TypeIconMap[FieldType.BB_REFERENCE][
+    icon: TypeIconMap[FieldType.BB_REFERENCE][FieldSubtype.USERS],
-      FieldTypeSubtypes.BB_REFERENCE.USERS
-    ],
     constraints: {
       type: "array",
     },

packages/frontend-core/src/constants.js

@@ -4,7 +4,7 @@
 export { OperatorOptions, SqlNumberTypeRangeMap } from "@budibase/shared-core"
 export { Feature as Features } from "@budibase/types"
 import { BpmCorrelationKey } from "@budibase/shared-core"
-import { FieldType, FieldTypeSubtypes } from "@budibase/types"
+import { FieldType, FieldSubtype } from "@budibase/types"
 
 // Cookie names
 export const Cookies = {
@@ -132,10 +132,10 @@ export const TypeIconMap = {
   [FieldType.BIGINT]: "TagBold",
   [FieldType.AUTO]: "MagicWand",
   [FieldType.BB_REFERENCE]: {
-    [FieldTypeSubtypes.BB_REFERENCE.USER]: "User",
+    [FieldSubtype.USER]: "User",
-    [FieldTypeSubtypes.BB_REFERENCE.USERS]: "UserGroup",
+    [FieldSubtype.USERS]: "UserGroup",
   },
   [FieldType.BB_REFERENCE_SINGLE]: {
-    [FieldTypeSubtypes.BB_REFERENCE.USER]: "User",
+    [FieldSubtype.USER]: "User",
   },
 }

packages/server/src/api/routes/tests/row.spec.ts

@@ -13,7 +13,7 @@ import {
   DeleteRow,
   FieldSchema,
   FieldType,
-  FieldTypeSubtypes,
+  FieldSubtype,
   FormulaType,
   INTERNAL_TABLE_SOURCE_ID,
   NumberFieldMetadata,
@@ -1015,12 +1015,12 @@ describe.each([
         user: {
           name: "user",
           type: FieldType.BB_REFERENCE,
-          subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+          subtype: FieldSubtype.USER,
         },
         users: {
           name: "users",
           type: FieldType.BB_REFERENCE,
-          subtype: FieldTypeSubtypes.BB_REFERENCE.USERS,
+          subtype: FieldSubtype.USERS,
         },
       }),
       () => config.createUser(),

packages/server/src/sdk/app/rows/search/tests/utils.spec.ts

@@ -2,7 +2,7 @@ import { searchInputMapping } from "../utils"
 import { db as dbCore } from "@budibase/backend-core"
 import {
   FieldType,
-  FieldTypeSubtypes,
+  FieldSubtype,
   INTERNAL_TABLE_SOURCE_ID,
   RowSearchParams,
   Table,
@@ -20,7 +20,7 @@ const tableWithUserCol: Table = {
     user: {
       name: "user",
       type: FieldType.BB_REFERENCE,
-      subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+      subtype: FieldSubtype.USER,
     },
   },
 }
@@ -35,7 +35,7 @@ const tableWithUsersCol: Table = {
     user: {
       name: "user",
       type: FieldType.BB_REFERENCE,
-      subtype: FieldTypeSubtypes.BB_REFERENCE.USERS,
+      subtype: FieldSubtype.USERS,
     },
   },
 }

packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts

@@ -2,7 +2,7 @@ import { inputProcessing } from ".."
 import { generator, structures } from "@budibase/backend-core/tests"
 import {
   FieldType,
-  FieldTypeSubtypes,
+  FieldSubtype,
   INTERNAL_TABLE_SOURCE_ID,
   Table,
   TableSourceType,
@@ -39,7 +39,7 @@ describe("rowProcessor - inputProcessing", () => {
         },
         user: {
           type: FieldType.BB_REFERENCE,
-          subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+          subtype: FieldSubtype.USER,
           name: "user",
           constraints: {
             presence: true,
@@ -94,7 +94,7 @@ describe("rowProcessor - inputProcessing", () => {
         },
         user: {
           type: FieldType.BB_REFERENCE,
-          subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+          subtype: FieldSubtype.USER,
           name: "user",
           constraints: {
             presence: false,
@@ -136,7 +136,7 @@ describe("rowProcessor - inputProcessing", () => {
           },
           user: {
             type: FieldType.BB_REFERENCE,
-            subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+            subtype: FieldSubtype.USER,
             name: "user",
             constraints: {
               presence: false,

packages/server/src/utilities/rowProcessor/tests/outputProcessing.spec.ts

@@ -1,7 +1,6 @@
 import {
-  FieldSubtype,
   FieldType,
-  FieldTypeSubtypes,
+  FieldSubtype,
   INTERNAL_TABLE_SOURCE_ID,
   RowAttachment,
   Table,
@@ -42,7 +41,7 @@ describe("rowProcessor - outputProcessing", () => {
         },
         user: {
           type: FieldType.BB_REFERENCE,
-          subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+          subtype: FieldSubtype.USER,
           name: "user",
           constraints: {
             presence: false,
@@ -176,7 +175,7 @@ describe("rowProcessor - outputProcessing", () => {
         },
         user: {
           type: FieldType.BB_REFERENCE,
-          subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+          subtype: FieldSubtype.USER,
           name: "user",
           constraints: {
             presence: false,

packages/types/src/documents/app/row.ts

@@ -131,13 +131,6 @@ export interface Row extends Document {
 
 export enum FieldSubtype {
   USER = "user",
+  /** @deprecated this should not be used anymore */
   USERS = "users",
 }
-
-// The 'as' are required for typescript not to type the outputs as generic FieldSubtype
-export const FieldTypeSubtypes = {
-  BB_REFERENCE: {
-    USER: FieldSubtype.USER as FieldSubtype.USER,
-    USERS: FieldSubtype.USERS as FieldSubtype.USERS,
-  },
-}