fix: switch to default page in campaigns has issue on decoration, and…

… audiences wrongly redirected.
hlxsites · Jun 24, 2024 · d284d3d · d284d3d
1 parent cdecca4
commit d284d3d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/plugins/experimentation/src/index.js b/plugins/experimentation/src/index.js
@@ -500,6 +500,7 @@ async function applyAllModifications(
  }
  }));
 
+ // Fragment-level modifications
  if (pageMetadata.manifest) {
  let entries = await getManifestEntriesForCurrentPage(pageMetadata.manifest);
  if (entries) {

diff --git a/plugins/experimentation/src/preview.js b/plugins/experimentation/src/preview.js
@@ -531,7 +531,11 @@ async function decorateCampaignPills(container, options) {
 
 function createAudience(audience, isSelected, options) {
  const url = new URL(window.location.href);
- url.searchParams.set(options.audiencesQueryParameter, audience);
+ if (audience !== 'default') {
+ url.searchParams.set(options.audiencesQueryParameter, audience);
+ } else {
+ url.searchParams.delete(options.audiencesQueryParameter);
+ }
 
  return {
  label: `<code>${audience}</code>`,

diff --git a/scripts/scripts.js b/scripts/scripts.js
@@ -42,7 +42,8 @@ window.hlx.plugins.add('rum-conversion', {
 });
 
 window.hlx.plugins.add('experimentation', {
- condition: () => document.head.querySelector('[name^="experiment"],[property^="campaign:-"],[property^="audience:-"]')
+ condition: () => document.head.querySelector('[name^="experiment"],[name^="campaign-"],[name^="audience-"]')
+ || document.head.querySelector('[property^="campaign:-"],[property^="audience:-"]')
  || document.querySelector('.section[class*="experiment-"],.section[class*="audience-"],.section[class*="campaign-"]')
  || [...document.querySelectorAll('.section-metadata div')].some((d) => d.textContent.match(/Experiment|Campaign|Audience/i))
  ,
@@ -280,7 +281,7 @@ async function loadPage() {
 // Properly decorate fragments that were pulled in
 document.addEventListener('aem:experimentation', (ev) => {
  // Do not redecorate the default content
- if (ev.detail.variant === 'control') {
+ if (ev.detail.variant === 'control' || ev.detail?.campaign === 'default' || ev.detail?.audience === 'default') {
  return;
  }
  // Rebuild the autoblock as needed