@budibase/server 1.0.123 → 1.0.125

package/src/api/controllers/query/{index.js → index.ts}

@@ -1,22 +1,19 @@
-const {
-  generateQueryID,
-  getQueryParams,
-  isProdAppID,
-} = require("../../../db/utils")
-const { BaseQueryVerbs } = require("../../../constants")
-const { Thread, ThreadType } = require("../../../threads")
-const { save: saveDatasource } = require("../datasource")
-const { RestImporter } = require("./import")
-const { invalidateDynamicVariables } = require("../../../threads/utils")
-const environment = require("../../../environment")
-const { getAppDB } = require("@budibase/backend-core/context")
+import { generateQueryID, getQueryParams, isProdAppID } from "../../../db/utils"
+import { BaseQueryVerbs } from "../../../constants"
+import { Thread, ThreadType } from "../../../threads"
+import { save as saveDatasource } from "../datasource"
+import { RestImporter } from "./import"
+import { invalidateDynamicVariables } from "../../../threads/utils"
+import { QUERY_THREAD_TIMEOUT } from "../../../environment"
+import { getAppDB } from "@budibase/backend-core/context"
+import { quotas } from "@budibase/pro"
 
 const Runner = new Thread(ThreadType.QUERY, {
-  timeoutMs: environment.QUERY_THREAD_TIMEOUT || 10000,
+  timeoutMs: QUERY_THREAD_TIMEOUT || 10000,
 })
 
 // simple function to append "readable" to all read queries
-function enrichQueries(input) {
+function enrichQueries(input: any) {
   const wasArray = Array.isArray(input)
   const queries = wasArray ? input : [input]
   for (let query of queries) {
@@ -27,7 +24,7 @@ function enrichQueries(input) {
   return wasArray ? queries : queries[0]
 }
 
-exports.fetch = async function (ctx) {
+export async function fetch(ctx: any) {
   const db = getAppDB()
 
   const body = await db.allDocs(
@@ -36,10 +33,10 @@ exports.fetch = async function (ctx) {
     })
   )
 
-  ctx.body = enrichQueries(body.rows.map(row => row.doc))
+  ctx.body = enrichQueries(body.rows.map((row: any) => row.doc))
 }
 
-exports.import = async ctx => {
+const _import = async (ctx: any) => {
   const body = ctx.request.body
   const data = body.data
 
@@ -49,7 +46,7 @@ exports.import = async ctx => {
   let datasourceId
   if (!body.datasourceId) {
     // construct new datasource
-    const info = await importer.getInfo()
+    const info: any = await importer.getInfo()
     let datasource = {
       type: "datasource",
       source: "REST",
@@ -77,8 +74,9 @@ exports.import = async ctx => {
   }
   ctx.status = 200
 }
+export { _import as import }
 
-exports.save = async function (ctx) {
+export async function save(ctx: any) {
   const db = getAppDB()
   const query = ctx.request.body
 
@@ -93,7 +91,7 @@ exports.save = async function (ctx) {
   ctx.message = `Query ${query.name} saved successfully.`
 }
 
-exports.find = async function (ctx) {
+export async function find(ctx: any) {
   const db = getAppDB()
   const query = enrichQueries(await db.get(ctx.params.queryId))
   // remove properties that could be dangerous in real app
@@ -104,7 +102,7 @@ exports.find = async function (ctx) {
   ctx.body = query
 }
 
-exports.preview = async function (ctx) {
+export async function preview(ctx: any) {
   const db = getAppDB()
 
   const datasource = await db.get(ctx.request.body.datasourceId)
@@ -114,16 +112,18 @@ exports.preview = async function (ctx) {
     ctx.request.body
 
   try {
-    const { rows, keys, info, extra } = await Runner.run({
-      appId: ctx.appId,
-      datasource,
-      queryVerb,
-      fields,
-      parameters,
-      transformer,
-      queryId,
-    })
-
+    const runFn = () =>
+      Runner.run({
+        appId: ctx.appId,
+        datasource,
+        queryVerb,
+        fields,
+        parameters,
+        transformer,
+        queryId,
+      })
+
+    const { rows, keys, info, extra } = await quotas.addQuery(runFn)
     ctx.body = {
       rows,
       schemaFields: [...new Set(keys)],
@@ -135,7 +135,7 @@ exports.preview = async function (ctx) {
   }
 }
 
-async function execute(ctx, opts = { rowsOnly: false }) {
+async function execute(ctx: any, opts = { rowsOnly: false }) {
   const db = getAppDB()
 
   const query = await db.get(ctx.params.queryId)
@@ -153,16 +153,19 @@ async function execute(ctx, opts = { rowsOnly: false }) {
 
   // call the relevant CRUD method on the integration class
   try {
-    const { rows, pagination, extra } = await Runner.run({
-      appId: ctx.appId,
-      datasource,
-      queryVerb: query.queryVerb,
-      fields: query.fields,
-      pagination: ctx.request.body.pagination,
-      parameters: enrichedParameters,
-      transformer: query.transformer,
-      queryId: ctx.params.queryId,
-    })
+    const runFn = () =>
+      Runner.run({
+        appId: ctx.appId,
+        datasource,
+        queryVerb: query.queryVerb,
+        fields: query.fields,
+        pagination: ctx.request.body.pagination,
+        parameters: enrichedParameters,
+        transformer: query.transformer,
+        queryId: ctx.params.queryId,
+      })
+
+    const { rows, pagination, extra } = await quotas.addQuery(runFn)
     if (opts && opts.rowsOnly) {
       ctx.body = rows
     } else {
@@ -173,15 +176,15 @@ async function execute(ctx, opts = { rowsOnly: false }) {
   }
 }
 
-exports.executeV1 = async function (ctx) {
+export async function executeV1(ctx: any) {
   return execute(ctx, { rowsOnly: true })
 }
 
-exports.executeV2 = async function (ctx) {
+export async function executeV2(ctx: any) {
   return execute(ctx, { rowsOnly: false })
 }
 
-const removeDynamicVariables = async queryId => {
+const removeDynamicVariables = async (queryId: any) => {
   const db = getAppDB()
   const query = await db.get(queryId)
   const datasource = await db.get(query.datasourceId)
@@ -190,19 +193,19 @@ const removeDynamicVariables = async queryId => {
   if (dynamicVariables) {
     // delete dynamic variables from the datasource
     datasource.config.dynamicVariables = dynamicVariables.filter(
-      dv => dv.queryId !== queryId
+      (dv: any) => dv.queryId !== queryId
     )
     await db.put(datasource)
 
     // invalidate the deleted variables
     const variablesToDelete = dynamicVariables.filter(
-      dv => dv.queryId === queryId
+      (dv: any) => dv.queryId === queryId
     )
     await invalidateDynamicVariables(variablesToDelete)
   }
 }
 
-exports.destroy = async function (ctx) {
+export async function destroy(ctx: any) {
   const db = getAppDB()
   await removeDynamicVariables(ctx.params.queryId)
   await db.remove(ctx.params.queryId, ctx.params.revId)

package/src/api/controllers/row/ExternalRequest.ts

@@ -52,7 +52,7 @@ interface RunConfig {
 
 module External {
   function buildFilters(
-    id: string | undefined,
+    id: string | undefined | string[],
     filters: SearchFilters,
     table: Table
   ) {

package/src/api/controllers/row/{index.js → index.ts}

@@ -1,15 +1,16 @@
-const internal = require("./internal")
-const external = require("./external")
-const { isExternalTable } = require("../../../integrations/utils")
+import { quotas } from "@budibase/pro"
+import internal from "./internal"
+import external from "./external"
+import { isExternalTable } from "../../../integrations/utils"
 
-function pickApi(tableId) {
+function pickApi(tableId: any) {
   if (isExternalTable(tableId)) {
     return external
   }
   return internal
 }
 
-function getTableId(ctx) {
+function getTableId(ctx: any) {
   if (ctx.request.body && ctx.request.body.tableId) {
     return ctx.request.body.tableId
   }
@@ -21,13 +22,13 @@ function getTableId(ctx) {
   }
 }
 
-exports.patch = async ctx => {
+export async function patch(ctx: any): Promise<any> {
   const appId = ctx.appId
   const tableId = getTableId(ctx)
   const body = ctx.request.body
   // if it doesn't have an _id then its save
   if (body && !body._id) {
-    return exports.save(ctx)
+    return save(ctx)
   }
   try {
     const { row, table } = await pickApi(tableId).patch(ctx)
@@ -41,13 +42,13 @@ exports.patch = async ctx => {
   }
 }
 
-exports.save = async function (ctx) {
+const saveRow = async (ctx: any) => {
   const appId = ctx.appId
   const tableId = getTableId(ctx)
   const body = ctx.request.body
   // if it has an ID already then its a patch
   if (body && body._id) {
-    return exports.patch(ctx)
+    return patch(ctx)
   }
   try {
     const { row, table } = await pickApi(tableId).save(ctx)
@@ -60,7 +61,11 @@ exports.save = async function (ctx) {
   }
 }
 
-exports.fetchView = async function (ctx) {
+export async function save(ctx: any) {
+  await quotas.addRow(() => saveRow(ctx))
+}
+
+export async function fetchView(ctx: any) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).fetchView(ctx)
@@ -69,7 +74,7 @@ exports.fetchView = async function (ctx) {
   }
 }
 
-exports.fetch = async function (ctx) {
+export async function fetch(ctx: any) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).fetch(ctx)
@@ -78,7 +83,7 @@ exports.fetch = async function (ctx) {
   }
 }
 
-exports.find = async function (ctx) {
+export async function find(ctx: any) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).find(ctx)
@@ -87,19 +92,21 @@ exports.find = async function (ctx) {
   }
 }
 
-exports.destroy = async function (ctx) {
+export async function destroy(ctx: any) {
   const appId = ctx.appId
   const inputs = ctx.request.body
   const tableId = getTableId(ctx)
   let response, row
   if (inputs.rows) {
     let { rows } = await pickApi(tableId).bulkDestroy(ctx)
+    await quotas.removeRows(rows.length)
     response = rows
     for (let row of rows) {
       ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
     }
   } else {
     let resp = await pickApi(tableId).destroy(ctx)
+    await quotas.removeRow()
     response = resp.response
     row = resp.row
     ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
@@ -110,7 +117,7 @@ exports.destroy = async function (ctx) {
   ctx.body = response
 }
 
-exports.search = async ctx => {
+export async function search(ctx: any) {
   const tableId = getTableId(ctx)
   try {
     ctx.status = 200
@@ -120,7 +127,7 @@ exports.search = async ctx => {
   }
 }
 
-exports.validate = async function (ctx) {
+export async function validate(ctx: any) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).validate(ctx)
@@ -129,7 +136,7 @@ exports.validate = async function (ctx) {
   }
 }
 
-exports.fetchEnrichedRow = async function (ctx) {
+export async function fetchEnrichedRow(ctx: any) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).fetchEnrichedRow(ctx)
@@ -138,7 +145,7 @@ exports.fetchEnrichedRow = async function (ctx) {
   }
 }
 
-exports.export = async function (ctx) {
+export const exportRows = async (ctx: any) => {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).exportRows(ctx)

package/src/api/controllers/row/internal.js

@@ -260,8 +260,9 @@ exports.find = async ctx => {
 
 exports.destroy = async function (ctx) {
   const db = getAppDB()
-  const { _id, _rev } = ctx.request.body
+  const { _id } = ctx.request.body
   let row = await db.get(_id)
+  let _rev = ctx.request.body._rev || row._rev
 
   if (row.tableId !== ctx.params.tableId) {
     throw "Supplied tableId doesn't match the row's tableId"

package/src/api/controllers/row/utils.js

@@ -65,7 +65,10 @@ exports.validate = async ({ tableId, row, table }) => {
     if (type === FieldTypes.ARRAY && row[fieldName]) {
       if (row[fieldName].length) {
         row[fieldName].map(val => {
-          if (!constraints.inclusion.includes(val)) {
+          if (
+            !constraints.inclusion.includes(val) &&
+            constraints.inclusion.length !== 0
+          ) {
             errors[fieldName] = "Field not in list"
           }
         })

package/src/api/controllers/static/templates/BudibaseApp.svelte

@@ -78,6 +78,9 @@
       app.
     </h2>
   </div>
+  <script type="application/javascript">
+    window.INIT_TIME = Date.now()
+  </script>
   <script type="application/javascript" src={clientLibPath}>
   </script>
   <script type="application/javascript">

package/src/api/controllers/table/bulkFormula.js

@@ -25,7 +25,7 @@ function getFormulaThatUseColumn(table, columnNames) {
     if (!isStaticFormula(column)) {
       continue
     }
-    if (!doesContainStrings(column.formula, columnNames)) {
+    if (!doesContainStrings(column?.formula ?? "", columnNames)) {
       continue
     }
     formula.push(column.name)

package/src/api/controllers/table/{internal.js → internal.ts}

@@ -1,22 +1,23 @@
-const linkRows = require("../../../db/linkedRows")
-const { getRowParams, generateTableID } = require("../../../db/utils")
-const { FieldTypes } = require("../../../constants")
-const {
+import { updateLinks, EventType } from "../../../db/linkedRows"
+import { getRowParams, generateTableID } from "../../../db/utils"
+import { FieldTypes } from "../../../constants"
+import {
   TableSaveFunctions,
   hasTypeChanged,
   getTable,
   handleDataImport,
-} = require("./utils")
-const usageQuota = require("../../../utilities/usageQuota")
+} from "./utils"
 const { getAppDB } = require("@budibase/backend-core/context")
-const env = require("../../../environment")
-const {
+import { isTest } from "../../../environment"
+import {
   cleanupAttachments,
   fixAutoColumnSubType,
-} = require("../../../utilities/rowProcessor")
-const { runStaticFormulaChecks } = require("./bulkFormula")
+} from "../../../utilities/rowProcessor"
+import { runStaticFormulaChecks } from "./bulkFormula"
+import { Table } from "../../../definitions/common"
+import { quotas } from "@budibase/pro"
 
-function checkAutoColumns(table, oldTable) {
+function checkAutoColumns(table: Table, oldTable: Table) {
   if (!table.schema) {
     return table
   }
@@ -34,7 +35,7 @@ function checkAutoColumns(table, oldTable) {
   return table
 }
 
-exports.save = async function (ctx) {
+export async function save(ctx: any) {
   const db = getAppDB()
   const { dataImport, ...rest } = ctx.request.body
   let tableToSave = {
@@ -104,10 +105,8 @@ exports.save = async function (ctx) {
 
   // update linked rows
   try {
-    const linkResp = await linkRows.updateLinks({
-      eventType: oldTable
-        ? linkRows.EventType.TABLE_UPDATED
-        : linkRows.EventType.TABLE_SAVE,
+    const linkResp: any = await updateLinks({
+      eventType: oldTable ? EventType.TABLE_UPDATED : EventType.TABLE_SAVE,
       table: tableToSave,
       oldTable: oldTable,
     })
@@ -129,11 +128,11 @@ exports.save = async function (ctx) {
 
   tableToSave = await tableSaveFunctions.after(tableToSave)
   // has to run after, make sure it has _id
-  await runStaticFormulaChecks(tableToSave, { oldTable })
+  await runStaticFormulaChecks(tableToSave, { oldTable, deletion: null })
   return tableToSave
 }
 
-exports.destroy = async function (ctx) {
+export async function destroy(ctx: any) {
   const db = getAppDB()
   const tableToDelete = await db.get(ctx.params.tableId)
 
@@ -143,12 +142,14 @@ exports.destroy = async function (ctx) {
       include_docs: true,
     })
   )
-  await db.bulkDocs(rows.rows.map(row => ({ ...row.doc, _deleted: true })))
-  await usageQuota.update(usageQuota.Properties.ROW, -rows.rows.length)
+  await db.bulkDocs(
+    rows.rows.map((row: any) => ({ ...row.doc, _deleted: true }))
+  )
+  await quotas.removeRows(rows.rows.length)
 
   // update linked rows
-  await linkRows.updateLinks({
-    eventType: linkRows.EventType.TABLE_DELETE,
+  await updateLinks({
+    eventType: EventType.TABLE_DELETE,
     table: tableToDelete,
   })
 
@@ -156,10 +157,10 @@ exports.destroy = async function (ctx) {
   await db.remove(tableToDelete)
 
   // remove table search index
-  if (!env.isTest()) {
+  if (!isTest()) {
     const currentIndexes = await db.getIndexes()
     const existingIndex = currentIndexes.indexes.find(
-      existing => existing.name === `search:${ctx.params.tableId}`
+      (existing: any) => existing.name === `search:${ctx.params.tableId}`
     )
     if (existingIndex) {
       await db.deleteIndex(existingIndex)
@@ -167,12 +168,15 @@ exports.destroy = async function (ctx) {
   }
 
   // has to run after, make sure it has _id
-  await runStaticFormulaChecks(tableToDelete, { deletion: true })
+  await runStaticFormulaChecks(tableToDelete, {
+    oldTable: null,
+    deletion: true,
+  })
   await cleanupAttachments(tableToDelete, { rows })
   return tableToDelete
 }
 
-exports.bulkImport = async function (ctx) {
+export async function bulkImport(ctx: any) {
   const table = await getTable(ctx.params.tableId)
   const { dataImport } = ctx.request.body
   await handleDataImport(ctx.user, table, dataImport)