@budibase/server 2.2.11-alpha.2 → 2.2.12-alpha.0

package/dist/package.json

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

package/dist/sdk/app/backups/imports.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.importApp = exports.getListOfAppsInMulti = exports.getGlobalDBFile = exports.untarFile = void 0;
+exports.importApp = exports.getListOfAppsInMulti = exports.getGlobalDBFile = exports.untarFile = exports.updateAttachmentColumns = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
 const budibaseDir_1 = require("../../../utilities/budibaseDir");
@@ -25,53 +25,37 @@ const __1 = __importDefault(require("../../"));
 const types_1 = require("@budibase/types");
 const uuid = require("uuid/v4");
 const tar = require("tar");
+function rewriteAttachmentUrl(appId, attachment) {
+    // URL looks like: /prod-budi-app-assets/appId/attachments/file.csv
+    const urlParts = attachment.key.split("/");
+    // remove the app ID
+    urlParts.shift();
+    // add new app ID
+    urlParts.unshift(appId);
+    const key = urlParts.join("/");
+    return Object.assign(Object.assign({}, attachment), { key, url: "" });
+}
 function updateAttachmentColumns(prodAppId, db) {
     return __awaiter(this, void 0, void 0, function* () {
         // iterate through attachment documents and update them
         const tables = yield __1.default.tables.getAllInternalTables(db);
+        let updatedRows = [];
         for (let table of tables) {
-            const attachmentCols = [];
-            for (let [key, column] of Object.entries(table.schema)) {
-                if (column.type === constants_2.FieldTypes.ATTACHMENT) {
-                    attachmentCols.push(key);
-                }
-            }
-            // no attachment columns, nothing to do
-            if (attachmentCols.length === 0) {
-                continue;
-            }
-            // use the CouchDB Mango query API to lookup rows that have attachments
-            const params = {
-                selector: {
-                    _id: {
-                        $regex: `^${utils_1.TABLE_ROW_PREFIX}`,
-                    },
-                },
-            };
-            attachmentCols.forEach(col => (params.selector[col] = { $exists: true }));
-            const { rows } = yield backend_core_1.db.directCouchFind(db.name, params);
-            for (let row of rows) {
-                for (let column of attachmentCols) {
-                    if (!Array.isArray(row[column])) {
-                        continue;
+            const { rows, columns } = yield __1.default.rows.getRowsWithAttachments(db.name, table);
+            updatedRows = updatedRows.concat(rows.map(row => {
+                for (let column of columns) {
+                    if (Array.isArray(row[column])) {
+                        row[column] = row[column].map((attachment) => rewriteAttachmentUrl(prodAppId, attachment));
                     }
-                    row[column] = row[column].map((attachment) => {
-                        // Key looks like: appId/attachments/file.csv
-                        const urlParts = attachment.key.split("/");
-                        // remove the app ID
-                        urlParts.shift();
-                        // add new app ID
-                        urlParts.unshift(prodAppId);
-                        const key = urlParts.join("/");
-                        return Object.assign(Object.assign({}, attachment), { key, url: "" });
-                    });
                 }
-            }
-            // write back the updated attachments
-            yield db.bulkDocs(rows);
+                return row;
+            }));
         }
+        // write back the updated attachments
+        yield db.bulkDocs(updatedRows);
     });
 }
+exports.updateAttachmentColumns = updateAttachmentColumns;
 function updateAutomations(prodAppId, db) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {

package/dist/sdk/app/rows/attachments.js

@@ -0,0 +1,61 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRowsWithAttachments = exports.FIND_LIMIT = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../../../db/utils");
+const constants_1 = require("../../../constants");
+// default limit - seems to work well for performance
+exports.FIND_LIMIT = 25;
+function generateAttachmentFindParams(tableId, attachmentCols, bookmark) {
+    const params = {
+        selector: {
+            _id: {
+                $regex: `^${utils_1.DocumentType.ROW}${utils_1.SEPARATOR}${tableId}`,
+            },
+        },
+        limit: exports.FIND_LIMIT,
+    };
+    attachmentCols.forEach(col => (params.selector[col] = { $exists: true }));
+    if (bookmark) {
+        params.bookmark = bookmark;
+    }
+    return params;
+}
+function getRowsWithAttachments(appId, table) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // iterate through attachment documents and update them
+        const db = backend_core_1.db.getDB(appId);
+        const attachmentCols = [];
+        for (let [key, column] of Object.entries(table.schema)) {
+            if (column.type === constants_1.FieldTypes.ATTACHMENT) {
+                attachmentCols.push(key);
+            }
+        }
+        // no attachment columns, nothing to do
+        if (attachmentCols.length === 0) {
+            return { rows: [], columns: [] };
+        }
+        let bookmark = null, rowsLength = 0, rowList = [];
+        do {
+            const params = generateAttachmentFindParams(table._id, attachmentCols, bookmark);
+            // use the CouchDB Mango query API to lookup rows that have attachments
+            const resp = yield backend_core_1.db.directCouchFind(db.name, params);
+            bookmark = resp.bookmark;
+            rowsLength = resp.rows.length;
+            const rows = resp.rows;
+            rowList = rowList.concat(rows);
+        } while (rowsLength === exports.FIND_LIMIT);
+        // write back the updated attachments
+        return { rows: rowList, columns: attachmentCols };
+    });
+}
+exports.getRowsWithAttachments = getRowsWithAttachments;

package/dist/sdk/app/rows/index.js

@@ -0,0 +1,28 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const attachments = __importStar(require("./attachments"));
+const rows = __importStar(require("./rows"));
+exports.default = Object.assign(Object.assign({}, attachments), rows);

package/dist/sdk/app/rows/rows.js

@@ -0,0 +1,30 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllInternalRows = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../../../db/utils");
+function getAllInternalRows(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let db;
+        if (appId) {
+            db = backend_core_1.db.getDB(appId);
+        }
+        else {
+            db = backend_core_1.context.getAppDB();
+        }
+        const response = yield db.allDocs((0, utils_1.getRowParams)(null, null, {
+            include_docs: true,
+        }));
+        return response.rows.map(row => row.doc);
+    });
+}
+exports.getAllInternalRows = getAllInternalRows;

package/dist/sdk/index.js

@@ -7,12 +7,14 @@ const backups_1 = __importDefault(require("./app/backups"));
 const tables_1 = __importDefault(require("./app/tables"));
 const automations_1 = __importDefault(require("./app/automations"));
 const applications_1 = __importDefault(require("./app/applications"));
+const rows_1 = __importDefault(require("./app/rows"));
 const users_1 = __importDefault(require("./users"));
 const sdk = {
     backups: backups_1.default,
     tables: tables_1.default,
     automations: automations_1.default,
     applications: applications_1.default,
+    rows: rows_1.default,
     users: users_1.default,
 };
 // default export for TS