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

Merge pull request #10845 from Budibase/budi-6945/create_datasource_on_connect 

Create datasource on the second step
This commit is contained in:
Michael Drury 2023-06-09 12:41:35 +01:00 committed by GitHub
parent 9ee06e8e42 86fa262649
commit faca84af83
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte
View File

@ -10,7 +10,7 @@
import { IntegrationNames, IntegrationTypes } from "constants/backend" import { IntegrationNames, IntegrationTypes } from "constants/backend"
import GoogleButton from "../_components/GoogleButton.svelte" import GoogleButton from "../_components/GoogleButton.svelte"
import { organisation } from "stores/portal" import { organisation } from "stores/portal"
import { onMount } from "svelte" import { onMount, onDestroy } from "svelte"
import { import {
validateDatasourceConfig, validateDatasourceConfig,
getDatasourceInfo, getDatasourceInfo,
@ -21,6 +21,7 @@
import { saveDatasource } from "builderStore/datasource" import { saveDatasource } from "builderStore/datasource"
import { DatasourceFeature } from "@budibase/types" import { DatasourceFeature } from "@budibase/types"
import { API } from "api"
export let integration export let integration
export let continueSetupId = false export let continueSetupId = false
@ -28,11 +29,14 @@
let datasource = cloneDeep(integration) let datasource = cloneDeep(integration)
datasource.config.continueSetupId = continueSetupId datasource.config.continueSetupId = continueSetupId
let { schema } = datasource
$: isGoogleConfigured = !!$organisation.googleDatasourceConfigured $: isGoogleConfigured = !!$organisation.googleDatasourceConfigured
onMount(async () => { onMount(async () => {
await organisation.init() await organisation.init()
}) })
const integrationName = IntegrationNames[IntegrationTypes.GOOGLE_SHEETS] const integrationName = IntegrationNames[IntegrationTypes.GOOGLE_SHEETS]
export const GoogleDatasouceConfigStep = { export const GoogleDatasouceConfigStep = {
@ -50,20 +54,6 @@
let allSheets let allSheets
let selectedSheets let selectedSheets
const saveDatasourceAndRedirect = async () => {
try {
const resp = await saveDatasource(datasource, {
tablesFilter: selectedSheets,
})
$goto(`./datasource/${resp._id}`)
notifications.success(`Datasource created successfully.`)
} catch (err) {
notifications.error(err?.message ?? "Error saving datasource")
// prevent the modal from closing
return false
}
}
$: modalConfig = { $: modalConfig = {
[GoogleDatasouceConfigStep.AUTH]: { [GoogleDatasouceConfigStep.AUTH]: {
title: `Connect to ${integrationName}`, title: `Connect to ${integrationName}`,
@ -82,8 +72,20 @@
} }
} }
try {
const resp = await saveDatasource(datasource, {
tablesFilter: selectedSheets,
skipFetch: true,
})
datasource = resp
} catch (err) {
notifications.error(err?.message ?? "Error saving datasource")
// prevent the modal from closing
return false
}
if (!integration.features[DatasourceFeature.FETCH_TABLE_NAMES]) { if (!integration.features[DatasourceFeature.FETCH_TABLE_NAMES]) {
saveDatasourceAndRedirect() notifications.success(`Datasource created successfully.`)
return return
} }
@ -107,10 +109,30 @@
? "Fetch sheets" ? "Fetch sheets"
: "Continue without fetching", : "Continue without fetching",
onConfirm: async () => { onConfirm: async () => {
await saveDatasourceAndRedirect() try {
if (selectedSheets.length) {
await API.buildDatasourceSchema({
datasourceId: datasource._id,
tablesFilter: selectedSheets,
})
}
return
} catch (err) {
notifications.error(err?.message ?? "Error fetching the sheets")
// prevent the modal from closing
return false
}
}, },
}, },
} }
// This will handle the user closing the modal pressing outside the modal
onDestroy(async () => {
if (step === GoogleDatasouceConfigStep.SET_SHEETS) {
await $goto(`./datasource/${datasource._id}`)
}
})
</script> </script>
<ModalContent <ModalContent
@ -144,7 +166,7 @@
<Body size="S">Add the URL of the sheet you want to connect.</Body> <Body size="S">Add the URL of the sheet you want to connect.</Body>
<IntegrationConfigForm <IntegrationConfigForm
schema={datasource.schema} {schema}
bind:datasource bind:datasource
creating={true} creating={true}
on:valid={e => (isValid = e.detail)} on:valid={e => (isValid = e.detail)}