@budibase/server 2.1.40-alpha.4 → 2.1.41

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

@@ -28,7 +28,7 @@ const linkedRows_1 = require("../../../db/linkedRows");
 const utils_1 = require("../../../db/utils");
 const constants_1 = require("../../../constants");
 const utils_2 = require("./utils");
-const backend_core_1 = require("@budibase/backend-core");
+const { getAppDB } = require("@budibase/backend-core/context");
 const environment_1 = require("../../../environment");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const bulkFormula_1 = require("./bulkFormula");
@@ -57,7 +57,7 @@ function checkAutoColumns(table, oldTable) {
 }
 function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const _a = ctx.request.body, { dataImport } = _a, rest = __rest(_a, ["dataImport"]);
         let tableToSave = Object.assign({ type: "table", _id: (0, utils_1.generateTableID)(), views: {} }, rest);
         // if the table obj had an _id then it will have been retrieved
@@ -141,14 +141,14 @@ function save(ctx) {
             tableToSave._rev = result.rev;
         }
         // has to run after, make sure it has _id
-        yield (0, bulkFormula_1.runStaticFormulaChecks)(tableToSave, { oldTable, deletion: false });
+        yield (0, bulkFormula_1.runStaticFormulaChecks)(tableToSave, { oldTable, deletion: null });
         return tableToSave;
     });
 }
 exports.save = save;
 function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const tableToDelete = yield db.get(ctx.params.tableId);
         // Delete all rows for that table
         const rowsData = yield db.allDocs((0, utils_1.getRowParams)(ctx.params.tableId, null, {
@@ -164,7 +164,7 @@ function destroy(ctx) {
             table: tableToDelete,
         });
         // don't remove the table itself until very end
-        yield db.remove(tableToDelete._id, tableToDelete._rev);
+        yield db.remove(tableToDelete);
         // remove table search index
         if (!(0, environment_1.isTest)() || environment_2.default.COUCH_DB_URL) {
             const currentIndexes = yield db.getIndexes();
@@ -175,6 +175,7 @@ function destroy(ctx) {
         }
         // has to run after, make sure it has _id
         yield (0, bulkFormula_1.runStaticFormulaChecks)(tableToDelete, {
+            oldTable: null,
             deletion: true,
         });
         yield (0, rowProcessor_1.cleanupAttachments)(tableToDelete, {

package/dist/api/controllers/table/utils.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.TableSaveFunctions = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.importToRows = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
+exports.TableSaveFunctions = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
 const csvParser_1 = require("../../../utilities/csvParser");
 const utils_1 = require("../../../db/utils");
 const lodash_1 = require("lodash");
@@ -21,25 +21,26 @@ const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const constants_2 = require("../../../constants");
 const utils_2 = require("../view/utils");
 const viewBuilder_1 = __importDefault(require("../view/viewBuilder"));
+const { getAppDB } = require("@budibase/backend-core/context");
 const fp_1 = require("lodash/fp");
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
 function clearColumns(table, columnNames) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const rows = yield db.allDocs((0, utils_1.getRowParams)(table._id, null, {
             include_docs: true,
         }));
-        return (yield db.bulkDocs(rows.rows.map(({ doc }) => {
+        return db.bulkDocs(rows.rows.map(({ doc }) => {
             columnNames.forEach((colName) => delete doc[colName]);
             return doc;
-        })));
+        }));
     });
 }
 exports.clearColumns = clearColumns;
 function checkForColumnUpdates(oldTable, updatedTable) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         let updatedRows = [];
         const rename = updatedTable._rename;
         let deletedColumns = [];
@@ -95,44 +96,39 @@ function makeSureTableUpToDate(table, tableToSave) {
     return tableToSave;
 }
 exports.makeSureTableUpToDate = makeSureTableUpToDate;
-function importToRows(data, table, user = {}) {
-    let finalData = [];
-    for (let i = 0; i < data.length; i++) {
-        let row = data[i];
-        row._id = (0, utils_1.generateRowID)(table._id);
-        row.tableId = table._id;
-        const processed = (0, rowProcessor_1.inputProcessing)(user, table, row, {
-            noAutoRelationships: true,
-        });
-        table = processed.table;
-        row = processed.row;
-        let fieldName;
-        let schema;
-        for ([fieldName, schema] of Object.entries(table.schema)) {
-            // check whether the options need to be updated for inclusion as part of the data import
-            if (schema.type === constants_1.FieldTypes.OPTIONS &&
-                (!schema.constraints.inclusion ||
-                    schema.constraints.inclusion.indexOf(row[fieldName]) === -1)) {
-                schema.constraints.inclusion = [
-                    ...schema.constraints.inclusion,
-                    row[fieldName],
-                ];
-            }
-        }
-        finalData.push(row);
-    }
-    return finalData;
-}
-exports.importToRows = importToRows;
 function handleDataImport(user, table, dataImport) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!dataImport || !dataImport.csvString) {
             return table;
         }
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         // Populate the table with rows imported from CSV in a bulk update
         const data = yield (0, csvParser_1.transform)(Object.assign(Object.assign({}, dataImport), { existingTable: table }));
-        let finalData = importToRows(data, table, user);
+        let finalData = [];
+        for (let i = 0; i < data.length; i++) {
+            let row = data[i];
+            row._id = (0, utils_1.generateRowID)(table._id);
+            row.tableId = table._id;
+            const processed = (0, rowProcessor_1.inputProcessing)(user, table, row, {
+                noAutoRelationships: true,
+            });
+            table = processed.table;
+            row = processed.row;
+            let fieldName;
+            let schema;
+            for ([fieldName, schema] of Object.entries(table.schema)) {
+                // check whether the options need to be updated for inclusion as part of the data import
+                if (schema.type === constants_1.FieldTypes.OPTIONS &&
+                    (!schema.constraints.inclusion ||
+                        schema.constraints.inclusion.indexOf(row[fieldName]) === -1)) {
+                    schema.constraints.inclusion = [
+                        ...schema.constraints.inclusion,
+                        row[fieldName],
+                    ];
+                }
+            }
+            finalData.push(row);
+        }
         yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
             tableId: table._id,
         });
@@ -143,7 +139,7 @@ function handleDataImport(user, table, dataImport) {
 exports.handleDataImport = handleDataImport;
 function handleSearchIndexes(table) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         // create relevant search indexes
         if (table.indexes && table.indexes.length > 0) {
             const currentIndexes = yield db.getIndexes();
@@ -196,7 +192,7 @@ function checkStaticTables(table) {
 exports.checkStaticTables = checkStaticTables;
 class TableSaveFunctions {
     constructor({ user, oldTable, dataImport }) {
-        this.db = backend_core_1.context.getAppDB();
+        this.db = getAppDB();
         this.user = user;
         this.oldTable = oldTable;
         this.dataImport = dataImport;
@@ -309,7 +305,7 @@ function generateJunctionTableName(column, table, relatedTable) {
     return `jt_${table.name}_${relatedTable.name}_${column.name}_${column.fieldName}`;
 }
 exports.generateJunctionTableName = generateJunctionTableName;
-function foreignKeyStructure(keyName, meta) {
+function foreignKeyStructure(keyName, meta = null) {
     const structure = {
         type: constants_1.FieldTypes.NUMBER,
         constraints: {},

package/dist/api/controllers/templates.js

@@ -8,22 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadTemplate = exports.fetch = void 0;
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const fileSystem_1 = require("../../utilities/fileSystem");
-const environment_1 = __importDefault(require("../../environment"));
+const fetch = require("node-fetch");
+const { downloadTemplate } = require("../../utilities/fileSystem");
+const env = require("../../environment");
 // development flag, can be used to test against templates exported locally
 const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com";
-function fetch(ctx) {
+exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let type = environment_1.default.TEMPLATE_REPOSITORY;
+        let type = env.TEMPLATE_REPOSITORY;
         let response, error = false;
         try {
-            response = yield (0, node_fetch_1.default)(`https://${DEFAULT_TEMPLATES_BUCKET}/manifest.json`);
+            response = yield fetch(`https://${DEFAULT_TEMPLATES_BUCKET}/manifest.json`);
             if (response.status !== 200) {
                 error = true;
             }
@@ -40,17 +35,15 @@ function fetch(ctx) {
             ctx.body = [];
         }
     });
-}
-exports.fetch = fetch;
+};
 // can't currently test this, have to ignore from coverage
 /* istanbul ignore next */
-function downloadTemplate(ctx) {
+exports.downloadTemplate = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { type, name } = ctx.params;
-        yield (0, fileSystem_1.downloadTemplate)(type, name);
+        yield downloadTemplate(type, name);
         ctx.body = {
             message: `template ${type}:${name} downloaded successfully.`,
         };
     });
-}
-exports.downloadTemplate = downloadTemplate;
+};

package/dist/api/controllers/user.js

@@ -8,30 +8,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFlags = exports.setFlag = exports.findMetadata = exports.destroyMetadata = exports.updateMetadata = exports.updateSelfMetadata = exports.fetchMetadata = exports.syncUser = exports.syncGlobalUsers = void 0;
-const utils_1 = require("../../db/utils");
-const utils_2 = require("../../db/utils");
-const global_1 = require("../../utilities/global");
-const users_1 = require("../../utilities/users");
-const lodash_1 = require("lodash");
-const backend_core_1 = require("@budibase/backend-core");
+const { generateUserMetadataID, getUserMetadataParams, generateUserFlagID, } = require("../../db/utils");
+const { InternalTables } = require("../../db/utils");
+const { getGlobalUsers, getRawGlobalUser } = require("../../utilities/global");
+const { getFullUser } = require("../../utilities/users");
+const { isEqual } = require("lodash");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { getDevelopmentAppID, getProdAppIDs, dbExists, } = require("@budibase/backend-core/db");
+const { UserStatus } = require("@budibase/backend-core/constants");
+const { getAppDB, doInAppContext } = require("@budibase/backend-core/context");
 function rawMetadata() {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        return (yield db.allDocs((0, utils_1.getUserMetadataParams)(null, {
+        const db = getAppDB();
+        return (yield db.allDocs(getUserMetadataParams(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
     });
 }
 function combineMetadataAndUser(user, metadata) {
     // skip users with no access
-    if (user.roleId === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+    if (user.roleId === BUILTIN_ROLE_IDS.PUBLIC) {
         return null;
     }
     delete user._rev;
-    const metadataId = (0, utils_1.generateUserMetadataID)(user._id);
-    const newDoc = Object.assign(Object.assign({}, user), { _id: metadataId, tableId: utils_2.InternalTables.USER_METADATA });
+    const metadataId = generateUserMetadataID(user._id);
+    const newDoc = Object.assign(Object.assign({}, user), { _id: metadataId, tableId: InternalTables.USER_METADATA });
     const found = Array.isArray(metadata)
         ? metadata.find(doc => doc._id === metadataId)
         : metadata;
@@ -39,33 +40,30 @@ function combineMetadataAndUser(user, metadata) {
     if (found) {
         newDoc._rev = found._rev;
     }
-    if (found == null || !(0, lodash_1.isEqual)(newDoc, found)) {
+    if (found == null || !isEqual(newDoc, found)) {
         return Object.assign(Object.assign({}, found), newDoc);
     }
     return null;
 }
-function syncGlobalUsers() {
-    return __awaiter(this, void 0, void 0, function* () {
-        // sync user metadata
-        const db = backend_core_1.context.getAppDB();
-        const [users, metadata] = yield Promise.all([(0, global_1.getGlobalUsers)(), rawMetadata()]);
-        const toWrite = [];
-        for (let user of users) {
-            const combined = yield combineMetadataAndUser(user, metadata);
-            if (combined) {
-                toWrite.push(combined);
-            }
+exports.syncGlobalUsers = () => __awaiter(void 0, void 0, void 0, function* () {
+    // sync user metadata
+    const db = getAppDB();
+    const [users, metadata] = yield Promise.all([getGlobalUsers(), rawMetadata()]);
+    const toWrite = [];
+    for (let user of users) {
+        const combined = yield combineMetadataAndUser(user, metadata);
+        if (combined) {
+            toWrite.push(combined);
         }
-        yield db.bulkDocs(toWrite);
-    });
-}
-exports.syncGlobalUsers = syncGlobalUsers;
-function syncUser(ctx) {
+    }
+    yield db.bulkDocs(toWrite);
+});
+exports.syncUser = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let deleting = false, user;
         const userId = ctx.params.id;
         try {
-            user = yield (0, global_1.getRawGlobalUser)(userId);
+            user = yield getRawGlobalUser(userId);
         }
         catch (err) {
             if (err && err.status === 404) {
@@ -85,23 +83,23 @@ function syncUser(ctx) {
         let prodAppIds;
         // if they are a builder then get all production app IDs
         if ((user.builder && user.builder.global) || deleting) {
-            prodAppIds = yield backend_core_1.db.getProdAppIDs();
+            prodAppIds = yield getProdAppIDs();
         }
         else {
             prodAppIds = Object.entries(roles)
-                .filter(entry => entry[1] !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC)
+                .filter(entry => entry[1] !== BUILTIN_ROLE_IDS.PUBLIC)
                 .map(([appId]) => appId);
         }
         for (let prodAppId of prodAppIds) {
             const roleId = roles[prodAppId];
-            const devAppId = backend_core_1.db.getDevelopmentAppID(prodAppId);
+            const devAppId = getDevelopmentAppID(prodAppId);
             for (let appId of [prodAppId, devAppId]) {
-                if (!(yield backend_core_1.db.dbExists(appId))) {
+                if (!(yield dbExists(appId))) {
                     continue;
                 }
-                yield backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
-                    const db = backend_core_1.context.getAppDB();
-                    const metadataId = (0, utils_1.generateUserMetadataID)(userId);
+                yield doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+                    const db = getAppDB();
+                    const metadataId = generateUserMetadataID(userId);
                     let metadata;
                     try {
                         metadata = yield db.get(metadataId);
@@ -111,7 +109,7 @@ function syncUser(ctx) {
                             return;
                         }
                         metadata = {
-                            tableId: utils_2.InternalTables.USER_METADATA,
+                            tableId: InternalTables.USER_METADATA,
                         };
                     }
                     // assign the roleId for the metadata doc
@@ -120,7 +118,7 @@ function syncUser(ctx) {
                     }
                     let combined = !deleting
                         ? combineMetadataAndUser(user, metadata)
-                        : Object.assign(Object.assign({}, metadata), { status: backend_core_1.constants.UserStatus.INACTIVE, metadata: backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC });
+                        : Object.assign(Object.assign({}, metadata), { status: UserStatus.INACTIVE, metadata: BUILTIN_ROLE_IDS.PUBLIC });
                     // if its null then there was no updates required
                     if (combined) {
                         yield db.put(combined);
@@ -132,52 +130,48 @@ function syncUser(ctx) {
             message: "User synced.",
         };
     });
-}
-exports.syncUser = syncUser;
-function fetchMetadata(ctx) {
+};
+exports.fetchMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const global = yield (0, global_1.getGlobalUsers)();
-        const metadata = yield rawMetadata();
+        const database = getAppDB();
+        const global = yield getGlobalUsers();
+        const metadata = yield rawMetadata(database);
         const users = [];
         for (let user of global) {
             // find the metadata that matches up to the global ID
             const info = metadata.find(meta => meta._id.includes(user._id));
             // remove these props, not for the correct DB
-            users.push(Object.assign(Object.assign(Object.assign({}, user), info), { tableId: utils_2.InternalTables.USER_METADATA, 
+            users.push(Object.assign(Object.assign(Object.assign({}, user), info), { tableId: InternalTables.USER_METADATA, 
                 // make sure the ID is always a local ID, not a global one
-                _id: (0, utils_1.generateUserMetadataID)(user._id) }));
+                _id: generateUserMetadataID(user._id) }));
         }
         ctx.body = users;
     });
-}
-exports.fetchMetadata = fetchMetadata;
-function updateSelfMetadata(ctx) {
-    var _a;
+};
+exports.updateSelfMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         // overwrite the ID with current users
-        ctx.request.body._id = (_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id;
+        ctx.request.body._id = ctx.user._id;
         // make sure no stale rev
         delete ctx.request.body._rev;
         // make sure no csrf token
         delete ctx.request.body.csrfToken;
-        yield updateMetadata(ctx);
+        yield exports.updateMetadata(ctx);
     });
-}
-exports.updateSelfMetadata = updateSelfMetadata;
-function updateMetadata(ctx) {
+};
+exports.updateMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const user = ctx.request.body;
         // this isn't applicable to the user
         delete user.roles;
-        const metadata = Object.assign({ tableId: utils_2.InternalTables.USER_METADATA }, user);
+        const metadata = Object.assign({ tableId: InternalTables.USER_METADATA }, user);
         ctx.body = yield db.put(metadata);
     });
-}
-exports.updateMetadata = updateMetadata;
-function destroyMetadata(ctx) {
+};
+exports.destroyMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         try {
             const dbUser = yield db.get(ctx.params.id);
             yield db.remove(dbUser._id, dbUser._rev);
@@ -189,24 +183,21 @@ function destroyMetadata(ctx) {
             message: `User metadata ${ctx.params.id} deleted.`,
         };
     });
-}
-exports.destroyMetadata = destroyMetadata;
-function findMetadata(ctx) {
+};
+exports.findMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield (0, users_1.getFullUser)(ctx, ctx.params.id);
+        ctx.body = yield getFullUser(ctx, ctx.params.id);
     });
-}
-exports.findMetadata = findMetadata;
-function setFlag(ctx) {
-    var _a;
+};
+exports.setFlag = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const userId = (_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id;
+        const userId = ctx.user._id;
         const { flag, value } = ctx.request.body;
         if (!flag) {
             ctx.throw(400, "Must supply a 'flag' field in request body.");
         }
-        const flagDocId = (0, utils_1.generateUserFlagID)(userId);
-        const db = backend_core_1.context.getAppDB();
+        const flagDocId = generateUserFlagID(userId);
+        const db = getAppDB();
         let doc;
         try {
             doc = yield db.get(flagDocId);
@@ -218,14 +209,12 @@ function setFlag(ctx) {
         yield db.put(doc);
         ctx.body = { message: "Flag set successfully" };
     });
-}
-exports.setFlag = setFlag;
-function getFlags(ctx) {
-    var _a;
+};
+exports.getFlags = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const userId = (_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id;
-        const docId = (0, utils_1.generateUserFlagID)(userId);
-        const db = backend_core_1.context.getAppDB();
+        const userId = ctx.user._id;
+        const docId = generateUserFlagID(userId);
+        const db = getAppDB();
         let doc;
         try {
             doc = yield db.get(docId);
@@ -235,5 +224,4 @@ function getFlags(ctx) {
         }
         ctx.body = doc;
     });
-}
-exports.getFlags = getFlags;
+};

package/dist/api/controllers/view/exporters.js

@@ -1,7 +1,5 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExportFormats = exports.json = exports.csv = void 0;
-function csv(headers, rows) {
+exports.csv = function (headers, rows) {
     let csv = headers.map(key => `"${key}"`).join(",");
     for (let row of rows) {
         csv = `${csv}\n${headers
@@ -16,12 +14,10 @@ function csv(headers, rows) {
             .join(",")}`;
     }
     return csv;
-}
-exports.csv = csv;
-function json(headers, rows) {
+};
+exports.json = function (headers, rows) {
     return JSON.stringify(rows, undefined, 2);
-}
-exports.json = json;
+};
 exports.ExportFormats = {
     CSV: "csv",
     JSON: "json",