@budibase/server 2.1.45 → 2.1.46-alpha.1

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

@@ -1,4 +1,27 @@
 "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) {
@@ -19,225 +42,270 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-const { DataSourceOperation, SortDirection, FieldTypes, NoEmptyFilterStrings, } = require("../../../constants");
-const { breakExternalTableId, breakRowIdField, } = require("../../../integrations/utils");
-const ExternalRequest = require("./ExternalRequest");
-const { getAppDB } = require("@budibase/backend-core/context");
-const exporters = require("../view/exporters");
-const { apiFileReturn } = require("../../../utilities/fileSystem");
-function handleRequest(operation, tableId, opts = {}) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchEnrichedRow = exports.exportRows = exports.validate = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = exports.handleRequest = void 0;
+const constants_1 = require("../../../constants");
+const utils_1 = require("../../../integrations/utils");
+const ExternalRequest_1 = require("./ExternalRequest");
+const backend_core_1 = require("@budibase/backend-core");
+const exporters = __importStar(require("../view/exporters"));
+const fileSystem_1 = require("../../../utilities/fileSystem");
+const types_1 = require("@budibase/types");
+function handleRequest(operation, tableId, opts) {
     return __awaiter(this, void 0, void 0, function* () {
         // make sure the filters are cleaned up, no empty strings for equals, fuzzy or string
         if (opts && opts.filters) {
-            for (let filterField of NoEmptyFilterStrings) {
+            for (let filterField of constants_1.NoEmptyFilterStrings) {
                 if (!opts.filters[filterField]) {
                     continue;
                 }
+                // @ts-ignore
                 for (let [key, value] of Object.entries(opts.filters[filterField])) {
                     if (!value || value === "") {
+                        // @ts-ignore
                         delete opts.filters[filterField][key];
                     }
                 }
             }
         }
-        return new ExternalRequest(operation, tableId, opts.datasource).run(opts);
+        return new ExternalRequest_1.ExternalRequest(operation, tableId, opts === null || opts === void 0 ? void 0 : opts.datasource).run(opts || {});
     });
 }
 exports.handleRequest = handleRequest;
-exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const inputs = ctx.request.body;
-    const tableId = ctx.params.tableId;
-    const id = inputs._id;
-    // don't save the ID to db
-    delete inputs._id;
-    return handleRequest(DataSourceOperation.UPDATE, tableId, {
-        id: breakRowIdField(id),
-        row: inputs,
+function patch(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const inputs = ctx.request.body;
+        const tableId = ctx.params.tableId;
+        const id = inputs._id;
+        // don't save the ID to db
+        delete inputs._id;
+        return handleRequest(types_1.Operation.UPDATE, tableId, {
+            id: (0, utils_1.breakRowIdField)(id),
+            row: inputs,
+        });
     });
-});
-exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const inputs = ctx.request.body;
-    const tableId = ctx.params.tableId;
-    return handleRequest(DataSourceOperation.CREATE, tableId, {
-        row: inputs,
+}
+exports.patch = patch;
+function save(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const inputs = ctx.request.body;
+        const tableId = ctx.params.tableId;
+        return handleRequest(types_1.Operation.CREATE, tableId, {
+            row: inputs,
+        });
     });
-});
-exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    // there are no views in external datasources, shouldn't ever be called
-    // for now just fetch
-    const split = ctx.params.viewName.split("all_");
-    ctx.params.tableId = split[1] ? split[1] : split[0];
-    return exports.fetch(ctx);
-});
-exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const tableId = ctx.params.tableId;
-    return handleRequest(DataSourceOperation.READ, tableId);
-});
-exports.find = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const id = ctx.params.rowId;
-    const tableId = ctx.params.tableId;
-    const response = yield handleRequest(DataSourceOperation.READ, tableId, {
-        id: breakRowIdField(id),
+}
+exports.save = save;
+function fetchView(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // there are no views in external datasources, shouldn't ever be called
+        // for now just fetch
+        const split = ctx.params.viewName.split("all_");
+        ctx.params.tableId = split[1] ? split[1] : split[0];
+        return fetch(ctx);
     });
-    return response ? response[0] : response;
-});
-exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const tableId = ctx.params.tableId;
-    const id = ctx.request.body._id;
-    const { row } = yield handleRequest(DataSourceOperation.DELETE, tableId, {
-        id: breakRowIdField(id),
+}
+exports.fetchView = fetchView;
+function fetch(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tableId = ctx.params.tableId;
+        return handleRequest(types_1.Operation.READ, tableId);
     });
-    return { response: { ok: true }, row };
-});
-exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { rows } = ctx.request.body;
-    const tableId = ctx.params.tableId;
-    let promises = [];
-    for (let row of rows) {
-        promises.push(handleRequest(DataSourceOperation.DELETE, tableId, {
-            id: breakRowIdField(row._id),
+}
+exports.fetch = fetch;
+function find(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const id = ctx.params.rowId;
+        const tableId = ctx.params.tableId;
+        const response = (yield handleRequest(types_1.Operation.READ, tableId, {
+            id: (0, utils_1.breakRowIdField)(id),
         }));
-    }
-    const responses = yield Promise.all(promises);
-    return { response: { ok: true }, rows: responses.map(resp => resp.row) };
-});
-exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const tableId = ctx.params.tableId;
-    const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
-    let { bookmark, limit } = params;
-    if (!bookmark && paginate) {
-        bookmark = 1;
-    }
-    let paginateObj = {};
-    if (paginate) {
-        paginateObj = {
-            // add one so we can track if there is another page
-            limit: limit,
-            page: bookmark,
-        };
-    }
-    else if (params && limit) {
-        paginateObj = {
-            limit: limit,
-        };
-    }
-    let sort;
-    if (params.sort) {
-        const direction = params.sortOrder === "descending"
-            ? SortDirection.DESCENDING
-            : SortDirection.ASCENDING;
-        sort = {
-            [params.sort]: direction,
-        };
-    }
-    try {
-        const rows = yield handleRequest(DataSourceOperation.READ, tableId, {
-            filters: query,
-            sort,
-            paginate: paginateObj,
-        });
-        let hasNextPage = false;
-        if (paginate && rows.length === limit) {
-            const nextRows = yield handleRequest(DataSourceOperation.READ, tableId, {
+        return response ? response[0] : response;
+    });
+}
+exports.find = find;
+function destroy(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tableId = ctx.params.tableId;
+        const id = ctx.request.body._id;
+        const { row } = (yield handleRequest(types_1.Operation.DELETE, tableId, {
+            id: (0, utils_1.breakRowIdField)(id),
+        }));
+        return { response: { ok: true }, row };
+    });
+}
+exports.destroy = destroy;
+function bulkDestroy(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { rows } = ctx.request.body;
+        const tableId = ctx.params.tableId;
+        let promises = [];
+        for (let row of rows) {
+            promises.push(handleRequest(types_1.Operation.DELETE, tableId, {
+                id: (0, utils_1.breakRowIdField)(row._id),
+            }));
+        }
+        const responses = (yield Promise.all(promises));
+        return { response: { ok: true }, rows: responses.map(resp => resp.row) };
+    });
+}
+exports.bulkDestroy = bulkDestroy;
+function search(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tableId = ctx.params.tableId;
+        const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
+        let { bookmark, limit } = params;
+        if (!bookmark && paginate) {
+            bookmark = 1;
+        }
+        let paginateObj = {};
+        if (paginate) {
+            paginateObj = {
+                // add one so we can track if there is another page
+                limit: limit,
+                page: bookmark,
+            };
+        }
+        else if (params && limit) {
+            paginateObj = {
+                limit: limit,
+            };
+        }
+        let sort;
+        if (params.sort) {
+            const direction = params.sortOrder === "descending"
+                ? constants_1.SortDirection.DESCENDING
+                : constants_1.SortDirection.ASCENDING;
+            sort = {
+                [params.sort]: direction,
+            };
+        }
+        try {
+            const rows = (yield handleRequest(types_1.Operation.READ, tableId, {
                 filters: query,
                 sort,
-                paginate: {
-                    limit: 1,
-                    page: bookmark * limit + 1,
-                },
-            });
-            hasNextPage = nextRows.length > 0;
+                paginate: paginateObj,
+            }));
+            let hasNextPage = false;
+            if (paginate && rows.length === limit) {
+                const nextRows = (yield handleRequest(types_1.Operation.READ, tableId, {
+                    filters: query,
+                    sort,
+                    paginate: {
+                        limit: 1,
+                        page: bookmark * limit + 1,
+                    },
+                }));
+                hasNextPage = nextRows.length > 0;
+            }
+            // need wrapper object for bookmarks etc when paginating
+            return { rows, hasNextPage, bookmark: bookmark + 1 };
         }
-        // need wrapper object for bookmarks etc when paginating
-        return { rows, hasNextPage, bookmark: bookmark + 1 };
-    }
-    catch (err) {
-        if (err.message && err.message.includes("does not exist")) {
-            throw new Error(`Table updated externally, please re-fetch - ${err.message}`);
+        catch (err) {
+            if (err.message && err.message.includes("does not exist")) {
+                throw new Error(`Table updated externally, please re-fetch - ${err.message}`);
+            }
+            else {
+                throw err;
+            }
         }
-        else {
-            throw err;
+    });
+}
+exports.search = search;
+function validate(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // can't validate external right now - maybe in future
+        return { valid: true };
+    });
+}
+exports.validate = validate;
+function exportRows(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { datasourceId } = (0, utils_1.breakExternalTableId)(ctx.params.tableId);
+        const db = backend_core_1.context.getAppDB();
+        const format = ctx.query.format;
+        const { columns } = ctx.request.body;
+        const datasource = yield db.get(datasourceId);
+        if (!datasource || !datasource.entities) {
+            ctx.throw(400, "Datasource has not been configured for plus API.");
         }
-    }
-});
-exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
-    // can't validate external right now - maybe in future
-    return { valid: true };
-});
-exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { datasourceId } = breakExternalTableId(ctx.params.tableId);
-    const db = getAppDB();
-    const format = ctx.query.format;
-    const { columns } = ctx.request.body;
-    const datasource = yield db.get(datasourceId);
-    if (!datasource || !datasource.entities) {
-        ctx.throw(400, "Datasource has not been configured for plus API.");
-    }
-    ctx.request.body = {
-        query: {
-            oneOf: {
-                _id: ctx.request.body.rows.map(row => JSON.parse(decodeURI(row))[0]),
+        ctx.request.body = {
+            query: {
+                oneOf: {
+                    _id: ctx.request.body.rows.map((row) => JSON.parse(decodeURI(row))[0]),
+                },
             },
-        },
-    };
-    let result = yield exports.search(ctx);
-    let rows = [];
-    // Filter data to only specified columns if required
-    if (columns && columns.length) {
-        for (let i = 0; i < result.rows.length; i++) {
-            rows[i] = {};
-            for (let column of columns) {
-                rows[i][column] = result.rows[i][column];
+        };
+        let result = yield search(ctx);
+        let rows = [];
+        // Filter data to only specified columns if required
+        if (columns && columns.length) {
+            for (let i = 0; i < result.rows.length; i++) {
+                rows[i] = {};
+                for (let column of columns) {
+                    rows[i][column] = result.rows[i][column];
+                }
             }
         }
-    }
-    else {
-        rows = result.rows;
-    }
-    let headers = Object.keys(rows[0]);
-    const exporter = exporters[format];
-    const filename = `export.${format}`;
-    // send down the file
-    ctx.attachment(filename);
-    return apiFileReturn(exporter(headers, rows));
-});
-exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const id = ctx.params.rowId;
-    const tableId = ctx.params.tableId;
-    const { datasourceId, tableName } = breakExternalTableId(tableId);
-    const db = getAppDB();
-    const datasource = yield db.get(datasourceId);
-    if (!datasource || !datasource.entities) {
-        ctx.throw(400, "Datasource has not been configured for plus API.");
-    }
-    const tables = datasource.entities;
-    const response = yield handleRequest(DataSourceOperation.READ, tableId, {
-        id,
-        datasource,
+        else {
+            rows = result.rows;
+        }
+        let headers = Object.keys(rows[0]);
+        // @ts-ignore
+        const exporter = exporters[format];
+        const filename = `export.${format}`;
+        // send down the file
+        ctx.attachment(filename);
+        return (0, fileSystem_1.apiFileReturn)(exporter(headers, rows));
     });
-    const table = tables[tableName];
-    const row = response[0];
-    // this seems like a lot of work, but basically we need to dig deeper for the enrich
-    // for a single row, there is probably a better way to do this with some smart multi-layer joins
-    for (let [fieldName, field] of Object.entries(table.schema)) {
-        if (field.type !== FieldTypes.LINK ||
-            !row[fieldName] ||
-            row[fieldName].length === 0) {
-            continue;
+}
+exports.exportRows = exportRows;
+function fetchEnrichedRow(ctx) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const id = ctx.params.rowId;
+        const tableId = ctx.params.tableId;
+        const { datasourceId, tableName } = (0, utils_1.breakExternalTableId)(tableId);
+        const db = backend_core_1.context.getAppDB();
+        const datasource = yield db.get(datasourceId);
+        if (!tableName) {
+            ctx.throw(400, "Unable to find table.");
         }
-        const links = row[fieldName];
-        const linkedTableId = field.tableId;
-        const linkedTable = tables[breakExternalTableId(linkedTableId).tableName];
-        // don't support composite keys right now
-        const linkedIds = links.map(link => breakRowIdField(link._id)[0]);
-        row[fieldName] = yield handleRequest(DataSourceOperation.READ, linkedTableId, {
-            tables,
-            filters: {
-                oneOf: {
-                    [linkedTable.primary]: linkedIds,
+        if (!datasource || !datasource.entities) {
+            ctx.throw(400, "Datasource has not been configured for plus API.");
+        }
+        const tables = datasource.entities;
+        const response = (yield handleRequest(types_1.Operation.READ, tableId, {
+            id,
+            datasource,
+        }));
+        const table = tables[tableName];
+        const row = response[0];
+        // this seems like a lot of work, but basically we need to dig deeper for the enrich
+        // for a single row, there is probably a better way to do this with some smart multi-layer joins
+        for (let [fieldName, field] of Object.entries(table.schema)) {
+            if (field.type !== constants_1.FieldTypes.LINK ||
+                !row[fieldName] ||
+                row[fieldName].length === 0) {
+                continue;
+            }
+            const links = row[fieldName];
+            const linkedTableId = field.tableId;
+            const linkedTableName = (0, utils_1.breakExternalTableId)(linkedTableId).tableName;
+            const linkedTable = tables[linkedTableName];
+            // don't support composite keys right now
+            const linkedIds = links.map((link) => (0, utils_1.breakRowIdField)(link._id)[0]);
+            const primaryLink = (_a = linkedTable.primary) === null || _a === void 0 ? void 0 : _a[0];
+            row[fieldName] = yield handleRequest(types_1.Operation.READ, linkedTableId, {
+                tables,
+                filters: {
+                    oneOf: {
+                        [primaryLink]: linkedIds,
+                    },
                 },
-            },
-        });
-    }
-    return row;
-});
+            });
+        }
+        return row;
+    });
+}
+exports.fetchEnrichedRow = fetchEnrichedRow;

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

@@ -1,4 +1,27 @@
 "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) {
@@ -8,20 +31,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.exportRows = exports.fetchEnrichedRow = exports.validate = exports.search = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = void 0;
 const pro_1 = require("@budibase/pro");
-const internal_1 = __importDefault(require("./internal"));
-const external_1 = __importDefault(require("./external"));
+const internal = __importStar(require("./internal"));
+const external = __importStar(require("./external"));
 const utils_1 = require("../../../integrations/utils");
 function pickApi(tableId) {
     if ((0, utils_1.isExternalTable)(tableId)) {
-        return external_1.default;
+        return external;
     }
-    return internal_1.default;
+    return internal;
 }
 function getTableId(ctx) {
     if (ctx.request.body && ctx.request.body.tableId) {
@@ -43,13 +63,22 @@ function patch(ctx) {
         if (body && !body._id) {
             return (0, exports.save)(ctx);
         }
-        const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
-            datasourceId: tableId,
-        });
-        ctx.status = 200;
-        ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
-        ctx.message = `${table.name} updated successfully.`;
-        ctx.body = row;
+        try {
+            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
+                datasourceId: tableId,
+            });
+            if (!row) {
+                ctx.throw(404, "Row not found");
+            }
+            ctx.status = 200;
+            ctx.eventEmitter &&
+                ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
+            ctx.message = `${table.name} updated successfully.`;
+            ctx.body = row;
+        }
+        catch (err) {
+            ctx.throw(400, err);
+        }
     });
 }
 exports.patch = patch;