@budibase/server 2.2.12-alpha.48 → 2.2.12-alpha.49

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

@@ -54,6 +54,7 @@ const exporters = __importStar(require("../view/exporters"));
 const fileSystem_1 = require("../../../utilities/fileSystem");
 const types_1 = require("@budibase/types");
 const sdk_1 = __importDefault(require("../../../sdk"));
+const { cleanExportRows } = require("./utils");
 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
@@ -231,13 +232,15 @@ function exportRows(ctx) {
         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]),
+        if (ctx.request.body.rows) {
+            ctx.request.body = {
+                query: {
+                    oneOf: {
+                        _id: ctx.request.body.rows.map((row) => JSON.parse(decodeURI(row))[0]),
+                    },
                 },
-            },
-        };
+            };
+        }
         let result = yield search(ctx);
         let rows = [];
         // Filter data to only specified columns if required
@@ -252,13 +255,16 @@ function exportRows(ctx) {
         else {
             rows = result.rows;
         }
-        let headers = Object.keys(rows[0]);
+        // @ts-ignore
+        let schema = datasource.entities[tableName].schema;
+        let exportRows = cleanExportRows(rows, schema, format, columns);
+        let headers = Object.keys(schema);
         // @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));
+        return (0, fileSystem_1.apiFileReturn)(exporter(headers, exportRows));
     });
 }
 exports.exportRows = exportRows;

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

@@ -63,6 +63,7 @@ const backend_core_1 = require("@budibase/backend-core");
 const staticFormula_1 = require("./staticFormula");
 const exporters_1 = require("../view/exporters");
 const fileSystem_1 = require("../../../utilities/fileSystem");
+const { cleanExportRows } = require("./utils");
 const CALCULATION_TYPES = {
     SUM: "sum",
     COUNT: "count",
@@ -364,6 +365,13 @@ function search(ctx) {
         const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
         params.version = ctx.version;
         params.tableId = tableId;
+        let table;
+        if (params.sort && !params.sortType) {
+            table = yield db.get(tableId);
+            const schema = table.schema;
+            const sortField = schema[params.sort];
+            params.sortType = sortField.type == "number" ? "number" : "string";
+        }
         let response;
         if (paginate) {
             response = yield (0, internalSearch_1.paginatedSearch)(query, params);
@@ -377,7 +385,7 @@ function search(ctx) {
             if (tableId === utils_1.InternalTables.USER_METADATA) {
                 response.rows = yield (0, global_1.getGlobalUsersFromMetadata)(response.rows);
             }
-            const table = yield db.get(tableId);
+            table = table || (yield db.get(tableId));
             response.rows = yield (0, rowProcessor_1.outputProcessing)(table, response.rows);
         }
         return response;
@@ -399,13 +407,21 @@ function exportRows(ctx) {
         const table = yield db.get(ctx.params.tableId);
         const rowIds = ctx.request.body.rows;
         let format = ctx.query.format;
-        const { columns } = ctx.request.body;
-        let response = (yield db.allDocs({
-            include_docs: true,
-            keys: rowIds,
-        })).rows.map(row => row.doc);
-        let result = (yield (0, rowProcessor_1.outputProcessing)(table, response));
+        const { columns, query } = ctx.request.body;
+        let result;
+        if (rowIds) {
+            let response = (yield db.allDocs({
+                include_docs: true,
+                keys: rowIds,
+            })).rows.map(row => row.doc);
+            result = yield (0, rowProcessor_1.outputProcessing)(table, response);
+        }
+        else if (query) {
+            let searchResponse = yield exports.search(ctx);
+            result = searchResponse.rows;
+        }
         let rows = [];
+        let schema = table.schema;
         // Filter data to only specified columns if required
         if (columns && columns.length) {
             for (let i = 0; i < result.length; i++) {
@@ -418,13 +434,18 @@ function exportRows(ctx) {
         else {
             rows = result;
         }
+        let exportRows = cleanExportRows(rows, schema, format, columns);
         if (format === exporters_1.Format.CSV) {
             ctx.attachment("export.csv");
-            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.csv)(Object.keys(rows[0]), rows));
+            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.csv)(Object.keys(rows[0]), exportRows));
         }
         else if (format === exporters_1.Format.JSON) {
             ctx.attachment("export.json");
-            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.json)(rows));
+            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.json)(exportRows));
+        }
+        else if (format === exporters_1.Format.JSON_WITH_SCHEMA) {
+            ctx.attachment("export.json");
+            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.jsonWithSchema)(schema, exportRows));
         }
         else {
             throw "Format not recognised";

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

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = exports.findRow = exports.getDatasourceAndQuery = exports.removeKeyNumbering = void 0;
+exports.cleanExportRows = exports.validate = exports.findRow = exports.getDatasourceAndQuery = exports.removeKeyNumbering = void 0;
 const utils_1 = require("../../../db/utils");
 const userController = __importStar(require("../user"));
 const constants_1 = require("../../../constants");
@@ -45,6 +45,7 @@ var utils_2 = require("../../../integrations/base/utils");
 Object.defineProperty(exports, "removeKeyNumbering", { enumerable: true, get: function () { return utils_2.removeKeyNumbering; } });
 const validateJs = require("validate.js");
 const { cloneDeep } = require("lodash/fp");
+const exporters_1 = require("../view/exporters");
 const sdk_1 = __importDefault(require("../../../sdk"));
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
@@ -154,3 +155,31 @@ function validate({ tableId, row, table, }) {
     });
 }
 exports.validate = validate;
+function cleanExportRows(rows, schema, format, columns) {
+    let cleanRows = [...rows];
+    const relationships = Object.entries(schema)
+        .filter((entry) => entry[1].type === constants_1.FieldTypes.LINK)
+        .map(entry => entry[0]);
+    relationships.forEach(column => {
+        cleanRows.forEach(row => {
+            delete row[column];
+        });
+        delete schema[column];
+    });
+    // Intended to avoid 'undefined' in export
+    if (format === exporters_1.Format.CSV) {
+        const schemaKeys = Object.keys(schema);
+        for (let key of schemaKeys) {
+            if ((columns === null || columns === void 0 ? void 0 : columns.length) && columns.indexOf(key) > 0) {
+                continue;
+            }
+            for (let row of cleanRows) {
+                if (row[key] == null) {
+                    row[key] = "";
+                }
+            }
+        }
+    }
+    return cleanRows;
+}
+exports.cleanExportRows = cleanExportRows;

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

@@ -29,10 +29,10 @@ const fileSystem_1 = require("../../../utilities/fileSystem");
 const exporters_1 = require("./exporters");
 const utils_1 = require("./utils");
 const row_1 = require("../row");
-const constants_1 = require("../../../constants");
 const backend_core_1 = require("@budibase/backend-core");
 const utils_2 = require("../../../db/utils");
 const sdk_1 = __importDefault(require("../../../sdk"));
+const utils_3 = require("../row/utils");
 const { cloneDeep, isEqual } = require("lodash");
 function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -164,39 +164,18 @@ function exportView(ctx) {
         if (!schema) {
             schema = table.schema;
         }
-        // remove any relationships
-        const relationships = Object.entries(schema)
-            .filter(entry => entry[1].type === constants_1.FieldTypes.LINK)
-            .map(entry => entry[0]);
-        // iterate relationship columns and remove from and row and schema
-        relationships.forEach(column => {
-            rows.forEach(row => {
-                delete row[column];
-            });
-            delete schema[column];
-        });
-        // make sure no "undefined" entries appear in the CSV
-        if (format === exporters_1.Format.CSV) {
-            const schemaKeys = Object.keys(schema);
-            for (let key of schemaKeys) {
-                for (let row of rows) {
-                    if (row[key] == null) {
-                        row[key] = "";
-                    }
-                }
-            }
-        }
+        let exportRows = (0, utils_3.cleanExportRows)(rows, schema, format, []);
         if (format === exporters_1.Format.CSV) {
             ctx.attachment(`${viewName}.csv`);
-            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.csv)(Object.keys(schema), rows));
+            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.csv)(Object.keys(schema), exportRows));
         }
         else if (format === exporters_1.Format.JSON) {
             ctx.attachment(`${viewName}.json`);
-            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.json)(rows));
+            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.json)(exportRows));
         }
         else if (format === exporters_1.Format.JSON_WITH_SCHEMA) {
             ctx.attachment(`${viewName}.json`);
-            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.jsonWithSchema)(schema, rows));
+            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.jsonWithSchema)(schema, exportRows));
         }
         else {
             throw "Format not recognised";

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.12-alpha.47",
+    "version": "2.2.12-alpha.48",
     "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.12-alpha.47",
-        "@budibase/client": "2.2.12-alpha.47",
-        "@budibase/pro": "2.2.12-alpha.47",
-        "@budibase/string-templates": "2.2.12-alpha.47",
-        "@budibase/types": "2.2.12-alpha.47",
+        "@budibase/backend-core": "2.2.12-alpha.48",
+        "@budibase/client": "2.2.12-alpha.48",
+        "@budibase/pro": "2.2.12-alpha.48",
+        "@budibase/string-templates": "2.2.12-alpha.48",
+        "@budibase/types": "2.2.12-alpha.48",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",