@budibase/server 2.0.30-alpha.7 → 2.0.31

package/dist/utilities/csvParser.js

@@ -13,7 +13,6 @@ const { FieldTypes } = require("../constants");
 const VALIDATORS = {
     [FieldTypes.STRING]: () => true,
     [FieldTypes.OPTIONS]: () => true,
-    [FieldTypes.BARCODEQR]: () => true,
     [FieldTypes.NUMBER]: attribute => {
         // allow not to be present
         if (!attribute) {

package/dist/utilities/rowProcessor/index.js

@@ -52,11 +52,6 @@ const TYPE_TRANSFORM_MAP = {
         [null]: "",
         [undefined]: undefined,
     },
-    [FieldTypes.BARCODEQR]: {
-        "": "",
-        [null]: "",
-        [undefined]: undefined,
-    },
     [FieldTypes.FORMULA]: {
         "": "",
         [null]: "",

package/dist/utilities/usageQuota/rows.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getRowParams, USER_METDATA_PREFIX } = require("../../db/utils");
-const { isDevAppID, getDevelopmentAppID, getProdAppID, doWithDB, } = require("@budibase/backend-core/db");
+const { isDevAppID, getDevelopmentAppID, doWithDB, } = require("@budibase/backend-core/db");
 const ROW_EXCLUSIONS = [USER_METDATA_PREFIX];
 const getAppPairs = appIds => {
     // collect the app ids into dev / prod pairs
@@ -53,7 +53,7 @@ const getAppRows = (appId) => __awaiter(void 0, void 0, void 0, function* () {
  * Rows duplicates may exist across apps due to data import so they are not filtered out.
  */
 exports.getUniqueRows = (appIds) => __awaiter(void 0, void 0, void 0, function* () {
-    let uniqueRows = [], rowsByApp = {};
+    let uniqueRows = [];
     const pairs = getAppPairs(appIds);
     for (let pair of Object.values(pairs)) {
         let appRows = [];
@@ -73,9 +73,7 @@ exports.getUniqueRows = (appIds) => __awaiter(void 0, void 0, void 0, function*
         // this can't be done on all rows because app import results in
         // duplicate row ids across apps
         // the array pre-concat is important to avoid stack overflow
-        const prodId = getProdAppID(pair.devId || pair.prodId);
-        rowsByApp[prodId] = [...new Set(appRows)];
-        uniqueRows = uniqueRows.concat(rowsByApp[prodId]);
+        uniqueRows = uniqueRows.concat([...new Set(appRows)]);
     }
-    return { rows: uniqueRows, appRows: rowsByApp };
+    return uniqueRows;
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.7",
+  "version": "2.0.31",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.30-alpha.7",
-    "@budibase/client": "2.0.30-alpha.7",
-    "@budibase/pro": "2.0.30-alpha.6",
-    "@budibase/string-templates": "2.0.30-alpha.7",
-    "@budibase/types": "2.0.30-alpha.7",
+    "@budibase/backend-core": "^2.0.31",
+    "@budibase/client": "^2.0.31",
+    "@budibase/pro": "2.0.30",
+    "@budibase/string-templates": "^2.0.31",
+    "@budibase/types": "^2.0.31",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -123,7 +123,7 @@
     "koa2-ratelimit": "1.1.1",
     "lodash": "4.17.21",
     "memorystream": "0.3.1",
-    "mongodb": "4.9",
+    "mongodb": "3.6.3",
     "mssql": "6.2.3",
     "mysql2": "2.3.3",
     "node-fetch": "2.6.7",
@@ -146,7 +146,7 @@
     "to-json-schema": "0.2.5",
     "uuid": "3.3.2",
     "validate.js": "0.13.1",
-    "vm2": "3.9.11",
+    "vm2": "3.9.6",
     "worker-farm": "1.7.0",
     "xml2js": "0.4.23",
     "yargs": "13.2.4",
@@ -166,6 +166,7 @@
     "@types/koa": "2.13.4",
     "@types/koa__router": "8.0.0",
     "@types/lodash": "4.14.180",
+    "@types/mongodb": "3.6.3",
     "@types/node": "14.18.20",
     "@types/node-fetch": "2.6.1",
     "@types/oracledb": "5.2.2",
@@ -198,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "74511ef9396141daf6d0154eec2b7abc4e884470"
+  "gitHead": "a93d02d9e3501a0df1b2c1285912115610bb3769"
 }

package/specs/openapi.json

@@ -783,7 +783,6 @@
                       "type": "string",
                       "enum": [
                         "string",
-                        "barcodeqr",
                         "longform",
                         "options",
                         "number",
@@ -987,7 +986,6 @@
                           "type": "string",
                           "enum": [
                             "string",
-                            "barcodeqr",
                             "longform",
                             "options",
                             "number",
@@ -1202,7 +1200,6 @@
                             "type": "string",
                             "enum": [
                               "string",
-                              "barcodeqr",
                               "longform",
                               "options",
                               "number",

package/specs/openapi.yaml

@@ -579,7 +579,6 @@ components:
                     type: string
                     enum:
                       - string
-                      - barcodeqr
                       - longform
                       - options
                       - number
@@ -742,7 +741,6 @@ components:
                         type: string
                         enum:
                           - string
-                          - barcodeqr
                           - longform
                           - options
                           - number
@@ -912,7 +910,6 @@ components:
                           type: string
                           enum:
                             - string
-                            - barcodeqr
                             - longform
                             - options
                             - number

package/src/api/controllers/application.ts

@@ -359,7 +359,7 @@ const appPostCreate = async (ctx: any, app: App) => {
   await creationEvents(ctx.request, app)
   // app import & template creation
   if (ctx.request.body.useTemplate === "true") {
-    const { rows } = await getUniqueRows([app.appId])
+    const rows = await getUniqueRows([app.appId])
     const rowCount = rows ? rows.length : 0
     if (rowCount) {
       try {
@@ -493,7 +493,7 @@ const destroyApp = async (ctx: any) => {
 }
 
 const preDestroyApp = async (ctx: any) => {
-  const { rows } = await getUniqueRows([ctx.params.appId])
+  const rows = await getUniqueRows([ctx.params.appId])
   ctx.rowCount = rows.length
 }
 

package/src/api/controllers/deploy/index.ts

@@ -17,6 +17,7 @@ import {
   getProdAppDB,
   getDevAppDB,
 } from "@budibase/backend-core/context"
+import { quotas } from "@budibase/pro"
 import { events } from "@budibase/backend-core"
 
 // the max time we can wait for an invalidation to complete before considering it failed

package/src/api/controllers/dev.js

@@ -103,7 +103,7 @@ exports.revert = async ctx => {
     target: appId,
   })
   try {
-    if (env.COUCH_DB_URL) {
+    if (!env.isTest()) {
       // in-memory db stalls on rollback
       await replication.rollback()
     }

package/src/api/controllers/query/index.ts

@@ -56,7 +56,6 @@ const _import = async (ctx: any) => {
       config: {
         url: info.url,
         defaultHeaders: [],
-        rejectUnauthorized: true,
       },
       name: info.name,
     }
@@ -154,10 +153,7 @@ export async function preview(ctx: any) {
           auth: { ...authConfigCtx },
         },
       })
-
-    const { rows, keys, info, extra } = await quotas.addQuery(runFn, {
-      datasourceId: datasource._id,
-    })
+    const { rows, keys, info, extra } = await quotas.addQuery(runFn)
     const schemaFields: any = {}
     if (rows?.length > 0) {
       for (let key of [...new Set(keys)] as string[]) {
@@ -238,9 +234,7 @@ async function execute(
         },
       })
 
-    const { rows, pagination, extra } = await quotas.addQuery(runFn, {
-      datasourceId: datasource._id,
-    })
+    const { rows, pagination, extra } = await quotas.addQuery(runFn)
     // remove the raw from execution incase transformer being used to hide data
     if (extra?.raw) {
       delete extra.raw

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

@@ -31,11 +31,8 @@ export async function patch(ctx: any): Promise<any> {
     return save(ctx)
   }
   try {
-    const { row, table } = await quotas.addQuery(
-      () => pickApi(tableId).patch(ctx),
-      {
-        datasourceId: tableId,
-      }
+    const { row, table } = await quotas.addQuery(() =>
+      pickApi(tableId).patch(ctx)
     )
     ctx.status = 200
     ctx.eventEmitter &&
@@ -57,9 +54,7 @@ export const save = async (ctx: any) => {
   }
   try {
     const { row, table } = await quotas.addRow(() =>
-      quotas.addQuery(() => pickApi(tableId).save(ctx), {
-        datasourceId: tableId,
-      })
+      quotas.addQuery(() => pickApi(tableId).save(ctx))
     )
     ctx.status = 200
     ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table)
@@ -73,9 +68,7 @@ export const save = async (ctx: any) => {
 export async function fetchView(ctx: any) {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).fetchView(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).fetchView(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -84,9 +77,7 @@ export async function fetchView(ctx: any) {
 export async function fetch(ctx: any) {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).fetch(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).fetch(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -95,9 +86,7 @@ export async function fetch(ctx: any) {
 export async function find(ctx: any) {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).find(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).find(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -109,11 +98,8 @@ export async function destroy(ctx: any) {
   const tableId = getTableId(ctx)
   let response, row
   if (inputs.rows) {
-    let { rows } = await quotas.addQuery(
-      () => pickApi(tableId).bulkDestroy(ctx),
-      {
-        datasourceId: tableId,
-      }
+    let { rows } = await quotas.addQuery(() =>
+      pickApi(tableId).bulkDestroy(ctx)
     )
     await quotas.removeRows(rows.length)
     response = rows
@@ -121,9 +107,7 @@ export async function destroy(ctx: any) {
       ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
     }
   } else {
-    let resp = await quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
-      datasourceId: tableId,
-    })
+    let resp = await quotas.addQuery(() => pickApi(tableId).destroy(ctx))
     await quotas.removeRow()
     response = resp.response
     row = resp.row
@@ -139,9 +123,7 @@ export async function search(ctx: any) {
   const tableId = getTableId(ctx)
   try {
     ctx.status = 200
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).search(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).search(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -159,11 +141,8 @@ export async function validate(ctx: any) {
 export async function fetchEnrichedRow(ctx: any) {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(
-      () => pickApi(tableId).fetchEnrichedRow(ctx),
-      {
-        datasourceId: tableId,
-      }
+    ctx.body = await quotas.addQuery(() =>
+      pickApi(tableId).fetchEnrichedRow(ctx)
     )
   } catch (err) {
     ctx.throw(400, err)
@@ -173,9 +152,7 @@ export async function fetchEnrichedRow(ctx: any) {
 export const exportRows = async (ctx: any) => {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).exportRows(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).exportRows(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }

package/src/api/controllers/static/templates/preview.hbs

@@ -56,16 +56,6 @@
         return
       }
 
-      // If this is a custom event, try and handle it
-      if (parsed.runtimeEvent) {
-        const { name, payload } = parsed
-        if (window.handleBuilderRuntimeEvent) {
-          window.handleBuilderRuntimeEvent(name, payload)
-        }
-        return
-      }
-
-      // Otherwise this is a full reload message
       // Extract data from message
       const {
         selectedComponentId,

package/src/api/controllers/table/internal.ts

@@ -18,7 +18,6 @@ import { Table } from "@budibase/types"
 import { quotas } from "@budibase/pro"
 import { isEqual } from "lodash"
 import { cloneDeep } from "lodash/fp"
-import env from "../../../environment"
 
 function checkAutoColumns(table: Table, oldTable: Table) {
   if (!table.schema) {
@@ -154,9 +153,7 @@ export async function destroy(ctx: any) {
   await db.bulkDocs(
     rows.rows.map((row: any) => ({ ...row.doc, _deleted: true }))
   )
-  await quotas.removeRows(rows.rows.length, {
-    tableId: ctx.params.tableId,
-  })
+  await quotas.removeRows(rows.rows.length)
 
   // update linked rows
   await updateLinks({
@@ -168,7 +165,7 @@ export async function destroy(ctx: any) {
   await db.remove(tableToDelete)
 
   // remove table search index
-  if (!isTest() || env.COUCH_DB_URL) {
+  if (!isTest()) {
     const currentIndexes = await db.getIndexes()
     const existingIndex = currentIndexes.indexes.find(
       (existing: any) => existing.name === `search:${ctx.params.tableId}`

package/src/api/controllers/table/utils.ts

@@ -148,9 +148,7 @@ export async function handleDataImport(user: any, table: any, dataImport: any) {
     finalData.push(row)
   }
 
-  await quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
-    tableId: table._id,
-  })
+  await quotas.addRows(finalData.length, () => db.bulkDocs(finalData))
   await events.rows.imported(table, "csv", finalData.length)
   return table
 }

package/src/api/routes/tests/row.spec.js

@@ -34,13 +34,18 @@ describe("/rows", () => {
       .expect(status)
 
   const getRowUsage = async () => {
-    const { total } = await config.doInContext(null, () => quotas.getCurrentUsageValues(QuotaUsageType.STATIC, StaticQuotaName.ROWS))
-    return total
+    return config.doInContext(null, () =>
+      quotas.getCurrentUsageValue(QuotaUsageType.STATIC, StaticQuotaName.ROWS)
+    )
   }
 
   const getQueryUsage = async () => {
-    const { total } = await config.doInContext(null, () => quotas.getCurrentUsageValues(QuotaUsageType.MONTHLY, MonthlyQuotaName.QUERIES))
-    return total
+    return config.doInContext(null, () =>
+      quotas.getCurrentUsageValue(
+        QuotaUsageType.MONTHLY,
+        MonthlyQuotaName.QUERIES
+      )
+    )
   }
 
   const assertRowUsage = async expected => {
@@ -55,26 +60,26 @@ describe("/rows", () => {
 
   describe("save, load, update", () => {
     it("returns a success message when the row is created", async () => {
-      const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
-
-      const res = await request
-        .post(`/api/${row.tableId}/rows`)
-        .send(row)
-        .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
-        .expect(200)
-      expect(res.res.statusMessage).toEqual(`${table.name} saved successfully`)
-      expect(res.body.name).toEqual("Test Contact")
-      expect(res.body._rev).toBeDefined()
-      await assertRowUsage(rowUsage + 1)
-      await assertQueryUsage(queryUsage + 1)
+      // const rowUsage = await getRowUsage()
+      // const queryUsage = await getQueryUsage()
+      //
+      // const res = await request
+      //   .post(`/api/${row.tableId}/rows`)
+      //   .send(row)
+      //   .set(config.defaultHeaders())
+      //   .expect('Content-Type', /json/)
+      //   .expect(200)
+      // expect(res.res.statusMessage).toEqual(`${table.name} saved successfully`)
+      // expect(res.body.name).toEqual("Test Contact")
+      // expect(res.body._rev).toBeDefined()
+      // await assertRowUsage(rowUsage + 1)
+      // await assertQueryUsage(queryUsage + 1)
     })
 
     it("updates a row successfully", async () => {
       const existing = await config.createRow()
-      const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
+      // const rowUsage = await getRowUsage()
+      // const queryUsage = await getQueryUsage()
 
       const res = await request
         .post(`/api/${table._id}/rows`)
@@ -92,8 +97,8 @@ describe("/rows", () => {
         `${table.name} updated successfully.`
       )
       expect(res.body.name).toEqual("Updated Name")
-      await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage + 1)
+      // await assertRowUsage(rowUsage)
+      // await assertQueryUsage(queryUsage + 1)
     })
 
     it("should load a row", async () => {

package/src/automations/steps/updateRow.js

@@ -66,9 +66,9 @@ exports.run = async function ({ inputs, appId, emitter }) {
   }
   const tableId = inputs.row.tableId
 
-  // clear any undefined, null or empty string properties so that they aren't updated
+  // clear any falsy properties so that they aren't updated
   for (let propKey of Object.keys(inputs.row)) {
-    if (inputs.row[propKey] == null || inputs.row[propKey] === "") {
+    if (!inputs.row[propKey] || inputs.row[propKey] === "") {
       delete inputs.row[propKey]
     }
   }

package/src/automations/tests/automation.spec.js

@@ -29,11 +29,16 @@ describe("Run through some parts of the automations system", () => {
   afterAll(setup.afterAll)
 
   it("should be able to init in builder", async () => {
-    await triggers.externalTrigger(basicAutomation(), { a: 1, appId: "app_123" })
+    await triggers.externalTrigger(basicAutomation(), { a: 1 })
     await wait(100)
     expect(thread.execute).toHaveBeenCalled()
   })
 
+  it("should be able to init in prod", async () => {
+    await triggers.externalTrigger(basicAutomation(), { a: 1 })
+    await wait(100)
+  })
+
   it("should check coercion", async () => {
     const table = await config.createTable()
     const automation = basicAutomation()

package/src/automations/utils.ts

@@ -13,7 +13,7 @@ import {
   getAppId,
   getProdAppDB,
 } from "@budibase/backend-core/context"
-import { context } from "@budibase/backend-core"
+import { tenancy } from "@budibase/backend-core"
 import { quotas } from "@budibase/pro"
 import { Automation } from "@budibase/types"
 
@@ -28,14 +28,12 @@ const jobMessage = (job: any, message: string) => {
 
 export async function processEvent(job: any) {
   try {
-    const automationId = job.data.automation._id
     console.log(jobMessage(job, "running"))
     // need to actually await these so that an error can be captured properly
-    return await context.doInContext(job.data.event.appId, async () => {
+    const tenantId = tenancy.getTenantIDFromAppID(job.data.event.appId)
+    return await tenancy.doInTenant(tenantId, async () => {
       const runFn = () => Runner.run(job)
-      return quotas.addAutomation(runFn, {
-        automationId,
-      })
+      return quotas.addAutomation(runFn)
     })
   } catch (err) {
     const errJson = JSON.stringify(err)

package/src/constants/index.js

@@ -31,7 +31,6 @@ exports.NoEmptyFilterStrings = [
 
 exports.FieldTypes = {
   STRING: "string",
-  BARCODEQR: "barcodeqr",
   LONGFORM: "longform",
   OPTIONS: "options",
   NUMBER: "number",
@@ -52,7 +51,6 @@ exports.CanSwitchTypes = [
     exports.FieldTypes.STRING,
     exports.FieldTypes.OPTIONS,
     exports.FieldTypes.LONGFORM,
-    exports.FieldTypes.BARCODEQR,
   ],
   [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
 ]

package/src/db/utils.js

@@ -34,6 +34,8 @@ const DocumentType = {
   INSTANCE: "inst",
   LAYOUT: "layout",
   SCREEN: "screen",
+  DATASOURCE: "datasource",
+  DATASOURCE_PLUS: "datasource_plus",
   QUERY: "query",
   DEPLOYMENTS: "deployments",
   METADATA: "metadata",

package/src/definitions/datasource.ts

@@ -31,7 +31,6 @@ export interface BearerAuthConfig {
 
 export interface RestConfig {
   url: string
-  rejectUnauthorized: boolean
   defaultHeaders: {
     [key: string]: any
   }

package/src/index.ts

@@ -8,7 +8,6 @@ function runServer() {
   checkDevelopmentEnvironment()
   fixPath()
   // this will setup http and https proxies form env variables
-  process.env.GLOBAL_AGENT_FORCE_GLOBAL_AGENT = "false"
   bootstrap()
   require("./app")
 }

package/src/integrations/base/sqlTable.ts

@@ -40,7 +40,6 @@ function generateSchema(
       case FieldTypes.STRING:
       case FieldTypes.OPTIONS:
       case FieldTypes.LONGFORM:
-      case FieldTypes.BARCODEQR:
         schema.text(key)
         break
       case FieldTypes.NUMBER: