@budibase/server 2.0.32 → 2.0.34-alpha.0

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

@@ -12,15 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableSaveFunctions = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.getTable = exports.getExternalTable = exports.getAllExternalTables = exports.getAllInternalTables = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
+exports.TableSaveFunctions = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
 const csvParser_1 = require("../../../utilities/csvParser");
 const utils_1 = require("../../../db/utils");
 const lodash_1 = require("lodash");
 const constants_1 = require("../../../constants");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const constants_2 = require("../../../constants");
-const utils_2 = require("../../../integrations/utils");
-const utils_3 = require("../view/utils");
+const utils_2 = require("../view/utils");
 const viewBuilder_1 = __importDefault(require("../view/viewBuilder"));
 const { getAppDB } = require("@budibase/backend-core/context");
 const fp_1 = require("lodash/fp");
@@ -130,7 +129,9 @@ function handleDataImport(user, table, dataImport) {
             }
             finalData.push(row);
         }
-        yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData));
+        yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
+            tableId: table._id,
+        });
         yield backend_core_1.events.rows.imported(table, "csv", finalData.length);
         return table;
     });
@@ -228,52 +229,9 @@ class TableSaveFunctions {
         return this.rows;
     }
 }
-function getAllInternalTables() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
-            include_docs: true,
-        }));
-        return internalTables.rows.map((tableDoc) => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: utils_1.BudibaseInternalDB._id })));
-    });
-}
-exports.getAllInternalTables = getAllInternalTables;
-function getAllExternalTables(datasourceId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        const datasource = yield db.get(datasourceId);
-        if (!datasource || !datasource.entities) {
-            throw "Datasource is not configured fully.";
-        }
-        return datasource.entities;
-    });
-}
-exports.getAllExternalTables = getAllExternalTables;
-function getExternalTable(datasourceId, tableName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const entities = yield getAllExternalTables(datasourceId);
-        return entities[tableName];
-    });
-}
-exports.getExternalTable = getExternalTable;
-function getTable(tableId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        if ((0, utils_2.isExternalTable)(tableId)) {
-            let { datasourceId, tableName } = (0, utils_2.breakExternalTableId)(tableId);
-            const datasource = yield db.get(datasourceId);
-            const table = yield getExternalTable(datasourceId, tableName);
-            return Object.assign(Object.assign({}, table), { sql: (0, utils_2.isSQL)(datasource) });
-        }
-        else {
-            return db.get(tableId);
-        }
-    });
-}
-exports.getTable = getTable;
 function checkForViewUpdates(table, rename, deletedColumns) {
     return __awaiter(this, void 0, void 0, function* () {
-        const views = yield (0, utils_3.getViews)();
+        const views = yield (0, utils_2.getViews)();
         const tableViews = views.filter(view => view.meta.tableId === table._id);
         // Check each table view to see if impacted by this table action
         for (let view of tableViews) {
@@ -329,7 +287,7 @@ function checkForViewUpdates(table, rename, deletedColumns) {
             // Update view if required
             if (needsUpdated) {
                 const newViewTemplate = (0, viewBuilder_1.default)(view.meta);
-                yield (0, utils_3.saveView)(null, view.name, newViewTemplate);
+                yield (0, utils_2.saveView)(null, view.name, newViewTemplate);
                 if (!newViewTemplate.meta.schema) {
                     newViewTemplate.meta.schema = table.schema;
                 }

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

@@ -24,12 +24,12 @@ const { apiFileReturn } = require("../../../utilities/fileSystem");
 const exporters = require("./exporters");
 const { saveView, getView, getViews, deleteView } = require("./utils");
 const { fetchView } = require("../row");
-const { getTable } = require("../table/utils");
 const { FieldTypes } = require("../../../constants");
 const { getAppDB } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
 const { DocumentType } = require("../../../db/utils");
 const { cloneDeep, isEqual } = require("lodash");
+const sdk = require("../../../sdk");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = yield getViews();
 });
@@ -137,7 +137,7 @@ exports.exportView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     let rows = ctx.body;
     let schema = view && view.meta && view.meta.schema;
     const tableId = ctx.params.tableId || view.meta.tableId;
-    const table = yield getTable(tableId);
+    const table = yield sdk.tables.getTable(tableId);
     if (!schema) {
         schema = table.schema;
     }

package/dist/api/routes/backup.js

@@ -1,8 +1,35 @@
 "use strict";
-const Router = require("@koa/router");
-const controller = require("../controllers/backup");
-const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = new Router();
-router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump);
-module.exports = router;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const router_1 = __importDefault(require("@koa/router"));
+const controller = __importStar(require("../controllers/backup"));
+const authorized_1 = __importDefault(require("../../middleware/authorized"));
+const permissions_1 = require("@budibase/backend-core/permissions");
+const router = new router_1.default();
+router.get("/api/backups/export", (0, authorized_1.default)(permissions_1.BUILDER), controller.exportAppDump);
+exports.default = router;

package/dist/api/routes/index.js

@@ -31,11 +31,16 @@ const dev_1 = __importDefault(require("./dev"));
 const cloud_1 = __importDefault(require("./cloud"));
 const migrations_1 = __importDefault(require("./migrations"));
 const plugin_1 = __importDefault(require("./plugin"));
+const pro_1 = require("@budibase/pro");
 var static_1 = require("./static");
 Object.defineProperty(exports, "staticRoutes", { enumerable: true, get: function () { return __importDefault(static_1).default; } });
 var public_1 = require("./public");
 Object.defineProperty(exports, "publicRoutes", { enumerable: true, get: function () { return __importDefault(public_1).default; } });
+const appBackupRoutes = pro_1.api.appBackups;
+const scheduleRoutes = pro_1.api.schedules;
 exports.mainRoutes = [
+    appBackupRoutes,
+    backup_1.default,
     auth_1.default,
     deploy_1.default,
     layout_1.default,
@@ -55,14 +60,14 @@ exports.mainRoutes = [
     permission_1.default,
     datasource_1.default,
     query_1.default,
-    backup_1.default,
     metadata_1.default,
     dev_1.default,
     cloud_1.default,
-    // these need to be handled last as they still use /api/:tableId
-    // this could be breaking as koa may recognise other routes as this
-    table_1.default,
     row_1.default,
     migrations_1.default,
     plugin_1.default,
+    scheduleRoutes,
+    // these need to be handled last as they still use /api/:tableId
+    // this could be breaking as koa may recognise other routes as this
+    table_1.default,
 ];

package/dist/app.js

@@ -67,6 +67,8 @@ const backend_core_1 = require("@budibase/backend-core");
 const workerRequests_1 = require("./utilities/workerRequests");
 const watch_1 = require("./watch");
 const websocket_1 = require("./websocket");
+const sdk_1 = __importDefault(require("./sdk"));
+const pro = __importStar(require("@budibase/pro"));
 const app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -118,6 +120,17 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
         process.exit(errCode);
     }
 }));
+const initPro = () => __awaiter(void 0, void 0, void 0, function* () {
+    yield pro.init({
+        backups: {
+            processing: {
+                exportAppFn: sdk_1.default.backups.exportApp,
+                importAppFn: sdk_1.default.backups.importApp,
+                statsFn: sdk_1.default.backups.calculateBackupStats,
+            },
+        },
+    });
+});
 module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     console.log(`Budibase running on ${JSON.stringify(server.address())}`);
@@ -125,6 +138,7 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
     eventEmitter.emitPort(env.PORT);
     fileSystem.init();
     yield redis_1.default.init();
+    yield initPro();
     // run migrations on startup if not done via http
     // not recommended in a clustered environment
     if (!env.HTTP_MIGRATIONS && !env.isTest()) {

package/dist/automations/automationUtils.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getTable } = require("../api/controllers/table/utils");
 const { findHBSBlocks, decodeJSBinding, isJSBinding, encodeJSBinding, } = require("@budibase/string-templates");
+const sdk = require("../sdk");
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -67,7 +67,7 @@ exports.cleanInputValues = (inputs, schema) => {
  * @returns {Promise<Object>} The cleaned up rows object, will should now have all the required primitive types.
  */
 exports.cleanUpRow = (tableId, row) => __awaiter(void 0, void 0, void 0, function* () {
-    let table = yield getTable(tableId);
+    let table = yield sdk.tables.getTable(tableId);
     return exports.cleanInputValues(row, { properties: table.schema });
 });
 exports.getError = err => {

package/dist/automations/bullboard.js

@@ -11,34 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { createBullBoard } = require("@bull-board/api");
 const { BullAdapter } = require("@bull-board/api/bullAdapter");
 const { KoaAdapter } = require("@bull-board/koa");
-const env = require("../environment");
-const Queue = env.isTest()
-    ? require("../utilities/queue/inMemoryQueue")
-    : require("bull");
-const { JobQueues } = require("../constants");
-const { utils } = require("@budibase/backend-core/redis");
-const { opts, redisProtocolUrl } = utils.getRedisOptions();
-const listeners = require("./listeners");
-const CLEANUP_PERIOD_MS = 60 * 1000;
-const queueConfig = redisProtocolUrl || { redis: opts };
-let cleanupInternal = null;
-let automationQueue = new Queue(JobQueues.AUTOMATIONS, queueConfig);
-listeners.addListeners(automationQueue);
-function cleanup() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield automationQueue.clean(CLEANUP_PERIOD_MS, "completed");
-    });
-}
+const { queue } = require("@budibase/backend-core");
+const automation = require("../threads/automation");
+let automationQueue = queue.createQueue(queue.JobQueue.AUTOMATION, automation.removeStalled);
 const PATH_PREFIX = "/bulladmin";
 exports.init = () => {
-    // cleanup the events every 5 minutes
-    if (!cleanupInternal) {
-        cleanupInternal = setInterval(cleanup, CLEANUP_PERIOD_MS);
-        // fire off an initial cleanup
-        cleanup().catch(err => {
-            console.error(`Unable to cleanup automation queue initially - ${err}`);
-        });
-    }
     // Set up queues for bull board admin
     const queues = [automationQueue];
     const adapters = [];
@@ -54,11 +31,6 @@ exports.init = () => {
     return serverAdapter.registerPlugin();
 };
 exports.shutdown = () => __awaiter(void 0, void 0, void 0, function* () {
-    if (automationQueue) {
-        clearInterval(cleanupInternal);
-        yield automationQueue.close();
-        automationQueue = null;
-    }
-    console.log("Bull shutdown");
+    yield queue.shutdown();
 });
-exports.queue = automationQueue;
+exports.automationQueue = automationQueue;

package/dist/automations/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { processEvent } = require("./utils");
-const { queue, shutdown } = require("./bullboard");
+const { automationQueue, shutdown } = require("./bullboard");
 const { TRIGGER_DEFINITIONS, rebootTrigger } = require("./triggers");
 const { ACTION_DEFINITIONS } = require("./actions");
 /**
@@ -18,7 +18,7 @@ const { ACTION_DEFINITIONS } = require("./actions");
 exports.init = function () {
     return __awaiter(this, void 0, void 0, function* () {
         // this promise will not complete
-        const promise = queue.process((job) => __awaiter(this, void 0, void 0, function* () {
+        const promise = automationQueue.process((job) => __awaiter(this, void 0, void 0, function* () {
             yield processEvent(job);
         }));
         // on init we need to trigger any reboot automations
@@ -27,11 +27,11 @@ exports.init = function () {
     });
 };
 exports.getQueues = () => {
-    return [queue];
+    return [automationQueue];
 };
 exports.shutdown = () => {
     return shutdown();
 };
-exports.queue = queue;
+exports.automationQueue = automationQueue;
 exports.TRIGGER_DEFINITIONS = TRIGGER_DEFINITIONS;
 exports.ACTION_DEFINITIONS = ACTION_DEFINITIONS;

package/dist/automations/steps/updateRow.js

@@ -74,9 +74,9 @@ exports.run = function ({ inputs, appId, emitter }) {
             };
         }
         const tableId = inputs.row.tableId;
-        // clear any falsy properties so that they aren't updated
+        // clear any undefined, null or empty string properties so that they aren't updated
         for (let propKey of Object.keys(inputs.row)) {
-            if (!inputs.row[propKey] || inputs.row[propKey] === "") {
+            if (inputs.row[propKey] == null || inputs.row[propKey] === "") {
                 delete inputs.row[propKey];
             }
         }

package/dist/automations/triggers.js

@@ -14,7 +14,7 @@ const { coerce } = require("../utilities/rowProcessor");
 const { definitions } = require("./triggerInfo");
 const { isDevAppID } = require("../db/utils");
 // need this to call directly, so we can get a response
-const { queue } = require("./bullboard");
+const { automationQueue } = require("./bullboard");
 const { checkTestFlag } = require("../utilities/redis");
 const utils = require("./utils");
 const env = require("../environment");
@@ -57,7 +57,7 @@ function queueRelevantRowAutomations(event, eventType) {
                 }
                 if (automationTrigger.inputs &&
                     automationTrigger.inputs.tableId === event.row.tableId) {
-                    yield queue.add({ automation, event }, JOB_OPTS);
+                    yield automationQueue.add({ automation, event }, JOB_OPTS);
                 }
             }
         }));
@@ -110,7 +110,7 @@ exports.externalTrigger = function (automation, params, { getResponses } = {}) {
             return utils.processEvent({ data });
         }
         else {
-            return queue.add(data, JOB_OPTS);
+            return automationQueue.add(data, JOB_OPTS);
         }
     });
 };
@@ -136,7 +136,7 @@ exports.rebootTrigger = () => __awaiter(void 0, void 0, void 0, function* () {
                             timestamp: Date.now(),
                         },
                     };
-                    rebootEvents.push(queue.add(job, JOB_OPTS));
+                    rebootEvents.push(automationQueue.add(job, JOB_OPTS));
                 }
             }
             yield Promise.all(rebootEvents);

package/dist/automations/utils.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isErrorInOutput = exports.isRecurring = exports.cleanupAutomations = exports.checkForWebhooks = exports.enableCronTrigger = exports.isRebootTrigger = exports.isCronTrigger = exports.clearMetadata = exports.disableCron = exports.disableAllCrons = exports.removeDeprecated = exports.updateTestHistory = exports.processEvent = void 0;
+exports.isErrorInOutput = exports.isRecurring = exports.cleanupAutomations = exports.checkForWebhooks = exports.enableCronTrigger = exports.isRebootTrigger = exports.isCronTrigger = exports.clearMetadata = exports.disableCronById = exports.disableAllCrons = exports.removeDeprecated = exports.updateTestHistory = exports.processEvent = void 0;
 const threads_1 = require("../threads");
 const triggerInfo_1 = require("./triggerInfo");
 const webhooks = __importStar(require("../api/controllers/webhook"));
@@ -59,12 +59,14 @@ const jobMessage = (job, message) => {
 function processEvent(job) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            const automationId = job.data.automation._id;
             console.log(jobMessage(job, "running"));
             // need to actually await these so that an error can be captured properly
-            const tenantId = backend_core_1.tenancy.getTenantIDFromAppID(job.data.event.appId);
-            return yield backend_core_1.tenancy.doInTenant(tenantId, () => __awaiter(this, void 0, void 0, function* () {
+            return yield backend_core_1.context.doInContext(job.data.event.appId, () => __awaiter(this, void 0, void 0, function* () {
                 const runFn = () => Runner.run(job);
-                return pro_1.quotas.addAutomation(runFn);
+                return pro_1.quotas.addAutomation(runFn, {
+                    automationId,
+                });
             }));
         }
         catch (err) {
@@ -106,12 +108,12 @@ exports.removeDeprecated = removeDeprecated;
 function disableAllCrons(appId) {
     return __awaiter(this, void 0, void 0, function* () {
         const promises = [];
-        const jobs = yield bullboard_1.queue.getRepeatableJobs();
+        const jobs = yield bullboard_1.automationQueue.getRepeatableJobs();
         for (let job of jobs) {
             if (job.key.includes(`${appId}_cron`)) {
-                promises.push(bullboard_1.queue.removeRepeatableByKey(job.key));
+                promises.push(bullboard_1.automationQueue.removeRepeatableByKey(job.key));
                 if (job.id) {
-                    promises.push(bullboard_1.queue.removeJobs(job.id));
+                    promises.push(bullboard_1.automationQueue.removeJobs(job.id));
                 }
             }
         }
@@ -119,14 +121,18 @@ function disableAllCrons(appId) {
     });
 }
 exports.disableAllCrons = disableAllCrons;
-function disableCron(jobId, jobKey) {
+function disableCronById(jobId) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield bullboard_1.queue.removeRepeatableByKey(jobKey);
-        yield bullboard_1.queue.removeJobs(jobId);
+        const repeatJobs = yield bullboard_1.automationQueue.getRepeatableJobs();
+        for (let repeatJob of repeatJobs) {
+            if (repeatJob.id === jobId) {
+                yield bullboard_1.automationQueue.removeRepeatableByKey(repeatJob.key);
+            }
+        }
         console.log(`jobId=${jobId} disabled`);
     });
 }
-exports.disableCron = disableCron;
+exports.disableCronById = disableCronById;
 function clearMetadata() {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, context_1.getProdAppDB)();
@@ -165,7 +171,7 @@ function enableCronTrigger(appId, automation) {
             (trigger === null || trigger === void 0 ? void 0 : trigger.inputs.cron)) {
             // make a job id rather than letting Bull decide, makes it easier to handle on way out
             const jobId = `${appId}_cron_${(0, newid_1.default)()}`;
-            const job = yield bullboard_1.queue.add({
+            const job = yield bullboard_1.automationQueue.add({
                 automation,
                 event: { appId, timestamp: Date.now() },
             }, { repeat: { cron: trigger.inputs.cron }, jobId });

package/dist/constants/index.js

@@ -1,10 +1,7 @@
 "use strict";
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { UserStatus } = require("@budibase/backend-core/constants");
-const { ObjectStoreBuckets } = require("@budibase/backend-core/objectStore");
-exports.JobQueues = {
-    AUTOMATIONS: "automationQueue",
-};
+const { objectStore } = require("@budibase/backend-core");
 const FilterTypes = {
     STRING: "string",
     FUZZY: "fuzzy",
@@ -28,6 +25,7 @@ exports.NoEmptyFilterStrings = [
 ];
 exports.FieldTypes = {
     STRING: "string",
+    BARCODEQR: "barcodeqr",
     LONGFORM: "longform",
     OPTIONS: "options",
     NUMBER: "number",
@@ -47,6 +45,7 @@ exports.CanSwitchTypes = [
         exports.FieldTypes.STRING,
         exports.FieldTypes.OPTIONS,
         exports.FieldTypes.LONGFORM,
+        exports.FieldTypes.BARCODEQR,
     ],
     [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
 ];
@@ -186,5 +185,5 @@ exports.AutomationErrors = {
     FAILURE_CONDITION: "FAILURE_CONDITION_MET",
 };
 // pass through the list from the auth/core lib
-exports.ObjectStoreBuckets = ObjectStoreBuckets;
+exports.ObjectStoreBuckets = objectStore.ObjectStoreBuckets;
 exports.MAX_AUTOMATION_RECURRING_ERRORS = 5;

package/dist/db/utils.js

@@ -1,16 +1,13 @@
 "use strict";
 const newid = require("./newid");
-const { DocumentType: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, getQueryIndex, ViewName, } = require("@budibase/backend-core/db");
+const { DocumentType: CoreDocType, InternalTable, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, getQueryIndex, ViewName, getDocParams, getRowParams, generateRowID, getUserMetadataParams, generateUserMetadataID, getGlobalIDFromUserMetadataID, } = require("@budibase/backend-core/db");
 const UNICODE_MAX = "\ufff0";
 const AppStatus = {
     DEV: "development",
     ALL: "all",
     DEPLOYED: "published",
 };
-const DocumentType = Object.assign(Object.assign({}, CoreDocTypes), { TABLE: "ta", ROW: "ro", USER: "us", AUTOMATION: "au", LINK: "li", WEBHOOK: "wh", INSTANCE: "inst", LAYOUT: "layout", SCREEN: "screen", DATASOURCE: "datasource", DATASOURCE_PLUS: "datasource_plus", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag", AUTOMATION_METADATA: "meta_au" });
-const InternalTables = {
-    USER_METADATA: "ta_users",
-};
+const DocumentType = CoreDocType;
 const SearchIndexes = {
     ROWS: "rows",
 };
@@ -26,11 +23,11 @@ exports.APP_PREFIX = APP_PREFIX;
 exports.APP_DEV_PREFIX = APP_DEV_PREFIX;
 exports.isDevAppID = isDevAppID;
 exports.isProdAppID = isProdAppID;
-exports.USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`;
-exports.LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`;
+exports.USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`;
+exports.LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`;
 exports.TABLE_ROW_PREFIX = `${DocumentType.ROW}${SEPARATOR}${DocumentType.TABLE}`;
 exports.ViewName = ViewName;
-exports.InternalTables = InternalTables;
+exports.InternalTables = InternalTable;
 exports.DocumentType = DocumentType;
 exports.SEPARATOR = SEPARATOR;
 exports.UNICODE_MAX = UNICODE_MAX;
@@ -42,25 +39,12 @@ exports.generateDevAppID = getDevelopmentAppID;
 exports.generateRoleID = generateRoleID;
 exports.getRoleParams = getRoleParams;
 exports.getQueryIndex = getQueryIndex;
-/**
- * If creating DB allDocs/query params with only a single top level ID this can be used, this
- * is usually the case as most of our docs are top level e.g. tables, automations, users and so on.
- * More complex cases such as link docs and rows which have multiple levels of IDs that their
- * ID consists of need their own functions to build the allDocs parameters.
- * @param {string} docType The type of document which input params are being built for, e.g. user,
- * link, app, table and so on.
- * @param {string|null} docId The ID of the document minus its type - this is only needed if looking
- * for a singular document.
- * @param {object} otherProps Add any other properties onto the request, e.g. include_docs.
- * @returns {object} Parameters which can then be used with an allDocs request.
- */
-function getDocParams(docType, docId = null, otherProps = {}) {
-    if (docId == null) {
-        docId = "";
-    }
-    return Object.assign(Object.assign({}, otherProps), { startkey: `${docType}${SEPARATOR}${docId}`, endkey: `${docType}${SEPARATOR}${docId}${UNICODE_MAX}` });
-}
 exports.getDocParams = getDocParams;
+exports.getRowParams = getRowParams;
+exports.generateRowID = generateRowID;
+exports.getUserMetadataParams = getUserMetadataParams;
+exports.generateUserMetadataID = generateUserMetadataID;
+exports.getGlobalIDFromUserMetadataID = getGlobalIDFromUserMetadataID;
 /**
  * Gets parameters for retrieving tables, this is a utility function for the getDocParams function.
  */
@@ -74,21 +58,6 @@ exports.getTableParams = (tableId = null, otherProps = {}) => {
 exports.generateTableID = () => {
     return `${DocumentType.TABLE}${SEPARATOR}${newid()}`;
 };
-/**
- * Gets the DB allDocs/query params for retrieving a row.
- * @param {string|null} tableId The table in which the rows have been stored.
- * @param {string|null} rowId The ID of the row which is being specifically queried for. This can be
- * left null to get all the rows in the table.
- * @param {object} otherProps Any other properties to add to the request.
- * @returns {object} Parameters which can then be used with an allDocs request.
- */
-exports.getRowParams = (tableId = null, rowId = null, otherProps = {}) => {
-    if (tableId == null) {
-        return getDocParams(DocumentType.ROW, null, otherProps);
-    }
-    const endOfKey = rowId == null ? `${tableId}${SEPARATOR}` : rowId;
-    return getDocParams(DocumentType.ROW, endOfKey, otherProps);
-};
 /**
  * Given a row ID this will find the table ID within it (only works for internal tables).
  * @param {string} rowId The ID of the row.
@@ -100,40 +69,6 @@ exports.getTableIDFromRowID = rowId => {
         .split(SEPARATOR);
     return `${DocumentType.TABLE}${SEPARATOR}${components[0]}`;
 };
-/**
- * Gets a new row ID for the specified table.
- * @param {string} tableId The table which the row is being created for.
- * @param {string|null} id If an ID is to be used then the UUID can be substituted for this.
- * @returns {string} The new ID which a row doc can be stored under.
- */
-exports.generateRowID = (tableId, id = null) => {
-    id = id || newid();
-    return `${DocumentType.ROW}${SEPARATOR}${tableId}${SEPARATOR}${id}`;
-};
-/**
- * Gets parameters for retrieving users, this is a utility function for the getDocParams function.
- */
-exports.getUserMetadataParams = (userId = null, otherProps = {}) => {
-    return exports.getRowParams(InternalTables.USER_METADATA, userId, otherProps);
-};
-/**
- * Generates a new user ID based on the passed in global ID.
- * @param {string} globalId The ID of the global user.
- * @returns {string} The new user ID which the user doc can be stored under.
- */
-exports.generateUserMetadataID = globalId => {
-    return exports.generateRowID(InternalTables.USER_METADATA, globalId);
-};
-/**
- * Breaks up the ID to get the global ID.
- */
-exports.getGlobalIDFromUserMetadataID = id => {
-    const prefix = `${DocumentType.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`;
-    if (!id || !id.includes(prefix)) {
-        return id;
-    }
-    return id.split(prefix)[1];
-};
 /**
  * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
  */

package/dist/index.js

@@ -9,6 +9,7 @@ function runServer() {
     checkDevelopmentEnvironment();
     fixPath();
     // this will setup http and https proxies form env variables
+    process.env.GLOBAL_AGENT_FORCE_GLOBAL_AGENT = "false";
     (0, global_agent_1.bootstrap)();
     require("./app");
 }

package/dist/integrations/arangodb.js

@@ -53,6 +53,8 @@ const SCHEMA = {
 class ArangoDBIntegration {
     constructor(config) {
         const newConfig = {
+            url: config.url,
+            databaseName: config.databaseName,
             auth: {
                 username: config.username,
                 password: config.password,

package/dist/integrations/base/sqlTable.js

@@ -31,6 +31,7 @@ function generateSchema(schema, table, tables, oldTable = null, renamed) {
             case FieldTypes.STRING:
             case FieldTypes.OPTIONS:
             case FieldTypes.LONGFORM:
+            case FieldTypes.BARCODEQR:
                 schema.text(key);
                 break;
             case FieldTypes.NUMBER: