@budibase/server 1.0.123-alpha.0 → 1.0.123

package/src/api/controllers/deploy/{index.ts → index.js}

@@ -1,18 +1,20 @@
-import Deployment from "./Deployment"
-import {
+const Deployment = require("./Deployment")
+const {
   Replication,
   getProdAppID,
   getDevelopmentAppID,
-} from "@budibase/backend-core/db"
-import { DocumentTypes, getAutomationParams } from "../../../db/utils"
-import { disableAllCrons, enableCronTrigger } from "../../../automations/utils"
-import { app as appCache } from "@budibase/backend-core/cache"
-import {
+} = require("@budibase/backend-core/db")
+const { DocumentTypes, getAutomationParams } = require("../../../db/utils")
+const {
+  disableAllCrons,
+  enableCronTrigger,
+} = require("../../../automations/utils")
+const { app: appCache } = require("@budibase/backend-core/cache")
+const {
   getAppId,
   getAppDB,
   getProdAppDB,
-} from "@budibase/backend-core/context"
-import { quotas } from "@budibase/pro"
+} = require("@budibase/backend-core/context")
 
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000
@@ -23,10 +25,9 @@ const DeploymentStatus = {
 }
 
 // checks that deployments are in a good state, any pending will be updated
-async function checkAllDeployments(deployments: any) {
+async function checkAllDeployments(deployments) {
   let updated = false
-  let deployment: any
-  for (deployment of Object.values(deployments.history)) {
+  for (let deployment of Object.values(deployments.history)) {
     // check that no deployments have crashed etc and are now stuck
     if (
       deployment.status === DeploymentStatus.PENDING &&
@@ -40,7 +41,7 @@ async function checkAllDeployments(deployments: any) {
   return { updated, deployments }
 }
 
-async function storeDeploymentHistory(deployment: any) {
+async function storeDeploymentHistory(deployment) {
   const deploymentJSON = deployment.getJSON()
   const db = getAppDB()
 
@@ -69,7 +70,7 @@ async function storeDeploymentHistory(deployment: any) {
   return deployment
 }
 
-async function initDeployedApp(prodAppId: any) {
+async function initDeployedApp(prodAppId) {
   const db = getProdAppDB()
   console.log("Reading automation docs")
   const automations = (
@@ -78,7 +79,7 @@ async function initDeployedApp(prodAppId: any) {
         include_docs: true,
       })
     )
-  ).rows.map((row: any) => row.doc)
+  ).rows.map(row => row.doc)
   console.log("You have " + automations.length + " automations")
   const promises = []
   console.log("Disabling prod crons..")
@@ -92,27 +93,21 @@ async function initDeployedApp(prodAppId: any) {
   console.log("Enabled cron triggers for deployed app..")
 }
 
-async function deployApp(deployment: any) {
+async function deployApp(deployment) {
   let replication
   try {
     const appId = getAppId()
     const devAppId = getDevelopmentAppID(appId)
     const productionAppId = getProdAppID(appId)
-
-    const config: any = {
+    replication = new Replication({
       source: devAppId,
       target: productionAppId,
-    }
-    replication = new Replication(config)
-
+    })
     console.log("Replication object created")
     await replication.replicate()
     console.log("replication complete.. replacing app meta doc")
     const db = getProdAppDB()
     const appDoc = await db.get(DocumentTypes.APP_METADATA)
-
-    deployment.appUrl = appDoc.url
-
     appDoc.appId = productionAppId
     appDoc.instance._id = productionAppId
     await db.put(appDoc)
@@ -122,7 +117,7 @@ async function deployApp(deployment: any) {
     console.log("Deployed app initialised, setting deployment to successful")
     deployment.setStatus(DeploymentStatus.SUCCESS)
     await storeDeploymentHistory(deployment)
-  } catch (err: any) {
+  } catch (err) {
     deployment.setStatus(DeploymentStatus.FAILURE, err.message)
     await storeDeploymentHistory(deployment)
     throw {
@@ -130,17 +125,18 @@ async function deployApp(deployment: any) {
       message: `Deployment Failed: ${err.message}`,
     }
   } finally {
-    if (replication) {
-      await replication.close()
-    }
+    await replication.close()
   }
 }
 
-export async function fetchDeployments(ctx: any) {
+exports.fetchDeployments = async function (ctx) {
   try {
     const db = getAppDB()
     const deploymentDoc = await db.get(DocumentTypes.DEPLOYMENTS)
-    const { updated, deployments } = await checkAllDeployments(deploymentDoc)
+    const { updated, deployments } = await checkAllDeployments(
+      deploymentDoc,
+      ctx.user
+    )
     if (updated) {
       await db.put(deployments)
     }
@@ -150,7 +146,7 @@ export async function fetchDeployments(ctx: any) {
   }
 }
 
-export async function deploymentProgress(ctx: any) {
+exports.deploymentProgress = async function (ctx) {
   try {
     const db = getAppDB()
     const deploymentDoc = await db.get(DocumentTypes.DEPLOYMENTS)
@@ -163,20 +159,7 @@ export async function deploymentProgress(ctx: any) {
   }
 }
 
-const isFirstDeploy = async () => {
-  try {
-    const db = getProdAppDB()
-    await db.get(DocumentTypes.APP_METADATA)
-  } catch (e: any) {
-    if (e.status === 404) {
-      return true
-    }
-    throw e
-  }
-  return false
-}
-
-const _deployApp = async function (ctx: any) {
+exports.deployApp = async function (ctx) {
   let deployment = new Deployment()
   console.log("Deployment object created")
   deployment.setStatus(DeploymentStatus.PENDING)
@@ -185,14 +168,7 @@ const _deployApp = async function (ctx: any) {
   console.log("Stored deployment history")
 
   console.log("Deploying app...")
-
-  if (await isFirstDeploy()) {
-    await quotas.addPublishedApp(() => deployApp(deployment))
-  } else {
-    await deployApp(deployment)
-  }
+  await deployApp(deployment)
 
   ctx.body = deployment
 }
-
-export { _deployApp as deployApp }

package/src/api/controllers/public/applications.ts

@@ -1,7 +1,7 @@
 const { getAllApps } = require("@budibase/backend-core/db")
 const { updateAppId } = require("@budibase/backend-core/context")
 import { search as stringSearch } from "./utils"
-import * as controller from "../application"
+import { default as controller } from "../application"
 import { Application } from "../../../definitions/common"
 
 function fixAppID(app: Application, params: any) {
@@ -59,7 +59,7 @@ export async function destroy(ctx: any, next: any) {
   // get the app before deleting it
   await setResponseApp(ctx)
   const body = ctx.body
-  await controller.destroy(ctx)
+  await controller.delete(ctx)
   // overwrite the body again
   ctx.body = body
   await next()

package/src/api/controllers/public/queries.ts

@@ -1,5 +1,5 @@
 import { search as stringSearch } from "./utils"
-import * as queryController from "../query"
+import { default as queryController } from "../query"
 
 export async function search(ctx: any, next: any) {
   await queryController.fetch(ctx)

package/src/api/controllers/public/rows.ts

@@ -1,4 +1,4 @@
-import * as rowController from "../row"
+import { default as rowController } from "../row"
 import { addRev } from "./utils"
 import { Row } from "../../../definitions/common"
 import { convertBookmark } from "../../../utilities"

package/src/api/controllers/query/{index.ts → index.js}

@@ -1,19 +1,22 @@
-import { generateQueryID, getQueryParams, isProdAppID } from "../../../db/utils"
-import { BaseQueryVerbs } from "../../../constants"
-import { Thread, ThreadType } from "../../../threads"
-import { save as saveDatasource } from "../datasource"
-import { RestImporter } from "./import"
-import { invalidateDynamicVariables } from "../../../threads/utils"
-import { QUERY_THREAD_TIMEOUT } from "../../../environment"
-import { getAppDB } from "@budibase/backend-core/context"
-import { quotas } from "@budibase/pro"
+const {
+  generateQueryID,
+  getQueryParams,
+  isProdAppID,
+} = require("../../../db/utils")
+const { BaseQueryVerbs } = require("../../../constants")
+const { Thread, ThreadType } = require("../../../threads")
+const { save: saveDatasource } = require("../datasource")
+const { RestImporter } = require("./import")
+const { invalidateDynamicVariables } = require("../../../threads/utils")
+const environment = require("../../../environment")
+const { getAppDB } = require("@budibase/backend-core/context")
 
 const Runner = new Thread(ThreadType.QUERY, {
-  timeoutMs: QUERY_THREAD_TIMEOUT || 10000,
+  timeoutMs: environment.QUERY_THREAD_TIMEOUT || 10000,
 })
 
 // simple function to append "readable" to all read queries
-function enrichQueries(input: any) {
+function enrichQueries(input) {
   const wasArray = Array.isArray(input)
   const queries = wasArray ? input : [input]
   for (let query of queries) {
@@ -24,7 +27,7 @@ function enrichQueries(input: any) {
   return wasArray ? queries : queries[0]
 }
 
-export async function fetch(ctx: any) {
+exports.fetch = async function (ctx) {
   const db = getAppDB()
 
   const body = await db.allDocs(
@@ -33,10 +36,10 @@ export async function fetch(ctx: any) {
     })
   )
 
-  ctx.body = enrichQueries(body.rows.map((row: any) => row.doc))
+  ctx.body = enrichQueries(body.rows.map(row => row.doc))
 }
 
-const _import = async (ctx: any) => {
+exports.import = async ctx => {
   const body = ctx.request.body
   const data = body.data
 
@@ -46,7 +49,7 @@ const _import = async (ctx: any) => {
   let datasourceId
   if (!body.datasourceId) {
     // construct new datasource
-    const info: any = await importer.getInfo()
+    const info = await importer.getInfo()
     let datasource = {
       type: "datasource",
       source: "REST",
@@ -74,9 +77,8 @@ const _import = async (ctx: any) => {
   }
   ctx.status = 200
 }
-export { _import as import }
 
-export async function save(ctx: any) {
+exports.save = async function (ctx) {
   const db = getAppDB()
   const query = ctx.request.body
 
@@ -91,7 +93,7 @@ export async function save(ctx: any) {
   ctx.message = `Query ${query.name} saved successfully.`
 }
 
-export async function find(ctx: any) {
+exports.find = async function (ctx) {
   const db = getAppDB()
   const query = enrichQueries(await db.get(ctx.params.queryId))
   // remove properties that could be dangerous in real app
@@ -102,7 +104,7 @@ export async function find(ctx: any) {
   ctx.body = query
 }
 
-export async function preview(ctx: any) {
+exports.preview = async function (ctx) {
   const db = getAppDB()
 
   const datasource = await db.get(ctx.request.body.datasourceId)
@@ -112,18 +114,16 @@ export async function preview(ctx: any) {
     ctx.request.body
 
   try {
-    const runFn = () =>
-      Runner.run({
-        appId: ctx.appId,
-        datasource,
-        queryVerb,
-        fields,
-        parameters,
-        transformer,
-        queryId,
-      })
-
-    const { rows, keys, info, extra } = await quotas.addQuery(runFn)
+    const { rows, keys, info, extra } = await Runner.run({
+      appId: ctx.appId,
+      datasource,
+      queryVerb,
+      fields,
+      parameters,
+      transformer,
+      queryId,
+    })
+
     ctx.body = {
       rows,
       schemaFields: [...new Set(keys)],
@@ -135,7 +135,7 @@ export async function preview(ctx: any) {
   }
 }
 
-async function execute(ctx: any, opts = { rowsOnly: false }) {
+async function execute(ctx, opts = { rowsOnly: false }) {
   const db = getAppDB()
 
   const query = await db.get(ctx.params.queryId)
@@ -153,19 +153,16 @@ async function execute(ctx: any, opts = { rowsOnly: false }) {
 
   // call the relevant CRUD method on the integration class
   try {
-    const runFn = () =>
-      Runner.run({
-        appId: ctx.appId,
-        datasource,
-        queryVerb: query.queryVerb,
-        fields: query.fields,
-        pagination: ctx.request.body.pagination,
-        parameters: enrichedParameters,
-        transformer: query.transformer,
-        queryId: ctx.params.queryId,
-      })
-
-    const { rows, pagination, extra } = await quotas.addQuery(runFn)
+    const { rows, pagination, extra } = await Runner.run({
+      appId: ctx.appId,
+      datasource,
+      queryVerb: query.queryVerb,
+      fields: query.fields,
+      pagination: ctx.request.body.pagination,
+      parameters: enrichedParameters,
+      transformer: query.transformer,
+      queryId: ctx.params.queryId,
+    })
     if (opts && opts.rowsOnly) {
       ctx.body = rows
     } else {
@@ -176,15 +173,15 @@ async function execute(ctx: any, opts = { rowsOnly: false }) {
   }
 }
 
-export async function executeV1(ctx: any) {
+exports.executeV1 = async function (ctx) {
   return execute(ctx, { rowsOnly: true })
 }
 
-export async function executeV2(ctx: any) {
+exports.executeV2 = async function (ctx) {
   return execute(ctx, { rowsOnly: false })
 }
 
-const removeDynamicVariables = async (queryId: any) => {
+const removeDynamicVariables = async queryId => {
   const db = getAppDB()
   const query = await db.get(queryId)
   const datasource = await db.get(query.datasourceId)
@@ -193,19 +190,19 @@ const removeDynamicVariables = async (queryId: any) => {
   if (dynamicVariables) {
     // delete dynamic variables from the datasource
     datasource.config.dynamicVariables = dynamicVariables.filter(
-      (dv: any) => dv.queryId !== queryId
+      dv => dv.queryId !== queryId
     )
     await db.put(datasource)
 
     // invalidate the deleted variables
     const variablesToDelete = dynamicVariables.filter(
-      (dv: any) => dv.queryId === queryId
+      dv => dv.queryId === queryId
     )
     await invalidateDynamicVariables(variablesToDelete)
   }
 }
 
-export async function destroy(ctx: any) {
+exports.destroy = async function (ctx) {
   const db = getAppDB()
   await removeDynamicVariables(ctx.params.queryId)
   await db.remove(ctx.params.queryId, ctx.params.revId)

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

@@ -52,7 +52,7 @@ interface RunConfig {
 
 module External {
   function buildFilters(
-    id: string | undefined | string[],
+    id: string | undefined,
     filters: SearchFilters,
     table: Table
   ) {

package/src/api/controllers/row/{index.ts → index.js}

@@ -1,16 +1,15 @@
-import { quotas } from "@budibase/pro"
-import internal from "./internal"
-import external from "./external"
-import { isExternalTable } from "../../../integrations/utils"
+const internal = require("./internal")
+const external = require("./external")
+const { isExternalTable } = require("../../../integrations/utils")
 
-function pickApi(tableId: any) {
+function pickApi(tableId) {
   if (isExternalTable(tableId)) {
     return external
   }
   return internal
 }
 
-function getTableId(ctx: any) {
+function getTableId(ctx) {
   if (ctx.request.body && ctx.request.body.tableId) {
     return ctx.request.body.tableId
   }
@@ -22,13 +21,13 @@ function getTableId(ctx: any) {
   }
 }
 
-export async function patch(ctx: any): Promise<any> {
+exports.patch = async ctx => {
   const appId = ctx.appId
   const tableId = getTableId(ctx)
   const body = ctx.request.body
   // if it doesn't have an _id then its save
   if (body && !body._id) {
-    return save(ctx)
+    return exports.save(ctx)
   }
   try {
     const { row, table } = await pickApi(tableId).patch(ctx)
@@ -42,13 +41,13 @@ export async function patch(ctx: any): Promise<any> {
   }
 }
 
-const saveRow = async (ctx: any) => {
+exports.save = async function (ctx) {
   const appId = ctx.appId
   const tableId = getTableId(ctx)
   const body = ctx.request.body
   // if it has an ID already then its a patch
   if (body && body._id) {
-    return patch(ctx)
+    return exports.patch(ctx)
   }
   try {
     const { row, table } = await pickApi(tableId).save(ctx)
@@ -61,11 +60,7 @@ const saveRow = async (ctx: any) => {
   }
 }
 
-export async function save(ctx: any) {
-  await quotas.addRow(() => saveRow(ctx))
-}
-
-export async function fetchView(ctx: any) {
+exports.fetchView = async function (ctx) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).fetchView(ctx)
@@ -74,7 +69,7 @@ export async function fetchView(ctx: any) {
   }
 }
 
-export async function fetch(ctx: any) {
+exports.fetch = async function (ctx) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).fetch(ctx)
@@ -83,7 +78,7 @@ export async function fetch(ctx: any) {
   }
 }
 
-export async function find(ctx: any) {
+exports.find = async function (ctx) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).find(ctx)
@@ -92,21 +87,19 @@ export async function find(ctx: any) {
   }
 }
 
-export async function destroy(ctx: any) {
+exports.destroy = async function (ctx) {
   const appId = ctx.appId
   const inputs = ctx.request.body
   const tableId = getTableId(ctx)
   let response, row
   if (inputs.rows) {
     let { rows } = await pickApi(tableId).bulkDestroy(ctx)
-    await quotas.removeRows(rows.length)
     response = rows
     for (let row of rows) {
       ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
     }
   } else {
     let resp = await pickApi(tableId).destroy(ctx)
-    await quotas.removeRow()
     response = resp.response
     row = resp.row
     ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
@@ -117,7 +110,7 @@ export async function destroy(ctx: any) {
   ctx.body = response
 }
 
-export async function search(ctx: any) {
+exports.search = async ctx => {
   const tableId = getTableId(ctx)
   try {
     ctx.status = 200
@@ -127,7 +120,7 @@ export async function search(ctx: any) {
   }
 }
 
-export async function validate(ctx: any) {
+exports.validate = async function (ctx) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).validate(ctx)
@@ -136,7 +129,7 @@ export async function validate(ctx: any) {
   }
 }
 
-export async function fetchEnrichedRow(ctx: any) {
+exports.fetchEnrichedRow = async function (ctx) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).fetchEnrichedRow(ctx)
@@ -145,7 +138,7 @@ export async function fetchEnrichedRow(ctx: any) {
   }
 }
 
-export const exportRows = async (ctx: any) => {
+exports.export = async function (ctx) {
   const tableId = getTableId(ctx)
   try {
     ctx.body = await pickApi(tableId).exportRows(ctx)

package/src/api/controllers/row/internal.js

@@ -260,9 +260,8 @@ exports.find = async ctx => {
 
 exports.destroy = async function (ctx) {
   const db = getAppDB()
-  const { _id } = ctx.request.body
+  const { _id, _rev } = ctx.request.body
   let row = await db.get(_id)
-  let _rev = ctx.request.body._rev || row._rev
 
   if (row.tableId !== ctx.params.tableId) {
     throw "Supplied tableId doesn't match the row's tableId"

package/src/api/controllers/row/utils.js

@@ -65,10 +65,7 @@ exports.validate = async ({ tableId, row, table }) => {
     if (type === FieldTypes.ARRAY && row[fieldName]) {
       if (row[fieldName].length) {
         row[fieldName].map(val => {
-          if (
-            !constraints.inclusion.includes(val) &&
-            constraints.inclusion.length !== 0
-          ) {
+          if (!constraints.inclusion.includes(val)) {
             errors[fieldName] = "Field not in list"
           }
         })

package/src/api/controllers/static/templates/BudibaseApp.svelte

@@ -78,9 +78,6 @@
       app.
     </h2>
   </div>
-  <script type="application/javascript">
-    window.INIT_TIME = Date.now()
-  </script>
   <script type="application/javascript" src={clientLibPath}>
   </script>
   <script type="application/javascript">

package/src/api/controllers/table/bulkFormula.js

@@ -25,7 +25,7 @@ function getFormulaThatUseColumn(table, columnNames) {
     if (!isStaticFormula(column)) {
       continue
     }
-    if (!doesContainStrings(column?.formula ?? "", columnNames)) {
+    if (!doesContainStrings(column.formula, columnNames)) {
       continue
     }
     formula.push(column.name)