From 67fea783bb46820dae8ab97bc9c3687d6fe72bc0 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 29 Oct 2024 10:29:41 +0000 Subject: [PATCH 1/5] Support boolean and bigint fields having default values. --- .../server/src/api/routes/tests/row.spec.ts | 56 +++++++++++++++++++ packages/shared-core/src/table.ts | 4 +- .../types/src/documents/app/table/schema.ts | 14 +++++ 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts index 2980803fbc..1cb6afe58b 100644 --- a/packages/server/src/api/routes/tests/row.spec.ts +++ b/packages/server/src/api/routes/tests/row.spec.ts @@ -835,6 +835,62 @@ describe.each([ }) }) + describe("boolean column", () => { + beforeAll(async () => { + table = await config.api.table.save( + saveTableRequest({ + schema: { + active: { + name: "active", + type: FieldType.BOOLEAN, + default: "true", + }, + }, + }) + ) + }) + + it("creates a new row with a default value successfully", async () => { + const row = await config.api.row.save(table._id!, {}) + expect(row.active).toEqual(true) + }) + + it("does not use default value if value specified", async () => { + const row = await config.api.row.save(table._id!, { + active: false, + }) + expect(row.active).toEqual(false) + }) + }) + + describe("bigint column", () => { + beforeAll(async () => { + table = await config.api.table.save( + saveTableRequest({ + schema: { + bigNumber: { + name: "bigNumber", + type: FieldType.BIGINT, + default: "1234567890", + }, + }, + }) + ) + }) + + it("creates a new row with a default value successfully", async () => { + const row = await config.api.row.save(table._id!, {}) + expect(row.bigNumber).toEqual("1234567890") + }) + + it("does not use default value if value specified", async () => { + const row = await config.api.row.save(table._id!, { + bigNumber: "9876543210", + }) + expect(row.bigNumber).toEqual("9876543210") + }) + }) + describe("bindings", () => { describe("string column", () => { beforeAll(async () => { diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts index 73e3ad6cb7..5402439d9c 100644 --- a/packages/shared-core/src/table.ts +++ b/packages/shared-core/src/table.ts @@ -57,12 +57,12 @@ const allowDefaultColumnByType: Record = { [FieldType.STRING]: true, [FieldType.OPTIONS]: true, [FieldType.ARRAY]: true, + [FieldType.BIGINT]: true, + [FieldType.BOOLEAN]: true, [FieldType.AUTO]: false, [FieldType.INTERNAL]: false, [FieldType.BARCODEQR]: false, - [FieldType.BIGINT]: false, - [FieldType.BOOLEAN]: false, [FieldType.FORMULA]: false, [FieldType.AI]: false, [FieldType.ATTACHMENTS]: false, diff --git a/packages/types/src/documents/app/table/schema.ts b/packages/types/src/documents/app/table/schema.ts index 45d0aa78d2..9e4555e1a2 100644 --- a/packages/types/src/documents/app/table/schema.ts +++ b/packages/types/src/documents/app/table/schema.ts @@ -198,6 +198,16 @@ interface BaseFieldSchema extends UIFieldMetadata { subtype?: never } +interface BooleanFieldMetadata extends BaseFieldSchema { + type: FieldType.BOOLEAN + default?: string +} + +interface BigIntFieldMetadata extends BaseFieldSchema { + type: FieldType.BIGINT + default?: string +} + interface OtherFieldMetadata extends BaseFieldSchema { type: Exclude< FieldType, @@ -214,6 +224,8 @@ interface OtherFieldMetadata extends BaseFieldSchema { | FieldType.STRING | FieldType.ARRAY | FieldType.OPTIONS + | FieldType.BOOLEAN + | FieldType.BIGINT > } @@ -233,6 +245,8 @@ export type FieldSchema = | BBReferenceSingleFieldMetadata | ArrayFieldMetadata | OptionsFieldMetadata + | BooleanFieldMetadata + | BigIntFieldMetadata export interface TableSchema { [key: string]: FieldSchema From b58fd7dc6b0e92976c330901b7b21b07b19163d1 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 29 Oct 2024 10:34:14 +0000 Subject: [PATCH 2/5] Fix OSS build. --- .../types/src/documents/app/table/schema.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/types/src/documents/app/table/schema.ts b/packages/types/src/documents/app/table/schema.ts index 9e4555e1a2..7e79902a49 100644 --- a/packages/types/src/documents/app/table/schema.ts +++ b/packages/types/src/documents/app/table/schema.ts @@ -186,6 +186,16 @@ export interface ArrayFieldMetadata extends BaseFieldSchema { default?: string[] } +export interface BooleanFieldMetadata extends BaseFieldSchema { + type: FieldType.BOOLEAN + default?: string +} + +export interface BigIntFieldMetadata extends BaseFieldSchema { + type: FieldType.BIGINT + default?: string +} + interface BaseFieldSchema extends UIFieldMetadata { type: FieldType name: string @@ -198,16 +208,6 @@ interface BaseFieldSchema extends UIFieldMetadata { subtype?: never } -interface BooleanFieldMetadata extends BaseFieldSchema { - type: FieldType.BOOLEAN - default?: string -} - -interface BigIntFieldMetadata extends BaseFieldSchema { - type: FieldType.BIGINT - default?: string -} - interface OtherFieldMetadata extends BaseFieldSchema { type: Exclude< FieldType, From 4da185a8432a5949814222f1dfd0949336b2d219 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 29 Oct 2024 11:00:45 +0000 Subject: [PATCH 3/5] Fixes an issue with public role access, some old roles have a slightly different role ID format which needs to be accounted for in the comparison. Tests will come after, want to get the fix out. --- packages/backend-core/src/security/roles.ts | 31 +++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/packages/backend-core/src/security/roles.ts b/packages/backend-core/src/security/roles.ts index c14178cacb..42a55c16c7 100644 --- a/packages/backend-core/src/security/roles.ts +++ b/packages/backend-core/src/security/roles.ts @@ -219,7 +219,10 @@ export function getBuiltinRole(roleId: string): Role | undefined { export function builtinRoleToNumber(id: string) { const builtins = getBuiltinRoles() const MAX = Object.values(builtins).length + 1 - if (id === BUILTIN_IDS.ADMIN || id === BUILTIN_IDS.BUILDER) { + if ( + compareRoleIds(id, BUILTIN_IDS.ADMIN) || + compareRoleIds(id, BUILTIN_IDS.BUILDER) + ) { return MAX } let role = builtins[id], @@ -256,7 +259,9 @@ export async function roleToNumber(id: string) { // find the built-in roles, get their number, sort it, then get the last one const highestBuiltin: number | undefined = role.inherits .map(roleId => { - const foundRole = hierarchy.find(role => role._id === roleId) + const foundRole = hierarchy.find(role => + compareRoleIds(role._id!, roleId) + ) if (foundRole) { return findNumber(foundRole) + 1 } @@ -380,7 +385,7 @@ async function getAllUserRoles( ): Promise { const allRoles = await getAllRoles() // admins have access to all roles - if (userRoleId === BUILTIN_IDS.ADMIN) { + if (compareRoleIds(userRoleId, BUILTIN_IDS.ADMIN)) { return allRoles } @@ -491,17 +496,21 @@ export async function getAllRoles(appId?: string): Promise { // need to combine builtin with any DB record of them (for sake of permissions) for (let builtinRoleId of externalBuiltinRoles) { const builtinRole = builtinRoles[builtinRoleId] - const dbBuiltin = roles.filter( - dbRole => - getExternalRoleID(dbRole._id!, dbRole.version) === builtinRoleId + const dbBuiltin = roles.filter(dbRole => + compareRoleIds(dbRole._id!, builtinRoleId) )[0] if (dbBuiltin == null) { roles.push(builtinRole || builtinRoles.BASIC) } else { // remove role and all back after combining with the builtin roles = roles.filter(role => role._id !== dbBuiltin._id) - dbBuiltin._id = getExternalRoleID(dbBuiltin._id!, dbBuiltin.version) - roles.push(Object.assign(builtinRole, dbBuiltin)) + dbBuiltin._id = getExternalRoleID(builtinRole._id!, dbBuiltin.version) + roles.push({ + ...builtinRole, + ...dbBuiltin, + name: builtinRole.name, + _id: getExternalRoleID(builtinRole._id!, builtinRole.version), + }) } } // check permissions @@ -544,9 +553,9 @@ export class AccessController { if ( tryingRoleId == null || tryingRoleId === "" || - tryingRoleId === userRoleId || - tryingRoleId === BUILTIN_IDS.BUILDER || - userRoleId === BUILTIN_IDS.BUILDER + compareRoleIds(tryingRoleId, BUILTIN_IDS.BUILDER) || + compareRoleIds(userRoleId!, tryingRoleId) || + compareRoleIds(userRoleId!, BUILTIN_IDS.BUILDER) ) { return true } From 5cad630b255fb99732e10a76e1b94fa88eee459a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Oct 2024 11:52:20 +0000 Subject: [PATCH 4/5] Bump version to 2.33.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 530c51d20b..505f313793 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "2.33.4", + "version": "2.33.5", "npmClient": "yarn", "packages": [ "packages/*", From f94d8ba870acb3a906d0a3fbb1356de4d0673d80 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 29 Oct 2024 12:18:36 +0000 Subject: [PATCH 5/5] Fixing merge artifact --- packages/backend-core/src/security/roles.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/backend-core/src/security/roles.ts b/packages/backend-core/src/security/roles.ts index b7060ebdd7..4076be93a0 100644 --- a/packages/backend-core/src/security/roles.ts +++ b/packages/backend-core/src/security/roles.ts @@ -238,8 +238,8 @@ export function builtinRoleToNumber(id: string) { const builtins = getBuiltinRoles() const MAX = Object.values(builtins).length + 1 if ( - compareRoleIds(id, BUILTIN_IDS.ADMIN) || - compareRoleIds(id, BUILTIN_IDS.BUILDER) + roleIDsAreEqual(id, BUILTIN_IDS.ADMIN) || + roleIDsAreEqual(id, BUILTIN_IDS.BUILDER) ) { return MAX } @@ -278,7 +278,7 @@ export async function roleToNumber(id: string) { const highestBuiltin: number | undefined = role.inherits .map(roleId => { const foundRole = hierarchy.find(role => - compareRoleIds(role._id!, roleId) + roleIDsAreEqual(role._id!, roleId) ) if (foundRole) { return findNumber(foundRole) + 1 @@ -403,7 +403,7 @@ async function getAllUserRoles( ): Promise { const allRoles = await getAllRoles() // admins have access to all roles - if (compareRoleIds(userRoleId, BUILTIN_IDS.ADMIN)) { + if (roleIDsAreEqual(userRoleId, BUILTIN_IDS.ADMIN)) { return allRoles } @@ -515,7 +515,7 @@ export async function getAllRoles(appId?: string): Promise { for (let builtinRoleId of externalBuiltinRoles) { const builtinRole = builtinRoles[builtinRoleId] const dbBuiltin = roles.filter(dbRole => - compareRoleIds(dbRole._id!, builtinRoleId) + roleIDsAreEqual(dbRole._id!, builtinRoleId) )[0] if (dbBuiltin == null) { roles.push(builtinRole || builtinRoles.BASIC) @@ -574,9 +574,9 @@ export class AccessController { if ( tryingRoleId == null || tryingRoleId === "" || - compareRoleIds(tryingRoleId, BUILTIN_IDS.BUILDER) || - compareRoleIds(userRoleId!, tryingRoleId) || - compareRoleIds(userRoleId!, BUILTIN_IDS.BUILDER) + roleIDsAreEqual(tryingRoleId, BUILTIN_IDS.BUILDER) || + roleIDsAreEqual(userRoleId!, tryingRoleId) || + roleIDsAreEqual(userRoleId!, BUILTIN_IDS.BUILDER) ) { return true }