@budibase/server 1.0.183 → 1.0.185-alpha.1

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed May 25 2022 15:03:42 GMT+0000 (Coordinated Universal Time)
+                at Thu May 26 2022 16:52:02 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -307,7 +307,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed May 25 2022 15:03:42 GMT+0000 (Coordinated Universal Time)
+                at Thu May 26 2022 16:52:02 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed May 25 2022 15:03:42 GMT+0000 (Coordinated Universal Time)
+                at Thu May 26 2022 16:52:02 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed May 25 2022 15:03:42 GMT+0000 (Coordinated Universal Time)
+                at Thu May 26 2022 16:52:02 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -487,7 +487,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed May 25 2022 15:03:42 GMT+0000 (Coordinated Universal Time)
+                at Thu May 26 2022 16:52:02 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -1372,36 +1372,36 @@ BRH:0
 end_of_record
 TN:
 SF:src/api/controllers/templates.js
-FN:8,(anonymous_0)
+FN:9,(anonymous_0)
 FNF:1
 FNH:1
 FNDA:1,(anonymous_0)
 DA:1,24
 DA:2,24
-DA:6,24
-DA:8,24
-DA:9,1
-DA:11,1
+DA:3,24
+DA:7,24
+DA:9,24
+DA:10,1
 DA:12,1
 DA:13,1
 DA:14,1
-DA:15,0
-DA:18,0
-DA:21,1
+DA:15,1
+DA:16,0
+DA:19,0
 DA:22,1
 DA:23,1
-DA:25,0
-LF:15
-LH:12
-BRDA:9,0,0,1
-BRDA:14,1,0,0
-BRDA:14,1,1,1
-BRDA:21,2,0,1
-BRDA:21,2,1,0
-BRDA:21,3,0,1
-BRDA:21,3,1,1
-BRF:7
-BRH:5
+DA:24,1
+DA:26,0
+LF:16
+LH:13
+BRDA:15,0,0,0
+BRDA:15,0,1,1
+BRDA:22,1,0,1
+BRDA:22,1,1,0
+BRDA:22,2,0,1
+BRDA:22,2,1,1
+BRF:6
+BRH:4
 end_of_record
 TN:
 SF:src/api/controllers/user.js
@@ -3354,8 +3354,10 @@ LF:11
 LH:11
 BRDA:9,0,0,0
 BRDA:9,0,1,2
-BRF:2
-BRH:1
+BRDA:9,1,0,2
+BRDA:9,1,1,0
+BRF:4
+BRH:2
 end_of_record
 TN:
 SF:src/api/controllers/view/index.js
@@ -4768,8 +4770,8 @@ BRH:12
 end_of_record
 TN:
 SF:src/automations/steps/queryRows.js
-FN:74,getTable
-FN:84,(anonymous_1)
+FN:75,getTable
+FN:85,(anonymous_1)
 FNF:2
 FNH:2
 FNDA:1,getTable
@@ -4782,35 +4784,35 @@ DA:5,41
 DA:7,41
 DA:12,41
 DA:17,41
-DA:75,1
-DA:80,1
+DA:76,1
 DA:81,1
-DA:84,41
-DA:85,1
+DA:82,1
+DA:85,41
 DA:86,1
 DA:87,1
 DA:88,1
 DA:89,1
 DA:90,1
-DA:93,1
-DA:105,1
+DA:91,1
+DA:94,1
 DA:106,1
 DA:107,1
-DA:112,0
+DA:108,1
+DA:113,0
 LF:23
 LH:22
-BRDA:88,0,0,1
-BRDA:88,0,1,0
-BRDA:88,1,0,1
-BRDA:88,1,1,1
-BRDA:88,1,2,1
-BRDA:88,1,3,1
-BRDA:91,2,0,0
-BRDA:91,2,1,1
-BRDA:101,3,0,1
-BRDA:101,3,1,0
-BRDA:108,4,0,1
-BRDA:108,4,1,0
+BRDA:89,0,0,1
+BRDA:89,0,1,0
+BRDA:89,1,0,1
+BRDA:89,1,1,1
+BRDA:89,1,2,1
+BRDA:89,1,3,1
+BRDA:92,2,0,0
+BRDA:92,2,1,1
+BRDA:102,3,0,1
+BRDA:102,3,1,0
+BRDA:109,4,0,1
+BRDA:109,4,1,0
 BRF:12
 BRH:8
 end_of_record
@@ -4830,12 +4832,15 @@ DA:54,0
 DA:56,0
 DA:57,0
 DA:58,0
-DA:63,0
-LF:11
+DA:59,0
+DA:64,0
+LF:12
 LH:4
 BRDA:53,0,0,0
 BRDA:53,0,1,0
-BRF:2
+BRDA:56,1,0,0
+BRDA:56,1,1,0
+BRF:4
 BRH:0
 end_of_record
 TN:
@@ -5242,7 +5247,7 @@ FNDA:0,(anonymous_5)
 FNDA:264,(anonymous_6)
 FNDA:3,(anonymous_7)
 FNDA:193,(anonymous_8)
-FNDA:2,(anonymous_9)
+FNDA:3,(anonymous_9)
 FNDA:225,(anonymous_10)
 FNDA:20,(anonymous_11)
 FNDA:9,(anonymous_12)
@@ -5317,10 +5322,10 @@ DA:180,3
 DA:188,54
 DA:189,193
 DA:195,54
-DA:196,2
-DA:197,2
+DA:196,3
+DA:197,3
 DA:198,1
-DA:200,1
+DA:200,2
 DA:206,54
 DA:207,225
 DA:214,54
@@ -5390,9 +5395,9 @@ BRDA:172,11,1,71
 BRDA:179,12,0,0
 BRDA:179,13,0,0
 BRDA:197,14,0,1
-BRDA:197,14,1,1
-BRDA:197,15,0,2
-BRDA:197,15,1,2
+BRDA:197,14,1,2
+BRDA:197,15,0,3
+BRDA:197,15,1,3
 BRDA:206,16,0,0
 BRDA:206,17,0,0
 BRDA:246,18,0,0
@@ -6146,7 +6151,7 @@ SF:src/middleware/builder.js
 FN:24,checkDevAppLocks
 FN:44,updateAppUpdatedAt
 FN:51,(anonymous_2)
-FN:62,(anonymous_3)
+FN:65,(anonymous_3)
 FNF:4
 FNH:4
 FNDA:1,checkDevAppLocks
@@ -6174,23 +6179,29 @@ DA:49,0
 DA:51,1
 DA:52,1
 DA:53,1
-DA:54,1
 DA:55,1
-DA:56,1
+DA:57,1
 DA:58,1
-DA:62,25
-DA:63,181
-DA:65,181
-DA:66,5
-DA:68,176
-DA:69,176
-DA:70,176
+DA:59,1
+DA:61,1
+DA:65,25
+DA:66,181
+DA:68,181
+DA:69,5
+DA:71,176
 DA:72,176
-DA:73,175
-DA:76,1
-DA:78,1
-LF:36
-LH:32
+DA:74,176
+DA:75,176
+DA:76,176
+DA:77,0
+DA:80,176
+DA:81,176
+DA:83,176
+DA:84,175
+DA:87,1
+DA:89,1
+LF:42
+LH:37
 BRDA:28,0,0,0
 BRDA:28,0,1,1
 BRDA:28,1,0,1
@@ -6205,16 +6216,22 @@ BRDA:48,5,0,0
 BRDA:48,5,1,1
 BRDA:48,6,0,1
 BRDA:48,6,1,1
-BRDA:65,7,0,5
-BRDA:65,7,1,176
-BRDA:70,8,0,1
-BRDA:70,8,1,175
-BRDA:72,9,0,175
-BRDA:72,9,1,1
-BRDA:72,10,0,176
-BRDA:72,10,1,109
-BRF:22
-BRH:17
+BRDA:68,7,0,5
+BRDA:68,7,1,176
+BRDA:75,8,0,175
+BRDA:75,8,1,1
+BRDA:76,9,0,0
+BRDA:76,9,1,176
+BRDA:80,10,0,175
+BRDA:80,10,1,1
+BRDA:81,11,0,1
+BRDA:81,11,1,175
+BRDA:83,12,0,175
+BRDA:83,12,1,1
+BRDA:83,13,0,176
+BRDA:83,13,1,109
+BRF:28
+BRH:22
 end_of_record
 TN:
 SF:src/middleware/currentapp.js
@@ -7046,47 +7063,14 @@ BRF:15
 BRH:10
 end_of_record
 TN:
-SF:src/utilities/bcrypt.js
-FN:8,(anonymous_0)
-FN:14,(anonymous_1)
-FNF:2
-FNH:0
-FNDA:0,(anonymous_0)
-FNDA:0,(anonymous_1)
-DA:3,0
-DA:4,0
-DA:6,0
-DA:8,0
-DA:9,0
-DA:10,0
-DA:11,0
-DA:14,0
-DA:15,0
-LF:9
-LH:0
-BRDA:6,0,0,0
-BRDA:6,0,1,0
-BRF:2
-BRH:0
-end_of_record
-TN:
 SF:src/utilities/budibaseDir.js
-FN:6,(anonymous_0)
-FNF:1
+FNF:0
 FNH:0
-FNDA:0,(anonymous_0)
 DA:1,42
-DA:2,42
 DA:3,42
-DA:4,42
-DA:6,42
-DA:7,0
-DA:10,42
-LF:7
-LH:6
-BRDA:7,0,0,0
-BRDA:7,0,1,0
-BRF:2
+LF:2
+LH:2
+BRF:0
 BRH:0
 end_of_record
 TN:

package/dist/api/controllers/templates.js

@@ -10,11 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const fetch = require("node-fetch");
 const { downloadTemplate } = require("../../utilities/fileSystem");
+const env = require("../../environment");
 // development flag, can be used to test against templates exported locally
 const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com";
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { type = "app" } = ctx.query;
+        let type = env.TEMPLATE_REPOSITORY;
         let response, error = false;
         try {
             response = yield fetch(`https://${DEFAULT_TEMPLATES_BUCKET}/manifest.json`);

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

@@ -6,7 +6,7 @@ exports.csv = function (headers, rows) {
             .map(header => {
             let val = row[header];
             val =
-                typeof val === "object"
+                typeof val === "object" && !(val instanceof Date)
                     ? `"${JSON.stringify(val).replace(/"/g, "'")}"`
                     : `"${val}"`;
             return val.trim();

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.182",
+    "version": "1.0.185-alpha.0",
     "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.182",
-        "@budibase/client": "^1.0.182",
-        "@budibase/pro": "1.0.182",
-        "@budibase/string-templates": "^1.0.182",
+        "@budibase/backend-core": "^1.0.185-alpha.0",
+        "@budibase/client": "^1.0.185-alpha.0",
+        "@budibase/pro": "1.0.185-alpha.0",
+        "@budibase/string-templates": "^1.0.185-alpha.0",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",