diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts index 0a2215f760..720a61805f 100644 --- a/packages/server/src/integrations/base/sqlTable.ts +++ b/packages/server/src/integrations/base/sqlTable.ts @@ -60,10 +60,10 @@ function generateSchema( case FieldType.OPTIONS: case FieldType.LONGFORM: case FieldType.BARCODEQR: + case FieldType.BB_REFERENCE_SINGLE: schema.text(key) break - case FieldType.BB_REFERENCE: - case FieldType.BB_REFERENCE_SINGLE: { + case FieldType.BB_REFERENCE: { const subtype = column.subtype switch (subtype) { case BBReferenceFieldSubType.USER: diff --git a/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts b/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts index 2e53a151e5..e467a9cff3 100644 --- a/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts +++ b/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts @@ -17,7 +17,7 @@ export function processInputBBReferences( export function processInputBBReferences( value: string | string[] | { _id: string } | { _id: string }[], type: FieldType.BB_REFERENCE, - subtype: BBReferenceFieldSubType.USER | BBReferenceFieldSubType.USERS + subtype: BBReferenceFieldSubType ): Promise export async function processInputBBReferences( @@ -121,7 +121,7 @@ export function processOutputBBReferences( export function processOutputBBReferences( value: string, type: FieldType.BB_REFERENCE, - subtype: BBReferenceFieldSubType.USER | BBReferenceFieldSubType.USERS + subtype: BBReferenceFieldSubType ): Promise export async function processOutputBBReferences( diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts index 4046a1de66..4ac1623325 100644 --- a/packages/server/src/utilities/schema.ts +++ b/packages/server/src/utilities/schema.ts @@ -170,7 +170,7 @@ export function parse(rows: Rows, schema: TableSchema): Rows { function isValidBBReference( data: any, type: FieldType.BB_REFERENCE | FieldType.BB_REFERENCE_SINGLE, - subtype: BBReferenceFieldSubType.USER | BBReferenceFieldSubType.USERS + subtype: BBReferenceFieldSubType ): boolean { if (typeof data !== "string") { return false diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts index c7cf935ef3..33e6a06f97 100644 --- a/packages/shared-core/src/filters.ts +++ b/packages/shared-core/src/filters.ts @@ -25,8 +25,8 @@ export const getValidOperatorsForType = ( subtype?: BBReferenceFieldSubType formulaType?: FormulaType }, - field: string, - datasource: Datasource & { tableId: any } + field?: string, + datasource?: Datasource & { tableId: any } ) => { const Op = OperatorOptions const stringOps = [ diff --git a/packages/types/src/documents/app/table/schema.ts b/packages/types/src/documents/app/table/schema.ts index 7f2b04b703..eb5eecd423 100644 --- a/packages/types/src/documents/app/table/schema.ts +++ b/packages/types/src/documents/app/table/schema.ts @@ -110,13 +110,13 @@ export interface FormulaFieldMetadata extends BaseFieldSchema { export interface BBReferenceFieldMetadata extends Omit { type: FieldType.BB_REFERENCE - subtype: BBReferenceFieldSubType.USER | BBReferenceFieldSubType.USERS + subtype: BBReferenceFieldSubType relationshipType?: RelationshipType } export interface BBReferenceSingleFieldMetadata extends Omit { type: FieldType.BB_REFERENCE_SINGLE - subtype: BBReferenceFieldSubType.USER | BBReferenceFieldSubType.USERS + subtype: BBReferenceFieldSubType } export interface AttachmentFieldMetadata extends BaseFieldSchema {