@budibase/server 2.3.2-alpha.3 → 2.3.3

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]
@@ -397,14 +392,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("*")
     }
   }
 
@@ -489,9 +481,7 @@ class InternalBuilder {
     if (opts.disableReturning) {
       return query.update(parsedBody)
     } else {
-      return query
-        .update(parsedBody)
-        .returning(generateSelectStatement(json, knex))
+      return query.update(parsedBody).returning("*")
     }
   }
 
@@ -506,7 +496,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/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()]

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/tests/jestEnv.ts

@@ -3,7 +3,11 @@ import { tmpdir } from "os"
 
 env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
-env._set("MULTI_TENANCY", "1")
-// @ts-ignore
+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,6 +1,9 @@
-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
@@ -12,5 +15,3 @@ if (!process.env.CI) {
   // 100 seconds
   jest.setTimeout(100000)
 }
-
-testContainerUtils.setupEnv(env, coreEnv)

package/src/tests/utilities/TestConfiguration.ts

@@ -1,4 +1,4 @@
-import { generator, mocks, structures } from "@budibase/backend-core/tests"
+import { mocks } from "@budibase/backend-core/tests"
 
 // init the licensing mock
 import * as pro from "@budibase/pro"
@@ -10,7 +10,6 @@ mocks.licenses.useUnlimited()
 import { init as dbInit } from "../../db"
 dbInit()
 import env from "../../environment"
-import { env as coreEnv } from "@budibase/backend-core"
 import {
   basicTable,
   basicRow,
@@ -39,27 +38,17 @@ import { cleanup } from "../../utilities/fileSystem"
 import newid from "../../db/newid"
 import { generateUserMetadataID } from "../../db/utils"
 import { startup } from "../../startup"
-import supertest from "supertest"
-import {
-  AuthToken,
-  Database,
-  Datasource,
-  Row,
-  SourceName,
-  Table,
-} from "@budibase/types"
-
-type DefaultUserValues = {
-  globalUserId: string
-  email: string
-  firstName: string
-  lastName: string
-  csrfToken: string
-}
+const supertest = require("supertest")
+
+const GLOBAL_USER_ID = "us_uuid1"
+const EMAIL = "babs@babs.com"
+const FIRSTNAME = "Barbara"
+const LASTNAME = "Barbington"
+const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
 
 class TestConfiguration {
   server: any
-  request: supertest.SuperTest<supertest.Test> | undefined
+  request: any
   started: boolean
   appId: string | null
   allApps: any[]
@@ -73,8 +62,6 @@ class TestConfiguration {
   linkedTable: any
   automation: any
   datasource: any
-  tenantId: string | null
-  defaultUserValues: DefaultUserValues
 
   constructor(openServer = true) {
     if (openServer) {
@@ -89,18 +76,6 @@ class TestConfiguration {
     }
     this.appId = null
     this.allApps = []
-    this.tenantId = null
-    this.defaultUserValues = this.populateDefaultUserValues()
-  }
-
-  populateDefaultUserValues(): DefaultUserValues {
-    return {
-      globalUserId: `us_${newid()}`,
-      email: generator.email(),
-      firstName: generator.first(),
-      lastName: generator.last(),
-      csrfToken: generator.hash(),
-    }
   }
 
   getRequest() {
@@ -125,10 +100,10 @@ class TestConfiguration {
 
   getUserDetails() {
     return {
-      globalId: this.defaultUserValues.globalUserId,
-      email: this.defaultUserValues.email,
-      firstName: this.defaultUserValues.firstName,
-      lastName: this.defaultUserValues.lastName,
+      globalId: GLOBAL_USER_ID,
+      email: EMAIL,
+      firstName: FIRSTNAME,
+      lastName: LASTNAME,
     }
   }
 
@@ -136,9 +111,7 @@ class TestConfiguration {
     if (!appId) {
       appId = this.appId
     }
-
-    const tenant = this.getTenantId()
-    return tenancy.doInTenant(tenant, () => {
+    return tenancy.doInTenant(TENANT_ID, () => {
       // check if already in a context
       if (context.getAppId() == null && appId !== null) {
         return context.doInAppContext(appId, async () => {
@@ -154,11 +127,6 @@ class TestConfiguration {
 
   // use a new id as the name to avoid name collisions
   async init(appName = newid()) {
-    this.defaultUserValues = this.populateDefaultUserValues()
-    if (context.isMultiTenant()) {
-      this.tenantId = structures.tenant.id()
-    }
-
     if (!this.started) {
       await startup()
     }
@@ -181,30 +149,9 @@ class TestConfiguration {
     }
   }
 
-  // MODES
-  #setMultiTenancy = (value: boolean) => {
-    env._set("MULTI_TENANCY", value)
-    coreEnv._set("MULTI_TENANCY", value)
-  }
-
-  #setSelfHosted = (value: boolean) => {
-    env._set("SELF_HOSTED", value)
-    coreEnv._set("SELF_HOSTED", value)
-  }
-
-  modeCloud = () => {
-    this.#setSelfHosted(false)
-    this.#setMultiTenancy(true)
-  }
-
-  modeSelf = () => {
-    this.#setSelfHosted(true)
-    this.#setMultiTenancy(false)
-  }
-
   // UTILS
 
-  _req(body: any, params: any, controlFunc: any) {
+  async _req(body: any, params: any, controlFunc: any) {
     // create a fake request ctx
     const request: any = {}
     const appId = this.appId
@@ -212,7 +159,7 @@ class TestConfiguration {
     // fake cookies, we don't need them
     request.cookies = { set: () => {}, get: () => {} }
     request.config = { jwtSecret: env.JWT_SECRET }
-    request.user = { appId, tenantId: this.getTenantId() }
+    request.user = { appId, tenantId: TENANT_ID }
     request.query = {}
     request.request = {
       body,
@@ -228,15 +175,15 @@ class TestConfiguration {
 
   // USER / AUTH
   async globalUser({
-    id = this.defaultUserValues.globalUserId,
-    firstName = this.defaultUserValues.firstName,
-    lastName = this.defaultUserValues.lastName,
+    id = GLOBAL_USER_ID,
+    firstName = FIRSTNAME,
+    lastName = LASTNAME,
     builder = true,
     admin = false,
-    email = this.defaultUserValues.email,
+    email = EMAIL,
     roles,
   }: any = {}) {
-    return tenancy.doWithGlobalDB(this.getTenantId(), async (db: Database) => {
+    return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => {
       let existing
       try {
         existing = await db.get(id)
@@ -247,14 +194,14 @@ class TestConfiguration {
         _id: id,
         ...existing,
         roles: roles || {},
-        tenantId: this.getTenantId(),
+        tenantId: TENANT_ID,
         firstName,
         lastName,
       }
       await sessions.createASession(id, {
         sessionId: "sessionid",
-        tenantId: this.getTenantId(),
-        csrfToken: this.defaultUserValues.csrfToken,
+        tenantId: TENANT_ID,
+        csrfToken: CSRF_TOKEN,
       })
       if (builder) {
         user.builder = { global: true }
@@ -268,7 +215,7 @@ class TestConfiguration {
       }
       const resp = await db.put(user)
       return {
-        _rev: resp.rev,
+        _rev: resp._rev,
         ...user,
       }
     })
@@ -276,9 +223,9 @@ class TestConfiguration {
 
   async createUser(
     id = null,
-    firstName = this.defaultUserValues.firstName,
-    lastName = this.defaultUserValues.lastName,
-    email = this.defaultUserValues.email,
+    firstName = FIRSTNAME,
+    lastName = LASTNAME,
+    email = EMAIL,
     builder = true,
     admin = false,
     roles = {}
@@ -317,13 +264,13 @@ class TestConfiguration {
       }
       await sessions.createASession(userId, {
         sessionId: "sessionid",
-        tenantId: this.getTenantId(),
+        tenantId: TENANT_ID,
       })
       // have to fake this
       const authObj = {
         userId,
         sessionId: "sessionid",
-        tenantId: this.getTenantId(),
+        tenantId: TENANT_ID,
       }
       const app = {
         roleId: roleId,
@@ -346,11 +293,10 @@ class TestConfiguration {
   }
 
   defaultHeaders(extras = {}) {
-    const tenantId = this.getTenantId()
-    const authObj: AuthToken = {
-      userId: this.defaultUserValues.globalUserId,
+    const authObj = {
+      userId: GLOBAL_USER_ID,
       sessionId: "sessionid",
-      tenantId,
+      tenantId: TENANT_ID,
     }
     const app = {
       roleId: roles.BUILTIN_ROLE_IDS.ADMIN,
@@ -364,20 +310,15 @@ class TestConfiguration {
         `${constants.Cookie.Auth}=${authToken}`,
         `${constants.Cookie.CurrentApp}=${appToken}`,
       ],
-      [constants.Header.CSRF_TOKEN]: this.defaultUserValues.csrfToken,
+      [constants.Header.CSRF_TOKEN]: CSRF_TOKEN,
       ...extras,
     }
-
     if (this.appId) {
       headers[constants.Header.APP_ID] = this.appId
     }
     return headers
   }
 
-  getTenantId() {
-    return this.tenantId || TENANT_ID
-  }
-
   publicHeaders({ prodApp = true } = {}) {
     const appId = prodApp ? this.prodAppId : this.appId
 
@@ -387,16 +328,11 @@ class TestConfiguration {
     if (appId) {
       headers[constants.Header.APP_ID] = appId
     }
-
-    if (this.tenantId) {
-      headers[constants.Header.TENANT_ID] = this.tenantId
-    }
-
     return headers
   }
 
   async roleHeaders({
-    email = this.defaultUserValues.email,
+    email = EMAIL,
     roleId = roles.BUILTIN_ROLE_IDS.ADMIN,
     builder = false,
     prodApp = true,
@@ -406,8 +342,8 @@ class TestConfiguration {
 
   // API
 
-  async generateApiKey(userId = this.defaultUserValues.globalUserId) {
-    return tenancy.doWithGlobalDB(this.getTenantId(), async (db: any) => {
+  async generateApiKey(userId = GLOBAL_USER_ID) {
+    return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => {
       const id = dbCore.generateDevInfoID(userId)
       let devInfo
       try {
@@ -416,7 +352,7 @@ class TestConfiguration {
         devInfo = { _id: id, userId }
       }
       devInfo.apiKey = encryption.encrypt(
-        `${this.getTenantId()}${dbCore.SEPARATOR}${newid()}`
+        `${TENANT_ID}${dbCore.SEPARATOR}${newid()}`
       )
       await db.put(devInfo)
       return devInfo.apiKey
@@ -472,13 +408,13 @@ class TestConfiguration {
 
   // TABLE
 
-  async updateTable(config?: any): Promise<Table> {
+  async updateTable(config?: any) {
     config = config || basicTable()
     this.table = await this._req(config, null, controllers.table.save)
     return this.table
   }
 
-  async createTable(config?: Table) {
+  async createTable(config?: any) {
     if (config != null && config._id) {
       delete config._id
     }
@@ -522,7 +458,7 @@ class TestConfiguration {
 
   // ROW
 
-  async createRow(config?: Row): Promise<Row> {
+  async createRow(config: any = null) {
     if (!this.table) {
       throw "Test requires table to be configured."
     }
@@ -531,7 +467,7 @@ class TestConfiguration {
     return this._req(config, { tableId }, controllers.row.save)
   }
 
-  async getRow(tableId: string, rowId: string): Promise<Row> {
+  async getRow(tableId: string, rowId: string) {
     return this._req(null, { tableId, rowId }, controllers.row.find)
   }
 
@@ -613,9 +549,7 @@ class TestConfiguration {
 
   // DATASOURCE
 
-  async createDatasource(config?: {
-    datasource: Datasource
-  }): Promise<Datasource> {
+  async createDatasource(config?: any) {
     config = config || basicDatasource()
     const response = await this._req(config, null, controllers.datasource.save)
     this.datasource = response.datasource
@@ -636,7 +570,7 @@ class TestConfiguration {
     return this.createDatasource({
       datasource: {
         ...basicDatasource().datasource,
-        source: SourceName.REST,
+        source: "REST",
         config: cfg || {},
       },
     })
@@ -645,7 +579,7 @@ class TestConfiguration {
   async dynamicVariableDatasource() {
     let datasource = await this.restDatasource()
     const basedOnQuery = await this.createQuery({
-      ...basicQuery(datasource._id!),
+      ...basicQuery(datasource._id),
       fields: {
         path: "www.google.com",
       },
@@ -673,7 +607,7 @@ class TestConfiguration {
     datasource: any,
     fields: any,
     params: any,
-    verb?: string
+    verb: string
   ) {
     return request
       .post(`/api/queries/preview`)