Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️ Allow siteimprove script before consent #2729 #2731

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions web/lib/hooks/useConsentState.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect, useState } from 'react'
import { useRouter } from 'next/router'
import { Flags } from '../../common/helpers/datasetHelpers'
import { CookieType } from '../../types'
import { checkCookieConsent } from '../../common/helpers/checkCookieConsent'
import { useProd } from './useProd'

//COOKIEBOT
declare global {
Expand All @@ -15,6 +15,7 @@ declare global {
function useConsentState(consentType: CookieType[], callback: () => void, cleanup?: () => void) {
const [consent, changeConsent] = useState<boolean>(false)
const router = useRouter()
const enableConsentLogic = useProd()

useEffect(() => {
const manageCookies = () => {
Expand All @@ -30,15 +31,12 @@ function useConsentState(consentType: CookieType[], callback: () => void, cleanu

useEffect(() => {
// Disable Radix.equinor.com due to SiteImprove (possibly) collecting wrong data
const host = window?.location.origin
const isLocalHost = host.includes('localhost')
const enableConsentLogic = !isLocalHost && (Flags.IS_DEV || !host.includes('radix.equinor.com'))
if (enableConsentLogic && consent) {
callback()
return () => {
if (cleanup) cleanup()
}
}
}, [router.asPath, consent, callback, cleanup])
}, [router.asPath, consent, callback, cleanup, enableConsentLogic])
}
export default useConsentState
14 changes: 14 additions & 0 deletions web/lib/hooks/useProd.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Flags } from '../../common/helpers/datasetHelpers'
import { useEffect, useState } from 'react'

export function useProd() {
const [isProd, setIsProd] = useState(false)

useEffect(() => {
const host = window?.location.origin
const isLocalHost = host.includes('localhost')
setIsProd(!isLocalHost && (Flags.IS_DEV || !host.includes('radix.equinor.com')))
Dismissed Show dismissed Hide dismissed
}, [])

return isProd
}
11 changes: 0 additions & 11 deletions web/pageComponents/SiteImprove.ts

This file was deleted.

6 changes: 3 additions & 3 deletions web/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import Script from 'next/script'
import { ErrorBoundary } from 'react-error-boundary'
import { ErrorFallback } from '../pageComponents/pageTemplates/ErrorFallback'
import useConsentState from '../lib/hooks/useConsentState'
import { loadSiteImproveScript, cleanUpSiteImproveScript } from '../pageComponents/SiteImprove'
import { enableDynatrace, disableDynatrace } from '../pageComponents/Dynatrace'
import { SWRConfig } from 'swr'

Expand All @@ -21,6 +20,7 @@ import { SWRConfig } from 'swr'
import { PreviewContextProvider } from '../lib/contexts/PreviewContext'
import { defaultLanguage } from '../languages'
import { default as NextLink } from 'next/link'
import { useProd } from '../lib/hooks/useProd'

/**
* TODO:
Expand Down Expand Up @@ -69,6 +69,7 @@ function MyApp({ Component, pageProps }: CustomAppProps): JSX.Element {
const router = useRouter()
const getLayout = Component.getLayout || ((page: ReactNode): ReactNode => page)
const IS_LIVE = process.env.NODE_ENV !== 'development'
const isProd = useProd()

useEffect(() => {
if (!GTM_ID) return
Expand All @@ -92,12 +93,10 @@ function MyApp({ Component, pageProps }: CustomAppProps): JSX.Element {
}, [router.asPath])

const enableStatisticsCookies = () => {
loadSiteImproveScript()
enableDynatrace()
}

const disableStatisticsCookies = () => {
cleanUpSiteImproveScript()
disableDynatrace()
}

Expand Down Expand Up @@ -126,6 +125,7 @@ function MyApp({ Component, pageProps }: CustomAppProps): JSX.Element {
</Head>
<GlobalStyle />
<GlobalFontStyle />
{isProd && <Script src="https://siteimproveanalytics.com/js/siteanalyze_6003171.js" id="siteimprove" async />}
{IS_LIVE && <CookieBot locale={router.locale} />}
<NextLink
href="#mainTitle"
Expand Down
12 changes: 0 additions & 12 deletions web/pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ const GoogleConsentMode = () => (
/>
)

const GoogleTagManagerHead = () => (
<script
dangerouslySetInnerHTML={{
__html: `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','${GTM_ID}');`,
}}
/>
)

const GoogleTagManagerBody = () => (
<noscript
dangerouslySetInnerHTML={{
Expand Down
Loading