From 1531ff710f28ee882385679e05fa152bb1ce90b5 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 27 Jul 2023 23:35:13 +0100
Subject: [PATCH 1/2] fix gsheets onboarding

---
 .../src/pages/builder/app/[application]/data/_layout.svelte  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index a2db33306c..4f64edb34d 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -2,14 +2,15 @@
   import { Button, Layout } from "@budibase/bbui"
   import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
   import Panel from "components/design/Panel.svelte"
-  import { isActive, goto, redirect } from "@roxi/routify"
+  import { isActive, redirect, goto, params } from "@roxi/routify"
   import BetaButton from "./_components/BetaButton.svelte"
   import { datasources } from "stores/backend"
 
   $: {
     // If we ever don't have any data other than the users table, prompt the
     // user to add some
-    if (!$datasources.hasData) {
+    // Don't redirect if setting up google sheets, or we lose the query parameter
+    if (!$datasources.hasData && !$params["?continue_google_setup"]) {
       $redirect("./new")
     }
   }

From 74183d3a463264bf1353d7970a58f631e267ad7f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 28 Jul 2023 08:39:16 +0000
Subject: [PATCH 2/2] Bump version to 2.8.29

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index b9545165d8..b02f81e499 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.28",
+  "version": "2.8.29",
   "npmClient": "yarn",
   "packages": [
     "packages/*"