From 75baba76d6e40e19bcda644ba556aed627dc2fbe Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 Mar 2023 11:38:09 +0100
Subject: [PATCH] Resolving PR comments.

---
 .../src/middleware/passport/datasource/google.ts          | 1 -
 .../src/pages/builder/portal/apps/onboarding/index.svelte | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts
index d67bc45f84..6fd4e9ff32 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.ts
+++ b/packages/backend-core/src/middleware/passport/datasource/google.ts
@@ -13,7 +13,6 @@ type Passport = {
 
 async function fetchGoogleCreds() {
   let config = await configs.getGoogleDatasourceConfig()
-  console.log(config)
 
   if (!config) {
     throw new Error("No google configuration found")
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index ab1b9c2331..8e018ae907 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -11,7 +11,7 @@
   import { store, automationStore } from "builderStore"
   import { saveDatasource } from "builderStore/datasource"
   import { integrations } from "stores/backend"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin, organisation } from "stores/portal"
   import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
   import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
   import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen"
@@ -31,7 +31,6 @@
   let googleComplete = false
 
   $: getIntegrations()
-  $: cloudHosted = $admin.cloud
 
   const createApp = async useSampleData => {
     creationLoading = true
@@ -79,7 +78,10 @@
 
       Object.entries($integrations).forEach(([integrationType, schema]) => {
         // google sheets not available in self-host
-        if (helpers.isGoogleSheets(integrationType) && !cloudHosted) {
+        if (
+          helpers.isGoogleSheets(integrationType) &&
+          !$organisation.googleDatasourceConfigured
+        ) {
           return
         }
         if (schema?.plus) {