Skip to content

MWPW-192812 only considering same locale variations for pzn #772

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

Merged
3ch023 merged 7 commits into from
Apr 24, 2026
Merged

MWPW-192812 only considering same locale variations for pzn #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d6ff1b
MWPW-192812 only considering same locale variations for pzn
npeltier Apr 16, 2026
083c998
Merge branch 'main' into MWPW-192812
honstar Apr 17, 2026
0e7f614
Merge branch 'main' into MWPW-192812
npeltier Apr 20, 2026
6d6f5c0
Merge branch 'main' into MWPW-192812
npeltier Apr 21, 2026
ed5ce11
Merge branch 'main' into MWPW-192812
npeltier Apr 24, 2026
1e8d252
MWPW-192812 fixing pattern for pzn
npeltier Apr 24, 2026
fc317a8
Merge branch 'MWPW-192812' of github.com:adobecom/mas into MWPW-192812
npeltier Apr 24, 2026
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
22 changes: 13 additions & 9 deletions io/www/src/fragment/transformers/customize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@ function deepMerge(...objects) {
return result;
}

function extractVariationBasedOnPath(variations, references, pathSegment) {
function extractVariationBasedOnPath(variations, references, pattern) {
return variations
.filter((variationId) => references[variationId]?.value?.path?.includes(pathSegment))
.filter((variationId) => pattern.test(references[variationId]?.value?.path))
.map((variationId) => references[variationId].value);
}

function findRegionalVariation(variations, references, prefix) {
const regionalVariations = extractVariationBasedOnPath(variations, references, prefix);
function findRegionalVariation(variations, customizeContext) {
const { surface, regionLocale, references } = customizeContext;
const pattern = new RegExp(`/content/dam/mas/${surface}/${regionLocale}/.+`);
const regionalVariations = extractVariationBasedOnPath(variations, references, pattern);
return regionalVariations.length > 0 ? regionalVariations[0] : null;
}

Expand Down Expand Up @@ -105,8 +107,9 @@ function personalizationMatchScore(pznTags, { regionLocale, country, pzn }) {
}

function findPersonalizationVariation(variations, customizeContext) {
const { country, pzn, references, regionLocale } = customizeContext;
const personalizationVariations = extractVariationBasedOnPath(variations, references, PZN_FOLDER);
const { country, pzn, references, regionLocale, surface, defaultLocale } = customizeContext;
const pattern = new RegExp(`/content/dam/mas/${surface}/${defaultLocale}/([^/]+)${PZN_FOLDER}.+`);
const personalizationVariations = extractVariationBasedOnPath(variations, references, pattern);
if (personalizationVariations.length === 0) {
logDebug(() => `No personalization variation found for region locale ${regionLocale}`, customizeContext);
return null;
Expand Down Expand Up @@ -134,15 +137,15 @@ function findPersonalizationVariation(variations, customizeContext) {
}

function mergeVariations(root, customizeContext) {
const { isRegionLocale, prefix, references } = customizeContext;
const { isRegionLocale } = customizeContext;
const variations = root?.fields?.variations;
if (!variations?.length) {
logDebug(() => `No variations to merge for fragment ${root.id}`, customizeContext);
return root;
}
logDebug(() => `found variations ${JSON.stringify(variations)} in ${root.id}`, customizeContext);
if (isRegionLocale) {
const regionalVariation = findRegionalVariation(variations, references, prefix);
const regionalVariation = findRegionalVariation(variations, customizeContext);
if (regionalVariation) {
logDebug(() => `Merging regional variation ${regionalVariation.id} for fragment ${root.id}`, customizeContext);
const merged = deepMerge(root, regionalVariation);
Expand Down Expand Up @@ -266,11 +269,12 @@ async function customize(context) {
const isRegionLocale = regionLocale !== defaultLocale;
const customizeContext = {
...context,
defaultLocale,
isRegionLocale,
promos,
regionLocale,
prefix: `${surface}/${regionLocale}`,
references,
surface,
};
const {
fragment: customizedFragment,
Expand Down
80 changes: 60 additions & 20 deletions io/www/test/fragment/customize.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ describe('customize collections', function () {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/intro',
path: '/content/dam/mas/sandbox/en_KW/PA-123/pzn/intro',
id: pznVariationId,
title: 'Intro pricing',
fields: {
Expand All @@ -162,7 +162,7 @@ describe('customize collections', function () {
},
},
[pznOtherVariationId]: {
path: '/content/dam/mas/pzn/sandbox/pznTest',
path: '/content/dam/mas/sandbox/en_KW/PA-123/pzn/pzn-test',
id: pznOtherVariationId,
title: 'test variation',
description: 'has en_KW too, but appears second in the list',
Expand Down Expand Up @@ -201,7 +201,7 @@ describe('customize collections', function () {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/country',
path: '/content/dam/mas/sandbox/en_KW/PA-123/pzn/country',
id: pznVariationId,
title: 'Country targeting',
fields: {
Expand Down Expand Up @@ -241,7 +241,7 @@ describe('customize collections', function () {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/mx',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/mx',
id: pznVariationId,
title: 'Mexico country targeting',
fields: {
Expand Down Expand Up @@ -281,7 +281,7 @@ describe('customize collections', function () {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/teams-edu',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/teams-edu',
id: pznVariationId,
title: 'Teams and EDU',
fields: {
Expand Down Expand Up @@ -322,7 +322,7 @@ describe('customize collections', function () {
[teamsOnlyId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/teams-only',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/teams-only',
id: teamsOnlyId,
title: 'Teams only',
fields: {
Expand All @@ -334,7 +334,7 @@ describe('customize collections', function () {
[teamsEduId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/teams-edu-combo',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/teams-edu-combo',
id: teamsEduId,
title: 'Teams and EDU combo',
fields: {
Expand Down Expand Up @@ -375,7 +375,7 @@ describe('customize collections', function () {
[teamsEduOnlyId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/no-country',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/no-country',
id: teamsEduOnlyId,
title: 'TEAMS+EDU no country tag',
fields: {
Expand All @@ -387,7 +387,7 @@ describe('customize collections', function () {
[teamsEduMxId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/with-mx',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/with-mx',
id: teamsEduMxId,
title: 'TEAMS+EDU with MX',
fields: {
Expand Down Expand Up @@ -428,7 +428,7 @@ describe('customize collections', function () {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/pzn-slash',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/pzn-slash',
id: pznVariationId,
title: 'pzn/ token',
fields: {
Expand Down Expand Up @@ -469,7 +469,7 @@ describe('customize collections', function () {
[oneTokenId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/one',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/one',
id: oneTokenId,
title: 'One token',
fields: {
Expand All @@ -481,7 +481,7 @@ describe('customize collections', function () {
[twoTokenId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/two',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/two',
id: twoTokenId,
title: 'Two tokens',
fields: {
Expand Down Expand Up @@ -521,7 +521,7 @@ describe('customize collections', function () {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/token',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/token',
id: pznVariationId,
title: 'Token targeting',
fields: {
Expand Down Expand Up @@ -561,7 +561,7 @@ describe('customize collections', function () {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/numeric',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/numeric',
id: pznVariationId,
title: 'Numeric pzn',
fields: {
Expand Down Expand Up @@ -604,7 +604,7 @@ describe('customize collections', function () {
[emptyArrayId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/empty-array',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/empty-array',
id: emptyArrayId,
title: 'Empty pznTags array',
fields: {
Expand All @@ -616,7 +616,7 @@ describe('customize collections', function () {
[invalidArrayId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/invalid',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/invalid',
id: invalidArrayId,
title: 'Not an array',
fields: {
Expand All @@ -628,7 +628,7 @@ describe('customize collections', function () {
[emptyTagsId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/empty-tags',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/empty-tags',
id: emptyTagsId,
title: 'Only falsy tag entries',
fields: {
Expand All @@ -640,7 +640,7 @@ describe('customize collections', function () {
[validId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/valid',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/valid',
id: validId,
title: 'Valid tags',
fields: {
Expand Down Expand Up @@ -816,7 +816,7 @@ describe('customize collections', function () {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/pzn/sandbox/promo',
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/promo',
id: pznVariationId,
title: 'PZN Promo',
fields: { pznTags: ['en_AE', 'fr_FR'], badge: 'Other badge' },
Expand All @@ -829,14 +829,54 @@ describe('customize collections', function () {
const result = await process({
...FAKE_CONTEXT,
fragmentPath: 'pzn-test-fragment',
locale: 'en_KW',
locale: 'en_US',
parsedLocale: 'en_US',
body: bodyWithPzn,
});

expect(result.status).to.equal(200);
expect(result.body.fields.badge).to.deep.include({ value: 'default badge', mimeType: 'text/html' });
});

it('should NOT apply a pzn variation located under en_US when the fragment is in fr_FR', async function () {
const pznVariationId = 'pzn-var-en-us-wrong-locale';
const bodyWithPzn = {
path: '/content/dam/mas/sandbox/fr_FR/some-fr-fragment',
id: 'root-fragment',
title: 'Root',
fields: {
badge: 'default badge',
variations: [pznVariationId],
},
references: {
[pznVariationId]: {
type: 'content-fragment',
value: {
path: '/content/dam/mas/sandbox/en_US/PA-123/pzn/en-us-variant',
id: pznVariationId,
title: 'EN US pzn variant',
fields: {
pznTags: ['en_US'],
badge: 'EN US PZN badge',
},
},
},
},
referencesTree: [],
};

const result = await process({
...FAKE_CONTEXT,
fragmentPath: 'some-fr-fragment',
locale: 'fr_FR',
parsedLocale: 'fr_FR',
body: bodyWithPzn,
});

expect(result.status).to.equal(200);
// pzn variation lives under en_US path, must NOT be applied to a fr_FR fragment
expect(result.body.fields.badge).to.equal('default badge');
});
});

async function process(context) {
Expand Down
Loading