From 1e39a873b23c651d5a38bc16ec970a7a4049c9be Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 16 Feb 2021 18:29:38 +0000
Subject: [PATCH] Fixing issue with cypress test, fixing a 409 conflict that
 could occur in table saving - shouldn't happen now.

---
 .../builder/src/components/backend/DataTable/DataTable.svelte   | 2 +-
 packages/builder/src/components/backend/DataTable/Table.svelte  | 2 +-
 .../backend/DataTable/buttons/HideAutocolumnButton.svelte       | 2 +-
 packages/server/src/api/controllers/table.js                    | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 9197026f4a..5f6f230210 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -13,7 +13,7 @@
   import CreateEditUser from "./modals/CreateEditUser.svelte"
   import CreateEditRow from "./modals/CreateEditRow.svelte"
 
-  let hideAutocolumns
+  let hideAutocolumns = true
   let data = []
   let loading = false
   $: isUsersTable = $backendUiStore.selectedTable?._id === TableNames.USERS
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 51dedf1a4d..195876cf05 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -24,7 +24,7 @@
   export let allowEditing = false
   export let loading = false
   export let theme = "alpine"
-  export let hideAutocolumns = false
+  export let hideAutocolumns
 
   let columnDefs = []
   let selectedRows = []
diff --git a/packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte
index 1af93dd4f8..fc50bfbfef 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { TextButton } from "@budibase/bbui"
 
-  export let hideAutocolumns = true
+  export let hideAutocolumns
 
   let anchor
   let dropdown
diff --git a/packages/server/src/api/controllers/table.js b/packages/server/src/api/controllers/table.js
index d3e7213fdb..d0bc4c0bee 100644
--- a/packages/server/src/api/controllers/table.js
+++ b/packages/server/src/api/controllers/table.js
@@ -70,6 +70,8 @@ exports.save = async function(ctx) {
   let oldTable
   if (ctx.request.body && ctx.request.body._id) {
     oldTable = await db.get(ctx.request.body._id)
+    // update _rev just to make sure its always accurate
+    tableToSave._rev = oldTable._rev
   }
 
   // make sure that types don't change of a column, have to remove