From f0d7b159162526965d10fa9f4267033a38d898b4 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 20 Apr 2022 11:00:58 +0100
Subject: [PATCH 1/4] Remove Row Rev from UI

---
 .../ButtonActionEditor/actions/DeleteRow.svelte           | 8 --------
 packages/server/src/automations/steps/deleteRow.js        | 8 ++------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DeleteRow.svelte
index 35a1a6ec86..0ca5bfaa76 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DeleteRow.svelte
@@ -26,14 +26,6 @@
     on:change={value => (parameters.rowId = value.detail)}
   />
 
-  <Label small>Row Rev</Label>
-  <DrawerBindableInput
-    {bindings}
-    title="Row rev to delete"
-    value={parameters.revId}
-    on:change={value => (parameters.revId = value.detail)}
-  />
-
   <Label small />
   <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
diff --git a/packages/server/src/automations/steps/deleteRow.js b/packages/server/src/automations/steps/deleteRow.js
index e41e5ad263..f1a39450bb 100644
--- a/packages/server/src/automations/steps/deleteRow.js
+++ b/packages/server/src/automations/steps/deleteRow.js
@@ -23,13 +23,9 @@ exports.definition = {
         id: {
           type: "string",
           title: "Row ID",
-        },
-        revision: {
-          type: "string",
-          title: "Row Revision",
-        },
+        }
       },
-      required: ["tableId", "id", "revision"],
+      required: ["tableId", "id"],
     },
     outputs: {
       properties: {

From 8858a416ef38a8fd6e43d65cd7c4c161d615ec7c Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 20 Apr 2022 11:02:27 +0100
Subject: [PATCH 2/4] Prettier comma fix

---
 packages/server/src/automations/steps/deleteRow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/automations/steps/deleteRow.js b/packages/server/src/automations/steps/deleteRow.js
index f1a39450bb..9fcf266349 100644
--- a/packages/server/src/automations/steps/deleteRow.js
+++ b/packages/server/src/automations/steps/deleteRow.js
@@ -23,7 +23,7 @@ exports.definition = {
         id: {
           type: "string",
           title: "Row ID",
-        }
+        },
       },
       required: ["tableId", "id"],
     },

From d85e0221829db39241219ca7369a882e8336dc37 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 20 Apr 2022 11:51:01 +0100
Subject: [PATCH 3/4] Get latest RevId if not provided

---
 packages/client/src/utils/buttonActions.js          | 2 +-
 packages/frontend-core/src/api/rows.js              | 2 +-
 packages/server/src/api/controllers/row/internal.js | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index f851a623c0..4e35cb2e54 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -81,7 +81,7 @@ const duplicateRowHandler = async (action, context) => {
 
 const deleteRowHandler = async action => {
   const { tableId, revId, rowId } = action.parameters
-  if (tableId && revId && rowId) {
+  if (tableId && rowId) {
     try {
       await API.deleteRow({ tableId, rowId, revId })
       notificationStore.actions.success("Row deleted")
diff --git a/packages/frontend-core/src/api/rows.js b/packages/frontend-core/src/api/rows.js
index 6a0d278cf7..9f980678c5 100644
--- a/packages/frontend-core/src/api/rows.js
+++ b/packages/frontend-core/src/api/rows.js
@@ -35,7 +35,7 @@ export const buildRowEndpoints = API => ({
    * @param revId the rev of the row to delete
    */
   deleteRow: async ({ tableId, rowId, revId }) => {
-    if (!tableId || !rowId || !revId) {
+    if (!tableId || !rowId) {
       return
     }
     return await API.delete({
diff --git a/packages/server/src/api/controllers/row/internal.js b/packages/server/src/api/controllers/row/internal.js
index 68ff4ca88d..d8e18df43b 100644
--- a/packages/server/src/api/controllers/row/internal.js
+++ b/packages/server/src/api/controllers/row/internal.js
@@ -259,8 +259,9 @@ exports.find = async ctx => {
 
 exports.destroy = async function (ctx) {
   const db = getAppDB()
-  const { _id, _rev } = ctx.request.body
+  const { _id } = ctx.request.body
   let row = await db.get(_id)
+  let _rev = ctx.request.body._rev || row._rev
 
   if (row.tableId !== ctx.params.tableId) {
     throw "Supplied tableId doesn't match the row's tableId"

From ec235a4e5c947af43ba683e8a0c8535ca4cb73a2 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 20 Apr 2022 12:11:36 +0100
Subject: [PATCH 4/4] RevId should be optional for automation delete

---
 packages/server/src/automations/steps/deleteRow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/automations/steps/deleteRow.js b/packages/server/src/automations/steps/deleteRow.js
index 9fcf266349..1e9acc5a41 100644
--- a/packages/server/src/automations/steps/deleteRow.js
+++ b/packages/server/src/automations/steps/deleteRow.js
@@ -49,7 +49,7 @@ exports.definition = {
 }
 
 exports.run = async function ({ inputs, appId, emitter }) {
-  if (inputs.id == null || inputs.revision == null) {
+  if (inputs.id == null) {
     return {
       success: false,
       response: {