@budibase/server 2.2.12-alpha.5 → 2.2.12-alpha.51

package/dist/api/controllers/application.js

@@ -75,12 +75,8 @@ function checkAppName(ctx, apps, name, currentAppId) {
         ctx.throw(400, "App name is already in use.");
     }
 }
-function createInstance(template, includeSampleData) {
+function createInstance(appId, template, includeSampleData) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tenantId = backend_core_1.tenancy.isMultiTenant() ? backend_core_1.tenancy.getTenantId() : null;
-        const baseAppId = (0, utils_1.generateAppID)(tenantId);
-        const appId = (0, utils_1.generateDevAppID)(baseAppId);
-        yield backend_core_1.context.updateAppId(appId);
         const db = backend_core_1.context.getAppDB();
         yield db.put({
             _id: "_design/database",
@@ -203,77 +199,80 @@ function performAppCreate(ctx) {
             instanceConfig.file = ctx.request.files.templateFile;
         }
         const includeSampleData = (0, utilities_1.isQsTrue)(ctx.request.body.sampleData);
-        const instance = yield createInstance(instanceConfig, includeSampleData);
-        const appId = instance._id;
-        const db = backend_core_1.context.getAppDB();
-        let newApplication = {
-            _id: utils_1.DocumentType.APP_METADATA,
-            _rev: undefined,
-            appId,
-            type: "app",
-            version: package_json_1.default.version,
-            componentLibraries: ["@budibase/standard-components"],
-            name: name,
-            url: url,
-            template: templateKey,
-            instance,
-            tenantId: backend_core_1.tenancy.getTenantId(),
-            updatedAt: new Date().toISOString(),
-            createdAt: new Date().toISOString(),
-            status: utils_1.AppStatus.DEV,
-            navigation: {
-                navigation: "Top",
-                title: name,
-                navWidth: "Large",
-                navBackground: "var(--spectrum-global-color-gray-100)",
-                links: [
-                    {
-                        url: "/home",
-                        text: "Home",
-                    },
-                ],
-            },
-            theme: "spectrum--light",
-            customTheme: {
-                buttonBorderRadius: "16px",
-            },
-        };
-        // If we used a template or imported an app there will be an existing doc.
-        // Fetch and migrate some metadata from the existing app.
-        try {
-            const existing = yield db.get(utils_1.DocumentType.APP_METADATA);
-            const keys = [
-                "_rev",
-                "navigation",
-                "theme",
-                "customTheme",
-                "icon",
-            ];
-            keys.forEach(key => {
-                if (existing[key]) {
-                    // @ts-ignore
-                    newApplication[key] = existing[key];
-                }
-            });
-            // Migrate navigation settings and screens if required
-            if (existing) {
-                const navigation = yield migrateAppNavigation();
-                if (navigation) {
-                    newApplication.navigation = navigation;
+        const tenantId = backend_core_1.tenancy.isMultiTenant() ? backend_core_1.tenancy.getTenantId() : null;
+        const appId = (0, utils_1.generateDevAppID)((0, utils_1.generateAppID)(tenantId));
+        return yield backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+            const instance = yield createInstance(appId, instanceConfig, includeSampleData);
+            const db = backend_core_1.context.getAppDB();
+            let newApplication = {
+                _id: utils_1.DocumentType.APP_METADATA,
+                _rev: undefined,
+                appId,
+                type: "app",
+                version: package_json_1.default.version,
+                componentLibraries: ["@budibase/standard-components"],
+                name: name,
+                url: url,
+                template: templateKey,
+                instance,
+                tenantId: backend_core_1.tenancy.getTenantId(),
+                updatedAt: new Date().toISOString(),
+                createdAt: new Date().toISOString(),
+                status: utils_1.AppStatus.DEV,
+                navigation: {
+                    navigation: "Top",
+                    title: name,
+                    navWidth: "Large",
+                    navBackground: "var(--spectrum-global-color-gray-100)",
+                    links: [
+                        {
+                            url: "/home",
+                            text: "Home",
+                        },
+                    ],
+                },
+                theme: "spectrum--light",
+                customTheme: {
+                    buttonBorderRadius: "16px",
+                },
+            };
+            // If we used a template or imported an app there will be an existing doc.
+            // Fetch and migrate some metadata from the existing app.
+            try {
+                const existing = yield db.get(utils_1.DocumentType.APP_METADATA);
+                const keys = [
+                    "_rev",
+                    "navigation",
+                    "theme",
+                    "customTheme",
+                    "icon",
+                ];
+                keys.forEach(key => {
+                    if (existing[key]) {
+                        // @ts-ignore
+                        newApplication[key] = existing[key];
+                    }
+                });
+                // Migrate navigation settings and screens if required
+                if (existing) {
+                    const navigation = yield migrateAppNavigation();
+                    if (navigation) {
+                        newApplication.navigation = navigation;
+                    }
                 }
             }
-        }
-        catch (err) {
-            // Nothing to do
-        }
-        const response = yield db.put(newApplication, { force: true });
-        newApplication._rev = response.rev;
-        /* istanbul ignore next */
-        if (!environment_1.default.isTest()) {
-            yield (0, fileSystem_1.createApp)(appId);
-        }
-        yield backend_core_1.cache.app.invalidateAppMetadata(appId, newApplication);
-        return newApplication;
+            catch (err) {
+                // Nothing to do
+            }
+            const response = yield db.put(newApplication, { force: true });
+            newApplication._rev = response.rev;
+            /* istanbul ignore next */
+            if (!environment_1.default.isTest()) {
+                yield (0, fileSystem_1.createApp)(appId);
+            }
+            yield backend_core_1.cache.app.invalidateAppMetadata(appId, newApplication);
+            return newApplication;
+        }));
     });
 }
 function creationEvents(request, app) {

package/dist/api/controllers/cloud.js

@@ -99,7 +99,7 @@ function importApps(ctx) {
         if (Array.isArray(file)) {
             ctx.throw(400, "Single file is required");
         }
-        if (file.type !== "application/gzip") {
+        if (file.type !== "application/gzip" && file.type !== "application/x-gzip") {
             ctx.throw(400, "Import file must be a gzipped tarball.");
         }
         // initially get all the app databases out of the tarball

package/dist/api/controllers/datasource.js

@@ -8,6 +8,9 @@ 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.query = exports.find = exports.destroy = exports.save = exports.update = exports.buildSchemaFromDb = exports.fetch = void 0;
 const utils_1 = require("../../db/utils");
@@ -17,6 +20,7 @@ const integrations_1 = require("../../integrations");
 const utils_2 = require("./row/utils");
 const utils_3 = require("../../threads/utils");
 const backend_core_1 = require("@budibase/backend-core");
+const sdk_1 = __importDefault(require("../../sdk"));
 function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         // Get internal tables
@@ -35,12 +39,11 @@ function fetch(ctx) {
         const datasources = (yield db.allDocs((0, utils_1.getDatasourceParams)(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
-        const allDatasources = [bbInternalDb, ...datasources];
+        const allDatasources = yield sdk_1.default.datasources.removeSecrets([
+            bbInternalDb,
+            ...datasources,
+        ]);
         for (let datasource of allDatasources) {
-            if (datasource.config && datasource.config.auth) {
-                // strip secrets from response so they don't show in the network request
-                delete datasource.config.auth;
-            }
             if (datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE) {
                 datasource.entities = internal[datasource._id];
             }
@@ -52,7 +55,7 @@ exports.fetch = fetch;
 function buildSchemaFromDb(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(ctx.params.datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(ctx.params.datasourceId);
         const tablesFilter = ctx.request.body.tablesFilter;
         let { tables, error } = yield buildSchemaHelper(datasource);
         if (tablesFilter) {
@@ -125,18 +128,18 @@ function invalidateVariables(existingDatasource, updatedDatasource) {
     });
 }
 function update(ctx) {
-    var _a;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         const datasourceId = ctx.params.datasourceId;
-        let datasource = yield db.get(datasourceId);
-        const auth = datasource.config.auth;
+        let datasource = yield sdk_1.default.datasources.get(datasourceId);
+        const auth = (_a = datasource.config) === null || _a === void 0 ? void 0 : _a.auth;
         yield invalidateVariables(datasource, ctx.request.body);
         const isBudibaseSource = datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE;
         const dataSourceBody = isBudibaseSource
-            ? { name: (_a = ctx.request.body) === null || _a === void 0 ? void 0 : _a.name }
+            ? { name: (_b = ctx.request.body) === null || _b === void 0 ? void 0 : _b.name }
             : ctx.request.body;
-        datasource = Object.assign(Object.assign({}, datasource), dataSourceBody);
+        datasource = Object.assign(Object.assign({}, datasource), sdk_1.default.datasources.mergeConfigs(dataSourceBody, datasource));
         if (auth && !ctx.request.body.auth) {
             // don't strip auth config from DB
             datasource.config.auth = auth;
@@ -153,7 +156,9 @@ function update(ctx) {
         }
         ctx.status = 200;
         ctx.message = "Datasource saved successfully.";
-        ctx.body = { datasource };
+        ctx.body = {
+            datasource: yield sdk_1.default.datasources.removeSecretSingle(datasource),
+        };
     });
 }
 exports.update = update;
@@ -180,7 +185,9 @@ function save(ctx) {
                 yield source.pool.end();
             }
         }
-        const response = { datasource };
+        const response = {
+            datasource: yield sdk_1.default.datasources.removeSecretSingle(datasource),
+        };
         if (schemaError) {
             response.error = schemaError;
         }
@@ -216,7 +223,7 @@ function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         const datasourceId = ctx.params.datasourceId;
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         // Delete all queries for the datasource
         if (datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE) {
             yield destroyInternalTablesBySourceId(datasourceId);
@@ -240,7 +247,8 @@ exports.destroy = destroy;
 function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const database = backend_core_1.context.getAppDB();
-        ctx.body = yield database.get(ctx.params.datasourceId);
+        const datasource = yield database.get(ctx.params.datasourceId);
+        ctx.body = yield sdk_1.default.datasources.removeSecretSingle(datasource);
     });
 }
 exports.find = find;
@@ -275,6 +283,7 @@ function updateError(error, newError, tables) {
 function buildSchemaHelper(datasource) {
     return __awaiter(this, void 0, void 0, function* () {
         const Connector = yield (0, integrations_1.getIntegration)(datasource.source);
+        datasource = yield sdk_1.default.datasources.enrich(datasource);
         // Connect to the DB and build the schema
         const connector = new Connector(datasource.config);
         yield connector.buildSchema(datasource._id, datasource.entities);

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

@@ -8,6 +8,9 @@ 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.destroy = exports.executeV2 = exports.executeV1 = exports.preview = exports.find = exports.save = exports.import = exports.fetch = void 0;
 const utils_1 = require("../../../db/utils");
@@ -16,11 +19,12 @@ const threads_1 = require("../../../threads");
 const datasource_1 = require("../datasource");
 const import_1 = require("./import");
 const utils_2 = require("../../../threads/utils");
-const environment_1 = require("../../../environment");
+const environment_1 = __importDefault(require("../../../environment"));
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
+const sdk_1 = __importDefault(require("../../../sdk"));
 const Runner = new threads_1.Thread(threads_1.ThreadType.QUERY, {
-    timeoutMs: environment_1.QUERY_THREAD_TIMEOUT || 10000,
+    timeoutMs: environment_1.default.QUERY_THREAD_TIMEOUT || 10000,
 });
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {
@@ -81,7 +85,7 @@ function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         const query = ctx.request.body;
-        const datasource = yield db.get(query.datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(query.datasourceId);
         let eventFn;
         if (!query._id) {
             query._id = (0, utils_1.generateQueryID)(query.datasourceId);
@@ -126,15 +130,14 @@ function getAuthConfig(ctx) {
 }
 function preview(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(ctx.request.body.datasourceId);
+        const { datasource, envVars } = yield sdk_1.default.datasources.getWithEnvVars(ctx.request.body.datasourceId);
         const query = ctx.request.body;
         // preview may not have a queryId as it hasn't been saved, but if it does
         // this stops dynamic variables from calling the same query
         const { fields, parameters, queryVerb, transformer, queryId } = query;
         const authConfigCtx = getAuthConfig(ctx);
         try {
-            const runFn = () => Runner.run({
+            const inputs = {
                 appId: ctx.appId,
                 datasource,
                 queryVerb,
@@ -142,11 +145,14 @@ function preview(ctx) {
                 parameters,
                 transformer,
                 queryId,
+                // have to pass down to the thread runner - can't put into context now
+                environmentVariables: envVars,
                 ctx: {
                     user: ctx.user,
                     auth: Object.assign({}, authConfigCtx),
                 },
-            });
+            };
+            const runFn = () => Runner.run(inputs);
             const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn, {
                 datasourceId: datasource._id,
             });
@@ -196,7 +202,7 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         const query = yield db.get(ctx.params.queryId);
-        const datasource = yield db.get(query.datasourceId);
+        const { datasource, envVars } = yield sdk_1.default.datasources.getWithEnvVars(query.datasourceId);
         let authConfigCtx = {};
         if (!opts.isAutomation) {
             authConfigCtx = getAuthConfig(ctx);
@@ -212,7 +218,7 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
         }
         // call the relevant CRUD method on the integration class
         try {
-            const runFn = () => Runner.run({
+            const inputs = {
                 appId: ctx.appId,
                 datasource,
                 queryVerb: query.queryVerb,
@@ -221,11 +227,14 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
                 parameters: enrichedParameters,
                 transformer: query.transformer,
                 queryId: ctx.params.queryId,
+                // have to pass down to the thread runner - can't put into context now
+                environmentVariables: envVars,
                 ctx: {
                     user: ctx.user,
                     auth: Object.assign({}, authConfigCtx),
                 },
-            });
+            };
+            const runFn = () => Runner.run(inputs);
             const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn, {
                 datasourceId: datasource._id,
             });
@@ -258,10 +267,11 @@ function executeV2(ctx, { isAutomation } = {}) {
 }
 exports.executeV2 = executeV2;
 const removeDynamicVariables = (queryId) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const db = backend_core_1.context.getAppDB();
     const query = yield db.get(queryId);
-    const datasource = yield db.get(query.datasourceId);
-    const dynamicVariables = datasource.config.dynamicVariables;
+    const datasource = yield sdk_1.default.datasources.get(query.datasourceId);
+    const dynamicVariables = (_a = datasource.config) === null || _a === void 0 ? void 0 : _a.dynamicVariables;
     if (dynamicVariables) {
         // delete dynamic variables from the datasource
         datasource.config.dynamicVariables = dynamicVariables.filter((dv) => dv.queryId !== queryId);
@@ -277,7 +287,7 @@ function destroy(ctx) {
         const queryId = ctx.params.queryId;
         yield removeDynamicVariables(queryId);
         const query = yield db.get(queryId);
-        const datasource = yield db.get(query.datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(query.datasourceId);
         yield db.remove(ctx.params.queryId, ctx.params.revId);
         ctx.message = `Query deleted.`;
         ctx.status = 200;

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

@@ -19,6 +19,9 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalRequest = void 0;
 const types_1 = require("@budibase/types");
@@ -29,8 +32,8 @@ const utils_3 = require("../../../integrations/utils");
 const string_templates_1 = require("@budibase/string-templates");
 const fp_1 = require("lodash/fp");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
-const backend_core_1 = require("@budibase/backend-core");
 const utils_4 = require("./utils");
+const sdk_1 = __importDefault(require("../../../sdk"));
 function buildFilters(id, filters, table) {
     const primary = table.primary;
     // if passed in array need to copy for shifting etc
@@ -562,6 +565,7 @@ class ExternalRequest {
         return fields;
     }
     run(config) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { operation, tableId } = this;
             let { datasourceId, tableName } = (0, utils_3.breakExternalTableId)(tableId);
@@ -569,8 +573,7 @@ class ExternalRequest {
                 throw "Unable to run without a table name";
             }
             if (!this.datasource) {
-                const db = backend_core_1.context.getAppDB();
-                this.datasource = yield db.get(datasourceId);
+                this.datasource = yield sdk_1.default.datasources.get(datasourceId);
                 if (!this.datasource || !this.datasource.entities) {
                     throw "No tables found, fetch tables before query.";
                 }
@@ -583,6 +586,12 @@ class ExternalRequest {
             }
             // look for specific components of config which may not be considered acceptable
             let { id, row, filters, sort, paginate, rows } = cleanupConfig(config, table);
+            //if the sort column is a formula, remove it
+            for (let sortColumn of Object.keys(sort || {})) {
+                if (((_a = table.schema[sortColumn]) === null || _a === void 0 ? void 0 : _a.type) === "formula") {
+                    sort === null || sort === void 0 ? true : delete sort[sortColumn];
+                }
+            }
             filters = buildFilters(id, filters || {}, table);
             const relationships = this.buildRelationships(table);
             // clean up row on ingress using schema

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

@@ -42,15 +42,19 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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");
+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
@@ -222,20 +226,21 @@ 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);
+        const datasource = yield sdk_1.default.datasources.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]),
+        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
@@ -250,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;
@@ -266,8 +274,7 @@ function fetchEnrichedRow(ctx) {
         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);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         if (!tableName) {
             ctx.throw(400, "Unable to find table.");
         }

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

@@ -61,8 +61,9 @@ const utils_2 = require("../view/utils");
 const fp_1 = require("lodash/fp");
 const backend_core_1 = require("@budibase/backend-core");
 const staticFormula_1 = require("./staticFormula");
-const exporters = __importStar(require("../view/exporters"));
+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,22 @@ function exportRows(ctx) {
         else {
             rows = result;
         }
-        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));
+        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]), exportRows));
+        }
+        else if (format === exporters_1.Format.JSON) {
+            ctx.attachment("export.json");
+            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";
+        }
     });
 }
 exports.exportRows = exportRows;