From 474d6c937a89b6f3185ee14c465187c8aa8b8c30 Mon Sep 17 00:00:00 2001 From: Klink <85062+dogmar@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:00:53 -0800 Subject: [PATCH] fix: Console logout seems buggy (#715) --- assets/package.json | 1 - .../contexts/DeploymentSettingsContext.tsx | 3 -- assets/src/components/layout/Console.tsx | 2 - assets/src/components/layout/Sidebar.tsx | 2 - assets/src/components/utils/Posthog.ts | 46 ------------------- assets/src/index.tsx | 11 ----- assets/src/routes/rootRoutes.tsx | 2 - assets/yarn.lock | 17 ------- 8 files changed, 84 deletions(-) delete mode 100644 assets/src/components/utils/Posthog.ts diff --git a/assets/package.json b/assets/package.json index 5f80a6de01..b1176588c9 100644 --- a/assets/package.json +++ b/assets/package.json @@ -77,7 +77,6 @@ "moment": "2.29.4", "phoenix": "1.7.3", "pluralsh-absinthe-socket-apollo-link": "0.2.0", - "posthog-js": "1.66.1", "query-string": "8.1.0", "randomcolor": "0.6.2", "react": "18.2.0", diff --git a/assets/src/components/contexts/DeploymentSettingsContext.tsx b/assets/src/components/contexts/DeploymentSettingsContext.tsx index 4469489a30..cc9ba95e8a 100644 --- a/assets/src/components/contexts/DeploymentSettingsContext.tsx +++ b/assets/src/components/contexts/DeploymentSettingsContext.tsx @@ -1,6 +1,5 @@ import { createContext, useContext, useMemo } from 'react' import { POLL_INTERVAL } from 'components/cd/ContinuousDeployment' -import { useCDEnabled } from 'components/cd/utils/useCDEnabled' import { DeploymentSettingsFragment, useDeploymentSettingsQuery, @@ -26,8 +25,6 @@ export function DeploymentSettingsProvider({ errorPolicy: 'all', }) - useCDEnabled({ redirect: false }) - const providerValue = useMemo( () => data?.deploymentSettings, [data?.deploymentSettings] diff --git a/assets/src/components/layout/Console.tsx b/assets/src/components/layout/Console.tsx index 8b7ce09f44..26e9e4ef13 100644 --- a/assets/src/components/layout/Console.tsx +++ b/assets/src/components/layout/Console.tsx @@ -60,8 +60,6 @@ export default function Console() { function ConsoleContent() { const isProduction = import.meta.env.MODE === 'production' - // usePosthogIdentify() - return ( { setIsMenuOpen(false) wipeToken() - posthog.reset() const w: Window = window w.location = '/login' diff --git a/assets/src/components/utils/Posthog.ts b/assets/src/components/utils/Posthog.ts deleted file mode 100644 index 5fd8a57216..0000000000 --- a/assets/src/components/utils/Posthog.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { LoginContext } from 'components/contexts' -import { useCookieSettings } from 'components/tracking/CookieSettings' -import posthog from 'posthog-js' -import { useContext, useEffect } from 'react' -import { useLocation } from 'react-router-dom' - -export default function usePosthogIdentify() { - const { me } = useContext(LoginContext) - const { consent } = useCookieSettings() - - // Set posthog identity when user or consent changes - useEffect(() => { - if (consent?.statistics) { - if (me?.pluralId) { - posthog.identify(me.pluralId) - if (me?.id) { - posthog.alias(me.pluralId, me.id) - } - } - } - }, [consent, me?.id, me?.pluralId]) -} - -export function usePosthog() { - const location = useLocation() - const { consent } = useCookieSettings() - - // Opt in/out when consent changes - useEffect(() => { - if (consent.statistics) { - posthog.opt_in_capturing() - } else { - posthog.opt_out_capturing() - } - }, [consent.statistics]) - - // Track route change events - useEffect(() => { - posthog.capture('$pageview') - // Need to run posthog.capture('$pageview') every time 'location' changes, - // even though we're not reading 'location' in this effect - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [location]) - - return null -} diff --git a/assets/src/index.tsx b/assets/src/index.tsx index 7b5eb3db6f..8e3cf9607d 100644 --- a/assets/src/index.tsx +++ b/assets/src/index.tsx @@ -7,17 +7,6 @@ import App from './App' // import * as serviceWorker from './serviceWorker' -// posthog.init('phc_r0v4jbKz8Rr27mfqgO15AN5BMuuvnU8hCFedd6zpSDy', { -// api_host: 'https://posthog.plural.sh', -// disable_session_recording: true, -// opt_out_capturing_by_default: true, -// }) - -// // add `source: console` to all events -// posthog.register({ -// source: 'console', -// }) - const container = document.getElementById('root') as Element const root = createRoot(container) diff --git a/assets/src/routes/rootRoutes.tsx b/assets/src/routes/rootRoutes.tsx index b1f38590c1..6bcb333b3e 100644 --- a/assets/src/routes/rootRoutes.tsx +++ b/assets/src/routes/rootRoutes.tsx @@ -12,8 +12,6 @@ import { OAuthCallback } from 'components/login/OauthCallback' import { consoleRoutes } from './consoleRoutes' function Root() { - // usePosthog() - return ( }> diff --git a/assets/yarn.lock b/assets/yarn.lock index de0ed85dcf..efed41fa9d 100644 --- a/assets/yarn.lock +++ b/assets/yarn.lock @@ -9198,7 +9198,6 @@ __metadata: npm-run-all: 4.1.5 phoenix: 1.7.3 pluralsh-absinthe-socket-apollo-link: 0.2.0 - posthog-js: 1.66.1 prettier: 3.0.3 query-string: 8.1.0 randomcolor: 0.6.2 @@ -11308,13 +11307,6 @@ __metadata: languageName: node linkType: hard -"fflate@npm:^0.4.1": - version: 0.4.8 - resolution: "fflate@npm:0.4.8" - checksum: 29d8cbe44d5e7f53e7f5a160ac7f9cc025480c7b3bfd85c5f898cbe20dfa2dad4732daa534982664bf30b35896a90af44ea33ede5d94c5ffd1b8b0c0a0a56ca2 - languageName: node - linkType: hard - "fflate@npm:^0.8.1": version: 0.8.1 resolution: "fflate@npm:0.8.1" @@ -15674,15 +15666,6 @@ __metadata: languageName: node linkType: hard -"posthog-js@npm:1.66.1": - version: 1.66.1 - resolution: "posthog-js@npm:1.66.1" - dependencies: - fflate: ^0.4.1 - checksum: 55c2696bd26b0d73aef45d7a08cad82a1ce7b20f79dc65cff434b3fb45f8a5fe65a0d6ad265250ff27404ae236f91181230577fc8eb56f91e8a20912cf4737c0 - languageName: node - linkType: hard - "preact@npm:^10.0.0": version: 10.17.0 resolution: "preact@npm:10.17.0"