@budibase/server 2.2.12-alpha.7 → 2.2.12-alpha.71

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

@@ -31,8 +31,11 @@ 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.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");
@@ -42,6 +45,8 @@ 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) {
         return new Date(value).getTime();
@@ -54,8 +59,7 @@ validateJs.extend(validateJs.validators.datetime, {
 function getDatasourceAndQuery(json) {
     return __awaiter(this, void 0, void 0, function* () {
         const datasourceId = json.endpoint.datasourceId;
-        const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         return (0, query_1.makeExternalQuery)(datasource, json);
     });
 }
@@ -151,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/static/index.js

@@ -14,20 +14,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveBuilderPreview = exports.serveApp = exports.deleteObjects = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
 require("svelte/register");
-const send = require("koa-send");
-const { resolve, join } = require("../../../utilities/centralPath");
+const centralPath_1 = require("../../../utilities/centralPath");
 const uuid = require("uuid");
 const constants_1 = require("../../../constants");
-const { processString } = require("@budibase/string-templates");
-const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
+const string_templates_1 = require("@budibase/string-templates");
+const fileSystem_1 = require("../../../utilities/fileSystem");
 const environment_1 = __importDefault(require("../../../environment"));
-const { DocumentType } = require("../../../db/utils");
-const { context, objectStore, utils } = require("@budibase/backend-core");
-const AWS = require("aws-sdk");
-const fs = require("fs");
+const utils_1 = require("../../../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+const aws_sdk_1 = __importDefault(require("aws-sdk"));
+const fs_1 = __importDefault(require("fs"));
+const sdk_1 = __importDefault(require("../../../sdk"));
+const send = require("koa-send");
 function prepareUpload({ s3Key, bucket, metadata, file }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const response = yield objectStore.upload({
+        const response = yield backend_core_1.objectStore.upload({
             bucket,
             metadata,
             filename: s3Key,
@@ -38,7 +39,7 @@ function prepareUpload({ s3Key, bucket, metadata, file }) {
         return {
             size: file.size,
             name: file.name,
-            url: objectStore.getAppFileUrl(s3Key),
+            url: backend_core_1.objectStore.getAppFileUrl(s3Key),
             extension: [...file.name.split(".")].pop(),
             key: response.Key,
         };
@@ -48,19 +49,19 @@ const toggleBetaUiFeature = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const cookieName = `beta:${ctx.params.feature}`;
         if (ctx.cookies.get(cookieName)) {
-            utils.clearCookie(ctx, cookieName);
+            backend_core_1.utils.clearCookie(ctx, cookieName);
             ctx.body = {
                 message: `${ctx.params.feature} disabled`,
             };
             return;
         }
-        let builderPath = resolve(TOP_LEVEL_PATH, "new_design_ui");
+        let builderPath = (0, centralPath_1.resolve)(fileSystem_1.TOP_LEVEL_PATH, "new_design_ui");
         // // download it from S3
-        if (!fs.existsSync(builderPath)) {
-            fs.mkdirSync(builderPath);
+        if (!fs_1.default.existsSync(builderPath)) {
+            fs_1.default.mkdirSync(builderPath);
         }
-        yield objectStore.downloadTarballDirect("https://cdn.budi.live/beta:design_ui/new_ui.tar.gz", builderPath);
-        utils.setCookie(ctx, {}, cookieName);
+        yield backend_core_1.objectStore.downloadTarballDirect("https://cdn.budi.live/beta:design_ui/new_ui.tar.gz", builderPath);
+        backend_core_1.utils.setCookie(ctx, {}, cookieName);
         ctx.body = {
             message: `${ctx.params.feature} enabled`,
         };
@@ -69,7 +70,7 @@ const toggleBetaUiFeature = function (ctx) {
 exports.toggleBetaUiFeature = toggleBetaUiFeature;
 const serveBuilder = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const builderPath = resolve(TOP_LEVEL_PATH, "builder");
+        const builderPath = (0, centralPath_1.resolve)(fileSystem_1.TOP_LEVEL_PATH, "builder");
         yield send(ctx, ctx.file, { root: builderPath });
     });
 };
@@ -85,7 +86,7 @@ const uploadFile = function (ctx) {
             const processedFileName = `${uuid.v4()}.${fileExtension}`;
             return prepareUpload({
                 file,
-                s3Key: `${context.getProdAppId()}/attachments/${processedFileName}`,
+                s3Key: `${backend_core_1.context.getProdAppId()}/attachments/${processedFileName}`,
                 bucket: constants_1.ObjectStoreBuckets.APPS,
             });
         }));
@@ -95,28 +96,28 @@ const uploadFile = function (ctx) {
 exports.uploadFile = uploadFile;
 const deleteObjects = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield objectStore.deleteFiles(constants_1.ObjectStoreBuckets.APPS, ctx.request.body.keys);
+        ctx.body = yield backend_core_1.objectStore.deleteFiles(constants_1.ObjectStoreBuckets.APPS, ctx.request.body.keys);
     });
 };
 exports.deleteObjects = deleteObjects;
 const serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = context.getAppDB({ skip_setup: true });
-        const appInfo = yield db.get(DocumentType.APP_METADATA);
-        let appId = context.getAppId();
+        const db = backend_core_1.context.getAppDB({ skip_setup: true });
+        const appInfo = yield db.get(utils_1.DocumentType.APP_METADATA);
+        let appId = backend_core_1.context.getAppId();
         if (!environment_1.default.isJest()) {
             const App = require("./templates/BudibaseApp.svelte").default;
-            const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins);
+            const plugins = backend_core_1.objectStore.enrichPluginURLs(appInfo.usedPlugins);
             const { head, html, css } = App.render({
                 metaImage: "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
                 title: appInfo.name,
                 production: environment_1.default.isProd(),
                 appId,
-                clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
+                clientLibPath: backend_core_1.objectStore.clientLibraryUrl(appId, appInfo.version),
                 usedPlugins: plugins,
             });
-            const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
-            ctx.body = yield processString(appHbs, {
+            const appHbs = (0, fileSystem_1.loadHandlebarsFile)(`${__dirname}/templates/app.hbs`);
+            ctx.body = yield (0, string_templates_1.processString)(appHbs, {
                 head,
                 body: html,
                 style: css.code,
@@ -132,13 +133,13 @@ const serveApp = function (ctx) {
 exports.serveApp = serveApp;
 const serveBuilderPreview = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = context.getAppDB({ skip_setup: true });
-        const appInfo = yield db.get(DocumentType.APP_METADATA);
+        const db = backend_core_1.context.getAppDB({ skip_setup: true });
+        const appInfo = yield db.get(utils_1.DocumentType.APP_METADATA);
         if (!environment_1.default.isJest()) {
-            let appId = context.getAppId();
-            const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`);
-            ctx.body = yield processString(previewHbs, {
-                clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
+            let appId = backend_core_1.context.getAppId();
+            const previewHbs = (0, fileSystem_1.loadHandlebarsFile)(`${__dirname}/templates/preview.hbs`);
+            ctx.body = yield (0, string_templates_1.processString)(previewHbs, {
+                clientLibPath: backend_core_1.objectStore.clientLibraryUrl(appId, appInfo.version),
             });
         }
         else {
@@ -151,7 +152,7 @@ exports.serveBuilderPreview = serveBuilderPreview;
 const serveClientLibrary = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         return send(ctx, "budibase-client.js", {
-            root: join(NODE_MODULES_PATH, "@budibase", "client", "dist"),
+            root: (0, centralPath_1.join)(fileSystem_1.NODE_MODULES_PATH, "@budibase", "client", "dist"),
         });
     });
 };
@@ -159,12 +160,11 @@ exports.serveClientLibrary = serveClientLibrary;
 const getSignedUploadURL = function (ctx) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        const database = context.getAppDB();
         // Ensure datasource is valid
         let datasource;
         try {
             const { datasourceId } = ctx.params;
-            datasource = yield database.get(datasourceId);
+            datasource = yield sdk_1.default.datasources.get(datasourceId, { enriched: true });
             if (!datasource) {
                 ctx.throw(400, "The specified datasource could not be found");
             }
@@ -179,15 +179,15 @@ const getSignedUploadURL = function (ctx) {
         // Determine type of datasource and generate signed URL
         let signedUrl;
         let publicUrl;
-        const awsRegion = ((_b = datasource === null || datasource === void 0 ? void 0 : datasource.config) === null || _b === void 0 ? void 0 : _b.region) || "eu-west-1";
-        if (datasource.source === "S3") {
+        const awsRegion = (((_b = datasource === null || datasource === void 0 ? void 0 : datasource.config) === null || _b === void 0 ? void 0 : _b.region) || "eu-west-1");
+        if ((datasource === null || datasource === void 0 ? void 0 : datasource.source) === "S3") {
             const { bucket, key } = ctx.request.body || {};
             if (!bucket || !key) {
                 ctx.throw(400, "bucket and key values are required");
                 return;
             }
             try {
-                const s3 = new AWS.S3({
+                const s3 = new aws_sdk_1.default.S3({
                     region: awsRegion,
                     accessKeyId: (_c = datasource === null || datasource === void 0 ? void 0 : datasource.config) === null || _c === void 0 ? void 0 : _c.accessKeyId,
                     secretAccessKey: (_d = datasource === null || datasource === void 0 ? void 0 : datasource.config) === null || _d === void 0 ? void 0 : _d.secretAccessKey,

package/dist/api/controllers/static/templates/BudibaseApp.svelte

@@ -2,7 +2,6 @@
   export let title = ""
   export let favicon = ""
   export let metaImage = ""
-  export let url = ""
 
   export let clientLibPath
   export let usedPlugins

package/dist/api/controllers/table/external.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) {
@@ -40,9 +17,9 @@ const utils_1 = require("../../../integrations/utils");
 const utils_2 = require("./utils");
 const constants_1 = require("../../../constants");
 const query_1 = require("../../../integrations/base/query");
-const csvParser = __importStar(require("../../../utilities/csvParser"));
 const external_1 = require("../row/external");
 const backend_core_1 = require("@budibase/backend-core");
+const schema_1 = require("../../../utilities/schema");
 const types_1 = require("@budibase/types");
 const sdk_1 = __importDefault(require("../../../sdk"));
 const { cloneDeep } = require("lodash/fp");
@@ -176,7 +153,7 @@ function save(ctx) {
         const table = ctx.request.body;
         const renamed = table === null || table === void 0 ? void 0 : table._rename;
         // can't do this right now
-        delete table.dataImport;
+        delete table.rows;
         const datasourceId = getDatasourceId(ctx.request.body);
         // table doesn't exist already, note that it is created
         if (!table._id) {
@@ -191,7 +168,7 @@ function save(ctx) {
             ctx.throw(400, "A column type has changed.");
         }
         const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         if (!datasource.entities) {
             datasource.entities = {};
         }
@@ -265,12 +242,15 @@ function destroy(ctx) {
         }
         const datasourceId = getDatasourceId(tableToDelete);
         const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         const tables = datasource.entities;
         const operation = types_1.Operation.DELETE_TABLE;
-        yield makeTableRequest(datasource, operation, tableToDelete, tables);
-        cleanupRelationships(tableToDelete, tables);
-        delete datasource.entities[tableToDelete.name];
+        if (tables) {
+            yield makeTableRequest(datasource, operation, tableToDelete, tables);
+            cleanupRelationships(tableToDelete, tables);
+            delete tables[tableToDelete.name];
+            datasource.entities = tables;
+        }
         yield db.put(datasource);
         return tableToDelete;
     });
@@ -279,15 +259,16 @@ exports.destroy = destroy;
 function bulkImport(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = yield sdk_1.default.tables.getTable(ctx.params.tableId);
-        const { dataImport } = ctx.request.body;
-        if (!dataImport || !dataImport.schema || !dataImport.csvString) {
+        const { rows } = ctx.request.body;
+        const schema = table.schema;
+        if (!rows || !(0, schema_1.isRows)(rows) || !(0, schema_1.isSchema)(schema)) {
             ctx.throw(400, "Provided data import information is invalid.");
         }
-        const rows = yield csvParser.transform(Object.assign(Object.assign({}, dataImport), { existingTable: table }));
+        const parsedRows = yield (0, schema_1.parse)(rows, schema);
         yield (0, external_1.handleRequest)(types_1.Operation.BULK_CREATE, table._id, {
-            rows,
+            rows: parsedRows,
         });
-        yield backend_core_1.events.rows.imported(table, "csv", rows.length);
+        yield backend_core_1.events.rows.imported(table, parsedRows.length);
         return table;
     });
 }

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

@@ -35,14 +35,15 @@ 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;
+exports.validateExistingTableImport = exports.validateNewTableImport = exports.csvToJson = exports.bulkImport = exports.destroy = exports.save = exports.find = exports.fetch = void 0;
 const internal = __importStar(require("./internal"));
 const external = __importStar(require("./external"));
-const csvParser = __importStar(require("../../../utilities/csvParser"));
+const schema_1 = require("../../../utilities/schema");
 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"));
 function pickApi({ tableId, table }) {
     if (table && !tableId) {
         tableId = table._id;
@@ -87,7 +88,7 @@ function save(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 isImport = table.rows;
         const savedTable = yield pickApi({ table }).save(ctx);
         if (!table._id) {
             yield backend_core_1.events.table.created(savedTable);
@@ -95,8 +96,8 @@ function save(ctx) {
         else {
             yield backend_core_1.events.table.updated(savedTable);
         }
-        if (importFormat) {
-            yield backend_core_1.events.table.imported(savedTable, importFormat);
+        if (isImport) {
+            yield backend_core_1.events.table.imported(savedTable);
         }
         ctx.status = 200;
         ctx.message = `Table ${table.name} saved successfully.`;
@@ -132,19 +133,47 @@ function bulkImport(ctx) {
     });
 }
 exports.bulkImport = bulkImport;
-function validateCSVSchema(ctx) {
+function csvToJson(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;
+        const { csvString } = ctx.request.body;
+        const result = yield (0, csvtojson_1.default)().fromString(csvString);
+        ctx.status = 200;
+        ctx.body = result;
+    });
+}
+exports.csvToJson = csvToJson;
+function validateNewTableImport(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { rows, schema } = ctx.request.body;
+        if ((0, schema_1.isRows)(rows) && (0, schema_1.isSchema)(schema)) {
+            ctx.status = 200;
+            ctx.body = (0, schema_1.validate)(rows, schema);
+        }
+        else {
+            ctx.status = 422;
+        }
+    });
+}
+exports.validateNewTableImport = validateNewTableImport;
+function validateExistingTableImport(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { rows, tableId } = ctx.request.body;
+        let schema = null;
         if (tableId) {
-            existingTable = yield sdk_1.default.tables.getTable(tableId);
+            const table = yield sdk_1.default.tables.getTable(tableId);
+            schema = table.schema;
         }
-        let result = yield csvParser.parse(csvString, schema);
-        if (existingTable) {
-            result = csvParser.updateSchema({ schema: result, existingTable });
+        else {
+            ctx.status = 422;
+            return;
+        }
+        if (tableId && (0, schema_1.isRows)(rows) && (0, schema_1.isSchema)(schema)) {
+            ctx.status = 200;
+            ctx.body = (0, schema_1.validate)(rows, schema);
+        }
+        else {
+            ctx.status = 422;
         }
-        ctx.body = { schema: result };
     });
 }
-exports.validateCSVSchema = validateCSVSchema;
+exports.validateExistingTableImport = validateExistingTableImport;

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

@@ -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 _a = ctx.request.body, { dataImport } = _a, rest = __rest(_a, ["dataImport"]);
+        const _a = ctx.request.body, { rows } = _a, rest = __rest(_a, ["rows"]);
         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
         let oldTable;
@@ -75,7 +75,7 @@ function save(ctx) {
         const tableSaveFunctions = new utils_2.TableSaveFunctions({
             user: ctx.user,
             oldTable,
-            dataImport,
+            importRows: rows,
         });
         tableToSave = yield tableSaveFunctions.before(tableToSave);
         // make sure that types don't change of a column, have to remove
@@ -186,8 +186,8 @@ exports.destroy = destroy;
 function bulkImport(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = yield sdk_1.default.tables.getTable(ctx.params.tableId);
-        const { dataImport } = ctx.request.body;
-        yield (0, utils_2.handleDataImport)(ctx.user, table, dataImport);
+        const { rows } = ctx.request.body;
+        yield (0, utils_2.handleDataImport)(ctx.user, table, rows);
         return table;
     });
 }

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

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (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;
-const csvParser_1 = require("../../../utilities/csvParser");
+const schema_1 = require("../../../utilities/schema");
 const utils_1 = require("../../../db/utils");
 const lodash_1 = require("lodash");
 const constants_1 = require("../../../constants");
@@ -124,19 +124,19 @@ function importToRows(data, table, user = {}) {
     return finalData;
 }
 exports.importToRows = importToRows;
-function handleDataImport(user, table, dataImport) {
+function handleDataImport(user, table, rows) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!dataImport || !dataImport.csvString) {
+        const schema = table.schema;
+        if (!rows || !(0, schema_1.isRows)(rows) || !(0, schema_1.isSchema)(schema)) {
             return table;
         }
         const db = backend_core_1.context.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 }));
+        const data = (0, schema_1.parse)(rows, schema);
         let finalData = importToRows(data, table, user);
         yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
             tableId: table._id,
         });
-        yield backend_core_1.events.rows.imported(table, "csv", finalData.length);
+        yield backend_core_1.events.rows.imported(table, finalData.length);
         return table;
     });
 }
@@ -195,11 +195,11 @@ function checkStaticTables(table) {
 }
 exports.checkStaticTables = checkStaticTables;
 class TableSaveFunctions {
-    constructor({ user, oldTable, dataImport }) {
+    constructor({ user, oldTable, importRows }) {
         this.db = backend_core_1.context.getAppDB();
         this.user = user;
         this.oldTable = oldTable;
-        this.dataImport = dataImport;
+        this.importRows = importRows;
         // any rows that need updated
         this.rows = [];
     }
@@ -225,7 +225,7 @@ class TableSaveFunctions {
     after(table) {
         return __awaiter(this, void 0, void 0, function* () {
             table = yield handleSearchIndexes(table);
-            table = yield handleDataImport(this.user, table, this.dataImport);
+            table = yield handleDataImport(this.user, table, this.importRows);
             return table;
         });
     }

package/dist/api/controllers/user.js

@@ -20,11 +20,13 @@ const users_1 = require("../../utilities/users");
 const backend_core_1 = require("@budibase/backend-core");
 const sdk_1 = __importDefault(require("../../sdk"));
 function syncUser(ctx) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         let deleting = false, user;
         const userId = ctx.params.id;
+        const previousUser = (_a = ctx.request.body) === null || _a === void 0 ? void 0 : _a.previousUser;
         try {
-            user = yield (0, global_1.getRawGlobalUser)(userId);
+            user = (yield (0, global_1.getRawGlobalUser)(userId));
         }
         catch (err) {
             if (err && err.status === 404) {
@@ -35,6 +37,9 @@ function syncUser(ctx) {
                 throw err;
             }
         }
+        let previousApps = previousUser
+            ? Object.keys(previousUser.roles).map(appId => appId)
+            : [];
         const roles = deleting ? {} : user.roles;
         // remove props which aren't useful to metadata
         delete user.password;
@@ -51,8 +56,9 @@ function syncUser(ctx) {
                 .filter(entry => entry[1] !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC)
                 .map(([appId]) => appId);
         }
-        for (let prodAppId of prodAppIds) {
+        for (let prodAppId of new Set([...prodAppIds, ...previousApps])) {
             const roleId = roles[prodAppId];
+            const deleteFromApp = !roleId;
             const devAppId = backend_core_1.db.getDevelopmentAppID(prodAppId);
             for (let appId of [prodAppId, devAppId]) {
                 if (!(yield backend_core_1.db.dbExists(appId))) {
@@ -66,20 +72,22 @@ function syncUser(ctx) {
                         metadata = yield db.get(metadataId);
                     }
                     catch (err) {
-                        if (deleting) {
+                        if (deleteFromApp) {
                             return;
                         }
                         metadata = {
                             tableId: utils_2.InternalTables.USER_METADATA,
                         };
                     }
+                    if (deleteFromApp) {
+                        yield db.remove(metadata);
+                        return;
+                    }
                     // assign the roleId for the metadata doc
                     if (roleId) {
                         metadata.roleId = roleId;
                     }
-                    let combined = !deleting
-                        ? sdk_1.default.users.combineMetadataAndUser(user, metadata)
-                        : Object.assign(Object.assign({}, metadata), { status: backend_core_1.constants.UserStatus.INACTIVE, metadata: backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC });
+                    let combined = sdk_1.default.users.combineMetadataAndUser(user, metadata);
                     // if its null then there was no updates required
                     if (combined) {
                         yield db.put(combined);

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExportFormats = exports.json = exports.csv = void 0;
+exports.isFormat = exports.Format = exports.jsonWithSchema = exports.json = exports.csv = void 0;
 function csv(headers, rows) {
     let csv = headers.map(key => `"${key}"`).join(",");
     for (let row of rows) {
@@ -18,11 +18,27 @@ function csv(headers, rows) {
     return csv;
 }
 exports.csv = csv;
-function json(headers, rows) {
+function json(rows) {
     return JSON.stringify(rows, undefined, 2);
 }
 exports.json = json;
-exports.ExportFormats = {
-    CSV: "csv",
-    JSON: "json",
-};
+function jsonWithSchema(schema, rows) {
+    const newSchema = {};
+    Object.values(schema).forEach(column => {
+        if (!column.autocolumn) {
+            newSchema[column.name] = column;
+        }
+    });
+    return JSON.stringify({ schema: newSchema, rows }, undefined, 2);
+}
+exports.jsonWithSchema = jsonWithSchema;
+var Format;
+(function (Format) {
+    Format["CSV"] = "csv";
+    Format["JSON"] = "json";
+    Format["JSON_WITH_SCHEMA"] = "jsonWithSchema";
+})(Format = exports.Format || (exports.Format = {}));
+function isFormat(format) {
+    return Object.values(Format).includes(format);
+}
+exports.isFormat = isFormat;