diff --git a/modules/defaults.js b/modules/defaults.js index 235ad12..4fdc4ca 100644 --- a/modules/defaults.js +++ b/modules/defaults.js @@ -10,4 +10,3 @@ * governing permissions and limitations under the License. */ export const KNOWN_PROPERTIES = ['weight', 'id', 'referer', 'checkpoint', 't', 'source', 'target', 'cwv', 'CLS', 'FID', 'LCP', 'INP', 'TTFB']; -export const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'enterleave', 'viewblock', 'viewmedia', 'loadresource', 'utm', 'paid', 'email']; diff --git a/modules/index.js b/modules/index.js index e061760..83d3a2c 100644 --- a/modules/index.js +++ b/modules/index.js @@ -11,7 +11,7 @@ */ /* eslint-env browser */ -import { KNOWN_PROPERTIES, DEFAULT_TRACKING_EVENTS } from './defaults.js'; +import { KNOWN_PROPERTIES } from './defaults.js'; import { fflags } from './fflags.js'; import { urlSanitizers } from './utils.js'; import { targetSelector, sourceSelector } from './dom.js'; @@ -22,13 +22,6 @@ const formSubmitListener = (e) => sampleRUM('formsubmit', { target: targetSelect // eslint-disable-next-line no-use-before-define const mutationObserver = window.MutationObserver ? new MutationObserver(mutationsCallback) : null; -// Gets configured collection from the config service for the current domain -function getCollectionConfig() { - // eslint-disable-next-line max-len - fflags.enabled('onetrust', () => DEFAULT_TRACKING_EVENTS.push('consent')); - return DEFAULT_TRACKING_EVENTS; -} - function trackCheckpoint(checkpoint, data, t) { const { weight, id } = window.hlx.rum; if (isSelected) { @@ -289,14 +282,13 @@ function addCookieConsentTracking() { } } -const addObserver = (ck, fn, block) => getCollectionConfig().includes(ck) && fn(block); function mutationsCallback(mutations) { mutations.filter((m) => m.type === 'attributes' && m.attributeName === 'data-block-status') .filter((m) => m.target.dataset.blockStatus === 'loaded') .forEach((m) => { - addObserver('form', addFormTracking, m.target); - addObserver('viewblock', addViewBlockTracking, m.target); - addObserver('viewmedia', addViewMediaTracking, m.target); + addFormTracking(m.target); + addViewBlockTracking(m.target); + addViewMediaTracking(m.target); }); } @@ -314,13 +306,11 @@ function addTrackingFromConfig() { utm: () => addUTMParametersTracking(), viewblock: () => addViewBlockTracking(window.document.body), viewmedia: () => addViewMediaTracking(window.document.body), - consent: () => addCookieConsentTracking(), + consent: () => fflags.enabled('onetrust', addCookieConsentTracking), paid: () => addAdsParametersTracking(), email: () => addEmailParameterTracking(), }; - - getCollectionConfig().filter((ck) => trackingFunctions[ck]) - .forEach((ck) => trackingFunctions[ck]()); + Object.values(trackingFunctions).forEach((fn) => fn()); } function initEnhancer() { diff --git a/test/unit/defaults.test.js b/test/unit/defaults.test.js index 30944ad..4b85904 100644 --- a/test/unit/defaults.test.js +++ b/test/unit/defaults.test.js @@ -13,7 +13,7 @@ /* eslint-env mocha */ import { expect } from '@esm-bundle/chai'; -import { KNOWN_PROPERTIES, DEFAULT_TRACKING_EVENTS } from '../../modules/defaults.js'; +import { KNOWN_PROPERTIES } from '../../modules/defaults.js'; describe('test defaults', () => { it('KNOWN_PROPERTIES is an array of string', () => { @@ -23,12 +23,4 @@ describe('test defaults', () => { expect(typeof prop).to.be.equal('string'); }); }); - - it('DEFAULT_TRACKING_EVENTS is an array of string', () => { - // eslint-disable-next-line no-unused-expressions - expect(Array.isArray(DEFAULT_TRACKING_EVENTS)).to.be.true; - DEFAULT_TRACKING_EVENTS.forEach((prop) => { - expect(typeof prop).to.be.equal('string'); - }); - }); });