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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.80-alpha.3",
+  "version": "1.0.80-alpha.6",
   "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.3",
-    "@budibase/client": "^1.0.80-alpha.3",
-    "@budibase/string-templates": "^1.0.80-alpha.3",
+    "@budibase/backend-core": "^1.0.80-alpha.6",
+    "@budibase/client": "^1.0.80-alpha.6",
+    "@budibase/string-templates": "^1.0.80-alpha.6",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -175,5 +175,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "f7de7ed349ad3413966e5790a2801d1e7e306142"
+  "gitHead": "094de0d4bc6d142522aabde7a4dff585280c3ad7"
 }

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

@@ -152,6 +152,27 @@ exports.validate = async () => {
   return { valid: true }
 }
 
+exports.exportRows = async ctx => {
+  const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId)
+  const db = getAppDB()
+  const datasource = await 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 = async ctx => {
   const id = ctx.params.rowId
   const tableId = ctx.params.tableId

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

@@ -137,3 +137,12 @@ exports.fetchEnrichedRow = async function (ctx) {
     ctx.throw(400, err)
   }
 }
+
+exports.export = async function (ctx) {
+  const tableId = getTableId(ctx)
+  try {
+    ctx.body = await pickApi(tableId).exportRows(ctx)
+  } catch (err) {
+    ctx.throw(400, err)
+  }
+}

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

@@ -362,6 +362,22 @@ exports.validate = async ctx => {
   })
 }
 
+exports.exportRows = async ctx => {
+  const db = getAppDB()
+  const table = await db.get(ctx.params.tableId)
+  const rowIds = ctx.request.body.rows
+  let response = (
+    await db.allDocs({
+      include_docs: true,
+      keys: rowIds,
+    })
+  ).rows.map(row => row.doc)
+
+  let rows = await outputProcessing(table, response)
+
+  return rows
+}
+
 exports.fetchEnrichedRow = async ctx => {
   const db = getAppDB()
   const tableId = ctx.params.tableId

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

@@ -25,7 +25,8 @@ async function makeTableRequest(
   operation,
   table,
   tables,
-  oldTable = null
+  oldTable = null,
+  renamed = null
 ) {
   const json = {
     endpoint: {
@@ -41,6 +42,9 @@ async function makeTableRequest(
   if (oldTable) {
     json.meta.table = oldTable
   }
+  if (renamed) {
+    json.meta.renamed = renamed
+  }
   return makeExternalQuery(datasource, json)
 }
 
@@ -160,6 +164,7 @@ function isRelationshipSetup(column) {
 
 exports.save = async function (ctx) {
   const table = ctx.request.body
+  const { _rename: renamed } = table
   // can't do this right now
   delete table.dataImport
   const datasourceId = getDatasourceId(ctx.request.body)
@@ -241,7 +246,14 @@ exports.save = async function (ctx) {
   const operation = oldTable
     ? DataSourceOperation.UPDATE_TABLE
     : DataSourceOperation.CREATE_TABLE
-  await makeTableRequest(datasource, operation, tableToSave, tables, oldTable)
+  await 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]
@@ -258,6 +270,8 @@ exports.save = async function (ctx) {
     )
   }
 
+  // remove the rename prop
+  delete tableToSave._rename
   // store it into couch now for budibase reference
   datasource.entities[tableToSave.name] = tableToSave
   await db.put(datasource)

package/src/api/routes/row.js

@@ -252,4 +252,25 @@ router
     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/src/definitions/datasource.ts

@@ -138,6 +138,11 @@ export interface PaginationJson {
   page?: string | number
 }
 
+export interface RenameColumn {
+  old: string
+  updated: string
+}
+
 export interface RelationshipsJson {
   through?: string
   from?: string
@@ -166,6 +171,7 @@ export interface QueryJson {
   meta?: {
     table?: Table
     tables?: Record<string, Table>
+    renamed: RenameColumn
   }
   extra?: {
     idFilter?: SearchFilters

package/src/integrations/base/sqlTable.ts

@@ -1,6 +1,10 @@
 import { Knex, knex } from "knex"
 import { Table } from "../../definitions/common"
-import { Operation, QueryJson } from "../../definitions/datasource"
+import {
+  Operation,
+  QueryJson,
+  RenameColumn,
+} from "../../definitions/datasource"
 import { breakExternalTableId } from "../utils"
 import SchemaBuilder = Knex.SchemaBuilder
 import CreateTableBuilder = Knex.CreateTableBuilder
@@ -10,7 +14,8 @@ function generateSchema(
   schema: CreateTableBuilder,
   table: Table,
   tables: Record<string, Table>,
-  oldTable: null | Table = null
+  oldTable: null | Table = null,
+  renamed?: RenameColumn
 ) {
   let primaryKey = table && table.primary ? table.primary[0] : null
   const columns = Object.values(table.schema)
@@ -29,7 +34,11 @@ function generateSchema(
   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?.updated === key
+    ) {
       continue
     }
     switch (column.type) {
@@ -81,6 +90,10 @@ function generateSchema(
     }
   }
 
+  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)
@@ -90,6 +103,9 @@ function generateSchema(
       )
       .map(([key]) => key)
     deletedColumns.forEach(key => {
+      if (renamed?.old === key) {
+        return
+      }
       if (oldTable.constrained && oldTable.constrained.indexOf(key) !== -1) {
         schema.dropForeign(key)
       }
@@ -114,10 +130,11 @@ function buildUpdateTable(
   knex: SchemaBuilder,
   table: Table,
   tables: Record<string, Table>,
-  oldTable: Table
+  oldTable: Table,
+  renamed: RenameColumn
 ): SchemaBuilder {
   return knex.alterTable(table.name, schema => {
-    generateSchema(schema, table, tables, oldTable)
+    generateSchema(schema, table, tables, oldTable, renamed)
   })
 }
 
@@ -167,7 +184,8 @@ class SqlTableQueryBuilder {
           client,
           json.table,
           json.meta.tables,
-          json.meta.table
+          json.meta.table,
+          json.meta.renamed
         )
         break
       case Operation.DELETE_TABLE: