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

Merge pull request #11290 from Budibase/fix-pro-ref-and-compile 

Update pro reference to latest develop and fix compile errors
This commit is contained in:
Rory Powell 2023-07-20 11:22:34 +01:00 committed by GitHub
parent 9ecce2c5dc 76f61cfd3a
commit bfb07e851e
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/pro

@ -1 +1 @@
Subproject commit 9c564edb37cb619cb5971e10c4317fa6e7c5bb00
Subproject commit 4d9840700e7684581c39965b7cb6a2b2428c477c

11
packages/server/src/api/controllers/query/index.ts
View File

@ -157,7 +157,7 @@ export async function preview(ctx: any) {
}
const runFn = () => Runner.run(inputs)
const { rows, keys, info, extra } = await quotas.addQuery(runFn, {
const { rows, keys, info, extra } = await quotas.addQuery<any>(runFn, {
datasourceId: datasource._id,
})
const schemaFields: any = {}
@ -246,9 +246,12 @@ async function execute(
}
const runFn = () => Runner.run(inputs)
const { rows, pagination, extra, info } = await quotas.addQuery(runFn, {
datasourceId: datasource._id,
})
const { rows, pagination, extra, info } = await quotas.addQuery<any>(
runFn,
{
datasourceId: datasource._id,
}
)
// remove the raw from execution incase transformer being used to hide data
if (extra?.raw) {
delete extra.raw

6
packages/server/src/api/controllers/row/index.ts
View File

@ -25,7 +25,7 @@ export async function patch(ctx: any): Promise<any> {
return save(ctx)
}
try {
const { row, table } = await quotas.addQuery(
const { row, table } = await quotas.addQuery<any>(
() => pickApi(tableId).patch(ctx),
{
datasourceId: tableId,
@ -104,7 +104,7 @@ export async function destroy(ctx: any) {
const tableId = utils.getTableId(ctx)
let response, row
if (inputs.rows) {
let { rows } = await quotas.addQuery(
let { rows } = await quotas.addQuery<any>(
() => pickApi(tableId).bulkDestroy(ctx),
{
datasourceId: tableId,
@ -117,7 +117,7 @@ export async function destroy(ctx: any) {
gridSocket?.emitRowDeletion(ctx, row._id)
}
} else {
let resp = await quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
let resp = await quotas.addQuery<any>(() => pickApi(tableId).destroy(ctx), {
datasourceId: tableId,
})
await quotas.removeRow()