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.

Sign up for GitHub

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

CommercialMetrics includes ad blocker use #3446

Merged
merged 17 commits into from
Sep 27, 2021
Merged

CommercialMetrics includes ad blocker use #3446

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
561f2f9
call isAdBlockInUse in CommercialMetrics directly
zekehuntergreen Sep 21, 2021
2710608
add adBlockerInUse to setSentCommercialMetrics args
zekehuntergreen Sep 21, 2021
62db1c2
upgrade commercial-core
zekehuntergreen Sep 22, 2021
c6972ea
upgrade typescript
zekehuntergreen Sep 22, 2021
6502c43
Merge branch 'main' into adblocker-in-commercial-metrics-2
zekehuntergreen Sep 22, 2021
3b3da43
set useUnknownInCatchVariables to false, suppressing typescript errors
zekehuntergreen Sep 22, 2021
b70767a
upgrade @types/jsdom
zekehuntergreen Sep 22, 2021
bc3fb8e
Merge branch 'main' into adblocker-in-commercial-metrics-2
zekehuntergreen Sep 22, 2021
1bbf4cd
remove useUnknownInCatchVariables
zekehuntergreen Sep 22, 2021
7302d8e
useAdBlockInUse always changes state of isInUse
zekehuntergreen Sep 23, 2021
8087518
CommercialMetrics calls useAdBlockInUse, send metrics even if adBlock…
zekehuntergreen Sep 23, 2021
f11f520
Add comments
zekehuntergreen Sep 24, 2021
199d82c
add adBlockerInUse to dependency array
zekehuntergreen Sep 24, 2021
93545ec
Merge branch 'main' into adblocker-in-commercial-metrics-2
zekehuntergreen Sep 24, 2021
d4d8f78
replace useEffect with useOnce
zekehuntergreen Sep 24, 2021
6f39232
Remove check for adBlockerInUse === undefined
zekehuntergreen Sep 27, 2021
fa95366
Move OR undefined to definition of isHidden for clarity
zekehuntergreen Sep 27, 2021
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
2 changes: 1 addition & 1 deletion dotcom-rendering/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@guardian/atoms-rendering": "^19.0.0",
"@guardian/braze-components": "^3.6.0",
"@guardian/automat-contributions": "^0.4.1",
"@guardian/commercial-core": "^0.19.2",
"@guardian/commercial-core": "^0.21.0",
"@guardian/consent-management-platform": "~6.11.5",
"@guardian/discussion-rendering": "^7.0.0",
"@guardian/libs": "^2.0.0",
Expand Down
18 changes: 17 additions & 1 deletion dotcom-rendering/src/web/components/CommercialMetrics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useEffect, useState } from 'react';
import { sendCommercialMetrics } from '@guardian/commercial-core';
import { useAB } from '@guardian/ab-react';
import { useDocumentVisibilityState } from '../lib/useDocumentHidden';
import { isAdBlockInUse } from '../lib/detectAdBlocker'

export const CommercialMetrics: React.FC<{
pageViewId: string;
Expand All @@ -16,7 +17,16 @@ export const CommercialMetrics: React.FC<{
false,
);

const [adBlockerInUse, setAdBlockerInUse] = useState<boolean>();

isAdBlockInUse().then((value) => {
zekehuntergreen marked this conversation as resolved.
Show resolved Hide resolved
setAdBlockerInUse(value);
}).catch((error) => {
console.log(error);
});

useEffect(() => {
zekehuntergreen marked this conversation as resolved.
Show resolved Hide resolved
if (adBlockerInUse === undefined) return;
if (visibilityState !== 'hidden') return;
if (sentCommercialMetrics) return;

Expand All @@ -33,14 +43,20 @@ export const CommercialMetrics: React.FC<{

if (isDev || shouldForceMetrics || userIsInSamplingGroup)
setSentCommercialMetrics(
sendCommercialMetrics(pageViewId, browserId, Boolean(isDev)),
sendCommercialMetrics(
pageViewId,
browserId,
zekehuntergreen marked this conversation as resolved.
Show resolved Hide resolved
Boolean(isDev),
adBlockerInUse,
),
);
}, [
ABTestAPI,
pageViewId,
browserId,
visibilityState,
sentCommercialMetrics,
adBlockerInUse
]);

// We don’t render anything
Expand Down
15 changes: 10 additions & 5 deletions dotcom-rendering/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,10 +1736,10 @@
resolved "https://registry.yarnpkg.com/@guardian/braze-components/-/braze-components-3.6.0.tgz#51ba3cfd067e075859b1234a3799b53855a87620"
integrity sha512-qIeESQ+RLV6ta8OBh3VBxNu3FSA6ekg9N+wdUzj4aDzKwycHaomHrs98CQWWzWCRkLiG+7PJBm8L5k0hspHvPQ==

"@guardian/commercial-core@^0.19.2":
version "0.19.2"
resolved "https://registry.yarnpkg.com/@guardian/commercial-core/-/commercial-core-0.19.2.tgz#8965a502f6a3c6ed7373f324f4180d41f1c1ed87"
integrity sha512-039V6kicXnwI3Xug2kwzOcpLRWvOITBbj69il//kvSSPNu65C0K4QiTewO0oozL1pDVoYH20BC9j1C+oAFok4g==
"@guardian/commercial-core@^0.21.0":
version "0.21.0"
resolved "https://registry.yarnpkg.com/@guardian/commercial-core/-/commercial-core-0.21.0.tgz#a876dee100e2d341efa176edfccdbe71f40620ca"
integrity sha512-GLI97c2pJGnH350DNmYypIF433BZzeWHG46JzfwcnaSK/6d+3h/fzD1j7cAeN59T1nRb3ehibmYDXoDaxGUpOA==

"@guardian/consent-management-platform@~6.11.5":
version "6.11.5"
Expand Down Expand Up @@ -20071,11 +20071,16 @@ typescript@^3.9.3:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==

typescript@^4.2.3, typescript@^4.2.4:
typescript@^4.2.3:
version "4.2.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==

typescript@^4.2.4:
version "4.4.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==

uglify-js@^3.5.1:
version "3.7.3"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
Expand Down