@budibase/server 1.0.46-alpha.2 → 1.0.47

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

@@ -130,6 +130,15 @@ function execute(ctx, opts = { rowsOnly: false }) {
         const db = new CouchDB(ctx.appId);
         const query = yield db.get(ctx.params.queryId);
         const datasource = yield db.get(query.datasourceId);
+        const enrichedParameters = ctx.request.body.parameters || {};
+        // make sure parameters are fully enriched with defaults
+        if (query && query.parameters) {
+            for (let parameter of query.parameters) {
+                if (!enrichedParameters[parameter.name]) {
+                    enrichedParameters[parameter.name] = parameter.default;
+                }
+            }
+        }
         // call the relevant CRUD method on the integration class
         try {
             const { rows, pagination, extra } = yield Runner.run({
@@ -138,7 +147,7 @@ function execute(ctx, opts = { rowsOnly: false }) {
                 queryVerb: query.queryVerb,
                 fields: query.fields,
                 pagination: ctx.request.body.pagination,
-                parameters: ctx.request.body.parameters,
+                parameters: enrichedParameters,
                 transformer: query.transformer,
                 queryId: ctx.params.queryId,
             });
@@ -170,8 +179,7 @@ const removeDynamicVariables = (db, queryId) => __awaiter(void 0, void 0, void 0
     const dynamicVariables = datasource.config.dynamicVariables;
     if (dynamicVariables) {
         // delete dynamic variables from the datasource
-        const newVariables = dynamicVariables.filter(dv => dv.queryId !== queryId);
-        datasource.config.dynamicVariables = newVariables;
+        datasource.config.dynamicVariables = dynamicVariables.filter(dv => dv.queryId !== queryId);
         yield db.put(datasource);
         // invalidate the deleted variables
         const variablesToDelete = dynamicVariables.filter(dv => dv.queryId === queryId);

package/dist/api/controllers/row/utils.js

@@ -59,23 +59,24 @@ exports.validate = ({ appId, tableId, row, table }) => __awaiter(void 0, void 0,
         const constraints = cloneDeep(table.schema[fieldName].constraints);
         const type = table.schema[fieldName].type;
         // special case for options, need to always allow unselected (null)
-        if ((type === FieldTypes.OPTIONS || type === FieldTypes.ARRAY) &&
-            constraints.inclusion) {
+        if (type === FieldTypes.OPTIONS && constraints.inclusion) {
             constraints.inclusion.push(null);
         }
         let res;
         // Validate.js doesn't seem to handle array
-        if (type === FieldTypes.ARRAY && row[fieldName]) {
-            if (row[fieldName].length) {
+        if (type === FieldTypes.ARRAY) {
+            const hasValues = Array.isArray(row[fieldName]) && row[fieldName].length > 0;
+            // Check values are valid if values are specified
+            if (hasValues) {
                 row[fieldName].map(val => {
                     if (!constraints.inclusion.includes(val)) {
-                        errors[fieldName] = "Field not in list";
+                        errors[fieldName] = "Value not in list";
                     }
                 });
             }
-            else if (constraints.presence && row[fieldName].length === 0) {
-                // non required MultiSelect creates an empty array, which should not throw errors
-                errors[fieldName] = [`${fieldName} is required`];
+            // Check for required constraint
+            if (constraints.presence === true && !hasValues) {
+                errors[fieldName] = "Required field";
             }
         }
         else if (type === FieldTypes.JSON && typeof row[fieldName] === "string") {

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

@@ -12,7 +12,7 @@ const CouchDB = require("../../../db");
 const internal = require("./internal");
 const external = require("./external");
 const csvParser = require("../../../utilities/csvParser");
-const { isExternalTable, isSQL } = require("../../../integrations/utils");
+const { isExternalTable } = require("../../../integrations/utils");
 const { getTableParams, getDatasourceParams, BudibaseInternalDB, } = require("../../../db/utils");
 const { getTable } = require("./utils");
 function pickApi({ tableId, table }) {
@@ -34,18 +34,12 @@ exports.fetch = function (ctx) {
         const internalTables = yield db.allDocs(getTableParams(null, {
             include_docs: true,
         }));
-        const internal = internalTables.rows.map(tableDoc => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: BudibaseInternalDB._id })));
+        const internal = internalTables.rows.map(row => (Object.assign(Object.assign({}, row.doc), { type: "internal", sourceId: BudibaseInternalDB._id })));
         const externalTables = yield db.allDocs(getDatasourceParams("plus", {
             include_docs: true,
         }));
-        const external = externalTables.rows.flatMap(tableDoc => {
-            let entities = tableDoc.doc.entities;
-            if (entities) {
-                return Object.values(entities).map(entity => (Object.assign(Object.assign({}, entity), { type: "external", sourceId: tableDoc.doc._id, sql: isSQL(tableDoc.doc) })));
-            }
-            else {
-                return [];
-            }
+        const external = externalTables.rows.flatMap(row => {
+            return Object.values(row.doc.entities || {}).map(entity => (Object.assign(Object.assign({}, entity), { type: "external", sourceId: row.doc._id })));
         });
         ctx.body = [...internal, ...external];
     });

package/dist/api/controllers/table/utils.js

@@ -15,7 +15,7 @@ const { isEqual } = require("lodash/fp");
 const { AutoFieldSubTypes, FieldTypes } = require("../../../constants");
 const { inputProcessing } = require("../../../utilities/rowProcessor");
 const { USERS_TABLE_SCHEMA, SwitchableTypes } = require("../../../constants");
-const { isExternalTable, breakExternalTableId, isSQL, } = require("../../../integrations/utils");
+const { isExternalTable, breakExternalTableId, } = require("../../../integrations/utils");
 const { getViews, saveView } = require("../view/utils");
 const viewTemplate = require("../view/viewBuilder");
 exports.checkForColumnUpdates = (db, oldTable, updatedTable) => __awaiter(void 0, void 0, void 0, function* () {
@@ -207,9 +207,7 @@ exports.getTable = (appId, tableId) => __awaiter(void 0, void 0, void 0, functio
     const db = new CouchDB(appId);
     if (isExternalTable(tableId)) {
         let { datasourceId, tableName } = breakExternalTableId(tableId);
-        const datasource = yield db.get(datasourceId);
-        const table = yield exports.getExternalTable(appId, datasourceId, tableName);
-        return Object.assign(Object.assign({}, table), { sql: isSQL(datasource) });
+        return exports.getExternalTable(appId, datasourceId, tableName);
     }
     else {
         return db.get(tableId);

package/dist/integrations/base/sql.js

@@ -69,16 +69,10 @@ class InternalBuilder {
         this.client = client;
     }
     // right now we only do filters on the specific table being queried
-    addFilters(query, filters, opts) {
+    addFilters(tableName, query, filters) {
         function iterate(structure, fn) {
             for (let [key, value] of Object.entries(structure)) {
-                const isRelationshipField = key.includes(".");
-                if (!opts.relationship && !isRelationshipField) {
-                    fn(`${opts.tableName}.${key}`, value);
-                }
-                if (opts.relationship && isRelationshipField) {
-                    fn(key, value);
-                }
+                fn(`${tableName}.${key}`, value);
             }
         }
         if (!filters) {
@@ -254,7 +248,7 @@ class InternalBuilder {
         if (foundOffset) {
             query = query.offset(foundOffset);
         }
-        query = this.addFilters(query, filters, { tableName });
+        query = this.addFilters(tableName, query, filters);
         // add sorting to pre-query
         query = this.addSorting(query, json);
         // @ts-ignore
@@ -267,14 +261,13 @@ class InternalBuilder {
             preQuery = this.addSorting(preQuery, json);
         }
         // handle joins
-        query = this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
-        return this.addFilters(query, filters, { relationship: true });
+        return this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
     }
     update(knex, json, opts) {
         const { endpoint, body, filters } = json;
         let query = knex(endpoint.entityId);
         const parsedBody = parseBody(body);
-        query = this.addFilters(query, filters, { tableName: endpoint.entityId });
+        query = this.addFilters(endpoint.entityId, query, filters);
         // mysql can't use returning
         if (opts.disableReturning) {
             return query.update(parsedBody);
@@ -286,7 +279,7 @@ class InternalBuilder {
     delete(knex, json, opts) {
         const { endpoint, filters } = json;
         let query = knex(endpoint.entityId);
-        query = this.addFilters(query, filters, { tableName: endpoint.entityId });
+        query = this.addFilters(endpoint.entityId, query, filters);
         // mysql can't use returning
         if (opts.disableReturning) {
             return query.delete();

package/dist/integrations/utils.js

@@ -125,12 +125,7 @@ function isSQL(datasource) {
     if (!datasource || !datasource.source) {
         return false;
     }
-    const SQL = [
-        datasource_1.SourceNames.POSTGRES,
-        datasource_1.SourceNames.SQL_SERVER,
-        datasource_1.SourceNames.MYSQL,
-        datasource_1.SourceNames.ORACLE,
-    ];
+    const SQL = [datasource_1.SourceNames.POSTGRES, datasource_1.SourceNames.SQL_SERVER, datasource_1.SourceNames.MYSQL];
     return SQL.indexOf(datasource.source) !== -1;
 }
 exports.isSQL = isSQL;
@@ -142,40 +137,8 @@ function isIsoDateString(str) {
     return d.toISOString() === str;
 }
 exports.isIsoDateString = isIsoDateString;
-/**
- * This function will determine whether a column is a relationship and whether it
- * is currently valid. The reason for the validity check is that tables can be deleted
- * outside of Budibase control and if this is the case it will break Budibase relationships.
- * The tableIds is a list passed down from the main finalise tables function, which is
- * based on the tables that have just been fetched. This will only really be used on subsequent
- * fetches to the first one - if the user is periodically refreshing Budibase knowledge of tables.
- * @param column The column to check, to see if it is a valid relationship.
- * @param tableIds The IDs of the tables which currently exist.
- */
-function shouldCopyRelationship(column, tableIds) {
-    return column.type === constants_1.FieldTypes.LINK && column.tableId && tableIds.includes(column.tableId);
-}
-/**
- * Similar function to the shouldCopyRelationship function, but instead this looks for options and boolean
- * types. It is possible to switch a string -> options and a number -> boolean (and vice versus) need to make
- * sure that these get copied over when tables are fetched. Also checks whether they are still valid, if a
- * column has changed type in the external database then copying it over may not be possible.
- * @param column The column to check for options or boolean type.
- * @param fetchedColumn The fetched column to check for the type in the external database.
- */
-function shouldCopySpecialColumn(column, fetchedColumn) {
-    return column.type === constants_1.FieldTypes.OPTIONS ||
-        ((!fetchedColumn || fetchedColumn.type === constants_1.FieldTypes.NUMBER) && column.type === constants_1.FieldTypes.BOOLEAN);
-}
-/**
- * Looks for columns which need to be copied over into the new table definitions, like relationships
- * and options types.
- * @param tableName The name of the table which is being checked.
- * @param table The specific table which is being checked.
- * @param entities All the tables that existed before - the old table definitions.
- * @param tableIds The IDs of the tables which exist now, to check if anything has been removed.
- */
-function copyExistingPropsOver(tableName, table, entities, tableIds) {
+// add the existing relationships from the entities if they exist, to prevent them from being overridden
+function copyExistingPropsOver(tableName, table, entities) {
     if (entities && entities[tableName]) {
         if (entities[tableName].primaryDisplay) {
             table.primaryDisplay = entities[tableName].primaryDisplay;
@@ -185,28 +148,20 @@ function copyExistingPropsOver(tableName, table, entities, tableIds) {
             if (!existingTableSchema.hasOwnProperty(key)) {
                 continue;
             }
-            const column = existingTableSchema[key];
-            if (shouldCopyRelationship(column, tableIds) ||
-                shouldCopySpecialColumn(column, table.schema[key])) {
+            if (existingTableSchema[key].type === constants_1.FieldTypes.LINK ||
+                existingTableSchema[key].type === constants_1.FieldTypes.OPTIONS ||
+                ((!table.schema[key] || table.schema[key].type === constants_1.FieldTypes.NUMBER) &&
+                    existingTableSchema[key].type === constants_1.FieldTypes.BOOLEAN)) {
                 table.schema[key] = existingTableSchema[key];
             }
         }
     }
     return table;
 }
-/**
- * Look through the final table definitions to see if anything needs to be
- * copied over from the old and if any errors have occurred mark them so
- * that the user can be made aware.
- * @param tables The list of tables that have been retrieved from the external database.
- * @param entities The old list of tables, if there was any to look for definitions in.
- */
 function finaliseExternalTables(tables, entities) {
     const invalidColumns = Object.values(constants_1.InvalidColumns);
     let finalTables = {};
     const errors = {};
-    // @ts-ignore
-    const tableIds = Object.values(tables).map(table => table._id);
     for (let [name, table] of Object.entries(tables)) {
         const schemaFields = Object.keys(table.schema);
         // make sure every table has a key
@@ -219,7 +174,7 @@ function finaliseExternalTables(tables, entities) {
             continue;
         }
         // make sure all previous props have been added back
-        finalTables[name] = copyExistingPropsOver(name, table, entities, tableIds);
+        finalTables[name] = copyExistingPropsOver(name, table, entities);
     }
     // sort the tables by name
     finalTables = Object.entries(finalTables)

package/dist/middleware/currentapp.js

@@ -49,15 +49,6 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         !isWebhookEndpoint(ctx) &&
         (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
         clearCookie(ctx, Cookies.CurrentApp);
-        // have to set the return url on the server side as client side is not available
-        setCookie(ctx, ctx.url, Cookies.RETURN_URL, {
-            // don't sign so the browser can easily read
-            sign: false,
-            // use the request domain to match how ui handles the return url cookie.
-            // it's important we don't use the shared domain here as the builder
-            // can't delete from it without awareness of the domain.
-            requestDomain: true,
-        });
         return ctx.redirect("/");
     }
     let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.46-alpha.1",
+    "version": "1.0.46",
     "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.46-alpha.1",
-        "@budibase/client": "^1.0.46-alpha.1",
-        "@budibase/string-templates": "^1.0.46-alpha.1",
+        "@budibase/backend-core": "^1.0.46",
+        "@budibase/client": "^1.0.46",
+        "@budibase/string-templates": "^1.0.46",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",