@budibase/server 1.2.28-alpha.0 → 1.2.30

package/dist/api/controllers/analytics.js

@@ -9,8 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEnabled = void 0;
+exports.ping = exports.isEnabled = void 0;
 const backend_core_1 = require("@budibase/backend-core");
+const types_1 = require("@budibase/types");
+const utils_1 = require("../../db/utils");
+const backend_core_2 = require("@budibase/backend-core");
 const isEnabled = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const enabled = yield backend_core_1.events.analytics.enabled();
     ctx.body = {
@@ -18,3 +21,26 @@ const isEnabled = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     };
 });
 exports.isEnabled = isEnabled;
+const ping = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const body = ctx.request.body;
+    switch (body.source) {
+        case types_1.PingSource.APP: {
+            const db = backend_core_2.context.getAppDB({ skip_setup: true });
+            const appInfo = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+            let appId = backend_core_2.context.getAppId();
+            if ((0, utils_1.isDevAppID)(appId)) {
+                yield backend_core_1.events.serve.servedAppPreview(appInfo, body.timezone);
+            }
+            else {
+                yield backend_core_1.events.serve.servedApp(appInfo, body.timezone);
+            }
+            break;
+        }
+        case types_1.PingSource.BUILDER: {
+            yield backend_core_1.events.serve.servedBuilder(body.timezone);
+            break;
+        }
+    }
+    ctx.status = 200;
+});
+exports.ping = ping;

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

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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");
@@ -170,8 +169,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,
                 });
@@ -283,8 +280,6 @@ class QueryBuilder {
         });
     }
 }
-// exported for unit testing
-exports.QueryBuilder = QueryBuilder;
 /**
  * Executes a lucene search query.
  * @param url The query URL

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

@@ -13,9 +13,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) {
         return new Date(value).getTime();
@@ -25,7 +24,6 @@ validateJs.extend(validateJs.validators.datetime, {
         return new Date(value).toISOString();
     },
 });
-exports.removeKeyNumbering = removeKeyNumbering;
 exports.getDatasourceAndQuery = (json) => __awaiter(void 0, void 0, void 0, function* () {
     const datasourceId = json.endpoint.datasourceId;
     const db = getAppDB();

package/dist/api/controllers/static/index.js

@@ -21,11 +21,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");
-const backend_core_1 = require("@budibase/backend-core");
 const fs = require("fs");
 const { downloadTarballDirect, } = require("../../../utilities/fileSystem/utilities");
 function prepareUpload({ s3Key, bucket, metadata, file }) {
@@ -74,9 +73,6 @@ const serveBuilder = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const builderPath = resolve(TOP_LEVEL_PATH, "builder");
         yield send(ctx, ctx.file, { root: builderPath });
-        if (ctx.file === "index.html") {
-            yield backend_core_1.events.serve.servedBuilder();
-        }
     });
 };
 exports.serveBuilder = serveBuilder;
@@ -124,12 +120,6 @@ const serveApp = function (ctx) {
             // just return the app info for jest to assert on
             ctx.body = appInfo;
         }
-        if (isDevAppID(appInfo.appId)) {
-            yield backend_core_1.events.serve.servedAppPreview(appInfo);
-        }
-        else {
-            yield backend_core_1.events.serve.servedApp(appInfo);
-        }
     });
 };
 exports.serveApp = serveApp;

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { buildExternalTableId, breakExternalTableId, } = require("../../../integrations/utils");
 const { getTable, generateForeignKey, generateJunctionTableName, foreignKeyStructure, hasTypeChanged, } = require("./utils");
 const { DataSourceOperation, 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/dist/api/routes/analytics.js

@@ -3,4 +3,5 @@ const Router = require("@koa/router");
 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/dist/automations/logging/index.js

@@ -56,9 +56,6 @@ function checkAppMetadata(apps) {
             for (let [key, errors] of Object.entries(metadata.automationErrors)) {
                 const updated = [];
                 for (let error of errors) {
-                    if (!error) {
-                        continue;
-                    }
                     const startDate = error.split(backend_core_1.db.SEPARATOR)[2];
                     if (startDate > maxStartDate) {
                         updated.push(error);

package/dist/integrations/airtable.js

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

package/dist/integrations/base/sql.js

@@ -17,7 +17,6 @@ const datasource_1 = require("../../definitions/datasource");
 const utils_1 = require("../utils");
 const sqlTable_1 = __importDefault(require("./sqlTable"));
 const environment_1 = __importDefault(require("../../environment"));
-const utils_2 = require("./utils");
 const envLimit = environment_1.default.SQL_MAX_ROWS
     ? parseInt(environment_1.default.SQL_MAX_ROWS)
     : null;
@@ -117,13 +116,12 @@ class InternalBuilder {
     addFilters(query, filters, opts) {
         function iterate(structure, fn) {
             for (let [key, value] of Object.entries(structure)) {
-                const updatedKey = (0, utils_2.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);
                 }
             }
         }
@@ -550,3 +548,4 @@ class SqlQueryBuilder extends sqlTable_1.default {
     }
 }
 exports.default = SqlQueryBuilder;
+module.exports = SqlQueryBuilder;

package/dist/integrations/base/utils.js

@@ -1,16 +1,30 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeKeyNumbering = void 0;
-const QUERY_START_REGEX = /\d[0-9]*:/g;
-function removeKeyNumbering(key) {
-    if (typeof key === "string" && key.match(QUERY_START_REGEX) != null) {
-        const parts = key.split(":");
-        // remove the number
-        parts.shift();
-        return parts.join(":");
+var DatasourceUtils;
+(function (DatasourceUtils) {
+    const { integrations } = require("../index");
+    function makeExternalQuery(datasource, json) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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.";
+            }
+        });
     }
-    else {
-        return key;
-    }
-}
-exports.removeKeyNumbering = removeKeyNumbering;
+    DatasourceUtils.makeExternalQuery = makeExternalQuery;
+    module.exports.makeExternalQuery = makeExternalQuery;
+})(DatasourceUtils || (DatasourceUtils = {}));

package/dist/integrations/microsoftSqlServer.js

@@ -8,16 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const datasource_1 = require("../definitions/datasource");
 const utils_1 = require("./utils");
-const sql_1 = __importDefault(require("./base/sql"));
 var MSSQLModule;
 (function (MSSQLModule) {
     const sqlServer = require("mssql");
+    const Sql = require("./base/sql");
     const DEFAULT_SCHEMA = "dbo";
     const SCHEMA = {
         docs: "https://github.com/tediousjs/node-mssql",
@@ -72,7 +69,7 @@ var MSSQLModule;
             },
         },
     };
-    class SqlServerIntegration extends sql_1.default {
+    class SqlServerIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClients.MS_SQL);
             this.index = 0;

package/dist/integrations/mysql.js

@@ -16,10 +16,10 @@ const datasource_1 = require("../definitions/datasource");
 const utils_1 = require("./utils");
 const dayjs_1 = __importDefault(require("dayjs"));
 const { NUMBER_REGEX } = require("../utilities");
-const sql_1 = __importDefault(require("./base/sql"));
 var MySQLModule;
 (function (MySQLModule) {
     const mysql = require("mysql2/promise");
+    const Sql = require("./base/sql");
     const SCHEMA = {
         docs: "https://github.com/sidorares/node-mysql2",
         plus: true,
@@ -96,7 +96,7 @@ var MySQLModule;
         }
         return bindings;
     }
-    class MySQLIntegration extends sql_1.default {
+    class MySQLIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClients.MY_SQL);
             this.tables = {};

package/dist/integrations/postgres.js

@@ -8,16 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const datasource_1 = require("../definitions/datasource");
 const utils_1 = require("./utils");
-const sql_1 = __importDefault(require("./base/sql"));
 var PostgresModule;
 (function (PostgresModule) {
     const { Client, types } = require("pg");
+    const Sql = require("./base/sql");
     const { escapeDangerousCharacters } = require("../utilities");
     // Return "date" and "timestamp" types as plain strings.
     // This lets us reference the original stored timezone.
@@ -96,7 +93,7 @@ var PostgresModule;
             },
         },
     };
-    class PostgresIntegration extends sql_1.default {
+    class PostgresIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClients.POSTGRES);
             this.index = 1;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.2.27",
+    "version": "1.2.29",
     "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.27",
-        "@budibase/client": "^1.2.27",
-        "@budibase/pro": "1.2.27",
-        "@budibase/string-templates": "^1.2.27",
-        "@budibase/types": "^1.2.27",
+        "@budibase/backend-core": "^1.2.29",
+        "@budibase/client": "^1.2.29",
+        "@budibase/pro": "1.2.29",
+        "@budibase/string-templates": "^1.2.29",
+        "@budibase/types": "^1.2.29",
         "@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",

package/dist/tests/utilities/TestConfiguration.js

@@ -24,6 +24,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";
 const FIRSTNAME = "Barbara";
@@ -47,6 +48,9 @@ class TestConfiguration {
     getApp() {
         return this.app;
     }
+    getProdApp() {
+        return this.prodApp;
+    }
     getAppId() {
         return this.appId;
     }
@@ -97,18 +101,11 @@ class TestConfiguration {
         cleanup(this.allApps.map(app => app.appId));
     }
     // UTILS
-    _req(body, params, controlFunc, opts = { prodApp: false }) {
+    _req(body, params, controlFunc) {
         return __awaiter(this, void 0, void 0, function* () {
             // 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: () => { } };
@@ -300,8 +297,8 @@ class TestConfiguration {
             const prodAppId = this.getAppId().replace("_dev", "");
             this.prodAppId = prodAppId;
             return context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
-                const appPackage = yield this._req(null, { appId: prodAppId }, controllers.app.fetchAppPackage, { prodApp: true });
-                return appPackage.application;
+                const db = context.getProdAppDB();
+                return yield db.get(DocumentTypes.APP_METADATA);
             }));
         });
     }