diff --git a/packages/builder/src/analytics.js b/packages/builder/src/analytics.js
index e6a647a08b..bcc59eb311 100644
--- a/packages/builder/src/analytics.js
+++ b/packages/builder/src/analytics.js
@@ -22,6 +22,7 @@ async function activate() {
if (sentryConfigured) Sentry.init({ dsn: process.env.SENTRY_DSN })
if (posthogConfigured) {
posthog.init(process.env.POSTHOG_TOKEN, {
+ autocapture: false,
api_host: process.env.POSTHOG_URL,
})
posthog.set_config({ persistence: "cookie" })
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte
index db99a5d001..56336c5335 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte
@@ -18,13 +18,18 @@
}
function selectIntegration(integrationType) {
- schema = integrations[integrationType].datasource
+ const selected = integrations[integrationType]
+
+ // build the schema
+ const schema = {}
+ for (let key in selected.datasource) {
+ schema[key] = selected.datasource[key].default
+ }
+
integration = {
type: integrationType,
- ...Object.keys(schema).reduce(
- (acc, next) => ({ ...acc, [next]: schema[next].default }),
- {}
- ),
+ plus: selected.plus,
+ ...schema
}
}
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
index a03f07e746..daf2127960 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
@@ -23,16 +23,17 @@
}
async function saveDatasource() {
- const { type, ...config } = integration
+ const { type, plus, ...config } = integration
// Create datasource
const response = await datasources.save({
name,
source: type,
config,
+ plus
})
notifications.success(`Datasource ${name} created successfully.`)
- analytics.captureEvent("Datasource Created", { name })
+ analytics.captureEvent("Datasource Created", { name, type })
// Navigate to new datasource
$goto(`./datasource/${response._id}`)
diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index ea538f8212..4971974f9e 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -4,7 +4,6 @@
import { store } from "builderStore"
import api from "builderStore/api"
import analytics from "analytics"
- import FeedbackIframe from "components/feedback/FeedbackIframe.svelte"
const DeploymentStatus = {
SUCCESS: "SUCCESS",
@@ -30,10 +29,6 @@
} else {
notifications.success(`Application published successfully`)
}
-
- if (analytics.requestFeedbackOnDeploy()) {
- feedbackModal.show()
- }
} catch (err) {
analytics.captureException(err)
notifications.error(`Error publishing app: ${err}`)
diff --git a/packages/builder/src/components/deploy/DeploymentHistory.svelte b/packages/builder/src/components/deploy/DeploymentHistory.svelte
index 2cf7c2b228..f49776b956 100644
--- a/packages/builder/src/components/deploy/DeploymentHistory.svelte
+++ b/packages/builder/src/components/deploy/DeploymentHistory.svelte
@@ -88,7 +88,8 @@
onMount(() => {
fetchDeployments()
- poll = setInterval(fetchDeployments, POLL_INTERVAL)
+ // TODO: fix
+ // poll = setInterval(fetchDeployments, POLL_INTERVAL)
})
onDestroy(() => clearInterval(poll))
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogOut.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogOut.svelte
new file mode 100644
index 0000000000..8782127243
--- /dev/null
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogOut.svelte
@@ -0,0 +1,14 @@
+
+
+
+ This action doesn't require any additional settings.
+
+
+
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
index a3e43cb045..b8114461f9 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
@@ -4,6 +4,7 @@ import DeleteRow from "./DeleteRow.svelte"
import ExecuteQuery from "./ExecuteQuery.svelte"
import TriggerAutomation from "./TriggerAutomation.svelte"
import ValidateForm from "./ValidateForm.svelte"
+import LogOut from "./LogOut.svelte"
// Defines which actions are available to configure in the front end.
// Unfortunately the "name" property is used as the identifier so please don't
@@ -37,4 +38,8 @@ export default [
name: "Validate Form",
component: ValidateForm,
},
+ {
+ name: "Log Out",
+ component: LogOut,
+ },
]
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
index 4d6acc22ae..c8e884a612 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
@@ -2,12 +2,12 @@
import { params } from "@roxi/routify"
import { queries } from "stores/backend"
- if ($params.query) {
- const query = $queries.list.find(m => m._id === $params.query)
- if (query) {
- queries.select(query)
- }
- }
+ // if ($params.query) {
+ // const query = $queries.list.find(m => m._id === $params.query)
+ // if (query) {
+ // queries.select(query)
+ // }
+ // }
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
index 7651eed33d..46fa13a09a 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -13,10 +13,14 @@
$: integration = datasource && $integrations[datasource.source]
async function saveDatasource() {
- // Create datasource
- await datasources.save(datasource)
- notifications.success(`Datasource ${name} saved successfully.`)
- unsaved = false
+ try {
+ // Create datasource
+ await datasources.save(datasource)
+ notifications.success(`Datasource ${name} saved successfully.`)
+ unsaved = false
+ } catch (err) {
+ notifications.error(`Error saving datasource: ${err}`)
+ }
}
function onClickQuery(query) {
@@ -66,20 +70,22 @@
on:change={setUnsaved}
/>
-
-
-
- {#each $queries.list.filter(query => query.datasourceId === datasource._id) as query}
-
onClickQuery(query)}>
-
{query.name}
-
{capitalise(query.queryVerb)}
-
→
-
- {/each}
-
+ {#each $queries.list.filter(query => query.datasourceId === datasource._id) as query}
+
onClickQuery(query)}>
+
{query.name}
+
{capitalise(query.queryVerb)}
+
→
+
+ {/each}
+