@budibase/server 1.0.49-alpha.10 → 1.0.49-alpha.14

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -1081,7 +1081,7 @@ exports.cleanupAttachments = async (table, { row, rows, oldRow, oldTable }) =&gt
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -181,7 +181,7 @@ exports.processFormulas = (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -274,7 +274,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -85,7 +85,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -125,7 +125,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -343,7 +343,7 @@ exports.update = async (property, usage, opts = { dryRun: false }) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -289,7 +289,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">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -118,7 +118,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">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -334,7 +334,7 @@ exports.removeAppFromUserRoles = async (ctx, appId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 10:32:19 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:52:10 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -1741,15 +1741,16 @@ FN:58,(anonymous_4)
 FN:72,(anonymous_5)
 FN:98,(anonymous_6)
 FN:99,(anonymous_7)
-FN:143,(anonymous_8)
-FN:150,(anonymous_9)
-FN:163,(anonymous_10)
-FN:173,(anonymous_11)
-FN:185,(anonymous_12)
-FN:198,(anonymous_13)
-FN:202,(anonymous_14)
-FN:221,(anonymous_15)
-FNF:16
+FN:108,(anonymous_8)
+FN:145,(anonymous_9)
+FN:152,(anonymous_10)
+FN:165,(anonymous_11)
+FN:175,(anonymous_12)
+FN:187,(anonymous_13)
+FN:200,(anonymous_14)
+FN:204,(anonymous_15)
+FN:223,(anonymous_16)
+FNF:17
 FNH:5
 FNDA:2,rawMetadata
 FNDA:0,(anonymous_1)
@@ -1759,14 +1760,15 @@ FNDA:0,(anonymous_4)
 FNDA:0,(anonymous_5)
 FNDA:0,(anonymous_6)
 FNDA:0,(anonymous_7)
-FNDA:2,(anonymous_8)
-FNDA:0,(anonymous_9)
+FNDA:0,(anonymous_8)
+FNDA:2,(anonymous_9)
 FNDA:0,(anonymous_10)
-FNDA:1,(anonymous_11)
+FNDA:0,(anonymous_11)
 FNDA:1,(anonymous_12)
 FNDA:1,(anonymous_13)
-FNDA:0,(anonymous_14)
+FNDA:1,(anonymous_14)
 FNDA:0,(anonymous_15)
+FNDA:0,(anonymous_16)
 DA:5,39
 DA:6,39
 DA:7,39
@@ -1826,67 +1828,68 @@ DA:105,0
 DA:106,0
 DA:108,0
 DA:109,0
-DA:111,0
+DA:110,0
 DA:112,0
-DA:114,0
+DA:113,0
 DA:115,0
-DA:117,0
-DA:122,0
+DA:116,0
+DA:118,0
 DA:123,0
-DA:125,0
-DA:133,0
+DA:124,0
+DA:126,0
 DA:134,0
-DA:138,0
-DA:143,39
-DA:144,2
-DA:145,2
+DA:135,0
+DA:140,0
+DA:145,39
 DA:146,2
 DA:147,2
 DA:148,2
-DA:150,7
+DA:149,2
+DA:150,2
 DA:152,7
-DA:160,2
-DA:163,39
-DA:165,0
+DA:154,7
+DA:162,2
+DA:165,39
 DA:167,0
 DA:169,0
-DA:170,0
-DA:173,39
-DA:174,1
-DA:175,1
+DA:171,0
+DA:172,0
+DA:175,39
+DA:176,1
 DA:177,1
-DA:178,1
-DA:182,1
-DA:185,39
-DA:186,1
-DA:187,1
+DA:179,1
+DA:180,1
+DA:184,1
+DA:187,39
 DA:188,1
-DA:189,0
-DA:193,1
-DA:198,39
-DA:199,1
-DA:202,39
-DA:203,0
-DA:204,0
+DA:189,1
+DA:190,1
+DA:191,0
+DA:195,1
+DA:200,39
+DA:201,1
+DA:204,39
 DA:205,0
 DA:206,0
+DA:207,0
 DA:208,0
-DA:209,0
+DA:210,0
 DA:211,0
-DA:212,0
+DA:213,0
 DA:214,0
 DA:216,0
-DA:217,0
 DA:218,0
-DA:221,39
-DA:222,0
-DA:223,0
+DA:219,0
+DA:220,0
+DA:223,39
 DA:224,0
+DA:225,0
 DA:226,0
-DA:227,0
+DA:228,0
 DA:229,0
 DA:231,0
-LF:119
+DA:233,0
+LF:120
 LH:38
 BRDA:32,0,0,0
 BRDA:32,0,1,0
@@ -1913,18 +1916,18 @@ BRDA:94,10,1,0
 BRDA:94,10,2,0
 BRDA:105,11,0,0
 BRDA:105,11,1,0
-BRDA:114,12,0,0
-BRDA:114,12,1,0
-BRDA:122,13,0,0
-BRDA:122,13,1,0
-BRDA:125,14,0,0
-BRDA:125,14,1,0
-BRDA:133,15,0,0
-BRDA:133,15,1,0
-BRDA:205,16,0,0
-BRDA:205,16,1,0
-BRDA:216,17,0,0
-BRDA:216,17,1,0
+BRDA:115,12,0,0
+BRDA:115,12,1,0
+BRDA:123,13,0,0
+BRDA:123,13,1,0
+BRDA:126,14,0,0
+BRDA:126,14,1,0
+BRDA:134,15,0,0
+BRDA:134,15,1,0
+BRDA:207,16,0,0
+BRDA:207,16,1,0
+BRDA:218,17,0,0
+BRDA:218,17,1,0
 BRF:37
 BRH:0
 end_of_record

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

@@ -21,7 +21,7 @@ const { clientLibraryPath } = require("../../../utilities");
 const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentTypes } = require("../../../db/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
+const { getAppDB, updateAppId } = require("@budibase/backend-core/context");
 const AWS = require("aws-sdk");
 const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1";
 function prepareUpload({ s3Key, bucket, metadata, file }) {
@@ -50,12 +50,9 @@ function getAppIdFromUrl(ctx) {
         // search prod apps for a url that matches, exclude dev where id is always used
         const apps = yield getAllApps({ dev: false });
         const app = apps.filter(a => a.url && a.url.toLowerCase() === possibleAppUrl)[0];
-        if (app && app.appId) {
-            return app.appId;
-        }
-        else {
-            return ctx.params.appId;
-        }
+        const appId = app && app.appId ? app.appId : ctx.params.appId;
+        updateAppId(appId);
+        return appId;
     });
 }
 exports.serveBuilder = function (ctx) {

package/dist/api/controllers/user.js

@@ -16,7 +16,7 @@ const { isEqual } = require("lodash");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { getDevelopmentAppID, getProdAppIDs, dbExists, } = require("@budibase/backend-core/db");
 const { UserStatus } = require("@budibase/backend-core/constants");
-const { getAppDB } = require("@budibase/backend-core/context");
+const { getAppDB, doInAppContext } = require("@budibase/backend-core/context");
 function rawMetadata() {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
@@ -97,31 +97,33 @@ exports.syncUser = function (ctx) {
                 if (!(yield dbExists(appId))) {
                     continue;
                 }
-                const db = getAppDB();
-                const metadataId = generateUserMetadataID(userId);
-                let metadata;
-                try {
-                    metadata = yield db.get(metadataId);
-                }
-                catch (err) {
-                    if (deleting) {
-                        continue;
+                yield doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+                    const db = getAppDB();
+                    const metadataId = generateUserMetadataID(userId);
+                    let metadata;
+                    try {
+                        metadata = yield db.get(metadataId);
                     }
-                    metadata = {
-                        tableId: InternalTables.USER_METADATA,
-                    };
-                }
-                // assign the roleId for the metadata doc
-                if (roleId) {
-                    metadata.roleId = roleId;
-                }
-                let combined = !deleting
-                    ? combineMetadataAndUser(user, metadata)
-                    : Object.assign(Object.assign({}, metadata), { status: UserStatus.INACTIVE, metadata: BUILTIN_ROLE_IDS.PUBLIC });
-                // if its null then there was no updates required
-                if (combined) {
-                    yield db.put(combined);
-                }
+                    catch (err) {
+                        if (deleting) {
+                            return;
+                        }
+                        metadata = {
+                            tableId: InternalTables.USER_METADATA,
+                        };
+                    }
+                    // assign the roleId for the metadata doc
+                    if (roleId) {
+                        metadata.roleId = roleId;
+                    }
+                    let combined = !deleting
+                        ? combineMetadataAndUser(user, metadata)
+                        : Object.assign(Object.assign({}, metadata), { status: UserStatus.INACTIVE, metadata: BUILTIN_ROLE_IDS.PUBLIC });
+                    // if its null then there was no updates required
+                    if (combined) {
+                        yield db.put(combined);
+                    }
+                }));
             }
         }
         ctx.body = {

package/dist/integrations/base/sql.js

@@ -159,15 +159,14 @@ class InternalBuilder {
     addSorting(query, json) {
         var _a;
         let { sort, paginate } = json;
-        if (!sort) {
-            return query;
-        }
         const table = (_a = json.meta) === null || _a === void 0 ? void 0 : _a.table;
-        for (let [key, value] of Object.entries(sort)) {
-            const direction = value === datasource_1.SortDirection.ASCENDING ? "asc" : "desc";
-            query = query.orderBy(`${table === null || table === void 0 ? void 0 : table.name}.${key}`, direction);
+        if (sort) {
+            for (let [key, value] of Object.entries(sort)) {
+                const direction = value === datasource_1.SortDirection.ASCENDING ? "asc" : "desc";
+                query = query.orderBy(`${table === null || table === void 0 ? void 0 : table.name}.${key}`, direction);
+            }
         }
-        if (this.client === utils_1.SqlClients.MS_SQL && !sort && (paginate === null || paginate === void 0 ? void 0 : paginate.limit)) {
+        else if (this.client === utils_1.SqlClients.MS_SQL && (paginate === null || paginate === void 0 ? void 0 : paginate.limit)) {
             // @ts-ignore
             query = query.orderBy(`${table === null || table === void 0 ? void 0 : table.name}.${table === null || table === void 0 ? void 0 : table.primary[0]}`);
         }

package/dist/package.json

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