@budibase/server 2.1.32-alpha.8 → 2.1.33

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

@@ -1,27 +1,4 @@
 "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;
-};
 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) {
@@ -31,18 +8,14 @@ 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.validateCSVSchema = exports.bulkImport = exports.destroy = exports.save = exports.find = exports.fetch = void 0;
-const internal = __importStar(require("./internal"));
-const external = __importStar(require("./external"));
-const csvParser_1 = __importDefault(require("../../../utilities/csvParser"));
-const utils_1 = require("../../../integrations/utils");
-const utils_2 = require("../../../db/utils");
-const backend_core_1 = require("@budibase/backend-core");
-const sdk_1 = __importDefault(require("../../../sdk"));
+const internal = require("./internal");
+const external = require("./external");
+const csvParser = require("../../../utilities/csvParser");
+const { isExternalTable, isSQL } = require("../../../integrations/utils");
+const { getDatasourceParams } = require("../../../db/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
+const { events } = require("@budibase/backend-core");
+const sdk = require("../../../sdk");
 function pickApi({ tableId, table }) {
     if (table && !tableId) {
         tableId = table._id;
@@ -50,23 +23,23 @@ function pickApi({ tableId, table }) {
     if (table && table.type === "external") {
         return external;
     }
-    else if (tableId && (0, utils_1.isExternalTable)(tableId)) {
+    else if (tableId && isExternalTable(tableId)) {
         return external;
     }
     return internal;
 }
 // covers both internal and external
-function fetch(ctx) {
+exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const internal = yield sdk_1.default.tables.getAllInternalTables();
-        const externalTables = yield db.allDocs((0, utils_2.getDatasourceParams)("plus", {
+        const db = getAppDB();
+        const internal = yield sdk.tables.getAllInternalTables();
+        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: (0, utils_1.isSQL)(tableDoc.doc) })));
+                return Object.values(entities).map(entity => (Object.assign(Object.assign({}, entity), { type: "external", sourceId: tableDoc.doc._id, sql: isSQL(tableDoc.doc) })));
             }
             else {
                 return [];
@@ -74,29 +47,27 @@ function fetch(ctx) {
         });
         ctx.body = [...internal, ...external];
     });
-}
-exports.fetch = fetch;
-function find(ctx) {
+};
+exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = ctx.params.tableId;
-        ctx.body = yield sdk_1.default.tables.getTable(tableId);
+        ctx.body = yield sdk.tables.getTable(tableId);
     });
-}
-exports.find = find;
-function save(ctx) {
+};
+exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         const table = ctx.request.body;
         const importFormat = table.dataImport && table.dataImport.csvString ? "csv" : undefined;
         const savedTable = yield pickApi({ table }).save(ctx);
         if (!table._id) {
-            yield backend_core_1.events.table.created(savedTable);
+            yield events.table.created(savedTable);
         }
         else {
-            yield backend_core_1.events.table.updated(savedTable);
+            yield events.table.updated(savedTable);
         }
         if (importFormat) {
-            yield backend_core_1.events.table.imported(savedTable, importFormat);
+            yield events.table.imported(savedTable, importFormat);
         }
         ctx.status = 200;
         ctx.message = `Table ${table.name} saved successfully.`;
@@ -104,23 +75,21 @@ function save(ctx) {
             ctx.eventEmitter.emitTable(`table:save`, appId, savedTable);
         ctx.body = savedTable;
     });
-}
-exports.save = save;
-function destroy(ctx) {
+};
+exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         const tableId = ctx.params.tableId;
         const deletedTable = yield pickApi({ tableId }).destroy(ctx);
-        yield backend_core_1.events.table.deleted(deletedTable);
+        yield events.table.deleted(deletedTable);
         ctx.eventEmitter &&
             ctx.eventEmitter.emitTable(`table:delete`, appId, deletedTable);
         ctx.status = 200;
         ctx.table = deletedTable;
         ctx.body = { message: `Table ${tableId} deleted.` };
     });
-}
-exports.destroy = destroy;
-function bulkImport(ctx) {
+};
+exports.bulkImport = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = ctx.params.tableId;
         yield pickApi({ tableId }).bulkImport(ctx);
@@ -130,21 +99,19 @@ function bulkImport(ctx) {
         ctx.status = 200;
         ctx.body = { message: `Bulk rows created.` };
     });
-}
-exports.bulkImport = bulkImport;
-function validateCSVSchema(ctx) {
+};
+exports.validateCSVSchema = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         // tableId being specified means its an import to an existing table
         const { csvString, schema = {}, tableId } = ctx.request.body;
         let existingTable;
         if (tableId) {
-            existingTable = yield sdk_1.default.tables.getTable(tableId);
+            existingTable = yield sdk.tables.getTable(tableId);
         }
-        let result = yield csvParser_1.default.parse(csvString, schema);
+        let result = yield csvParser.parse(csvString, schema);
         if (existingTable) {
-            result = csvParser_1.default.updateSchema({ schema: result, existingTable });
+            result = csvParser.updateSchema({ schema: result, existingTable });
         }
         ctx.body = { schema: result };
     });
-}
-exports.validateCSVSchema = validateCSVSchema;
+};

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;
+};