Merge pull request #10181 from Budibase/fix/same-tab-googlesheets-onboarding

Minor googlesheets onboarding improvement

packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte

@@ -6,6 +6,7 @@
   export let preAuthStep
   export let datasource
   export let disabled
+  export let samePage
 
   $: tenantId = $auth.tenantId
 </script>
@@ -25,10 +26,12 @@
         ds = resp
       }
     }
-    window.open(
+    const url = `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}`
-      `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}`,
+    if (samePage) {
-      "_blank"
+      window.location = url
-    )
+    } else {
+      window.open(url, "_blank")
+    }
   }}
 >
   <img src={GoogleLogo} alt="google icon" />

packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte

@@ -3,6 +3,7 @@
   import GoogleLogo from "assets/google-logo.png"
   import { auth, organisation } from "stores/portal"
 
+  export let samePage
   let show
 
   $: tenantId = $auth.tenantId
@@ -12,8 +13,14 @@
 {#if show}
   <FancyButton
     icon={GoogleLogo}
-    on:click={() =>
+    on:click={() => {
-      window.open(`/api/global/auth/${tenantId}/google`, "_blank")}
+      const url = `/api/global/auth/${tenantId}/google`
+      if (samePage) {
+        window.location = url
+      } else {
+        window.open(url, "_blank")
+      }
+    }}
   >
     Log in with Google
   </FancyButton>

packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte

@@ -9,6 +9,8 @@
   import { oidc, organisation, auth } from "stores/portal"
   import { onMount } from "svelte"
 
+  export let samePage
+
   $: show = $organisation.oidc
 
   let preDefinedIcons = {
@@ -35,11 +37,14 @@
 {#if show}
   <FancyButton
     icon={src}
-    on:click={() =>
+    on:click={() => {
-      window.open(
+      const url = `/api/global/auth/${$auth.tenantId}/oidc/configs/${$oidc.uuid}`
-        `/api/global/auth/${$auth.tenantId}/oidc/configs/${$oidc.uuid}`,
+      if (samePage) {
-        "_blank"
+        window.location = url
-      )}
+      } else {
+        window.open(url, "_blank")
+      }
+    }}
   >
     {`Log in with ${$oidc.name || "OIDC"}`}
   </FancyButton>

packages/builder/src/pages/builder/auth/login.svelte

@@ -78,8 +78,8 @@
       <Layout gap="S" noPadding>
         {#if loaded && ($organisation.google || $organisation.oidc)}
           <FancyForm>
-            <OIDCButton oidcIcon={$oidc.logo} oidcName={$oidc.name} />
+            <OIDCButton oidcIcon={$oidc.logo} oidcName={$oidc.name} samePage />
-            <GoogleButton />
+            <GoogleButton samePage />
           </FancyForm>
         {/if}
         {#if !$organisation.isSSOEnforced}

packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte

@@ -107,7 +107,7 @@
     </FancyForm>
   </div>
   {#if isGoogle}
-    <GoogleButton disabled={!isValid} preAuthStep={handleNext} />
+    <GoogleButton disabled={!isValid} preAuthStep={handleNext} samePage />
   {:else}
     <Button cta disabled={!isValid} on:click={handleNext}>Connect</Button>
   {/if}