From 637f7f514ae69f1ac9a9c39710ce31c27dc4f573 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 26 Apr 2024 12:18:50 +0200 Subject: [PATCH] Remove FieldTypeSubtypes --- packages/frontend-core/src/constants.js | 6 +++--- packages/server/src/api/routes/tests/row.spec.ts | 6 +++--- .../server/src/sdk/app/rows/search/tests/utils.spec.ts | 6 +++--- .../utilities/rowProcessor/tests/inputProcessing.spec.ts | 8 ++++---- .../utilities/rowProcessor/tests/outputProcessing.spec.ts | 7 +++---- packages/types/src/documents/app/row.ts | 8 -------- 6 files changed, 16 insertions(+), 25 deletions(-) diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 95228c3bdc..2a9b0379f8 100644 --- a/packages/frontend-core/src/constants.js +++ b/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 = { @@ -134,7 +134,7 @@ export const TypeIconMap = { [FieldType.USER]: "User", [FieldType.USERS]: "UserGroup", [FieldType.BB_REFERENCE]: { - [FieldTypeSubtypes.BB_REFERENCE.USER]: "User", - [FieldTypeSubtypes.BB_REFERENCE.USERS]: "UserGroup", + [FieldSubtype.USER]: "User", + [FieldSubtype.USERS]: "UserGroup", }, } diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts index 8e1014f825..f2ace8f795 100644 --- a/packages/server/src/api/routes/tests/row.spec.ts +++ b/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(), diff --git a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts index bf7799402d..413b5e28cf 100644 --- a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts +++ b/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, }, }, } diff --git a/packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts b/packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts index 859a203133..47f930803b 100644 --- a/packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts +++ b/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, @@ -93,7 +93,7 @@ describe("rowProcessor - inputProcessing", () => { }, user: { type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + subtype: FieldSubtype.USER, name: "user", constraints: { presence: false, @@ -135,7 +135,7 @@ describe("rowProcessor - inputProcessing", () => { }, user: { type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + subtype: FieldSubtype.USER, name: "user", constraints: { presence: false, diff --git a/packages/server/src/utilities/rowProcessor/tests/outputProcessing.spec.ts b/packages/server/src/utilities/rowProcessor/tests/outputProcessing.spec.ts index 74d55aff36..7a7c319bb8 100644 --- a/packages/server/src/utilities/rowProcessor/tests/outputProcessing.spec.ts +++ b/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, @@ -175,7 +174,7 @@ describe("rowProcessor - outputProcessing", () => { }, user: { type: FieldType.BB_REFERENCE, - subtype: FieldTypeSubtypes.BB_REFERENCE.USER, + subtype: FieldSubtype.USER, name: "user", constraints: { presence: false, diff --git a/packages/types/src/documents/app/row.ts b/packages/types/src/documents/app/row.ts index 865ab4ba64..b98bd8dc32 100644 --- a/packages/types/src/documents/app/row.ts +++ b/packages/types/src/documents/app/row.ts @@ -129,11 +129,3 @@ export enum FieldSubtype { USER = "user", 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, - }, -}