@budibase/server 1.0.49-alpha.9 → 1.0.49

package/src/automations/steps/deleteRow.js

@@ -1,4 +1,5 @@
 const rowController = require("../../api/controllers/row")
+const env = require("../../environment")
 const usage = require("../../utilities/usageQuota")
 const { buildCtx } = require("./utils")
 const automationUtils = require("../automationUtils")
@@ -73,7 +74,9 @@ exports.run = async function ({ inputs, appId, emitter }) {
   })
 
   try {
-    await usage.update(usage.Properties.ROW, -1)
+    if (env.isProd()) {
+      await usage.update(usage.Properties.ROW, -1)
+    }
     await rowController.destroy(ctx)
     return {
       response: ctx.body,

package/src/automations/steps/updateRow.js

@@ -87,7 +87,7 @@ exports.run = async function ({ inputs, appId, emitter }) {
 
   try {
     if (tableId) {
-      inputs.row = await automationUtils.cleanUpRow(tableId, inputs.row)
+      inputs.row = await automationUtils.cleanUpRow(appId, tableId, inputs.row)
     }
     await rowController.patch(ctx)
     return {

package/src/automations/triggers.js

@@ -1,3 +1,4 @@
+const CouchDB = require("../db")
 const emitter = require("../events/index")
 const { getAutomationParams } = require("../db/utils")
 const { coerce } = require("../utilities/rowProcessor")
@@ -8,7 +9,6 @@ const { queue } = require("./bullboard")
 const { checkTestFlag } = require("../utilities/redis")
 const utils = require("./utils")
 const env = require("../environment")
-const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 
 const TRIGGER_DEFINITIONS = definitions
 const JOB_OPTS = {
@@ -21,41 +21,39 @@ async function queueRelevantRowAutomations(event, eventType) {
     throw `No appId specified for ${eventType} - check event emitters.`
   }
 
-  doInAppContext(event.appId, async () => {
-    const db = getAppDB()
-    let automations = await db.allDocs(
-      getAutomationParams(null, { include_docs: true })
-    )
+  const db = new CouchDB(event.appId)
+  let automations = await db.allDocs(
+    getAutomationParams(null, { include_docs: true })
+  )
 
-    // filter down to the correct event type
-    automations = automations.rows
-      .map(automation => automation.doc)
-      .filter(automation => {
-        const trigger = automation.definition.trigger
-        return trigger && trigger.event === eventType
-      })
+  // filter down to the correct event type
+  automations = automations.rows
+    .map(automation => automation.doc)
+    .filter(automation => {
+      const trigger = automation.definition.trigger
+      return trigger && trigger.event === eventType
+    })
 
-    for (let automation of automations) {
-      let automationDef = automation.definition
-      let automationTrigger = automationDef ? automationDef.trigger : {}
-      // don't queue events which are for dev apps, only way to test automations is
-      // running tests on them, in production the test flag will never
-      // be checked due to lazy evaluation (first always false)
-      if (
-        !env.ALLOW_DEV_AUTOMATIONS &&
-        isDevAppID(event.appId) &&
-        !(await checkTestFlag(automation._id))
-      ) {
-        continue
-      }
-      if (
-        automationTrigger.inputs &&
-        automationTrigger.inputs.tableId === event.row.tableId
-      ) {
-        await queue.add({ automation, event }, JOB_OPTS)
-      }
+  for (let automation of automations) {
+    let automationDef = automation.definition
+    let automationTrigger = automationDef ? automationDef.trigger : {}
+    // don't queue events which are for dev apps, only way to test automations is
+    // running tests on them, in production the test flag will never
+    // be checked due to lazy evaluation (first always false)
+    if (
+      !env.ALLOW_DEV_AUTOMATIONS &&
+      isDevAppID(event.appId) &&
+      !(await checkTestFlag(automation._id))
+    ) {
+      continue
     }
-  })
+    if (
+      automationTrigger.inputs &&
+      automationTrigger.inputs.tableId === event.row.tableId
+    ) {
+      await queue.add({ automation, event }, JOB_OPTS)
+    }
+  }
 }
 
 emitter.on("row:save", async function (event) {

package/src/automations/utils.js

@@ -6,9 +6,8 @@ const { queue } = require("./bullboard")
 const newid = require("../db/newid")
 const { updateEntityMetadata } = require("../utilities")
 const { MetadataTypes } = require("../constants")
-const { getProdAppID } = require("@budibase/backend-core/db")
+const { getDeployedAppID } = require("@budibase/backend-core/db")
 const { cloneDeep } = require("lodash/fp")
-const { getAppDB, getAppId } = require("@budibase/backend-core/context")
 
 const WH_STEP_ID = definitions.WEBHOOK.stepId
 const CRON_STEP_ID = definitions.CRON.stepId
@@ -28,6 +27,7 @@ exports.processEvent = async job => {
 
 exports.updateTestHistory = async (appId, automation, history) => {
   return updateEntityMetadata(
+    appId,
     MetadataTypes.AUTOMATION_TEST_HISTORY,
     automation._id,
     metadata => {
@@ -93,9 +93,6 @@ exports.enableCronTrigger = async (appId, automation) => {
     )
     // Assign cron job ID from bull so we can remove it later if the cron trigger is removed
     trigger.cronJobId = job.id
-    // can't use getAppDB here as this is likely to be called from dev app,
-    // but this call could be for dev app or prod app, need to just use what
-    // was passed in
     const db = new CouchDB(appId)
     const response = await db.put(automation)
     automation._id = response.id
@@ -112,8 +109,7 @@ exports.enableCronTrigger = async (appId, automation) => {
  * @returns {Promise<object|undefined>} After this is complete the new automation object may have been updated and should be
  * written to DB (this does not write to DB as it would be wasteful to repeat).
  */
-exports.checkForWebhooks = async ({ oldAuto, newAuto }) => {
-  const appId = getAppId()
+exports.checkForWebhooks = async ({ appId, oldAuto, newAuto }) => {
   const oldTrigger = oldAuto ? oldAuto.definition.trigger : null
   const newTrigger = newAuto ? newAuto.definition.trigger : null
   const triggerChanged =
@@ -132,7 +128,7 @@ exports.checkForWebhooks = async ({ oldAuto, newAuto }) => {
     oldTrigger.webhookId
   ) {
     try {
-      let db = getAppDB()
+      let db = new CouchDB(appId)
       // need to get the webhook to get the rev
       const webhook = await db.get(oldTrigger.webhookId)
       const ctx = {
@@ -170,7 +166,7 @@ exports.checkForWebhooks = async ({ oldAuto, newAuto }) => {
     // the app ID has to be development for this endpoint
     // it can only be used when building the app
     // but the trigger endpoint will always be used in production
-    const prodAppId = getProdAppID(appId)
+    const prodAppId = getDeployedAppID(appId)
     newTrigger.inputs = {
       schemaUrl: `api/webhooks/schema/${appId}/${id}`,
       triggerUrl: `api/webhooks/trigger/${prodAppId}/${id}`,

package/src/constants/index.js

@@ -61,11 +61,6 @@ exports.RelationshipTypes = {
   MANY_TO_MANY: "many-to-many",
 }
 
-exports.FormulaTypes = {
-  STATIC: "static",
-  DYNAMIC: "dynamic",
-}
-
 exports.AuthTypes = {
   APP: "app",
   BUILDER: "builder",
@@ -83,10 +78,6 @@ exports.DataSourceOperation = {
   DELETE_TABLE: "DELETE_TABLE",
 }
 
-exports.DatasourceAuthTypes = {
-  GOOGLE: "google",
-}
-
 exports.SortDirection = {
   ASCENDING: "ASCENDING",
   DESCENDING: "DESCENDING",

package/src/db/linkedRows/LinkController.js

@@ -1,3 +1,4 @@
+const CouchDB = require("../index")
 const { IncludeDocs, getLinkDocuments } = require("./linkUtils")
 const {
   generateLinkID,
@@ -6,7 +7,6 @@ const {
 } = require("../utils")
 const Sentry = require("@sentry/node")
 const { FieldTypes, RelationshipTypes } = require("../../constants")
-const { getAppDB } = require("@budibase/backend-core/context")
 
 /**
  * Creates a new link document structure which can be put to the database. It is important to
@@ -52,8 +52,9 @@ function LinkDocument(
 }
 
 class LinkController {
-  constructor({ tableId, row, table, oldTable }) {
-    this._db = getAppDB()
+  constructor({ appId, tableId, row, table, oldTable }) {
+    this._appId = appId
+    this._db = new CouchDB(appId)
     this._tableId = tableId
     this._row = row
     this._table = table
@@ -98,6 +99,7 @@ class LinkController {
    */
   getRowLinkDocs(rowId) {
     return getLinkDocuments({
+      appId: this._appId,
       tableId: this._tableId,
       rowId,
       includeDocs: IncludeDocs.INCLUDE,
@@ -109,6 +111,7 @@ class LinkController {
    */
   getTableLinkDocs() {
     return getLinkDocuments({
+      appId: this._appId,
       tableId: this._tableId,
       includeDocs: IncludeDocs.INCLUDE,
     })
@@ -227,6 +230,7 @@ class LinkController {
           if (linkedSchema.relationshipType === RelationshipTypes.ONE_TO_MANY) {
             let links = (
               await getLinkDocuments({
+                appId: this._appId,
                 tableId: field.tableId,
                 rowId: linkId,
                 includeDocs: IncludeDocs.EXCLUDE,

package/src/db/linkedRows/index.js

@@ -9,12 +9,12 @@ const {
   getLinkedTable,
 } = require("./linkUtils")
 const { flatten } = require("lodash")
+const CouchDB = require("../../db")
 const { FieldTypes } = require("../../constants")
 const { getMultiIDParams, USER_METDATA_PREFIX } = require("../../db/utils")
 const { partition } = require("lodash")
 const { getGlobalUsersFromMetadata } = require("../../utilities/global")
 const { processFormulas } = require("../../utilities/rowProcessor/utils")
-const { getAppDB } = require("@budibase/backend-core/context")
 
 /**
  * This functionality makes sure that when rows with links are created, updated or deleted they are processed
@@ -48,13 +48,14 @@ function clearRelationshipFields(table, rows) {
   return rows
 }
 
-async function getLinksForRows(rows) {
+async function getLinksForRows(appId, rows) {
   const tableIds = [...new Set(rows.map(el => el.tableId))]
   // start by getting all the link values for performance reasons
   const responses = flatten(
     await Promise.all(
       tableIds.map(tableId =>
         getLinkDocuments({
+          appId,
           tableId: tableId,
           includeDocs: IncludeDocs.EXCLUDE,
         })
@@ -71,9 +72,9 @@ async function getLinksForRows(rows) {
   )
 }
 
-async function getFullLinkedDocs(links) {
+async function getFullLinkedDocs(ctx, appId, links) {
   // create DBs
-  const db = getAppDB()
+  const db = new CouchDB(appId)
   const linkedRowIds = links.map(link => link.id)
   const uniqueRowIds = [...new Set(linkedRowIds)]
   let dbRows = (await db.allDocs(getMultiIDParams(uniqueRowIds))).rows.map(
@@ -87,7 +88,7 @@ async function getFullLinkedDocs(links) {
   let [users, other] = partition(linked, linkRow =>
     linkRow._id.startsWith(USER_METDATA_PREFIX)
   )
-  users = await getGlobalUsersFromMetadata(users)
+  users = await getGlobalUsersFromMetadata(appId, users)
   return [...other, ...users]
 }
 
@@ -95,16 +96,20 @@ async function getFullLinkedDocs(links) {
  * Update link documents for a row or table - this is to be called by the API controller when a change is occurring.
  * @param {string} args.eventType states what type of change which is occurring, means this can be expanded upon in the
  * future quite easily (all updates go through one function).
+ * @param {string} args.appId The ID of the instance in which the change is occurring.
  * @param {string} args.tableId The ID of the of the table which is being changed.
- * @param {object|undefined} args.row The row which is changing, e.g. created, updated or deleted.
- * @param {object|undefined} args.table If the table has already been retrieved this can be used to reduce database gets.
- * @param {object|undefined} args.oldTable If the table is being updated then the old table can be provided for differencing.
+ * @param {object|null} args.row The row which is changing, e.g. created, updated or deleted.
+ * @param {object|null} args.table If the table has already been retrieved this can be used to reduce database gets.
+ * @param {object|null} args.oldTable If the table is being updated then the old table can be provided for differencing.
  * @returns {Promise<object>} When the update is complete this will respond successfully. Returns the row for
  * row operations and the table for table operations.
  */
 exports.updateLinks = async function (args) {
-  const { eventType, row, tableId, table, oldTable } = args
+  const { eventType, appId, row, tableId, table, oldTable } = args
   const baseReturnObj = row == null ? table : row
+  if (appId == null) {
+    throw "Cannot operate without an instance ID."
+  }
   // make sure table ID is set
   if (tableId == null && table != null) {
     args.tableId = table._id
@@ -141,23 +146,27 @@ exports.updateLinks = async function (args) {
 /**
  * Given a table and a list of rows this will retrieve all of the attached docs and enrich them into the row.
  * This is required for formula fields, this may only be utilised internally (for now).
+ * @param {object} ctx The request which is looking for rows.
  * @param {object} table The table from which the rows originated.
  * @param {array<object>} rows The rows which are to be enriched.
  * @return {Promise<*>} returns the rows with all of the enriched relationships on it.
  */
-exports.attachFullLinkedDocs = async (table, rows) => {
+exports.attachFullLinkedDocs = async (ctx, table, rows) => {
+  const appId = ctx.appId
   const linkedTableIds = getLinkedTableIDs(table)
   if (linkedTableIds.length === 0) {
     return rows
   }
+  // create DBs
+  const db = new CouchDB(appId)
   // get all the links
-  const links = (await getLinksForRows(rows)).filter(link =>
+  const links = (await getLinksForRows(appId, rows)).filter(link =>
     rows.some(row => row._id === link.thisId)
   )
   // clear any existing links that could be dupe'd
   rows = clearRelationshipFields(table, rows)
   // now get the docs and combine into the rows
-  let linked = await getFullLinkedDocs(links)
+  let linked = await getFullLinkedDocs(ctx, appId, links)
   const linkedTables = []
   for (let row of rows) {
     for (let link of links.filter(link => link.thisId === row._id)) {
@@ -168,7 +177,11 @@ exports.attachFullLinkedDocs = async (table, rows) => {
       if (linkedRow) {
         const linkedTableId =
           linkedRow.tableId || getRelatedTableForField(table, link.fieldName)
-        const linkedTable = await getLinkedTable(linkedTableId, linkedTables)
+        const linkedTable = await getLinkedTable(
+          db,
+          linkedTableId,
+          linkedTables
+        )
         if (linkedTable) {
           row[link.fieldName].push(processFormulas(linkedTable, linkedRow))
         }
@@ -180,16 +193,18 @@ exports.attachFullLinkedDocs = async (table, rows) => {
 
 /**
  * This function will take the given enriched rows and squash the links to only contain the primary display field.
+ * @param {string} appId The app in which the tables/rows/links exist.
  * @param {object} table The table from which the rows originated.
  * @param {array<object>} enriched The pre-enriched rows (full docs) which are to be squashed.
  * @returns {Promise<Array>} The rows after having their links squashed to only contain the ID and primary display.
  */
-exports.squashLinksToPrimaryDisplay = async (table, enriched) => {
+exports.squashLinksToPrimaryDisplay = async (appId, table, enriched) => {
+  const db = new CouchDB(appId)
   // will populate this as we find them
   const linkedTables = [table]
   for (let row of enriched) {
     // this only fetches the table if its not already in array
-    const rowTable = await getLinkedTable(row.tableId, linkedTables)
+    const rowTable = await getLinkedTable(db, row.tableId, linkedTables)
     for (let [column, schema] of Object.entries(rowTable.schema)) {
       if (schema.type !== FieldTypes.LINK || !Array.isArray(row[column])) {
         continue
@@ -197,7 +212,7 @@ exports.squashLinksToPrimaryDisplay = async (table, enriched) => {
       const newLinks = []
       for (let link of row[column]) {
         const linkTblId = link.tableId || getRelatedTableForField(table, column)
-        const linkedTable = await getLinkedTable(linkTblId, linkedTables)
+        const linkedTable = await getLinkedTable(db, linkTblId, linkedTables)
         const obj = { _id: link._id }
         if (link[linkedTable.primaryDisplay]) {
           obj.primaryDisplay = link[linkedTable.primaryDisplay]

package/src/db/linkedRows/linkUtils.js

@@ -1,8 +1,8 @@
+const CouchDB = require("../index")
 const Sentry = require("@sentry/node")
 const { ViewNames, getQueryIndex } = require("../utils")
 const { FieldTypes } = require("../../constants")
 const { createLinkView } = require("../views/staticViews")
-const { getAppDB } = require("@budibase/backend-core/context")
 
 /**
  * Only needed so that boolean parameters are being used for includeDocs
@@ -17,6 +17,7 @@ exports.createLinkView = createLinkView
 
 /**
  * Gets the linking documents, not the linked documents themselves.
+ * @param {string} args.appId The instance in which we are searching for linked rows.
  * @param {string} args.tableId The table which we are searching for linked rows against.
  * @param {string|null} args.fieldName The name of column/field which is being altered, only looking for
  * linking documents that are related to it. If this is not specified then the table level will be assumed.
@@ -29,8 +30,8 @@ exports.createLinkView = createLinkView
  * (if any).
  */
 exports.getLinkDocuments = async function (args) {
-  const { tableId, rowId, includeDocs } = args
-  const db = getAppDB()
+  const { appId, tableId, rowId, includeDocs } = args
+  const db = new CouchDB(appId)
   let params
   if (rowId != null) {
     params = { key: [tableId, rowId] }
@@ -67,7 +68,7 @@ exports.getLinkDocuments = async function (args) {
   } catch (err) {
     // check if the view doesn't exist, it should for all new instances
     if (err != null && err.name === "not_found") {
-      await exports.createLinkView()
+      await exports.createLinkView(appId)
       return exports.getLinkDocuments(arguments[0])
     } else {
       /* istanbul ignore next */
@@ -88,8 +89,7 @@ exports.getLinkedTableIDs = table => {
     .map(column => column.tableId)
 }
 
-exports.getLinkedTable = async (id, tables) => {
-  const db = getAppDB()
+exports.getLinkedTable = async (db, id, tables) => {
   let linkedTable = tables.find(table => table._id === id)
   if (linkedTable) {
     return linkedTable

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

@@ -20,6 +20,7 @@ describe("test the link controller", () => {
 
   function createLinkController(table, row = null, oldTable = null) {
     const linkConfig = {
+      appId: config.getAppId(),
       tableId: table._id,
       table,
     }

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

@@ -1,8 +1,8 @@
 const TestConfig = require("../../tests/utilities/TestConfiguration")
-const { basicTable } = require("../../tests/utilities/structures")
+const { basicTable, basicLinkedRow } = require("../../tests/utilities/structures")
 const linkUtils = require("../linkedRows/linkUtils")
+const links = require("../linkedRows")
 const CouchDB = require("../index")
-const { getAppDB } = require("@budibase/backend-core/context")
 
 describe("test link functionality", () => {
   const config = new TestConfig(false)
@@ -11,18 +11,18 @@ describe("test link functionality", () => {
     let db, table
     beforeEach(async () => {
       await config.init()
-      db = getAppDB()
+      db = new CouchDB(config.getAppId())
       table = await config.createTable()
     })
 
     it("should be able to retrieve a linked table from a list", async () => {
-      const retrieved = await linkUtils.getLinkedTable(table._id, [table])
+      const retrieved = await linkUtils.getLinkedTable(db, table._id, [table])
       expect(retrieved._id).toBe(table._id)
     })
 
     it("should be able to retrieve a table from DB and update list", async () => {
       const tables = []
-      const retrieved = await linkUtils.getLinkedTable(table._id, tables)
+      const retrieved = await linkUtils.getLinkedTable(db, table._id, tables)
       expect(retrieved._id).toBe(table._id)
       expect(tables[0]).toBeDefined()
     })
@@ -51,6 +51,7 @@ describe("test link functionality", () => {
       const db = new CouchDB("test")
       await db.put({ _id: "_design/database", views: {} })
       const output = await linkUtils.getLinkDocuments({
+        appId: "test",
         tableId: "test",
         rowId: "test",
         includeDocs: false,

package/src/db/views/staticViews.js

@@ -1,4 +1,4 @@
-const { getAppDB } = require("@budibase/backend-core/context")
+const CouchDB = require("../index")
 const {
   DocumentTypes,
   SEPARATOR,
@@ -21,11 +21,12 @@ const SCREEN_PREFIX = DocumentTypes.SCREEN + SEPARATOR
 /**
  * Creates the link view for the instance, this will overwrite the existing one, but this should only
  * be called if it is found that the view does not exist.
+ * @param {string} appId The instance to which the view should be added.
  * @returns {Promise<void>} The view now exists, please note that the next view of this query will actually build it,
  * so it may be slow.
  */
-exports.createLinkView = async () => {
-  const db = getAppDB()
+exports.createLinkView = async appId => {
+  const db = new CouchDB(appId)
   const designDoc = await db.get("_design/database")
   const view = {
     map: function (doc) {
@@ -56,8 +57,8 @@ exports.createLinkView = async () => {
   await db.put(designDoc)
 }
 
-exports.createRoutingView = async () => {
-  const db = getAppDB()
+exports.createRoutingView = async appId => {
+  const db = new CouchDB(appId)
   const designDoc = await db.get("_design/database")
   const view = {
     // if using variables in a map function need to inject them before use
@@ -77,8 +78,8 @@ exports.createRoutingView = async () => {
   await db.put(designDoc)
 }
 
-async function searchIndex(indexName, fnString) {
-  const db = getAppDB()
+async function searchIndex(appId, indexName, fnString) {
+  const db = new CouchDB(appId)
   const designDoc = await db.get("_design/database")
   designDoc.indexes = {
     [indexName]: {
@@ -89,8 +90,9 @@ async function searchIndex(indexName, fnString) {
   await db.put(designDoc)
 }
 
-exports.createAllSearchIndex = async () => {
+exports.createAllSearchIndex = async appId => {
   await searchIndex(
+    appId,
     SearchIndexes.ROWS,
     function (doc) {
       function idx(input, prev) {

package/src/definitions/common.ts

@@ -17,8 +17,6 @@ export interface FieldSchema {
   autocolumn?: boolean
   throughFrom?: string
   throughTo?: string
-  formula?: string
-  formulaType?: string
   main?: boolean
   meta?: {
     toTable: string
@@ -48,7 +46,6 @@ export interface Table extends Base {
   schema: TableSchema
   primaryDisplay?: string
   sourceId?: string
-  relatedFormula?: string[]
   constrained?: string[]
 }
 

package/src/definitions/datasource.ts

@@ -47,7 +47,6 @@ export enum SourceNames {
   ARANGODB = "ARANGODB",
   REST = "REST",
   ORACLE = "ORACLE",
-  GOOGLE_SHEETS = "GOOGLE_SHEETS",
 }
 
 export enum IncludeRelationships {
@@ -87,8 +86,6 @@ export interface ExtraQueryConfig {
 export interface Integration {
   docs: string
   plus?: boolean
-  auth?: { type: string }
-  relationships?: boolean
   description: string
   friendlyName: string
   datasource: {}

package/src/environment.js

@@ -2,8 +2,7 @@ function isTest() {
   return (
     process.env.NODE_ENV === "jest" ||
     process.env.NODE_ENV === "cypress" ||
-    (process.env.JEST_WORKER_ID != null &&
-      process.env.JEST_WORKER_ID !== "null")
+    process.env.JEST_WORKER_ID != null
   )
 }
 
@@ -39,12 +38,10 @@ module.exports = {
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   USE_QUOTAS: process.env.USE_QUOTAS,
-  EXCLUDE_QUOTAS_TENANTS: process.env.EXCLUDE_QUOTAS_TENANTS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
   MULTI_TENANCY: process.env.MULTI_TENANCY,
-  HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
   // environment
   NODE_ENV: process.env.NODE_ENV,
   JEST_WORKER_ID: process.env.JEST_WORKER_ID,