@budibase/server 1.0.80-alpha.3 → 1.0.80-alpha.6

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

@@ -152,6 +152,24 @@ 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, tableName } = breakExternalTableId(ctx.params.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 table = tables[tableName];
+    ctx.request.body = {
+        query: {
+            oneOf: {
+                [table.primaryDisplay]: ctx.request.body.map(id => breakRowIdField(id)[0]),
+            },
+        },
+    };
+    return exports.search(ctx);
+});
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const id = ctx.params.rowId;
     const tableId = ctx.params.tableId;

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

@@ -159,3 +159,14 @@ exports.fetchEnrichedRow = function (ctx) {
         }
     });
 };
+exports.export = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tableId = getTableId(ctx);
+        try {
+            ctx.body = yield pickApi(tableId).exportRows(ctx);
+        }
+        catch (err) {
+            ctx.throw(400, err);
+        }
+    });
+};

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

@@ -336,6 +336,17 @@ exports.validate = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         row: ctx.request.body,
     });
 });
+exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
+    const table = yield db.get(ctx.params.tableId);
+    const rowIds = ctx.request.body.rows;
+    let response = (yield db.allDocs({
+        include_docs: true,
+        keys: rowIds,
+    })).rows.map(row => row.doc);
+    let rows = yield outputProcessing(table, response);
+    return rows;
+});
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
     const tableId = ctx.params.tableId;

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

@@ -16,7 +16,7 @@ const { cloneDeep } = require("lodash/fp");
 const csvParser = require("../../../utilities/csvParser");
 const { handleRequest } = require("../row/external");
 const { getAppDB } = require("@budibase/backend-core/context");
-function makeTableRequest(datasource, operation, table, tables, oldTable = null) {
+function makeTableRequest(datasource, operation, table, tables, oldTable = null, renamed = null) {
     return __awaiter(this, void 0, void 0, function* () {
         const json = {
             endpoint: {
@@ -32,6 +32,9 @@ function makeTableRequest(datasource, operation, table, tables, oldTable = null)
         if (oldTable) {
             json.meta.table = oldTable;
         }
+        if (renamed) {
+            json.meta.renamed = renamed;
+        }
         return makeExternalQuery(datasource, json);
     });
 }
@@ -135,6 +138,7 @@ function isRelationshipSetup(column) {
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = ctx.request.body;
+        const { _rename: renamed } = table;
         // can't do this right now
         delete table.dataImport;
         const datasourceId = getDatasourceId(ctx.request.body);
@@ -193,7 +197,7 @@ exports.save = function (ctx) {
         const operation = oldTable
             ? DataSourceOperation.UPDATE_TABLE
             : DataSourceOperation.CREATE_TABLE;
-        yield makeTableRequest(datasource, operation, tableToSave, tables, oldTable);
+        yield makeTableRequest(datasource, operation, tableToSave, tables, oldTable, renamed);
         // update any extra tables (like foreign keys in other tables)
         for (let extraTable of extraTablesToUpdate) {
             const oldExtraTable = oldTables[extraTable.name];
@@ -206,6 +210,8 @@ exports.save = function (ctx) {
         if (Array.isArray(tableToSave.constrained)) {
             tableToSave.constrained = tableToSave.constrained.filter(constraint => Object.keys(tableToSave.schema).includes(constraint));
         }
+        // remove the rename prop
+        delete tableToSave._rename;
         // store it into couch now for budibase reference
         datasource.entities[tableToSave.name] = tableToSave;
         yield db.put(datasource);

package/dist/api/routes/row.js

@@ -194,5 +194,19 @@ router
      * of the deleted rows, if deleting a single row then the body will contain a "row" property which
      * is the deleted row.
      */
-    .delete("/api/:tableId/rows", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), usage, rowController.destroy);
+    .delete("/api/:tableId/rows", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), usage, rowController.destroy)
+    /**
+     * @api {post} /api/:tableId/rows/exportRows Export Rows
+     * @apiName Export rows
+     * @apiGroup rows
+     * @apiPermission table write access
+     * @apiDescription This API can export a number of provided rows
+     *
+     * @apiParam {string} tableId The ID of the table the row is to be deleted from.
+     *
+     * @apiParam (Body) {object[]} [rows] The row IDs which are to be exported
+     *
+     * @apiSuccess {object[]|object}
+     */
+    .post("/api/:tableId/rows/exportRows", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), usage, rowController.export);
 module.exports = router;

package/dist/integrations/base/sqlTable.js

@@ -4,7 +4,7 @@ const knex_1 = require("knex");
 const datasource_1 = require("../../definitions/datasource");
 const utils_1 = require("../utils");
 const { FieldTypes, RelationshipTypes } = require("../../constants");
-function generateSchema(schema, table, tables, oldTable = null) {
+function generateSchema(schema, table, tables, oldTable = null, renamed) {
     let primaryKey = table && table.primary ? table.primary[0] : null;
     const columns = Object.values(table.schema);
     // all columns in a junction table will be meta
@@ -22,7 +22,9 @@ function generateSchema(schema, table, tables, oldTable = null) {
     for (let [key, column] of Object.entries(table.schema)) {
         // skip things that are already correct
         const oldColumn = oldTable ? oldTable.schema[key] : null;
-        if ((oldColumn && oldColumn.type) || (primaryKey === key && !isJunction)) {
+        if ((oldColumn && oldColumn.type) ||
+            (primaryKey === key && !isJunction) ||
+            (renamed === null || renamed === void 0 ? void 0 : renamed.updated) === key) {
             continue;
         }
         switch (column.type) {
@@ -72,12 +74,18 @@ function generateSchema(schema, table, tables, oldTable = null) {
                 break;
         }
     }
+    if (renamed) {
+        schema.renameColumn(renamed.old, renamed.updated);
+    }
     // need to check if any columns have been deleted
     if (oldTable) {
         const deletedColumns = Object.entries(oldTable.schema)
             .filter(([key, schema]) => schema.type !== FieldTypes.LINK && table.schema[key] == null)
             .map(([key]) => key);
         deletedColumns.forEach(key => {
+            if ((renamed === null || renamed === void 0 ? void 0 : renamed.old) === key) {
+                return;
+            }
             if (oldTable.constrained && oldTable.constrained.indexOf(key) !== -1) {
                 schema.dropForeign(key);
             }
@@ -91,9 +99,9 @@ function buildCreateTable(knex, table, tables) {
         generateSchema(schema, table, tables);
     });
 }
-function buildUpdateTable(knex, table, tables, oldTable) {
+function buildUpdateTable(knex, table, tables, oldTable, renamed) {
     return knex.alterTable(table.name, schema => {
-        generateSchema(schema, table, tables, oldTable);
+        generateSchema(schema, table, tables, oldTable, renamed);
     });
 }
 function buildDeleteTable(knex, table) {
@@ -132,7 +140,7 @@ class SqlTableQueryBuilder {
                 if (!json.meta || !json.meta.table) {
                     throw "Must specify old table for update";
                 }
-                query = buildUpdateTable(client, json.table, json.meta.tables, json.meta.table);
+                query = buildUpdateTable(client, json.table, json.meta.tables, json.meta.table, json.meta.renamed);
                 break;
             case datasource_1.Operation.DELETE_TABLE:
                 query = buildDeleteTable(client, json.table);

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.80-alpha.2",
+    "version": "1.0.80-alpha.5",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -71,9 +71,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.80-alpha.2",
-        "@budibase/client": "^1.0.80-alpha.2",
-        "@budibase/string-templates": "^1.0.80-alpha.2",
+        "@budibase/backend-core": "^1.0.80-alpha.5",
+        "@budibase/client": "^1.0.80-alpha.5",
+        "@budibase/string-templates": "^1.0.80-alpha.5",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",