MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolving PR comments.

This commit is contained in:
mike12345567 2023-03-31 11:38:09 +01:00
parent 42320b1d95
commit 75baba76d6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/backend-core/src/middleware/passport/datasource/google.ts
View File

@ -13,7 +13,6 @@ type Passport = {
async function fetchGoogleCreds() { async function fetchGoogleCreds() {
let config = await configs.getGoogleDatasourceConfig() let config = await configs.getGoogleDatasourceConfig()
console.log(config)
if (!config) { if (!config) {
throw new Error("No google configuration found") throw new Error("No google configuration found")

8
packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
View File

@ -11,7 +11,7 @@
import { store, automationStore } from "builderStore" import { store, automationStore } from "builderStore"
import { saveDatasource } from "builderStore/datasource" import { saveDatasource } from "builderStore/datasource"
import { integrations } from "stores/backend" 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 FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte" import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen" import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen"
@ -31,7 +31,6 @@
let googleComplete = false let googleComplete = false
$: getIntegrations() $: getIntegrations()
$: cloudHosted = $admin.cloud
const createApp = async useSampleData => { const createApp = async useSampleData => {
creationLoading = true creationLoading = true
@ -79,7 +78,10 @@
Object.entries($integrations).forEach(([integrationType, schema]) => { Object.entries($integrations).forEach(([integrationType, schema]) => {
// google sheets not available in self-host // google sheets not available in self-host
if (helpers.isGoogleSheets(integrationType) && !cloudHosted) { if (
helpers.isGoogleSheets(integrationType) &&
!$organisation.googleDatasourceConfigured
) {
return return
} }
if (schema?.plus) { if (schema?.plus) {