MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into s3-file-system-fixes

This commit is contained in:
Martin McKeaveney 2024-05-15 14:46:21 +01:00 committed by GitHub
parent fddf82eaa7 7e1eddc787
commit d6f9da28aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 613 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "2.26.2",
"version": "2.26.3",
"npmClient": "yarn",
"packages": [
"packages/*",

6
packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte
View File

@ -2,21 +2,21 @@
import { Modal, ModalContent } from "@budibase/bbui"
import FreeTrial from "../../../../assets/FreeTrial.svelte"
import { get } from "svelte/store"
import { auth, licensing } from "stores/portal"
import { auth, licensing, admin } from "stores/portal"
import { API } from "api"
import { PlanType } from "@budibase/types"
import { sdk } from "@budibase/shared-core"
let freeTrialModal
$: planType = $licensing?.license?.plan?.type
$: showFreeTrialModal(planType, freeTrialModal)
$: isOwner = $auth.accountPortalAccess && $admin.cloud
const showFreeTrialModal = (planType, freeTrialModal) => {
if (
planType === PlanType.ENTERPRISE_BASIC_TRIAL &&
!$auth.user?.freeTrialConfirmedAt &&
sdk.users.isAdmin($auth.user)
isOwner
) {
freeTrialModal?.show()
}

13
packages/builder/src/pages/builder/portal/_layout.svelte
View File

@ -1,7 +1,14 @@
<script>
import { isActive, redirect, goto, url } from "@roxi/routify"
import { Icon, notifications, Tabs, Tab } from "@budibase/bbui"
import { organisation, auth, menu, appsStore, licensing } from "stores/portal"
import {
organisation,
auth,
menu,
appsStore,
licensing,
admin,
} from "stores/portal"
import { onMount } from "svelte"
import UpgradeButton from "./_components/UpgradeButton.svelte"
import MobileMenu from "./_components/MobileMenu.svelte"
@ -20,6 +27,7 @@
$: $url(), updateActiveTab($menu)
$: isOnboarding =
!$appsStore.apps.length && sdk.users.hasBuilderPermissions($auth.user)
$: isOwner = $auth.accountPortalAccess && $admin.cloud
const updateActiveTab = menu => {
for (let entry of menu) {
@ -38,8 +46,7 @@
const showFreeTrialBanner = () => {
return (
$licensing.license?.plan?.type ===
Constants.PlanType.ENTERPRISE_BASIC_TRIAL &&
sdk.users.isAdmin($auth.user)
Constants.PlanType.ENTERPRISE_BASIC_TRIAL && isOwner
)
}

2
packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
View File

@ -386,7 +386,7 @@
>
Hide column
</MenuItem>
{#if $config.canEditColumns && column.schema.type === "link" && column.schema.tableId === TableNames.USERS}
{#if $config.canEditColumns && column.schema.type === "link" && column.schema.tableId === TableNames.USERS && !column.schema.autocolumn}
<MenuItem icon="User" on:click={openMigrationModal}>
Migrate to user column
</MenuItem>

19
packages/server/src/api/controllers/row/ExternalRequest.ts
View File

@ -265,7 +265,10 @@ export class ExternalRequest<T extends Operation> {
}
}
inputProcessing(row: Row | undefined, table: Table) {
inputProcessing<T extends Row | undefined>(
row: T,
table: Table
): { row: T; manyRelationships: ManyRelationship[] } {
if (!row) {
return { row, manyRelationships: [] }
}
@ -346,7 +349,7 @@ export class ExternalRequest<T extends Operation> {
// we return the relationships that may need to be created in the through table
// we do this so that if the ID is generated by the DB it can be inserted
// after the fact
return { row: newRow, manyRelationships }
return { row: newRow as T, manyRelationships }
}
/**
@ -598,6 +601,18 @@ export class ExternalRequest<T extends Operation> {
// clean up row on ingress using schema
const processed = this.inputProcessing(row, table)
row = processed.row
let manyRelationships = processed.manyRelationships
if (!row && rows) {
manyRelationships = []
for (let i = 0; i < rows.length; i++) {
const processed = this.inputProcessing(rows[i], table)
rows[i] = processed.row
if (processed.manyRelationships.length) {
manyRelationships.push(...processed.manyRelationships)
}
}
}
if (
operation === Operation.DELETE &&
(filters == null || Object.keys(filters).length === 0)

13
packages/server/src/api/controllers/table/external.ts
View File

@ -15,6 +15,7 @@ import {
} from "@budibase/types"
import sdk from "../../../sdk"
import { builderSocket } from "../../../websockets"
import { inputProcessing } from "../../../utilities/rowProcessor"
function getDatasourceId(table: Table) {
if (!table) {
@ -80,7 +81,7 @@ export async function destroy(ctx: UserCtx) {
export async function bulkImport(
ctx: UserCtx<BulkImportRequest, BulkImportResponse>
) {
const table = await sdk.tables.getTable(ctx.params.tableId)
let table = await sdk.tables.getTable(ctx.params.tableId)
const { rows } = ctx.request.body
const schema = table.schema
@ -88,7 +89,15 @@ export async function bulkImport(
ctx.throw(400, "Provided data import information is invalid.")
}
const parsedRows = parse(rows, schema)
const parsedRows = []
for (const row of parse(rows, schema)) {
const processed = await inputProcessing(ctx.user?._id, table, row, {
noAutoRelationships: true,
})
parsedRows.push(processed.row)
table = processed.table
}
await handleRequest(Operation.BULK_CREATE, table._id!, {
rows: parsedRows,
})

2
packages/server/src/automations/tests/executeQuery.spec.ts
View File

@ -88,7 +88,7 @@ describe.each(
let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId, {
query: { queryId: "wrong_id" },
})
expect(res.response).toEqual("Error: CouchDB error: missing")
expect(res.response).toBeDefined()
expect(res.success).toEqual(false)
})
})

4
packages/server/src/sdk/app/rows/search.ts
View File

@ -79,9 +79,7 @@ export async function search(
}
const table = await sdk.tables.getTable(options.tableId)
options = searchInputMapping(table, options, {
isSql: !!table.sql || !!env.SQS_SEARCH_ENABLE,
})
options = searchInputMapping(table, options)
if (isExternalTable) {
return external.search(options, table)

32
packages/server/src/sdk/app/rows/search/utils.ts
View File

@ -11,7 +11,7 @@ import {
RowSearchParams,
} from "@budibase/types"
import { db as dbCore, context } from "@budibase/backend-core"
import { helpers, utils } from "@budibase/shared-core"
import { utils } from "@budibase/shared-core"
export async function paginatedSearch(
query: SearchFilters,
@ -49,12 +49,7 @@ function findColumnInQueries(
}
}
function userColumnMapping(
column: string,
options: RowSearchParams,
isDeprecatedSingleUserColumn: boolean = false,
isSql: boolean = false
) {
function userColumnMapping(column: string, options: RowSearchParams) {
findColumnInQueries(column, options, (filterValue: any): any => {
const isArray = Array.isArray(filterValue),
isString = typeof filterValue === "string"
@ -71,33 +66,23 @@ function userColumnMapping(
}
}
let wrapper = (s: string) => s
if (isDeprecatedSingleUserColumn && filterValue && isSql) {
// Decreated single users are stored as stringified arrays of a single value
wrapper = (s: string) => JSON.stringify([s])
}
if (isArray) {
return filterValue.map(el => {
if (typeof el === "string") {
return wrapper(processString(el))
return processString(el)
} else {
return el
}
})
} else {
return wrapper(processString(filterValue))
return processString(filterValue)
}
})
}
// maps through the search parameters to check if any of the inputs are invalid
// based on the table schema, converts them to something that is valid.
export function searchInputMapping(
table: Table,
options: RowSearchParams,
datasourceOptions: { isSql?: boolean } = {}
) {
export function searchInputMapping(table: Table, options: RowSearchParams) {
if (!table?.schema) {
return options
}
@ -116,12 +101,7 @@ export function searchInputMapping(
break
}
case FieldType.BB_REFERENCE: {
userColumnMapping(
key,
options,
helpers.schema.isDeprecatedSingleUserColumn(column),
datasourceOptions.isSql
)
userColumnMapping(key, options)
break
}
}

8
packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts
View File

@ -14,7 +14,13 @@ export async function processInputBBReference(
subtype: BBReferenceFieldSubType.USER
): Promise<string | null> {
if (value && Array.isArray(value)) {
throw "BB_REFERENCE_SINGLE cannot be an array"
if (value.length > 1) {
throw new InvalidBBRefError(
JSON.stringify(value),
BBReferenceFieldSubType.USER
)
}
value = value[0]
}
let id = typeof value === "string" ? value : value?._id

11
packages/server/src/utilities/rowProcessor/index.ts
View File

@ -18,6 +18,7 @@ import {
processOutputBBReferences,
} from "./bbReferenceProcessor"
import { isExternalTableID } from "../../integrations/utils"
import { helpers } from "@budibase/shared-core"
export * from "./utils"
export * from "./attachments"
@ -162,10 +163,14 @@ export async function inputProcessing(
if (attachment?.url) {
delete clonedRow[key].url
}
} else if (field.type === FieldType.BB_REFERENCE && value) {
clonedRow[key] = await processInputBBReferences(value, field.subtype)
} else if (field.type === FieldType.BB_REFERENCE_SINGLE && value) {
} else if (
value &&
(field.type === FieldType.BB_REFERENCE_SINGLE ||
helpers.schema.isDeprecatedSingleUserColumn(field))
) {
clonedRow[key] = await processInputBBReference(value, field.subtype)
} else if (value && field.type === FieldType.BB_REFERENCE) {
clonedRow[key] = await processInputBBReferences(value, field.subtype)
}
}

6
packages/server/src/utilities/rowProcessor/tests/inputProcessing.spec.ts
View File

@ -102,7 +102,7 @@ describe("rowProcessor - inputProcessing", () => {
name: "user",
constraints: {
presence: true,
type: "string",
type: "array",
},
},
},
@ -154,7 +154,7 @@ describe("rowProcessor - inputProcessing", () => {
name: "user",
constraints: {
presence: false,
type: "string",
type: "array",
},
},
},
@ -196,7 +196,7 @@ describe("rowProcessor - inputProcessing", () => {
name: "user",
constraints: {
presence: false,
type: "string",
type: "array",
},
},
},

5
packages/shared-core/src/helpers/schema.ts
View File

@ -6,7 +6,10 @@ import {
export function isDeprecatedSingleUserColumn(
schema: Pick<FieldSchema, "type" | "subtype" | "constraints">
) {
): schema is {
type: FieldType.BB_REFERENCE
subtype: BBReferenceFieldSubType.USER
} {
const result =
schema.type === FieldType.BB_REFERENCE &&
schema.subtype === BBReferenceFieldSubType.USER &&

18
packages/worker/src/api/routes/global/tests/scim.spec.ts
View File

@ -459,10 +459,11 @@ describe("scim", () => {
it("should return 404 when requesting unexisting user id", async () => {
const response = await findScimUser(structures.uuid(), { expect: 404 })
expect(response).toEqual({
message: "missing",
status: 404,
})
expect(response).toEqual(
expect.objectContaining({
status: 404,
})
)
})
})
@ -861,10 +862,11 @@ describe("scim", () => {
it("should return 404 when requesting unexisting group id", async () => {
const response = await findScimGroup(structures.uuid(), { expect: 404 })
expect(response).toEqual({
message: "missing",
status: 404,
})
expect(response).toEqual(
expect.objectContaining({
status: 404,
})
)
})
it("should allow excluding members", async () => {

672
yarn.lock
View File

File diff suppressed because it is too large Load Diff