npm - @budibase/server - Versions diffs - 2.3.20 → 2.3.21-alpha.1 - Mend

@budibase/server 2.3.20 → 2.3.21-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (528) hide show

package/builder/assets/listScreenPreview.599c0aae.png ADDED Viewed

Binary file

package/builder/index.html CHANGED Viewed

@@ -10,8 +10,8 @@
 		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.3faec52d.js"></script>
-  <link rel="stylesheet" href="/builder/assets/index.4488f38d.css">
+  <script type="module" crossorigin src="/builder/assets/index.ab679a87.js"></script>
+  <link rel="stylesheet" href="/builder/assets/index.b24b9dea.css">
 </head>
 <body id="app">

package/dist/api/controllers/automation.js CHANGED Viewed

@@ -85,9 +85,13 @@ function create(ctx) {
         automation.appId = ctx.appId;
         // call through to update if already exists
         if (automation._id && automation._rev) {
-            return update(ctx);
+            yield update(ctx);
+            return;
+        }
+        // Respect existing IDs if recreating a deleted automation
+        if (!automation._id) {
+            automation._id = (0, utils_1.generateAutomationID)();
         }
-        automation._id = (0, utils_1.generateAutomationID)();
         automation.type = "automation";
         automation = cleanAutomationInputs(automation);
         automation = yield (0, utils_2.checkForWebhooks)({
@@ -137,6 +141,11 @@ function update(ctx) {
         const db = backend_core_1.context.getAppDB();
         let automation = ctx.request.body;
         automation.appId = ctx.appId;
+        // Call through to create if it doesn't exist
+        if (!automation._id || !automation._rev) {
+            yield create(ctx);
+            return;
+        }
         const oldAutomation = yield db.get(automation._id);
         automation = cleanAutomationInputs(automation);
         automation = yield (0, utils_2.checkForWebhooks)({

package/dist/api/controllers/cloud.js CHANGED Viewed

@@ -71,7 +71,7 @@ function exportApps(ctx) {
 exports.exportApps = exportApps;
 function checkHasBeenImported() {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!environment_1.default.SELF_HOSTED || environment_1.default.MULTI_TENANCY) {
+        if (!environment_1.default.SELF_HOSTED) {
             return true;
         }
         const apps = yield backend_core_1.db.getAllApps({ all: true });
@@ -88,7 +88,7 @@ function hasBeenImported(ctx) {
 exports.hasBeenImported = hasBeenImported;
 function importApps(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!environment_1.default.SELF_HOSTED || environment_1.default.MULTI_TENANCY) {
+        if (!environment_1.default.SELF_HOSTED) {
             ctx.throw(400, "Importing only allowed in self hosted environments.");
         }
         const beenImported = yield checkHasBeenImported();

package/dist/api/controllers/query/index.js CHANGED Viewed

@@ -184,6 +184,8 @@ function preview(ctx) {
                     schemaFields[key] = fieldType;
                 }
             }
+            // remove configuration before sending event
+            delete datasource.config;
             yield backend_core_1.events.query.previewed(datasource, query);
             ctx.body = {
                 rows,

package/dist/api/controllers/row/ExternalRequest.js CHANGED Viewed

@@ -32,7 +32,7 @@ const utils_3 = require("../../../integrations/utils");
 const string_templates_1 = require("@budibase/string-templates");
 const fp_1 = require("lodash/fp");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
-const utils_4 = require("./utils");
+const backend_core_1 = require("@budibase/backend-core");
 const sdk_1 = __importDefault(require("../../../sdk"));
 function buildFilters(id, filters, table) {
     const primary = table.primary;
@@ -43,7 +43,7 @@ function buildFilters(id, filters, table) {
         let prefix = 1;
         for (let operator of Object.values(filters)) {
             for (let field of Object.keys(operator || {})) {
-                if ((0, utils_4.removeKeyNumbering)(field) === "_id") {
+                if (backend_core_1.db.removeKeyNumbering(field) === "_id") {
                     if (primary) {
                         const parts = (0, utils_1.breakRowIdField)(operator[field]);
                         for (let field of primary) {
@@ -119,7 +119,7 @@ function cleanupConfig(config, table) {
     }
     return config;
 }
-function generateIdForRow(row, table) {
+function generateIdForRow(row, table, isLinked = false) {
     const primary = table.primary;
     if (!row || !primary) {
         return "";
@@ -127,8 +127,12 @@ function generateIdForRow(row, table) {
     // build id array
     let idParts = [];
     for (let field of primary) {
-        // need to handle table name + field or just field, depending on if relationships used
-        const fieldValue = row[`${table.name}.${field}`] || row[field];
+        let fieldValue = extractFieldValue({
+            row,
+            tableName: table.name,
+            fieldName: field,
+            isLinked,
+        });
         if (fieldValue) {
             idParts.push(fieldValue);
         }
@@ -149,18 +153,31 @@ function getEndpoint(tableId, operation) {
         operation,
     };
 }
-function basicProcessing(row, table) {
+// need to handle table name + field or just field, depending on if relationships used
+function extractFieldValue({ row, tableName, fieldName, isLinked, }) {
+    let value = row[`${tableName}.${fieldName}`];
+    if (value == null && !isLinked) {
+        value = row[fieldName];
+    }
+    return value;
+}
+function basicProcessing({ row, table, isLinked, }) {
     const thisRow = {};
     // filter the row down to what is actually the row (not joined)
-    for (let fieldName of Object.keys(table.schema)) {
-        const pathValue = row[`${table.name}.${fieldName}`];
-        const value = pathValue != null ? pathValue : row[fieldName];
+    for (let field of Object.values(table.schema)) {
+        const fieldName = field.name;
+        const value = extractFieldValue({
+            row,
+            tableName: table.name,
+            fieldName,
+            isLinked,
+        });
         // all responses include "select col as table.col" so that overlaps are handled
         if (value != null) {
             thisRow[fieldName] = value;
         }
     }
-    thisRow._id = generateIdForRow(row, table);
+    thisRow._id = generateIdForRow(row, table, isLinked);
     thisRow.tableId = table._id;
     thisRow._rev = "rev";
     return (0, rowProcessor_1.processFormulas)(table, thisRow);
@@ -254,7 +271,7 @@ class ExternalRequest {
                 // we're not inserting a doc, will be a bunch of update calls
                 const otherKey = field.throughFrom || linkTablePrimary;
                 const thisKey = field.throughTo || tablePrimary;
-                row[key].map((relationship) => {
+                row[key].forEach((relationship) => {
                     manyRelationships.push({
                         tableId: field.through || field.tableId,
                         isUpdate: false,
@@ -270,7 +287,7 @@ class ExternalRequest {
                 const thisKey = "id";
                 // @ts-ignore
                 const otherKey = field.fieldName;
-                row[key].map((relationship) => {
+                row[key].forEach((relationship) => {
                     manyRelationships.push({
                         tableId: field.tableId,
                         isUpdate: true,
@@ -328,7 +345,7 @@ class ExternalRequest {
                 ((_a = row[fromColumn]) === null || _a === void 0 ? void 0 : _a.toString()) !== ((_b = row[toColumn]) === null || _b === void 0 ? void 0 : _b.toString())) {
                 continue;
             }
-            let linked = basicProcessing(row, linkedTable);
+            let linked = basicProcessing({ row, table: linkedTable, isLinked: true });
             if (!linked._id) {
                 continue;
             }
@@ -362,7 +379,7 @@ class ExternalRequest {
                 finalRows = this.updateRelationshipColumns(table, row, finalRows, relationships);
                 continue;
             }
-            const thisRow = fixArrayTypes(basicProcessing(row, table), table);
+            const thisRow = fixArrayTypes(basicProcessing({ row, table, isLinked: false }), table);
             if (thisRow._id == null) {
                 throw "Unable to generate row ID for SQL rows";
             }
@@ -439,7 +456,7 @@ class ExternalRequest {
                     isOneSide(field)) {
                     continue;
                 }
-                const isMany = field.relationshipType === constants_1.RelationshipTypes.MANY_TO_MANY;
+                const isMany = field.relationshipType === types_1.RelationshipTypes.MANY_TO_MANY;
                 const tableId = isMany ? field.through : field.tableId;
                 const { tableName: relatedTableName } = (0, utils_3.breakExternalTableId)(tableId);
                 // @ts-ignore
@@ -486,16 +503,25 @@ class ExternalRequest {
                 const { key, tableId, isUpdate, id } = relationship, rest = __rest(relationship, ["key", "tableId", "isUpdate", "id"]);
                 const body = (0, string_templates_1.processObjectSync)(rest, row, {});
                 const linkTable = this.getTable(tableId);
-                // @ts-ignore
-                const linkPrimary = linkTable === null || linkTable === void 0 ? void 0 : linkTable.primary[0];
+                const relationshipPrimary = (linkTable === null || linkTable === void 0 ? void 0 : linkTable.primary) || [];
+                const linkPrimary = relationshipPrimary[0];
                 if (!linkTable || !linkPrimary) {
                     return;
                 }
+                const linkSecondary = relationshipPrimary[1];
                 const rows = ((_a = related[key]) === null || _a === void 0 ? void 0 : _a.rows) || [];
-                const found = rows.find((row) => row[linkPrimary] === relationship.id ||
-                    row[linkPrimary] === (body === null || body === void 0 ? void 0 : body[linkPrimary]));
+                function relationshipMatchPredicate({ row, linkPrimary, linkSecondary, }) {
+                    const matchesPrimaryLink = row[linkPrimary] === relationship.id ||
+                        row[linkPrimary] === (body === null || body === void 0 ? void 0 : body[linkPrimary]);
+                    if (!matchesPrimaryLink || !linkSecondary) {
+                        return matchesPrimaryLink;
+                    }
+                    const matchesSecondayLink = row[linkSecondary] === (body === null || body === void 0 ? void 0 : body[linkSecondary]);
+                    return matchesPrimaryLink && matchesSecondayLink;
+                }
+                const existingRelationship = rows.find((row) => relationshipMatchPredicate({ row, linkPrimary, linkSecondary }));
                 const operation = isUpdate ? types_1.Operation.UPDATE : types_1.Operation.CREATE;
-                if (!found) {
+                if (!existingRelationship) {
                     promises.push((0, utils_2.getDatasourceAndQuery)({
                         endpoint: getEndpoint(tableId, operation),
                         // if we're doing many relationships then we're writing, only one response
@@ -505,7 +531,7 @@ class ExternalRequest {
                 }
                 else {
                     // remove the relationship from cache so it isn't adjusted again
-                    rows.splice(rows.indexOf(found), 1);
+                    rows.splice(rows.indexOf(existingRelationship), 1);
                 }
             }
             // finally cleanup anything that needs to be removed
@@ -540,7 +566,7 @@ class ExternalRequest {
      * Creating the specific list of fields that we desire, and excluding the ones that are no use to us
      * is more performant and has the added benefit of protecting against this scenario.
      */
-    buildFields(table, includeRelations = types_1.IncludeRelationship.INCLUDE) {
+    buildFields(table, includeRelations) {
         function extractRealFields(table, existing = []) {
             return Object.entries(table.schema)
                 .filter(column => column[1].type !== constants_1.FieldTypes.LINK &&
@@ -594,6 +620,7 @@ class ExternalRequest {
             }
             filters = buildFilters(id, filters || {}, table);
             const relationships = this.buildRelationships(table);
+            const includeSqlRelationships = config.includeSqlRelationships === types_1.IncludeRelationship.INCLUDE;
             // clean up row on ingress using schema
             const processed = this.inputProcessing(row, table);
             row = processed.row;
@@ -609,7 +636,7 @@ class ExternalRequest {
                 },
                 resource: {
                     // have to specify the fields to avoid column overlap (for SQL)
-                    fields: isSql ? this.buildFields(table) : [],
+                    fields: isSql ? this.buildFields(table, includeSqlRelationships) : [],
                 },
                 filters,
                 sort,

package/dist/api/controllers/row/external.js CHANGED Viewed

@@ -86,6 +86,7 @@ function patch(ctx) {
         return handleRequest(types_1.Operation.UPDATE, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
             row: inputs,
+            includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
         });
     });
 }
@@ -96,6 +97,7 @@ function save(ctx) {
         const tableId = ctx.params.tableId;
         return handleRequest(types_1.Operation.CREATE, tableId, {
             row: inputs,
+            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         });
     });
 }
@@ -113,7 +115,9 @@ exports.fetchView = fetchView;
 function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = ctx.params.tableId;
-        return handleRequest(types_1.Operation.READ, tableId);
+        return handleRequest(types_1.Operation.READ, tableId, {
+            includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
+        });
     });
 }
 exports.fetch = fetch;
@@ -123,6 +127,7 @@ function find(ctx) {
         const tableId = ctx.params.tableId;
         const response = (yield handleRequest(types_1.Operation.READ, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
+            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         }));
         return response ? response[0] : response;
     });
@@ -134,6 +139,7 @@ function destroy(ctx) {
         const id = ctx.request.body._id;
         const { row } = (yield handleRequest(types_1.Operation.DELETE, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
+            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         }));
         return { response: { ok: true }, row };
     });
@@ -147,6 +153,7 @@ function bulkDestroy(ctx) {
         for (let row of rows) {
             promises.push(handleRequest(types_1.Operation.DELETE, tableId, {
                 id: (0, utils_1.breakRowIdField)(row._id),
+                includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
             }));
         }
         const responses = (yield Promise.all(promises));
@@ -189,6 +196,7 @@ function search(ctx) {
                 filters: query,
                 sort,
                 paginate: paginateObj,
+                includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
             }));
             let hasNextPage = false;
             if (paginate && rows.length === limit) {
@@ -199,6 +207,7 @@ function search(ctx) {
                         limit: 1,
                         page: bookmark * limit + 1,
                     },
+                    includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
                 }));
                 hasNextPage = nextRows.length > 0;
             }
@@ -287,6 +296,7 @@ function fetchEnrichedRow(ctx) {
         const response = (yield handleRequest(types_1.Operation.READ, tableId, {
             id,
             datasource,
+            includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
         }));
         const table = tables[tableName];
         const row = response[0];
@@ -312,6 +322,7 @@ function fetchEnrichedRow(ctx) {
                         [primaryLink]: linkedIds,
                     },
                 },
+                includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
             });
         }
         return row;