@budibase/server 1.0.123-alpha.0 → 1.0.123

package/src/api/routes/public/index.ts

@@ -3,6 +3,7 @@ import queryEndpoints from "./queries"
 import tableEndpoints from "./tables"
 import rowEndpoints from "./rows"
 import userEndpoints from "./users"
+import usage from "../../../middleware/usageQuota"
 import authorized from "../../../middleware/authorized"
 import publicApi from "../../../middleware/publicApi"
 import { paramResource, paramSubResource } from "../../../middleware/resourceId"
@@ -113,6 +114,8 @@ function applyRoutes(
   // add the authorization middleware, using the correct perm type
   addMiddleware(endpoints.read, authorized(permType, PermissionLevels.READ))
   addMiddleware(endpoints.write, authorized(permType, PermissionLevels.WRITE))
+  // add the usage quota middleware
+  addMiddleware(endpoints.write, usage)
   // add the output mapper middleware
   addMiddleware(endpoints.read, mapperMiddleware, { output: true })
   addMiddleware(endpoints.write, mapperMiddleware, { output: true })
@@ -127,4 +130,4 @@ applyRoutes(queryEndpoints, PermissionTypes.QUERY, "queryId")
 // needs to be applied last for routing purposes, don't override other endpoints
 applyRoutes(rowEndpoints, PermissionTypes.TABLE, "tableId", "rowId")
 
-export default publicRouter
+module.exports = publicRouter

package/src/api/routes/{row.ts → row.js}

@@ -1,14 +1,18 @@
-import Router from "@koa/router"
-import * as rowController from "../controllers/row"
-import authorized from "../../middleware/authorized"
-import { paramResource, paramSubResource } from "../../middleware/resourceId"
+const Router = require("@koa/router")
+const rowController = require("../controllers/row")
+const authorized = require("../../middleware/authorized")
+const usage = require("../../middleware/usageQuota")
+const {
+  paramResource,
+  paramSubResource,
+} = require("../../middleware/resourceId")
 const {
   PermissionLevels,
   PermissionTypes,
 } = require("@budibase/backend-core/permissions")
 const { internalSearchValidator } = require("./utils/validators")
 
-const router = new Router()
+const router = Router()
 
 router
   /**
@@ -176,6 +180,7 @@ router
     "/api/:tableId/rows",
     paramResource("tableId"),
     authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
+    usage,
     rowController.save
   )
   /**
@@ -190,6 +195,7 @@ router
     "/api/:tableId/rows",
     paramResource("tableId"),
     authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
+    usage,
     rowController.patch
   )
   /**
@@ -242,6 +248,7 @@ router
     "/api/:tableId/rows",
     paramResource("tableId"),
     authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
+    usage,
     rowController.destroy
   )
 
@@ -262,7 +269,8 @@ router
     "/api/:tableId/rows/exportRows",
     paramResource("tableId"),
     authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
-    rowController.exportRows
+    usage,
+    rowController.export
   )
 
-export default router
+module.exports = router

package/src/api/routes/{static.ts → static.js}

@@ -1,19 +1,19 @@
-import Router from "@koa/router"
-import * as controller from "../controllers/static"
-import { budibaseTempDir } from "../../utilities/budibaseDir"
-import authorized from "../../middleware/authorized"
-import {
+const Router = require("@koa/router")
+const controller = require("../controllers/static")
+const { budibaseTempDir } = require("../../utilities/budibaseDir")
+const authorized = require("../../middleware/authorized")
+const {
   BUILDER,
   PermissionTypes,
   PermissionLevels,
-} from "@budibase/backend-core/permissions"
-import * as env from "../../environment"
-import { paramResource } from "../../middleware/resourceId"
+} = require("@budibase/backend-core/permissions")
+const env = require("../../environment")
+const { paramResource } = require("../../middleware/resourceId")
 
-const router = new Router()
+const router = Router()
 
 /* istanbul ignore next */
-router.param("file", async (file: any, ctx: any, next: any) => {
+router.param("file", async (file, ctx, next) => {
   ctx.file = file && file.includes(".") ? file : "index.html"
   if (!ctx.file.startsWith("budibase-client")) {
     return next()
@@ -52,4 +52,4 @@ router
     controller.getSignedUploadURL
   )
 
-export default router
+module.exports = router

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

@@ -43,55 +43,53 @@ describe("run misc tests", () => {
 
   describe("test table utilities", () => {
     it("should be able to import a CSV", async () => {
-      return config.doInContext(null, async () => {
-        const table = await config.createTable({
-          name: "table",
-          type: "table",
-          key: "name",
-          schema: {
-            a: {
+      const table = await config.createTable({
+        name: "table",
+        type: "table",
+        key: "name",
+        schema: {
+          a: {
+            type: "string",
+            constraints: {
               type: "string",
-              constraints: {
-                type: "string",
-              },
             },
-            b: {
+          },
+          b: {
+            type: "string",
+            constraints: {
               type: "string",
-              constraints: {
-                type: "string",
-              },
             },
-            c: {
+          },
+          c: {
+            type: "string",
+            constraints: {
               type: "string",
-              constraints: {
-                type: "string",
-              },
             },
-            d: {
+          },
+          d: {
+            type: "string",
+            constraints: {
               type: "string",
-              constraints: {
-                type: "string",
-              },
             },
           },
-        })
-        const dataImport = {
-          csvString: "a,b,c,d\n1,2,3,4",
-          schema: {},
-        }
-        for (let col of ["a", "b", "c", "d"]) {
-          dataImport.schema[col] = { type: "string" }
-        }
-        await tableUtils.handleDataImport(
-          { userId: "test" },
-          table,
-          dataImport
-        )
-        const rows = await config.getRows()
-        expect(rows[0].a).toEqual("1")
-        expect(rows[0].b).toEqual("2")
-        expect(rows[0].c).toEqual("3")
+        },
       })
+      const dataImport = {
+        csvString: "a,b,c,d\n1,2,3,4",
+        schema: {},
+      }
+      for (let col of ["a", "b", "c", "d"]) {
+        dataImport.schema[col] = { type: "string" }
+      }
+      await tableUtils.handleDataImport(
+        { userId: "test" },
+        table,
+        dataImport
+      )
+      const rows = await config.getRows()
+      expect(rows[0].a).toEqual("1")
+      expect(rows[0].b).toEqual("2")
+      expect(rows[0].c).toEqual("3")
     })
   })
 })

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

@@ -2,7 +2,6 @@ const setup = require("./utilities")
 const { basicScreen } = setup.structures
 const { checkBuilderEndpoint, runInProd } = require("./utilities/TestFunctions")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { doInAppContext } = require("@budibase/backend-core/context")
 
 const route = "/test"
 

package/src/api/routes/tests/utilities/{TestFunctions.ts → TestFunctions.js}

@@ -1,54 +1,44 @@
-import * as rowController from "../../../controllers/row"
-import * as appController from "../../../controllers/application"
-import { AppStatus } from "../../../../db/utils"
-import { BUILTIN_ROLE_IDS } from "@budibase/backend-core/roles"
-import { doInTenant } from "@budibase/backend-core/tenancy"
-import { TENANT_ID } from "../../../../tests/utilities/structures"
-import { getAppDB, doInAppContext } from "@budibase/backend-core/context"
-import * as env from "../../../../environment"
-
-class Request {
-  appId: any
-  params: any
-  request: any
-  body: any
-
-  constructor(appId: any, params: any) {
-    this.appId = appId
-    this.params = params
-    this.request = {}
-  }
+const rowController = require("../../../controllers/row")
+const appController = require("../../../controllers/application")
+const { AppStatus } = require("../../../../db/utils")
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
+const { TENANT_ID } = require("../../../../tests/utilities/structures")
+const { doInAppContext } = require("@budibase/backend-core/context")
+const env = require("../../../../environment")
+
+function Request(appId, params) {
+  this.appId = appId
+  this.params = params
+  this.request = {}
 }
 
-function runRequest(appId: any, controlFunc: any, request?: any) {
+function runRequest(appId, controlFunc, request) {
   return doInAppContext(appId, async () => {
     return controlFunc(request)
   })
 }
 
-export const getAllTableRows = async (config: any) => {
+exports.getAllTableRows = async config => {
   const req = new Request(config.appId, { tableId: config.table._id })
   await runRequest(config.appId, rowController.fetch, req)
   return req.body
 }
 
-export const clearAllApps = async (tenantId = TENANT_ID) => {
-  await doInTenant(tenantId, async () => {
-    const req: any = { query: { status: AppStatus.DEV }, user: { tenantId } }
-    await appController.fetch(req)
-    const apps = req.body
-    if (!apps || apps.length <= 0) {
-      return
-    }
-    for (let app of apps) {
-      const { appId } = app
-      const req = new Request(null, { appId })
-      await runRequest(appId, appController.destroy, req)
-    }
-  })
+exports.clearAllApps = async (tenantId = TENANT_ID) => {
+  const req = { query: { status: AppStatus.DEV }, user: { tenantId } }
+  await appController.fetch(req)
+  const apps = req.body
+  if (!apps || apps.length <= 0) {
+    return
+  }
+  for (let app of apps) {
+    const { appId } = app
+    const req = new Request(null, { appId })
+    await runRequest(appId, appController.delete, req)
+  }
 }
 
-export const clearAllAutomations = async (config: any) => {
+exports.clearAllAutomations = async config => {
   const automations = await config.getAllAutomations()
   for (let auto of automations) {
     await doInAppContext(config.appId, async () => {
@@ -57,12 +47,7 @@ export const clearAllAutomations = async (config: any) => {
   }
 }
 
-export const createRequest = (
-  request: any,
-  method: any,
-  url: any,
-  body: any
-) => {
+exports.createRequest = (request, method, url, body) => {
   let req
 
   if (method === "POST") req = request.post(url).send(body)
@@ -74,12 +59,7 @@ export const createRequest = (
   return req
 }
 
-export const checkBuilderEndpoint = async ({
-  config,
-  method,
-  url,
-  body,
-}: any) => {
+exports.checkBuilderEndpoint = async ({ config, method, url, body }) => {
   const headers = await config.login({
     userId: "us_fail",
     builder: false,
@@ -91,14 +71,14 @@ export const checkBuilderEndpoint = async ({
     .expect(403)
 }
 
-export const checkPermissionsEndpoint = async ({
+exports.checkPermissionsEndpoint = async ({
   config,
   method,
   url,
   body,
   passRole,
   failRole,
-}: any) => {
+}) => {
   const passHeader = await config.login({
     roleId: passRole,
     prodApp: true,
@@ -126,11 +106,7 @@ export const checkPermissionsEndpoint = async ({
     .expect(403)
 }
 
-export const getDB = () => {
-  return getAppDB()
-}
-
-export const testAutomation = async (config: any, automation: any) => {
+exports.testAutomation = async (config, automation) => {
   return runRequest(automation.appId, async () => {
     return await config.request
       .post(`/api/automations/${automation._id}/test`)
@@ -146,7 +122,7 @@ export const testAutomation = async (config: any, automation: any) => {
   })
 }
 
-export const runInProd = async (func: any) => {
+exports.runInProd = async func => {
   const nodeEnv = env.NODE_ENV
   const workerId = env.JEST_WORKER_ID
   env._set("NODE_ENV", "PRODUCTION")

package/src/app.ts

@@ -1,5 +1,6 @@
 // need to load environment first
 import { ExtendableContext } from "koa"
+
 import * as env from "./environment"
 import db from "./db"
 db.init()
@@ -14,7 +15,7 @@ const automations = require("./automations/index")
 const Sentry = require("@sentry/node")
 const fileSystem = require("./utilities/fileSystem")
 const bullboard = require("./automations/bullboard")
-import redis from "./utilities/redis"
+const redis = require("./utilities/redis")
 import * as migrations from "./migrations"
 
 const app = new Koa()

package/src/automations/actions.js

@@ -13,7 +13,6 @@ const integromat = require("./steps/integromat")
 let filter = require("./steps/filter")
 let delay = require("./steps/delay")
 let queryRow = require("./steps/queryRows")
-let loop = require("./steps/loop")
 const env = require("../environment")
 
 const ACTION_IMPLS = {
@@ -28,7 +27,6 @@ const ACTION_IMPLS = {
   DELAY: delay.run,
   FILTER: filter.run,
   QUERY_ROWS: queryRow.run,
-  LOOP: loop.run,
   // these used to be lowercase step IDs, maintain for backwards compat
   discord: discord.run,
   slack: slack.run,
@@ -47,7 +45,6 @@ const ACTION_DEFINITIONS = {
   DELAY: delay.definition,
   FILTER: filter.definition,
   QUERY_ROWS: queryRow.definition,
-  LOOP: loop.definition,
   // these used to be lowercase step IDs, maintain for backwards compat
   discord: discord.definition,
   slack: slack.definition,

package/src/automations/automationUtils.js

@@ -1,5 +1,4 @@
 const { getTable } = require("../api/controllers/table/utils")
-const { findHBSBlocks } = require("@budibase/string-templates")
 
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
@@ -75,14 +74,3 @@ exports.getError = err => {
   }
   return typeof err !== "string" ? err.toString() : err
 }
-
-exports.substituteLoopStep = (hbsString, substitute) => {
-  let blocks = findHBSBlocks(hbsString)
-  for (let block of blocks) {
-    let oldBlock = block
-    block = block.replace(/loop/, substitute)
-    hbsString = hbsString.replace(new RegExp(oldBlock, "g"), block)
-  }
-
-  return hbsString
-}

package/src/automations/steps/{createRow.ts → createRow.js}

@@ -1,8 +1,9 @@
-import { save } from "../../api/controllers/row"
-import { cleanUpRow, getError } from "../automationUtils"
-import { buildCtx } from "./utils"
+const rowController = require("../../api/controllers/row")
+const automationUtils = require("../automationUtils")
+const usage = require("../../utilities/usageQuota")
+const { buildCtx } = require("./utils")
 
-export const definition = {
+exports.definition = {
   name: "Create Row",
   tagline: "Create a {{inputs.enriched.table.name}} row",
   icon: "TableRowAddBottom",
@@ -58,7 +59,7 @@ export const definition = {
   },
 }
 
-export async function run({ inputs, appId, emitter }: any) {
+exports.run = async function ({ inputs, appId, emitter }) {
   if (inputs.row == null || inputs.row.tableId == null) {
     return {
       success: false,
@@ -68,7 +69,7 @@ export async function run({ inputs, appId, emitter }: any) {
     }
   }
   // have to clean up the row, remove the table from it
-  const ctx: any = buildCtx(appId, emitter, {
+  const ctx = buildCtx(appId, emitter, {
     body: inputs.row,
     params: {
       tableId: inputs.row.tableId,
@@ -76,8 +77,13 @@ export async function run({ inputs, appId, emitter }: any) {
   })
 
   try {
-    inputs.row = await cleanUpRow(inputs.row.tableId, inputs.row)
-    await save(ctx)
+    inputs.row = await automationUtils.cleanUpRow(
+      inputs.row.tableId,
+      inputs.row
+    )
+    await usage.update(usage.Properties.ROW, 1, { dryRun: true })
+    await rowController.save(ctx)
+    await usage.update(usage.Properties.ROW, 1)
     return {
       row: inputs.row,
       response: ctx.body,
@@ -88,7 +94,7 @@ export async function run({ inputs, appId, emitter }: any) {
   } catch (err) {
     return {
       success: false,
-      response: getError(err),
+      response: automationUtils.getError(err),
     }
   }
 }

package/src/automations/steps/{deleteRow.ts → deleteRow.js}

@@ -1,8 +1,9 @@
-import { destroy } from "../../api/controllers/row"
-import { buildCtx } from "./utils"
-import { getError } from "../automationUtils"
+const rowController = require("../../api/controllers/row")
+const usage = require("../../utilities/usageQuota")
+const { buildCtx } = require("./utils")
+const automationUtils = require("../automationUtils")
 
-export const definition = {
+exports.definition = {
   description: "Delete a row from your database",
   icon: "TableRowRemoveCenter",
   name: "Delete Row",
@@ -23,8 +24,12 @@ export const definition = {
           type: "string",
           title: "Row ID",
         },
+        revision: {
+          type: "string",
+          title: "Row Revision",
+        },
       },
-      required: ["tableId", "id"],
+      required: ["tableId", "id", "revision"],
     },
     outputs: {
       properties: {
@@ -47,8 +52,8 @@ export const definition = {
   },
 }
 
-export async function run({ inputs, appId, emitter }: any) {
-  if (inputs.id == null) {
+exports.run = async function ({ inputs, appId, emitter }) {
+  if (inputs.id == null || inputs.revision == null) {
     return {
       success: false,
       response: {
@@ -57,7 +62,7 @@ export async function run({ inputs, appId, emitter }: any) {
     }
   }
 
-  let ctx: any = buildCtx(appId, emitter, {
+  let ctx = buildCtx(appId, emitter, {
     body: {
       _id: inputs.id,
       _rev: inputs.revision,
@@ -68,7 +73,8 @@ export async function run({ inputs, appId, emitter }: any) {
   })
 
   try {
-    await destroy(ctx)
+    await usage.update(usage.Properties.ROW, -1)
+    await rowController.destroy(ctx)
     return {
       response: ctx.body,
       row: ctx.row,
@@ -77,7 +83,7 @@ export async function run({ inputs, appId, emitter }: any) {
   } catch (err) {
     return {
       success: false,
-      response: getError(err),
+      response: automationUtils.getError(err),
     }
   }
 }

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

@@ -1,3 +1,4 @@
+jest.mock("../../utilities/usageQuota")
 jest.mock("../../threads/automation")
 jest.mock("../../utilities/redis", () => ({
   init: jest.fn(),

package/src/automations/tests/{createRow.spec.ts → createRow.spec.js}

@@ -1,8 +1,10 @@
-import * as setup from "./utilities"
+jest.mock("../../utilities/usageQuota")
+
+const usageQuota = require("../../utilities/usageQuota")
+const setup = require("./utilities")
 
 describe("test the create row action", () => {
-  let table: any
-  let row: any
+  let table, row
   let config = setup.getConfig()
 
   beforeEach(async () => {
@@ -34,11 +36,20 @@ describe("test the create row action", () => {
       row: {
         tableId: "invalid",
         invalid: "invalid",
-      },
+      }
     })
     expect(res.success).toEqual(false)
   })
 
+  it("check usage quota attempts", async () => {
+    await setup.runInProd(async () => {
+      await setup.runStep(setup.actions.CREATE_ROW.stepId, {
+        row
+      })
+      expect(usageQuota.update).toHaveBeenCalledWith("rows", 1)
+    })
+  })
+
   it("should check invalid inputs return an error", async () => {
     const res = await setup.runStep(setup.actions.CREATE_ROW.stepId, {})
     expect(res.success).toEqual(false)

package/src/automations/tests/{deleteRow.spec.ts → deleteRow.spec.js}

@@ -1,9 +1,10 @@
+jest.mock("../../utilities/usageQuota")
+
+const usageQuota = require("../../utilities/usageQuota")
 const setup = require("./utilities")
 
 describe("test the delete row action", () => {
-  let table: any
-  let row: any
-  let inputs: any
+  let table, row, inputs
   let config = setup.getConfig()
 
   beforeEach(async () => {
@@ -36,6 +37,7 @@ describe("test the delete row action", () => {
   it("check usage quota attempts", async () => {
     await setup.runInProd(async () => {
       await setup.runStep(setup.actions.DELETE_ROW.stepId, inputs)
+      expect(usageQuota.update).toHaveBeenCalledWith("rows", -1)
     })
   })
 

package/src/automations/tests/utilities/index.js

@@ -1,6 +1,4 @@
 const TestConfig = require("../../../tests/utilities/TestConfiguration")
-const { TENANT_ID } = require("../../../tests/utilities/structures")
-const { doInTenant } = require("@budibase/backend-core/tenancy")
 const actions = require("../../actions")
 const emitter = require("../../../events/index")
 const env = require("../../../environment")
@@ -20,6 +18,7 @@ exports.afterAll = () => {
 
 exports.runInProd = async fn => {
   env._set("NODE_ENV", "production")
+  env._set("USE_QUOTAS", 1)
   let error
   try {
     await fn()
@@ -27,22 +26,21 @@ exports.runInProd = async fn => {
     error = err
   }
   env._set("NODE_ENV", "jest")
+  env._set("USE_QUOTAS", null)
   if (error) {
     throw error
   }
 }
 
 exports.runStep = async function runStep(stepId, inputs) {
-  return doInTenant(TENANT_ID, async () => {
-    let step = await actions.getAction(stepId)
-    expect(step).toBeDefined()
-    return step({
-      inputs,
-      appId: config ? config.getAppId() : null,
-      // don't really need an API key, mocked out usage quota, not being tested here
-      apiKey: exports.apiKey,
-      emitter,
-    })
+  let step = await actions.getAction(stepId)
+  expect(step).toBeDefined()
+  return step({
+    inputs,
+    appId: config ? config.getAppId() : null,
+    // don't really need an API key, mocked out usage quota, not being tested here
+    apiKey: exports.apiKey,
+    emitter,
   })
 }