@budibase/server 2.5.10-alpha.0 → 2.5.10-alpha.1

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

@@ -63,7 +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 utils_3 = require("./utils");
 const CALCULATION_TYPES = {
     SUM: "sum",
     COUNT: "count",
@@ -398,6 +398,9 @@ function exportRows(ctx) {
         const table = yield db.get(ctx.params.tableId);
         const rowIds = ctx.request.body.rows;
         let format = ctx.query.format;
+        if (typeof format !== "string") {
+            ctx.throw(400, "Format parameter is not valid");
+        }
         const { columns, query } = ctx.request.body;
         let result;
         if (rowIds) {
@@ -425,7 +428,7 @@ function exportRows(ctx) {
         else {
             rows = result;
         }
-        let exportRows = cleanExportRows(rows, schema, format, columns);
+        let exportRows = (0, utils_3.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]), exportRows));

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

@@ -164,8 +164,8 @@ function cleanExportRows(rows, schema, format, columns) {
         });
         delete schema[column];
     });
-    // Intended to avoid 'undefined' in export
     if (format === exporters_1.Format.CSV) {
+        // Intended to append empty values in export
         const schemaKeys = Object.keys(schema);
         for (let key of schemaKeys) {
             if ((columns === null || columns === void 0 ? void 0 : columns.length) && columns.indexOf(key) > 0) {
@@ -173,7 +173,7 @@ function cleanExportRows(rows, schema, format, columns) {
             }
             for (let row of cleanRows) {
                 if (row[key] == null) {
-                    row[key] = "";
+                    row[key] = undefined;
                 }
             }
         }

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

@@ -43,7 +43,7 @@ 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 csvtojson_1 = __importDefault(require("csvtojson"));
+const csv_1 = require("../../../utilities/csv");
 function pickApi({ tableId, table }) {
     if (table && !tableId) {
         tableId = table._id;
@@ -136,7 +136,7 @@ exports.bulkImport = bulkImport;
 function csvToJson(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { csvString } = ctx.request.body;
-        const result = yield (0, csvtojson_1.default)().fromString(csvString);
+        const result = yield (0, csv_1.jsonFromCsvString)(csvString);
         ctx.status = 200;
         ctx.body = result;
     });

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

@@ -10,7 +10,9 @@ function csv(headers, rows) {
             val =
                 typeof val === "object" && !(val instanceof Date)
                     ? `"${JSON.stringify(val).replace(/"/g, "'")}"`
-                    : `"${val}"`;
+                    : val !== undefined
+                        ? `"${val}"`
+                        : "";
             return val.trim();
         })
             .join(",")}`;