@budibase/server 1.0.27-alpha.4 → 1.0.27-alpha.8

package/dist/api/controllers/query/import/sources/base/index.js

@@ -11,12 +11,13 @@ var MethodToVerb;
 })(MethodToVerb || (MethodToVerb = {}));
 class ImportSource {
     constructor() {
-        this.constructQuery = (datasourceId, name, method, path, queryString, headers = {}, parameters = [], body = undefined) => {
+        this.constructQuery = (datasourceId, name, method, path, url, queryString, headers = {}, parameters = [], body = undefined) => {
             const readable = true;
             const queryVerb = this.verbFromMethod(method);
             const transformer = "return data";
             const schema = {};
             path = this.processPath(path);
+            path = `${url.origin}/${path}`;
             queryString = this.processQuery(queryString);
             const requestBody = JSON.stringify(body, null, 2);
             const query = {

package/dist/api/controllers/query/import/sources/curl.js

@@ -67,15 +67,17 @@ class Curl extends base_1.ImportSource {
             }
             return true;
         });
+        this.getUrl = () => {
+            return new url_1.URL(this.curl.raw_url);
+        };
         this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
-            const url = new url_1.URL(this.curl.url);
+            const url = this.getUrl();
             return {
-                url: url.origin,
                 name: url.hostname,
             };
         });
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
-            const url = new url_1.URL(this.curl.raw_url);
+            const url = this.getUrl();
             const name = url.pathname;
             const path = url.pathname;
             const method = this.curl.method;
@@ -86,7 +88,7 @@ class Curl extends base_1.ImportSource {
             if (cookieHeader) {
                 headers["Cookie"] = cookieHeader;
             }
-            const query = this.constructQuery(datasourceId, name, method, path, queryString, headers, [], requestBody);
+            const query = this.constructQuery(datasourceId, name, method, path, url, queryString, headers, [], requestBody);
             return [query];
         });
     }

package/dist/api/controllers/query/import/sources/openapi2.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAPI2 = void 0;
 const openapi_types_1 = require("openapi-types");
 const openapi_1 = require("./base/openapi");
+const url_1 = require("url");
 const parameterNotRef = (param) => {
     // all refs are deferenced by parser library
     return true;
@@ -53,19 +54,21 @@ class OpenAPI2 extends openapi_1.OpenAPISource {
                 return false;
             }
         });
-        this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
+        this.getUrl = () => {
             var _a;
             const scheme = ((_a = this.document.schemes) === null || _a === void 0 ? void 0 : _a.includes("https")) ? "https" : "http";
             const basePath = this.document.basePath || "";
             const host = this.document.host || "<host>";
-            const url = `${scheme}://${host}${basePath}`;
+            return new url_1.URL(`${scheme}://${host}${basePath}`);
+        };
+        this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
             const name = this.document.info.title || "Swagger Import";
             return {
-                url: url,
-                name: name,
+                name,
             };
         });
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
+            const url = this.getUrl();
             const queries = [];
             for (let [path, pathItem] of Object.entries(this.document.paths)) {
                 // parameters that apply to every operation in the path
@@ -128,7 +131,7 @@ class OpenAPI2 extends openapi_1.OpenAPISource {
                             }
                         }
                     }
-                    const query = this.constructQuery(datasourceId, name, methodName, path, queryString, headers, parameters, requestBody);
+                    const query = this.constructQuery(datasourceId, name, methodName, path, url, queryString, headers, parameters, requestBody);
                     queries.push(query);
                 }
             }

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

@@ -14,6 +14,7 @@ const { BaseQueryVerbs } = require("../../../constants");
 const { Thread, ThreadType } = require("../../../threads");
 const { save: saveDatasource } = require("../datasource");
 const { RestImporter } = require("./import");
+const { invalidateDynamicVariables } = require("../../../threads/utils");
 const Runner = new Thread(ThreadType.QUERY, { timeoutMs: 10000 });
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {
@@ -159,9 +160,24 @@ exports.executeV2 = function (ctx) {
         return execute(ctx, { rowsOnly: false });
     });
 };
+const removeDynamicVariables = (db, queryId) => __awaiter(void 0, void 0, void 0, function* () {
+    const query = yield db.get(queryId);
+    const datasource = yield db.get(query.datasourceId);
+    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;
+        yield db.put(datasource);
+        // invalidate the deleted variables
+        const variablesToDelete = dynamicVariables.filter(dv => dv.queryId === queryId);
+        yield invalidateDynamicVariables(variablesToDelete);
+    }
+});
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
+        yield removeDynamicVariables(db, ctx.params.queryId);
         yield db.remove(ctx.params.queryId, ctx.params.revId);
         ctx.message = `Query deleted.`;
         ctx.status = 200;

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

@@ -23,7 +23,7 @@ const CouchDB = require("../../../db");
 const linkRows = require("../../../db/linkedRows");
 const { getRowParams, generateRowID, DocumentTypes, InternalTables, } = require("../../../db/utils");
 const userController = require("../user");
-const { inputProcessing, outputProcessing, processAutoColumn, } = require("../../../utilities/rowProcessor");
+const { inputProcessing, outputProcessing, processAutoColumn, cleanupAttachments, } = require("../../../utilities/rowProcessor");
 const { FieldTypes } = require("../../../constants");
 const { isEqual } = require("lodash");
 const { validate, findRow } = require("./utils");
@@ -32,6 +32,7 @@ const { getGlobalUsersFromMetadata } = require("../../../utilities/global");
 const inMemoryViews = require("../../../db/inMemoryView");
 const env = require("../../../environment");
 const { migrateToInMemoryView, migrateToDesignView, getFromDesignDoc, getFromMemoryDoc, } = require("../view/utils");
+const { cloneDeep } = require("lodash/fp");
 const CALCULATION_TYPES = {
     SUM: "sum",
     COUNT: "count",
@@ -119,15 +120,15 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const inputs = ctx.request.body;
     const tableId = inputs.tableId;
     const isUserTable = tableId === InternalTables.USER_METADATA;
-    let dbRow;
+    let oldRow;
     try {
-        dbRow = yield db.get(inputs._id);
+        oldRow = yield db.get(inputs._id);
     }
     catch (err) {
         if (isUserTable) {
             // don't include the rev, it'll be the global rev
             // this time
-            dbRow = {
+            oldRow = {
                 _id: inputs._id,
             };
         }
@@ -137,13 +138,14 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     }
     let dbTable = yield db.get(tableId);
     // need to build up full patch fields before coerce
+    let combinedRow = cloneDeep(oldRow);
     for (let key of Object.keys(inputs)) {
         if (!dbTable.schema[key])
             continue;
-        dbRow[key] = inputs[key];
+        combinedRow[key] = inputs[key];
     }
     // this returns the table and row incase they have been updated
-    let { table, row } = inputProcessing(ctx.user, dbTable, dbRow);
+    let { table, row } = inputProcessing(ctx.user, dbTable, combinedRow);
     const validateResult = yield validate({
         row,
         table,
@@ -159,6 +161,8 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         tableId: row.tableId,
         table,
     });
+    // check if any attachments removed
+    yield cleanupAttachments(appId, table, { oldRow, row });
     if (isUserTable) {
         // the row has been updated, need to put it into the ctx
         ctx.request.body = row;
@@ -284,6 +288,8 @@ exports.destroy = function (ctx) {
             row,
             tableId: row.tableId,
         });
+        // remove any attachments that were on the row from object storage
+        yield cleanupAttachments(appId, table, { row });
         let response;
         if (ctx.params.tableId === InternalTables.USER_METADATA) {
             ctx.params = {
@@ -325,6 +331,8 @@ exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     else {
         yield db.bulkDocs(rows.map(row => (Object.assign(Object.assign({}, row), { _deleted: true }))));
     }
+    // remove any attachments that were on the rows from object storage
+    yield cleanupAttachments(appId, table, { rows });
     yield Promise.all(updates);
     return { response: { ok: true }, rows };
 });

package/dist/integrations/base/sqlTable.js

@@ -29,7 +29,7 @@ function generateSchema(schema, table, tables, oldTable = null) {
             case FieldTypes.STRING:
             case FieldTypes.OPTIONS:
             case FieldTypes.LONGFORM:
-                schema.string(key);
+                schema.text(key);
                 break;
             case FieldTypes.NUMBER:
                 // if meta is specified then this is a junction table entry

package/dist/integrations/rest.js

@@ -159,7 +159,7 @@ var RestModule;
         getUrl(path, queryString) {
             const main = `${path}?${queryString}`;
             let complete = main;
-            if (this.config.url && !main.startsWith(this.config.url)) {
+            if (this.config.url && !main.startsWith("http")) {
                 complete = !this.config.url ? main : `${this.config.url}/${main}`;
             }
             if (!complete.startsWith("http")) {

package/dist/package.json

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

package/dist/threads/utils.js

@@ -47,9 +47,10 @@ exports.checkCacheForDynamicVariable = (queryId, variable) => __awaiter(void 0,
     return cache.get(makeVariableKey(queryId, variable));
 });
 exports.invalidateDynamicVariables = (cachedVars) => __awaiter(void 0, void 0, void 0, function* () {
+    const cache = yield getClient();
     let promises = [];
     for (let variable of cachedVars) {
-        promises.push(client.delete(makeVariableKey(variable.queryId, variable.name)));
+        promises.push(cache.delete(makeVariableKey(variable.queryId, variable.name)));
     }
     yield Promise.all(promises);
 });