@budibase/server 1.2.28-alpha.0 → 1.2.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.28-alpha.0",
+  "version": "1.2.30",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.28-alpha.0",
-    "@budibase/client": "1.2.28-alpha.0",
-    "@budibase/pro": "1.2.27",
-    "@budibase/string-templates": "1.2.28-alpha.0",
-    "@budibase/types": "1.2.28-alpha.0",
+    "@budibase/backend-core": "^1.2.30",
+    "@budibase/client": "^1.2.30",
+    "@budibase/pro": "1.2.29",
+    "@budibase/string-templates": "^1.2.30",
+    "@budibase/types": "^1.2.30",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -106,7 +106,7 @@
     "google-auth-library": "7.12.0",
     "google-spreadsheet": "3.2.0",
     "jimp": "0.16.1",
-    "joi": "17.6.0",
+    "joi": "17.2.1",
     "js-yaml": "4.1.0",
     "jsonschema": "1.4.0",
     "knex": "0.95.15",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "f73078bcbfba186fefdfe09a8558f89d9e961ce8"
+  "gitHead": "cf73b9fa2db06bcd836fd725dc02d1196b4f7b01"
 }

package/src/api/controllers/analytics.ts

@@ -1,4 +1,7 @@
 import { events } from "@budibase/backend-core"
+import { AnalyticsPingRequest, PingSource } from "@budibase/types"
+import { DocumentTypes, isDevAppID } from "../../db/utils"
+import { context } from "@budibase/backend-core"
 
 export const isEnabled = async (ctx: any) => {
   const enabled = await events.analytics.enabled()
@@ -6,3 +9,27 @@ export const isEnabled = async (ctx: any) => {
     enabled,
   }
 }
+
+export const ping = async (ctx: any) => {
+  const body = ctx.request.body as AnalyticsPingRequest
+  switch (body.source) {
+    case PingSource.APP: {
+      const db = context.getAppDB({ skip_setup: true })
+      const appInfo = await db.get(DocumentTypes.APP_METADATA)
+      let appId = context.getAppId()
+
+      if (isDevAppID(appId)) {
+        await events.serve.servedAppPreview(appInfo, body.timezone)
+      } else {
+        await events.serve.servedApp(appInfo, body.timezone)
+      }
+      break
+    }
+    case PingSource.BUILDER: {
+      await events.serve.servedBuilder(body.timezone)
+      break
+    }
+  }
+
+  ctx.status = 200
+}

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

@@ -1,5 +1,4 @@
 const { SearchIndexes } = require("../../../db/utils")
-const { removeKeyNumbering } = require("./utils")
 const fetch = require("node-fetch")
 const { getCouchInfo } = require("@budibase/backend-core/db")
 const { getAppId } = require("@budibase/backend-core/context")
@@ -198,8 +197,6 @@ class QueryBuilder {
 
     function build(structure, queryFn) {
       for (let [key, value] of Object.entries(structure)) {
-        // check for new format - remove numbering if needed
-        key = removeKeyNumbering(key)
         key = builder.preprocess(key.replace(/ /g, "_"), {
           escape: true,
         })
@@ -313,9 +310,6 @@ class QueryBuilder {
   }
 }
 
-// exported for unit testing
-exports.QueryBuilder = QueryBuilder
-
 /**
  * Executes a lucene search query.
  * @param url The query URL

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

@@ -3,9 +3,8 @@ const { cloneDeep } = require("lodash/fp")
 const { InternalTables } = require("../../../db/utils")
 const userController = require("../user")
 const { FieldTypes } = require("../../../constants")
+const { makeExternalQuery } = require("../../../integrations/base/utils")
 const { getAppDB } = require("@budibase/backend-core/context")
-const { makeExternalQuery } = require("../../../integrations/base/query")
-const { removeKeyNumbering } = require("../../../integrations/base/utils")
 
 validateJs.extend(validateJs.validators.datetime, {
   parse: function (value) {
@@ -17,8 +16,6 @@ validateJs.extend(validateJs.validators.datetime, {
   },
 })
 
-exports.removeKeyNumbering = removeKeyNumbering
-
 exports.getDatasourceAndQuery = async json => {
   const datasourceId = json.endpoint.datasourceId
   const db = getAppDB()

package/src/api/controllers/static/index.ts

@@ -14,11 +14,10 @@ const env = require("../../../environment")
 const { clientLibraryPath } = require("../../../utilities")
 const { upload } = require("../../../utilities/fileSystem")
 const { attachmentsRelativeURL } = require("../../../utilities")
-const { DocumentTypes, isDevAppID } = require("../../../db/utils")
+const { DocumentTypes } = require("../../../db/utils")
 const { getAppDB, getAppId } = require("@budibase/backend-core/context")
 const { setCookie, clearCookie } = require("@budibase/backend-core/utils")
 const AWS = require("aws-sdk")
-import { events } from "@budibase/backend-core"
 
 const fs = require("fs")
 const {
@@ -75,9 +74,6 @@ export const toggleBetaUiFeature = async function (ctx: any) {
 export const serveBuilder = async function (ctx: any) {
   const builderPath = resolve(TOP_LEVEL_PATH, "builder")
   await send(ctx, ctx.file, { root: builderPath })
-  if (ctx.file === "index.html") {
-    await events.serve.servedBuilder()
-  }
 }
 
 export const uploadFile = async function (ctx: any) {
@@ -126,12 +122,6 @@ export const serveApp = async function (ctx: any) {
     // just return the app info for jest to assert on
     ctx.body = appInfo
   }
-
-  if (isDevAppID(appInfo.appId)) {
-    await events.serve.servedAppPreview(appInfo)
-  } else {
-    await events.serve.servedApp(appInfo)
-  }
 }
 
 export const serveClientLibrary = async function (ctx: any) {

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

@@ -14,7 +14,7 @@ const {
   FieldTypes,
   RelationshipTypes,
 } = require("../../../constants")
-const { makeExternalQuery } = require("../../../integrations/base/query")
+const { makeExternalQuery } = require("../../../integrations/base/utils")
 const { cloneDeep } = require("lodash/fp")
 const csvParser = require("../../../utilities/csvParser")
 const { handleRequest } = require("../row/external")

package/src/api/routes/analytics.js

@@ -4,5 +4,6 @@ const controller = require("../controllers/analytics")
 const router = Router()
 
 router.get("/api/bbtel", controller.isEnabled)
+router.post("/api/bbtel/ping", controller.ping)
 
 module.exports = router

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

@@ -0,0 +1,59 @@
+const setup = require("./utilities")
+const { events, constants, db } = require("@budibase/backend-core")
+
+describe("/static", () => {
+  let request = setup.getRequest()
+  let config = setup.getConfig()
+  let app
+
+  const timezone = "Europe/London"
+
+  afterAll(setup.afterAll)
+
+  beforeEach(async () => {
+    app = await config.init()
+    jest.clearAllMocks()
+  })
+
+  describe("/ping", () => {
+    it("should ping from builder", async () => {
+      await request
+        .post("/api/bbtel/ping")
+        .send({source: "builder", timezone})
+        .set(config.defaultHeaders())
+        .expect(200)
+
+      expect(events.serve.servedBuilder).toBeCalledTimes(1)
+      expect(events.serve.servedBuilder).toBeCalledWith(timezone)
+      expect(events.serve.servedApp).not.toBeCalled()
+      expect(events.serve.servedAppPreview).not.toBeCalled()
+    })
+
+    it("should ping from app preview", async () => {
+      await request
+        .post("/api/bbtel/ping")
+        .send({source: "app", timezone})
+        .set(config.defaultHeaders())
+        .expect(200)
+
+      expect(events.serve.servedAppPreview).toBeCalledTimes(1)
+      expect(events.serve.servedAppPreview).toBeCalledWith(config.getApp(), timezone)
+      expect(events.serve.servedApp).not.toBeCalled()
+    })
+
+    it("should ping from app", async () => {
+      const headers = config.defaultHeaders()
+      headers[constants.Headers.APP_ID] = config.prodAppId
+
+      await request
+        .post("/api/bbtel/ping")
+        .send({source: "app", timezone})
+        .set(headers)
+        .expect(200)
+
+      expect(events.serve.servedApp).toBeCalledTimes(1)
+      expect(events.serve.servedApp).toBeCalledWith(config.getProdApp(), timezone)
+      expect(events.serve.servedAppPreview).not.toBeCalled()
+    })
+  })
+})

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

@@ -36,7 +36,6 @@ describe("/static", () => {
         .expect(200)
 
       expect(res.text).toContain("<title>Budibase</title>")
-      expect(events.serve.servedBuilder).toBeCalledTimes(1)
     })
   })
 
@@ -56,9 +55,6 @@ describe("/static", () => {
         .expect(200)
 
       expect(res.body.appId).toBe(config.prodAppId)
-      expect(events.serve.servedApp).toBeCalledTimes(1)
-      expect(events.serve.servedApp).toBeCalledWith(res.body)
-      expect(events.serve.servedAppPreview).not.toBeCalled()
     })
 
     it("should serve the app by url", async () => {
@@ -71,9 +67,6 @@ describe("/static", () => {
         .expect(200)
 
       expect(res.body.appId).toBe(config.prodAppId)
-      expect(events.serve.servedApp).toBeCalledTimes(1)
-      expect(events.serve.servedApp).toBeCalledWith(res.body)
-      expect(events.serve.servedAppPreview).not.toBeCalled()
     })
 
     it("should serve the app preview by id", async () => {
@@ -83,9 +76,6 @@ describe("/static", () => {
         .expect(200)
 
       expect(res.body.appId).toBe(config.appId)
-      expect(events.serve.servedAppPreview).toBeCalledTimes(1)
-      expect(events.serve.servedAppPreview).toBeCalledWith(res.body)
-      expect(events.serve.servedApp).not.toBeCalled()
     })
   })
 

package/src/automations/logging/index.ts

@@ -23,9 +23,6 @@ export async function checkAppMetadata(apps: App[]) {
     for (let [key, errors] of Object.entries(metadata.automationErrors)) {
       const updated = []
       for (let error of errors) {
-        if (!error) {
-          continue
-        }
         const startDate = error.split(dbUtils.SEPARATOR)[2]
         if (startDate > maxStartDate) {
           updated.push(error)

package/src/integrations/airtable.ts

@@ -64,6 +64,11 @@ module AirtableModule {
         customisable: true,
         fields: {
           id: {
+            display: "Record ID",
+            type: DatasourceFieldTypes.STRING,
+            required: true,
+          },
+          table: {
             type: DatasourceFieldTypes.STRING,
             required: true,
           },

package/src/integrations/base/sql.ts

@@ -10,7 +10,6 @@ import {
 import { isIsoDateString, SqlClients } from "../utils"
 import SqlTableQueryBuilder from "./sqlTable"
 import environment from "../../environment"
-import { removeKeyNumbering } from "./utils"
 
 const envLimit = environment.SQL_MAX_ROWS
   ? parseInt(environment.SQL_MAX_ROWS)
@@ -134,13 +133,12 @@ class InternalBuilder {
       fn: (key: string, value: any) => void
     ) {
       for (let [key, value] of Object.entries(structure)) {
-        const updatedKey = removeKeyNumbering(key)
-        const isRelationshipField = updatedKey.includes(".")
+        const isRelationshipField = key.includes(".")
         if (!opts.relationship && !isRelationshipField) {
-          fn(`${opts.tableName}.${updatedKey}`, value)
+          fn(`${opts.tableName}.${key}`, value)
         }
         if (opts.relationship && isRelationshipField) {
-          fn(updatedKey, value)
+          fn(key, value)
         }
       }
     }
@@ -584,3 +582,4 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
 }
 
 export default SqlQueryBuilder
+module.exports = SqlQueryBuilder

package/src/integrations/base/utils.ts

@@ -1,12 +1,22 @@
-const QUERY_START_REGEX = /\d[0-9]*:/g
+import { QueryJson } from "../../definitions/datasource"
+import { Datasource } from "../../definitions/common"
 
-export function removeKeyNumbering(key: any): string {
-  if (typeof key === "string" && key.match(QUERY_START_REGEX) != null) {
-    const parts = key.split(":")
-    // remove the number
-    parts.shift()
-    return parts.join(":")
-  } else {
-    return key
+module DatasourceUtils {
+  const { integrations } = require("../index")
+
+  export async function makeExternalQuery(
+    datasource: Datasource,
+    json: QueryJson
+  ) {
+    const Integration = integrations[datasource.source]
+    // query is the opinionated function
+    if (Integration.prototype.query) {
+      const integration = new Integration(datasource.config)
+      return integration.query(json)
+    } else {
+      throw "Datasource does not support query."
+    }
   }
+
+  module.exports.makeExternalQuery = makeExternalQuery
 }

package/src/integrations/microsoftSqlServer.ts

@@ -15,10 +15,10 @@ import {
 } from "./utils"
 import { DatasourcePlus } from "./base/datasourcePlus"
 import { Table, TableSchema } from "../definitions/common"
-import Sql from "./base/sql"
 
 module MSSQLModule {
   const sqlServer = require("mssql")
+  const Sql = require("./base/sql")
   const DEFAULT_SCHEMA = "dbo"
 
   interface MSSQLConfig {
@@ -96,8 +96,7 @@ module MSSQLModule {
   class SqlServerIntegration extends Sql implements DatasourcePlus {
     private readonly config: MSSQLConfig
     private index: number = 0
-    private readonly pool: any
-    private client: any
+    static pool: any
     public tables: Record<string, Table> = {}
     public schemaErrors: Record<string, string> = {}
 

package/src/integrations/mysql.ts

@@ -16,10 +16,10 @@ import {
 import { DatasourcePlus } from "./base/datasourcePlus"
 import dayjs from "dayjs"
 const { NUMBER_REGEX } = require("../utilities")
-import Sql from "./base/sql"
 
 module MySQLModule {
   const mysql = require("mysql2/promise")
+  const Sql = require("./base/sql")
 
   interface MySQLConfig {
     host: string

package/src/integrations/postgres.ts

@@ -14,10 +14,10 @@ import {
   SqlClients,
 } from "./utils"
 import { DatasourcePlus } from "./base/datasourcePlus"
-import Sql from "./base/sql"
 
 module PostgresModule {
   const { Client, types } = require("pg")
+  const Sql = require("./base/sql")
   const { escapeDangerousCharacters } = require("../utilities")
 
   // Return "date" and "timestamp" types as plain strings.
@@ -117,7 +117,6 @@ module PostgresModule {
     private readonly client: any
     private readonly config: PostgresConfig
     private index: number = 1
-    private open: boolean
     public tables: Record<string, Table> = {}
     public schemaErrors: Record<string, string> = {}
 

package/src/integrations/queries/sql.ts

@@ -1,4 +1,5 @@
 import { findHBSBlocks, processStringSync } from "@budibase/string-templates"
+import { Integration } from "../../definitions/datasource"
 import { DatasourcePlus } from "../base/datasourcePlus"
 
 const CONST_CHAR_REGEX = new RegExp("'[^']*'", "g")

package/src/integrations/tests/airtable.spec.js

@@ -48,7 +48,7 @@ describe("Airtable Integration", () => {
 
   it("calls the update method with the correct params", async () => {
     const response = await config.integration.update({
-      table: "test",
+      table: "table",
       id: "123",
       json: {
         name: "test"

package/src/integrations/tests/sql.spec.js

@@ -1,4 +1,4 @@
-const Sql = require("../base/sql").default
+const Sql = require("../base/sql")
 const { SqlClients } = require("../utils")
 
 const TABLE_NAME = "test"

package/src/tests/utilities/TestConfiguration.js

@@ -25,6 +25,7 @@ const newid = require("../../db/newid")
 const context = require("@budibase/backend-core/context")
 const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db")
 const { encrypt } = require("@budibase/backend-core/encryption")
+const { DocumentTypes } = require("../../db/utils")
 
 const GLOBAL_USER_ID = "us_uuid1"
 const EMAIL = "babs@babs.com"
@@ -53,6 +54,10 @@ class TestConfiguration {
     return this.app
   }
 
+  getProdApp() {
+    return this.prodApp
+  }
+
   getAppId() {
     return this.appId
   }
@@ -106,19 +111,11 @@ class TestConfiguration {
 
   // UTILS
 
-  async _req(body, params, controlFunc, opts = { prodApp: false }) {
+  async _req(body, params, controlFunc) {
     // create a fake request ctx
     const request = {}
-
-    // set the app id
-    let appId
-    if (opts.prodApp) {
-      appId = this.prodAppId
-    } else {
-      appId = this.appId
-    }
+    const appId = this.appId
     request.appId = appId
-
     // fake cookies, we don't need them
     request.cookies = { set: () => {}, get: () => {} }
     request.config = { jwtSecret: env.JWT_SECRET }
@@ -344,14 +341,10 @@ class TestConfiguration {
     await this._req(null, null, controllers.deploy.deployApp)
     const prodAppId = this.getAppId().replace("_dev", "")
     this.prodAppId = prodAppId
+
     return context.doInAppContext(prodAppId, async () => {
-      const appPackage = await this._req(
-        null,
-        { appId: prodAppId },
-        controllers.app.fetchAppPackage,
-        { prodApp: true }
-      )
-      return appPackage.application
+      const db = context.getProdAppDB()
+      return await db.get(DocumentTypes.APP_METADATA)
     })
   }