Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-12 04:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): opt out telemetry if it was set to false (#6335)

Browse Source
This commit is contained in:
Brooooooklyn
2024-03-27 04:36:09 +00:00
parent 30b8b12703
commit 5dcb3d69e5
7 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx
View File

@@ -111,7 +111,7 @@ export const AboutAffine = () => {
desc={t['com.affine.telemetry.enable.desc']()}
>
<Switch
checked={appSettings.enableTelemetry}
checked={appSettings.enableTelemetry !== false}
onChange={onSwitchTelemetry}
/>
</SettingRow>

20
packages/frontend/core/src/telemetry.tsx Normal file
View File

@@ -0,0 +1,20 @@
import { appSettingAtom } from '@toeverything/infra';
import { useAtomValue } from 'jotai/react';
import mixpanel from 'mixpanel-browser';
import { useLayoutEffect } from 'react';
export function Telemetry() {
const settings = useAtomValue(appSettingAtom);
useLayoutEffect(() => {
if (process.env.MIXPANEL_TOKEN) {
mixpanel.init(process.env.MIXPANEL_TOKEN || '', {
track_pageview: true,
persistence: 'localStorage',
});
}
if (settings.enableTelemetry !== false) {
mixpanel.opt_out_tracking();
}
}, [settings.enableTelemetry]);
return null;
}

2
packages/frontend/electron/package.json
View File

@@ -44,7 +44,6 @@
"@emotion/react": "^11.11.4",
"@pengx17/electron-forge-maker-appimage": "^1.1.1",
"@toeverything/infra": "workspace:*",
"@types/mixpanel-browser": "^2.49.0",
"@types/uuid": "^9.0.8",
"@vitejs/plugin-react-swc": "^3.6.0",
"builder-util-runtime": "^9.2.4",
@@ -60,7 +59,6 @@
"jotai": "^2.6.5",
"jotai-devtools": "^0.8.0",
"lodash-es": "^4.17.21",
"mixpanel-browser": "^2.49.0",
"nanoid": "^5.0.6",
"react": "^18.2.0",
"react-dom": "^18.2.0",

10
packages/frontend/electron/renderer/app.tsx
View File

@@ -12,12 +12,12 @@ import {
performanceLogger,
performanceRenderLogger,
} from '@affine/core/shared';
import { Telemetry } from '@affine/core/telemetry';
import createEmotionCache from '@affine/core/utils/create-emotion-cache';
import { configureWebServices } from '@affine/core/web';
import { createI18n, setUpLanguage } from '@affine/i18n';
import { CacheProvider } from '@emotion/react';
import { getCurrentStore, ServiceCollection } from '@toeverything/infra';
import mixpanel from 'mixpanel-browser';
import type { PropsWithChildren, ReactElement } from 'react';
import { lazy, Suspense } from 'react';
import { RouterProvider } from 'react-router-dom';
@@ -62,13 +62,6 @@ const serviceProvider = services.provider();
export function App() {
performanceRenderLogger.info('App');
if (process.env.MIXPANEL_TOKEN) {
mixpanel.init(process.env.MIXPANEL_TOKEN || '', {
track_pageview: true,
persistence: 'localStorage',
});
}
if (!languageLoadingPromise) {
languageLoadingPromise = loadLanguage().catch(console.error);
}
@@ -79,6 +72,7 @@ export function App() {
<CacheProvider value={cache}>
<AffineContext store={getCurrentStore()}>
<CloudSessionProvider>
<Telemetry />
<DebugProvider>
<GlobalLoading />
<NotificationCenter />

3
packages/frontend/web/package.json
View File

@@ -16,13 +16,12 @@
"@juggle/resize-observer": "^3.4.0",
"core-js": "^3.36.1",
"intl-segmenter-polyfill-rs": "^0.1.7",
"mixpanel-browser": "^2.49.0",
"jotai": "^2.7.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@affine/cli": "workspace:*",
"@types/mixpanel-browser": "^2.49.0",
"@types/react": "^18.2.60",
"@types/react-dom": "^18.2.19",
"typescript": "^5.3.3"

10
packages/frontend/web/src/app.tsx
View File

@@ -12,12 +12,12 @@ import {
performanceLogger,
performanceRenderLogger,
} from '@affine/core/shared';
import { Telemetry } from '@affine/core/telemetry';
import createEmotionCache from '@affine/core/utils/create-emotion-cache';
import { configureWebServices } from '@affine/core/web';
import { createI18n, setUpLanguage } from '@affine/i18n';
import { CacheProvider } from '@emotion/react';
import { getCurrentStore, ServiceCollection } from '@toeverything/infra';
import mixpanel from 'mixpanel-browser';
import type { PropsWithChildren, ReactElement } from 'react';
import { lazy, Suspense } from 'react';
import { RouterProvider } from 'react-router-dom';
@@ -62,13 +62,6 @@ const serviceProvider = services.provider();
export function App() {
performanceRenderLogger.info('App');
if (process.env.MIXPANEL_TOKEN) {
mixpanel.init(process.env.MIXPANEL_TOKEN || '', {
track_pageview: true,
persistence: 'localStorage',
});
}
if (!languageLoadingPromise) {
languageLoadingPromise = loadLanguage().catch(console.error);
}
@@ -79,6 +72,7 @@ export function App() {
<CacheProvider value={cache}>
<AffineContext store={getCurrentStore()}>
<CloudSessionProvider>
<Telemetry />
<DebugProvider>
<GlobalLoading />
<NotificationCenter />