@budibase/server 2.3.18-alpha.9 → 2.3.19

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

@@ -28,11 +28,8 @@ describe("/views", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
-  })
-  
-  beforeEach(async() => {
     table = await config.createTable(priceTable())
   })
 

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

@@ -9,8 +9,7 @@ describe("/webhooks", () => {
 
   afterAll(setup.afterAll)
 
-  const setupTest = async () => {
-    config.modeSelf()
+  beforeEach(async () => {
     await config.init()
     const autoConfig = basicAutomation()
     autoConfig.definition.trigger = {
@@ -19,9 +18,7 @@ describe("/webhooks", () => {
     }
     await config.createAutomation(autoConfig)
     webhook = await config.createWebhook()
-  }
-
-  beforeAll(setupTest)
+  })
 
   describe("create", () => {
     it("should create a webhook successfully", async () => {
@@ -47,8 +44,6 @@ describe("/webhooks", () => {
   })
 
   describe("fetch", () => {
-    beforeAll(setupTest)
-
     it("returns the correct routing for basic user", async () => {
       const res = await request
         .get(`/api/webhooks`)
@@ -69,8 +64,6 @@ describe("/webhooks", () => {
   })
 
   describe("delete", () => {
-    beforeAll(setupTest)
-    
     it("should successfully delete", async () => {
       const res = await request
         .delete(`/api/webhooks/${webhook._id}/${webhook._rev}`)
@@ -91,8 +84,6 @@ describe("/webhooks", () => {
   })
 
   describe("build schema", () => {
-    beforeAll(setupTest)
-
     it("should allow building a schema", async () => {
       const res = await request
         .post(`/api/webhooks/schema/${config.getAppId()}/${webhook._id}`)

package/src/app.ts

@@ -1,11 +1,3 @@
-if (process.env.DD_APM_ENABLED) {
-  require("./ddApm")
-}
-
-if (process.env.ELASTIC_APM_ENABLED) {
-  require("./elasticApm")
-}
-
 // need to load environment first
 import env from "./environment"
 
@@ -74,7 +66,6 @@ initialiseWebsockets(server)
 
 let shuttingDown = false,
   errCode = 0
-
 server.on("close", async () => {
   // already in process
   if (shuttingDown) {
@@ -84,7 +75,7 @@ server.on("close", async () => {
   console.log("Server Closed")
   await automations.shutdown()
   await redis.shutdown()
-  events.shutdown()
+  await events.shutdown()
   await Thread.shutdown()
   api.shutdown()
   if (!env.isTest()) {

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

@@ -21,7 +21,7 @@ const setup = require("./utilities")
 describe("Run through some parts of the automations system", () => {
   let config = setup.getConfig()
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await automation.init()
     await config.init()
   })
@@ -29,9 +29,9 @@ 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: config.appId })
-      await wait(100)
-      expect(thread.execute).toHaveBeenCalled()
+    await triggers.externalTrigger(basicAutomation(), { a: 1, appId: "app_123" })
+    await wait(100)
+    expect(thread.execute).toHaveBeenCalled()
   })
 
   it("should check coercion", async () => {

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

@@ -3,7 +3,7 @@ const setup = require("./utilities")
 describe("test the bash action", () => {
     let config = setup.getConfig()
 
-    beforeAll(async () => {
+    beforeEach(async () => {
         await config.init()
     })
     afterAll(setup.afterAll)

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

@@ -7,7 +7,7 @@ describe("test the outgoing webhook action", () => {
     let inputs
     let config = setup.getConfig()
 
-    beforeAll(async () => {
+    beforeEach(async () => {
         await config.init()
         inputs = {
             username: "joe_bloggs",

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

@@ -1,9 +1,10 @@
 const setup = require("./utilities")
 
 describe("test the execute query action", () => {
+    let datasource
     let config = setup.getConfig()
 
-    beforeAll(async () => {
+    beforeEach(async () => {
         await config.init()
 
         await config.createDatasource()
@@ -40,7 +41,7 @@ describe("test the execute query action", () => {
                 query: { queryId: "wrong_id" }
             }
         )
-        expect(res.response).toEqual('Error: missing')
+        expect(res.response).toEqual('{"status":404,"name":"not_found","message":"missing","reason":"missing"}')
         expect(res.success).toEqual(false)
     })
 

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

@@ -3,7 +3,7 @@ const setup = require("./utilities")
 describe("test the execute script action", () => {
     let config = setup.getConfig()
 
-    beforeAll(async () => {
+    beforeEach(async () => {
         await config.init()
     })
     afterAll(setup.afterAll)

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

@@ -7,7 +7,7 @@ describe("test the outgoing webhook action", () => {
   let inputs
   let config = setup.getConfig()
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     inputs = {
       requestMethod: "POST",

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

@@ -36,7 +36,7 @@ const setup = require("./utilities")
 describe("test the outgoing webhook action", () => {
     let inputs
     let config = setup.getConfig()
-    beforeAll(async () => {
+    beforeEach(async () => {
         await config.init()
     })
 

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

@@ -3,7 +3,7 @@ const setup = require("./utilities")
 describe("test the server log action", () => {
     let config = setup.getConfig()
 
-    beforeAll(async () => {
+    beforeEach(async () => {
         await config.init()
         inputs = {
             text: "log message",

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

@@ -4,7 +4,7 @@ describe("test the update row action", () => {
   let table, row, inputs
   let config = setup.getConfig()
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     table = await config.createTable()
     row = await config.createRow()

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

@@ -7,7 +7,7 @@ describe("test the outgoing webhook action", () => {
     let inputs
     let config = setup.getConfig()
 
-    beforeAll(async () => {
+    beforeEach(async () => {
         await config.init()
         inputs = {
             value1: "test",

package/src/constants/index.ts

@@ -1,5 +1,4 @@
 import { objectStore, roles, constants } from "@budibase/backend-core"
-export { FieldType as FieldTypes, RelationshipTypes } from "@budibase/types"
 
 export enum FilterTypes {
   STRING = "string",
@@ -23,6 +22,23 @@ export const NoEmptyFilterStrings = [
   FilterTypes.NOT_CONTAINS,
 ]
 
+export enum FieldTypes {
+  STRING = "string",
+  BARCODEQR = "barcodeqr",
+  LONGFORM = "longform",
+  OPTIONS = "options",
+  NUMBER = "number",
+  BOOLEAN = "boolean",
+  ARRAY = "array",
+  DATETIME = "datetime",
+  ATTACHMENT = "attachment",
+  LINK = "link",
+  FORMULA = "formula",
+  AUTO = "auto",
+  JSON = "json",
+  INTERNAL = "internal",
+}
+
 export const CanSwitchTypes = [
   [exports.FieldTypes.JSON, exports.FieldTypes.ARRAY],
   [
@@ -38,6 +54,12 @@ export const SwitchableTypes = CanSwitchTypes.reduce((prev, current) =>
   prev ? prev.concat(current) : current
 )
 
+export enum RelationshipTypes {
+  ONE_TO_MANY = "one-to-many",
+  MANY_TO_ONE = "many-to-one",
+  MANY_TO_MANY = "many-to-many",
+}
+
 export enum FormulaTypes {
   STATIC = "static",
   DYNAMIC = "dynamic",

package/src/db/defaultData/datasource_bb_default.ts

@@ -1,4 +1,8 @@
-import { FieldTypes, AutoFieldSubTypes } from "../../constants"
+import {
+  FieldTypes,
+  AutoFieldSubTypes,
+  RelationshipTypes,
+} from "../../constants"
 import { importToRows } from "../../api/controllers/table/utils"
 import { cloneDeep } from "lodash/fp"
 import LinkDocument from "../linkedRows/LinkDocument"
@@ -7,7 +11,7 @@ import { employeeImport } from "./employeeImport"
 import { jobsImport } from "./jobsImport"
 import { expensesImport } from "./expensesImport"
 import { db as dbCore } from "@budibase/backend-core"
-import { Table, Row, RelationshipTypes } from "@budibase/types"
+import { Table, Row } from "@budibase/types"
 
 export const DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs"
 export const DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory"
@@ -186,7 +190,7 @@ export const DEFAULT_INVENTORY_TABLE_SCHEMA: Table = {
   },
 }
 
-export const DEFAULT_EMPLOYEE_TABLE_SCHEMA: Table = {
+export const DEFAULT_EMPLOYEE_TABLE_SCHEMA = {
   _id: DEFAULT_EMPLOYEE_TABLE_ID,
   type: "internal",
   views: {},
@@ -283,7 +287,7 @@ export const DEFAULT_EMPLOYEE_TABLE_SCHEMA: Table = {
       sortable: false,
     },
     "Badge Photo": {
-      type: FieldTypes.ATTACHMENT,
+      type: "attachment",
       constraints: {
         type: FieldTypes.ARRAY,
         presence: false,
@@ -462,7 +466,7 @@ export const DEFAULT_JOBS_TABLE_SCHEMA: Table = {
       // sortable: true,
     },
     "Works End": {
-      type: FieldTypes.DATETIME,
+      type: "datetime",
       constraints: {
         type: "string",
         length: {},
@@ -476,7 +480,7 @@ export const DEFAULT_JOBS_TABLE_SCHEMA: Table = {
       ignoreTimezones: true,
     },
     "Updated Price": {
-      type: FieldTypes.NUMBER,
+      type: "number",
       constraints: {
         type: "number",
         presence: false,

package/src/db/linkedRows/LinkController.ts

@@ -1,14 +1,13 @@
 import { IncludeDocs, getLinkDocuments } from "./linkUtils"
 import { InternalTables, getUserMetadataParams } from "../utils"
 import Sentry from "@sentry/node"
-import { FieldTypes } from "../../constants"
+import { FieldTypes, RelationshipTypes } from "../../constants"
 import { context } from "@budibase/backend-core"
 import LinkDocument from "./LinkDocument"
 import {
   Database,
   FieldSchema,
   LinkDocumentValue,
-  RelationshipTypes,
   Row,
   Table,
 } from "@budibase/types"

package/src/db/tests/linkController.spec.js

@@ -9,12 +9,9 @@ describe("test the link controller", () => {
   let config = new TestConfig(false)
   let table1, table2, appId
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     const app = await config.init()
     appId = app.appId
-  })
-
-  beforeEach(async () => {
     const { _id } = await config.createTable()
     table2 = await config.createLinkedTable(RelationshipTypes.MANY_TO_MANY, ["link", "link2"])
     // update table after creating link

package/src/db/tests/linkTests.spec.js

@@ -9,7 +9,7 @@ describe("test link functionality", () => {
 
   describe("getLinkedTable", () => {
     let table
-    beforeAll(async () => {
+    beforeEach(async () => {
       const app = await config.init()
       appId = app.appId
       table = await config.createTable()

package/src/integrations/base/sql.ts

@@ -90,15 +90,10 @@ function parseFilters(filters: SearchFilters | undefined): SearchFilters {
 function generateSelectStatement(
   json: QueryJson,
   knex: Knex
-): (string | Knex.Raw)[] | "*" {
+): (string | Knex.Raw)[] {
   const { resource, meta } = json
-
-  if (!resource) {
-    return "*"
-  }
-
   const schema = meta?.table?.schema
-  return resource.fields.map(field => {
+  return resource!.fields.map(field => {
     const fieldNames = field.split(/\./g)
     const tableName = fieldNames[0]
     const columnName = fieldNames[1]
@@ -410,14 +405,11 @@ class InternalBuilder {
         delete parsedBody[key]
       }
     }
-
     // mysql can't use returning
     if (opts.disableReturning) {
       return query.insert(parsedBody)
     } else {
-      return query
-        .insert(parsedBody)
-        .returning(generateSelectStatement(json, knex))
+      return query.insert(parsedBody).returning("*")
     }
   }
 
@@ -502,9 +494,7 @@ class InternalBuilder {
     if (opts.disableReturning) {
       return query.update(parsedBody)
     } else {
-      return query
-        .update(parsedBody)
-        .returning(generateSelectStatement(json, knex))
+      return query.update(parsedBody).returning("*")
     }
   }
 
@@ -519,7 +509,7 @@ class InternalBuilder {
     if (opts.disableReturning) {
       return query.delete()
     } else {
-      return query.delete().returning(generateSelectStatement(json, knex))
+      return query.delete().returning("*")
     }
   }
 }

package/src/integrations/oracle.ts

@@ -247,7 +247,7 @@ class OracleIntegration extends Sql implements DatasourcePlus {
     )
   }
 
-  private internalConvertType(column: OracleColumn): { type: FieldTypes } {
+  private internalConvertType(column: OracleColumn): { type: string } {
     if (this.isBooleanType(column)) {
       return { type: FieldTypes.BOOLEAN }
     }

package/src/integrations/tests/couchdb.spec.ts

@@ -1,3 +1,5 @@
+import { DatabaseWithConnection } from "@budibase/backend-core/src/db"
+
 jest.mock("@budibase/backend-core", () => {
   const core = jest.requireActual("@budibase/backend-core")
   return {

package/src/middleware/authorized.ts

@@ -79,6 +79,10 @@ export default (
       return ctx.throw(403, "No user info found")
     }
 
+    // check general builder stuff, this middleware is a good way
+    // to find API endpoints which are builder focused
+    await builderMiddleware(ctx, permType)
+
     // get the resource roles
     let resourceRoles: any = []
     let otherLevelRoles: any = []
@@ -108,12 +112,6 @@ export default (
       return ctx.throw(403, "Session not authenticated")
     }
 
-    // check general builder stuff, this middleware is a good way
-    // to find API endpoints which are builder focused
-    if (permType === permissions.PermissionType.BUILDER) {
-      await builderMiddleware(ctx)
-    }
-
     try {
       // check authorized
       await checkAuthorized(ctx, resourceRoles, permType, permLevel)

package/src/middleware/builder.ts

@@ -64,18 +64,13 @@ async function updateAppUpdatedAt(ctx: BBContext) {
   })
 }
 
-export default async function builder(ctx: BBContext) {
+export default async function builder(ctx: BBContext, permType: string) {
   const appId = ctx.appId
   // this only functions within an app context
   if (!appId) {
     return
   }
-
-  // check authenticated
-  if (!ctx.isAuthenticated) {
-    return ctx.throw(403, "Session not authenticated")
-  }
-
+  const isBuilderApi = permType === permissions.PermissionType.BUILDER
   const referer = ctx.headers["referer"]
 
   const overviewPath = "/builder/portal/overview/"
@@ -87,7 +82,7 @@ export default async function builder(ctx: BBContext) {
   const hasAppId = !referer ? false : referer.includes(appId)
   const editingApp = referer ? hasAppId : false
   // check this is a builder call and editing
-  if (!editingApp) {
+  if (!isBuilderApi || !editingApp) {
     return
   }
   // check locks

package/src/migrations/functions/tests/appUrls.spec.js

@@ -6,7 +6,7 @@ const migration = require("../appUrls")
 describe("run", () => {
   let config = new TestConfig(false)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 

package/src/migrations/functions/tests/syncQuotas.spec.js

@@ -11,7 +11,7 @@ const migration = require("../syncQuotas")
 describe("run", () => {
   let config = new TestConfig(false)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 

package/src/migrations/functions/tests/userEmailViewCasing.spec.js

@@ -19,7 +19,7 @@ const migration = require("../userEmailViewCasing")
 describe("run", () => {
     let config = new TestConfig(false)
 
-    beforeAll(async () => {
+    beforeEach(async () => {
       await config.init()
     })
 

package/src/migrations/tests/index.spec.ts

@@ -10,9 +10,8 @@ import * as structures from "../../tests/utilities/structures"
 import { MIGRATIONS } from "../"
 import * as helpers from "./helpers"
 
-import tk from "timekeeper"
-const timestamp = new Date().toISOString()
-tk.freeze(timestamp)
+const { mocks } = require("@budibase/backend-core/tests")
+const timestamp = mocks.date.MOCK_DATE.toISOString()
 
 const clearMigrations = async () => {
   const dbs = [context.getDevAppDB(), context.getProdAppDB()]
@@ -93,16 +92,24 @@ describe("migrations", () => {
       await clearMigrations()
       const appId = config.prodAppId
       const roles = { [appId]: "role_12345" }
-      await config.createUser({
-        builder: false,
-        admin: true,
-        roles,
-      }) // admin only
-      await config.createUser({
-        builder: false,
-        admin: false,
-        roles,
-      }) // non admin non builder
+      await config.createUser(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        false,
+        true,
+        roles
+      ) // admin only
+      await config.createUser(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        false,
+        false,
+        roles
+      ) // non admin non builder
       await config.createTable()
       await config.createRow()
       await config.createRow()

package/src/sdk/app/backups/exports.ts

@@ -45,18 +45,12 @@ function tarFilesToTmp(tmpDir: string, files: string[]) {
  * @return {*} either a readable stream or a string
  */
 export async function exportDB(dbName: string, opts: ExportOpts = {}) {
-  const exportOpts = {
-    filter: opts?.filter,
-    batch_size: 1000,
-    batch_limit: 5,
-    style: "main_only",
-  }
   return dbCore.doWithDB(dbName, async (db: any) => {
     // Write the dump to file if required
     if (opts?.exportPath) {
       const path = opts?.exportPath
       const writeStream = fs.createWriteStream(path)
-      await db.dump(writeStream, exportOpts)
+      await db.dump(writeStream, { filter: opts?.filter })
       return path
     } else {
       // Stringify the dump in memory if required
@@ -65,7 +59,7 @@ export async function exportDB(dbName: string, opts: ExportOpts = {}) {
       memStream.on("data", (chunk: any) => {
         appString += chunk.toString()
       })
-      await db.dump(memStream, exportOpts)
+      await db.dump(memStream, { filter: opts?.filter })
       return appString
     }
   })

package/src/sdk/app/datasources/datasources.ts

@@ -88,9 +88,6 @@ export async function removeSecrets(datasources: Datasource[]) {
   const definitions = await getDefinitions()
   for (let datasource of datasources) {
     const schema = definitions[datasource.source]
-    if (!schema) {
-      continue
-    }
     if (datasource.config) {
       // strip secrets from response, so they don't show in the network request
       if (datasource.config.auth) {

package/src/tests/jestEnv.ts

@@ -1,10 +1,13 @@
+import env from "../environment"
 import { tmpdir } from "os"
 
-process.env.SELF_HOSTED = "1"
-process.env.NODE_ENV = "jest"
-process.env.MULTI_TENANCY = "1"
-// @ts-ignore
-process.env.BUDIBASE_DIR = tmpdir("budibase-unittests")
-process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
-process.env.ENABLE_4XX_HTTP_LOGGING = "0"
-process.env.MOCK_REDIS = "1"
+env._set("SELF_HOSTED", "1")
+env._set("NODE_ENV", "jest")
+env._set("JWT_SECRET", "test-jwtsecret")
+env._set("CLIENT_ID", "test-client-id")
+env._set("BUDIBASE_DIR", tmpdir("budibase-unittests"))
+env._set("LOG_LEVEL", "silent")
+env._set("PORT", 0)
+env._set("MINIO_URL", "http://localhost")
+env._set("MINIO_ACCESS_KEY", "test")
+env._set("MINIO_SECRET_KEY", "test")

package/src/tests/jestSetup.ts

@@ -1,7 +1,9 @@
-import "./logging"
-import env from "../environment"
-import { env as coreEnv } from "@budibase/backend-core"
-import { testContainerUtils } from "@budibase/backend-core/tests"
+import { mocks } from "@budibase/backend-core/tests"
+
+// mock all dates to 2020-01-01T00:00:00.000Z
+// use tk.reset() to use real dates in individual tests
+const tk = require("timekeeper")
+tk.freeze(mocks.date.MOCK_DATE)
 
 if (!process.env.DEBUG) {
   global.console.log = jest.fn() // console.log are ignored in tests
@@ -11,9 +13,5 @@ if (!process.env.DEBUG) {
 if (!process.env.CI) {
   // set a longer timeout in dev for debugging
   // 100 seconds
-  jest.setTimeout(100 * 1000)
-} else {
-  jest.setTimeout(10 * 1000)
+  jest.setTimeout(100000)
 }
-
-testContainerUtils.setupEnv(env, coreEnv)