diff --git a/packages/builder/src/analytics/index.js b/packages/builder/src/analytics/index.js
index b79ab67e0c..e9edf38d74 100644
--- a/packages/builder/src/analytics/index.js
+++ b/packages/builder/src/analytics/index.js
@@ -3,8 +3,6 @@ import PosthogClient from "./PosthogClient"
import IntercomClient from "./IntercomClient"
import SentryClient from "./SentryClient"
import { Events } from "./constants"
-import { auth } from "stores/portal"
-import { get } from "svelte/store"
const posthog = new PosthogClient(
process.env.POSTHOG_TOKEN,
@@ -19,27 +17,13 @@ class AnalyticsHub {
}
async activate() {
- // Setting the analytics env var off in the backend overrides org/tenant settings
const analyticsStatus = await api.get("/api/analytics")
const json = await analyticsStatus.json()
- // Multitenancy disabled on the backend
+ // Analytics disabled
if (!json.enabled) return
- const tenantId = get(auth).tenantId
-
- if (tenantId) {
- const res = await api.get(
- `/api/global/configs/public?tenantId=${tenantId}`
- )
- const orgJson = await res.json()
-
- // analytics opted out for the tenant
- if (orgJson.config?.analytics === false) return
- }
-
this.clients.forEach(client => client.init())
- this.enabled = true
}
identify(id, metadata) {
diff --git a/packages/builder/src/pages/builder/portal/settings/organisation.svelte b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
index 79eaebb28b..a182103c4e 100644
--- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
@@ -7,13 +7,11 @@
Divider,
Label,
Input,
- Toggle,
Dropzone,
notifications,
} from "@budibase/bbui"
- import { auth, organisation } from "stores/portal"
+ import { auth, organisation, admin } from "stores/portal"
import { post } from "builderStore/api"
- import analytics from "analytics"
import { writable } from "svelte/store"
import { redirect } from "@roxi/routify"
@@ -25,7 +23,6 @@
}
const values = writable({
- analytics: analytics.enabled,
company: $organisation.company,
platformUrl: $organisation.platformUrl,
logo: $organisation.logoUrl
@@ -57,7 +54,6 @@
const config = {
company: $values.company ?? "",
platformUrl: $values.platformUrl ?? "",
- analytics: $values.analytics,
}
// remove logo if required
if (!$values.logo) {
@@ -112,34 +108,22 @@
-
-
- Platform
- Here you can set up general platform settings.
-
-
-
-
-
-
-
-
-
+ {#if !$admin.cloud}
+
- Analytics
-
- If you would like to send analytics that help us make Budibase better,
- please let us know below.
-
+ Platform
+ Here you can set up general platform settings.
-
-