@budibase/server 2.6.19 → 2.6.21

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.b131b0de.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.69c5c1ea.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.86c992bf.css">
 </head>
 

package/dist/automations/steps/queryRows.js

@@ -39,6 +39,7 @@ const constants_1 = require("../../constants");
 const utils_1 = require("./utils");
 const automationUtils = __importStar(require("../automationUtils"));
 const types_1 = require("@budibase/types");
+const backend_core_1 = require("@budibase/backend-core");
 var SortOrder;
 (function (SortOrder) {
     SortOrder["ASCENDING"] = "ascending";
@@ -140,7 +141,10 @@ function typeCoercion(filters, table) {
         const searchParam = filters[key];
         if (typeof searchParam === "object") {
             for (let [property, value] of Object.entries(searchParam)) {
-                const column = table.schema[property];
+                // We need to strip numerical prefixes here, so that we can look up
+                // the correct field name in the schema
+                const columnName = backend_core_1.db.removeKeyNumbering(property);
+                const column = table.schema[columnName];
                 // convert string inputs
                 if (!column || typeof value !== "string") {
                     continue;

package/dist/sdk/users/utils.js

@@ -44,9 +44,11 @@ function combineMetadataAndUser(user, metadata) {
     return null;
 }
 exports.combineMetadataAndUser = combineMetadataAndUser;
-function rawUserMetadata() {
+function rawUserMetadata(db) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        if (!db) {
+            db = backend_core_1.context.getAppDB();
+        }
         return (yield db.allDocs((0, utils_1.getUserMetadataParams)(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
@@ -56,32 +58,37 @@ exports.rawUserMetadata = rawUserMetadata;
 function syncGlobalUsers() {
     return __awaiter(this, void 0, void 0, function* () {
         // sync user metadata
-        const db = backend_core_1.context.getAppDB();
-        const resp = yield Promise.all([(0, global_1.getGlobalUsers)(), rawUserMetadata()]);
-        const users = resp[0];
-        const metadata = resp[1];
-        const toWrite = [];
-        for (let user of users) {
-            const combined = combineMetadataAndUser(user, metadata);
-            if (combined) {
-                toWrite.push(combined);
-            }
-        }
-        let foundEmails = [];
-        for (let data of metadata) {
-            if (!data._id) {
+        const dbs = [backend_core_1.context.getDevAppDB(), backend_core_1.context.getProdAppDB()];
+        for (let db of dbs) {
+            if (!(yield db.exists())) {
                 continue;
             }
-            const alreadyExisting = data.email && foundEmails.indexOf(data.email) !== -1;
-            const globalId = (0, utils_1.getGlobalIDFromUserMetadataID)(data._id);
-            if (!users.find(user => user._id === globalId) || alreadyExisting) {
-                toWrite.push(Object.assign(Object.assign({}, data), { _deleted: true }));
+            const resp = yield Promise.all([(0, global_1.getGlobalUsers)(), rawUserMetadata(db)]);
+            const users = resp[0];
+            const metadata = resp[1];
+            const toWrite = [];
+            for (let user of users) {
+                const combined = combineMetadataAndUser(user, metadata);
+                if (combined) {
+                    toWrite.push(combined);
+                }
             }
-            if (data.email) {
-                foundEmails.push(data.email);
+            let foundEmails = [];
+            for (let data of metadata) {
+                if (!data._id) {
+                    continue;
+                }
+                const alreadyExisting = data.email && foundEmails.indexOf(data.email) !== -1;
+                const globalId = (0, utils_1.getGlobalIDFromUserMetadataID)(data._id);
+                if (!users.find(user => user._id === globalId) || alreadyExisting) {
+                    toWrite.push(Object.assign(Object.assign({}, data), { _deleted: true }));
+                }
+                if (data.email) {
+                    foundEmails.push(data.email);
+                }
             }
+            yield db.bulkDocs(toWrite);
         }
-        yield db.bulkDocs(toWrite);
     });
 }
 exports.syncGlobalUsers = syncGlobalUsers;