@budibase/server 1.0.190 → 1.0.192-alpha.0

package/dist/automations/bullboard.js

@@ -51,4 +51,11 @@ exports.init = () => {
     serverAdapter.setBasePath(PATH_PREFIX);
     return serverAdapter.registerPlugin();
 };
+exports.shutdown = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (automationQueue) {
+        clearInterval(cleanupInternal);
+        yield automationQueue.close();
+        automationQueue = null;
+    }
+});
 exports.queue = 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 } = require("./bullboard");
+const { queue, shutdown } = require("./bullboard");
 /**
  * This module is built purely to kick off the worker farm and manage the inputs/outputs
  */
@@ -22,4 +22,7 @@ exports.init = function () {
 exports.getQueues = () => {
     return [queue];
 };
+exports.shutdown = () => {
+    return shutdown();
+};
 exports.queue = queue;

package/dist/automations/steps/queryRows.js

@@ -57,6 +57,7 @@ exports.definition = {
                 limit: {
                     type: "number",
                     title: "Limit",
+                    customType: "queryLimit",
                 },
             },
             required: ["tableId"],

package/dist/automations/steps/sendSmtpEmail.js

@@ -62,6 +62,7 @@ exports.run = function ({ inputs }) {
         if (!contents) {
             contents = "<h1>No content</h1>";
         }
+        to = to || undefined;
         try {
             let response = yield sendSmtpEmail(to, from, subject, contents, true);
             return {

package/dist/environment.js

@@ -33,15 +33,12 @@ module.exports = {
     COUCH_DB_URL: process.env.COUCH_DB_URL,
     MINIO_URL: process.env.MINIO_URL,
     WORKER_URL: process.env.WORKER_URL,
-    SELF_HOSTED: process.env.SELF_HOSTED,
     AWS_REGION: process.env.AWS_REGION,
-    ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
     MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
     MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
     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,
     API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
     GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
@@ -51,28 +48,27 @@ module.exports = {
     JEST_WORKER_ID: process.env.JEST_WORKER_ID,
     BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
     DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
+    TEMPLATE_REPOSITORY: process.env.TEMPLATE_REPOSITORY || "app",
     DISABLE_AUTO_PROD_APP_SYNC: process.env.DISABLE_AUTO_PROD_APP_SYNC,
     // minor
     SALT_ROUNDS: process.env.SALT_ROUNDS,
     LOGGER: process.env.LOGGER,
     LOG_LEVEL: process.env.LOG_LEVEL,
-    AUTOMATION_DIRECTORY: process.env.AUTOMATION_DIRECTORY,
-    AUTOMATION_BUCKET: process.env.AUTOMATION_BUCKET,
     AUTOMATION_MAX_ITERATIONS: process.env.AUTOMATION_MAX_ITERATIONS,
     SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
     DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
     POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
     QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),
-    // old - to remove
-    CLIENT_ID: process.env.CLIENT_ID,
-    BUDIBASE_DIR: process.env.BUDIBASE_DIR,
-    DEPLOYMENT_DB_URL: process.env.DEPLOYMENT_DB_URL,
-    BUDIBASE_API_KEY: process.env.BUDIBASE_API_KEY,
-    USERID_API_KEY: process.env.USERID_API_KEY,
-    DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
+    SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
+    // flags
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
-    SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
+    DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
+    MULTI_TENANCY: process.env.MULTI_TENANCY,
+    ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
+    SELF_HOSTED: process.env.SELF_HOSTED,
+    // old
+    CLIENT_ID: process.env.CLIENT_ID,
     _set(key, value) {
         process.env[key] = value;
         module.exports[key] = value;

package/dist/middleware/builder.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { APP_DEV_PREFIX } = require("../db/utils");
 const { doesUserHaveLock, updateLock, checkDebounce, setDebounce, } = require("../utilities/redis");
 const { doWithDB } = require("@budibase/backend-core/db");
-const { DocumentTypes } = require("../db/utils");
+const { DocumentTypes, getGlobalIDFromUserMetadataID } = require("../db/utils");
 const { PermissionTypes } = require("@budibase/backend-core/permissions");
 const { app: appCache } = require("@budibase/backend-core/cache");
 const DEBOUNCE_TIME_SEC = 30;
@@ -52,6 +52,7 @@ function updateAppUpdatedAt(ctx) {
         yield doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
             const metadata = yield db.get(DocumentTypes.APP_METADATA);
             metadata.updatedAt = new Date().toISOString();
+            metadata.updatedBy = getGlobalIDFromUserMetadataID(ctx.user.userId);
             const response = yield db.put(metadata);
             metadata._rev = response.rev;
             yield appCache.invalidateAppMetadata(appId, metadata);
@@ -68,7 +69,13 @@ module.exports = (ctx, permType) => __awaiter(void 0, void 0, void 0, function*
     }
     const isBuilderApi = permType === PermissionTypes.BUILDER;
     const referer = ctx.headers["referer"];
-    const editingApp = referer ? referer.includes(appId) : false;
+    const overviewPath = "/builder/portal/overview/";
+    const overviewContext = !referer ? false : referer.includes(overviewPath);
+    if (overviewContext) {
+        return;
+    }
+    const hasAppId = !referer ? false : referer.includes(appId);
+    const editingApp = referer ? hasAppId : false;
     // check this is a builder call and editing
     if (!isBuilderApi || !editingApp) {
         return;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.189",
+    "version": "1.0.191",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,10 +70,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.189",
-        "@budibase/client": "^1.0.189",
-        "@budibase/pro": "1.0.189",
-        "@budibase/string-templates": "^1.0.189",
+        "@budibase/backend-core": "^1.0.191",
+        "@budibase/client": "^1.0.191",
+        "@budibase/pro": "1.0.191",
+        "@budibase/string-templates": "^1.0.191",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/index.js

@@ -66,6 +66,7 @@ class Thread {
                 workerOpts.maxCallTime = opts.timeoutMs;
             }
             this.workers = (0, worker_farm_1.default)(workerOpts, typeToFile(type));
+            Thread.workerRefs.push(this.workers);
         }
     }
     run(data) {
@@ -91,5 +92,24 @@ class Thread {
             });
         });
     }
+    static shutdown() {
+        return new Promise(resolve => {
+            if (Thread.workerRefs.length === 0) {
+                resolve();
+            }
+            let count = 0;
+            function complete() {
+                count++;
+                if (count >= Thread.workerRefs.length) {
+                    resolve();
+                }
+            }
+            for (let worker of Thread.workerRefs) {
+                worker_farm_1.default.end(worker, complete);
+            }
+            Thread.workerRefs = [];
+        });
+    }
 }
 exports.Thread = Thread;
+Thread.workerRefs = [];