@budibase/server 2.6.19-alpha.10 → 2.6.19-alpha.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.19-alpha.10",
+  "version": "2.6.19-alpha.12",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.6.19-alpha.10",
-    "@budibase/client": "2.6.19-alpha.10",
-    "@budibase/pro": "2.6.19-alpha.10",
-    "@budibase/shared-core": "2.6.19-alpha.10",
-    "@budibase/string-templates": "2.6.19-alpha.10",
-    "@budibase/types": "2.6.19-alpha.10",
+    "@budibase/backend-core": "2.6.19-alpha.12",
+    "@budibase/client": "2.6.19-alpha.12",
+    "@budibase/pro": "2.6.19-alpha.12",
+    "@budibase/shared-core": "2.6.19-alpha.12",
+    "@budibase/string-templates": "2.6.19-alpha.12",
+    "@budibase/types": "2.6.19-alpha.12",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -193,5 +193,5 @@
       }
     }
   },
-  "gitHead": "7143391429a9d3685a0c443a32c7b3c3d82b78cf"
+  "gitHead": "29935057b058f97e80a208b0cfdcf65b0ce150c2"
 }

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

@@ -415,7 +415,7 @@ export async function exportRows(ctx: UserCtx) {
 
     result = await outputProcessing(table, response)
   } else if (query) {
-    let searchResponse = await exports.search(ctx)
+    let searchResponse = await search(ctx)
     result = searchResponse.rows
   }
 

package/src/api/controllers/table/internal.ts

@@ -186,11 +186,7 @@ export async function destroy(ctx: any) {
 export async function bulkImport(ctx: any) {
   const db = context.getAppDB()
   const table = await sdk.tables.getTable(ctx.params.tableId)
-  const { rows } = ctx.request.body
-  await handleDataImport(ctx.user, table, rows)
-
-  // Ensure auto id and other table updates are persisted
-  await db.put(table)
-
+  const { rows, identifierFields } = ctx.request.body
+  await handleDataImport(ctx.user, table, rows, identifierFields)
   return table
 }

package/src/api/controllers/table/utils.ts

@@ -149,7 +149,12 @@ export function importToRows(
   return finalData
 }
 
-export async function handleDataImport(user: any, table: any, rows: any) {
+export async function handleDataImport(
+  user: any,
+  table: any,
+  rows: any,
+  identifierFields: Array<string> = []
+) {
   const schema: unknown = table.schema
 
   if (!rows || !isRows(rows) || !isSchema(schema)) {
@@ -161,6 +166,32 @@ export async function handleDataImport(user: any, table: any, rows: any) {
 
   let finalData: any = importToRows(data, table, user)
 
+  //Set IDs of finalData to match existing row if an update is expected
+  if (identifierFields.length > 0) {
+    const allDocs = await db.allDocs(
+      getRowParams(table._id, null, {
+        include_docs: true,
+      })
+    )
+    allDocs.rows
+      .map(existingRow => existingRow.doc)
+      .forEach((doc: any) => {
+        finalData.forEach((finalItem: any) => {
+          let match = true
+          for (const field of identifierFields) {
+            if (finalItem[field] !== doc[field]) {
+              match = false
+              break
+            }
+          }
+          if (match) {
+            finalItem._id = doc._id
+            finalItem._rev = doc._rev
+          }
+        })
+      })
+  }
+
   await quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
     tableId: table._id,
   })