diff --git a/libs/scripts/taxonomy.js b/libs/scripts/taxonomy.js
index e2825da94a..9dd68a22bd 100644
--- a/libs/scripts/taxonomy.js
+++ b/libs/scripts/taxonomy.js
@@ -67,7 +67,7 @@ async function fetchTaxonomy(target) {
return fetch(target).then((response) => response.json());
}
-function parseTaxonomyJson(data, root) {
+function parseTaxonomyJson(data, root, route) {
let level1; let level2;
return data?.reduce((taxonomy, row) => {
const level3 = removeLineBreaks(row[TAXONOMY_FIELDS.level3]);
@@ -94,7 +94,7 @@ function parseTaxonomyJson(data, root) {
? new URL([row[TAXONOMY_FIELDS.link]])
: generateUri(name);
const path = taxLink.pathname
- ? taxLink.pathname?.replace('.html', '').split('/topics/').pop()
+ ? taxLink.pathname?.replace('.html', '').split(`${route}/`).pop()
: taxLink;
const link = `${root}/${path}`;
const hidden = !!row[TAXONOMY_FIELDS.hidden]?.trim();
@@ -164,7 +164,7 @@ export default async (config, route, target) => {
return fetchTaxonomy(path)
.then((json) => {
- const taxonomy = parseTaxonomyJson(json.data, root);
+ const taxonomy = parseTaxonomyJson(json.data, root, route);
return {
CATEGORIES,
diff --git a/libs/utils/utils.js b/libs/utils/utils.js
index 9d640c2c2a..80cf597e1e 100644
--- a/libs/utils/utils.js
+++ b/libs/utils/utils.js
@@ -1027,7 +1027,7 @@ export async function loadArea(area = document) {
areaBlocks.push(...sectionBlocks);
areaBlocks.forEach((block) => {
- block.dataset.block = '';
+ if (!block.className.includes('metadata')) block.dataset.block = '';
});
}
diff --git a/test/blocks/caas-config/caas-config.test.html b/test/blocks/caas-config/caas-config.test.html
index 9203d5ecb0..a2e2ac1f31 100644
--- a/test/blocks/caas-config/caas-config.test.html
+++ b/test/blocks/caas-config/caas-config.test.html
@@ -193,7 +193,7 @@
expectedConfig.hideCtaIds = ['hide-cta-id'];
expect(config).to.eql(expectedConfig);
});
-
+
it('Can add tags to use for hiding ctas', async() => {
await tagSelectorModalChoose('Tags that should hide CTAS', [
@@ -285,7 +285,7 @@
copyBtn.click();
await delay(50);
const copyTextArea = document.querySelector('.copy-text');
- expect(copyTextArea.value.split('#')[1]).to.equal('eyJhZGRpdGlvbmFsUmVxdWVzdFBhcmFtcyI6W10sImFuYWx5dGljc0NvbGxlY3Rpb25OYW1lIjoiIiwiYW5hbHl0aWNzVHJhY2tJbXByZXNzaW9uIjpmYWxzZSwiYW5kTG9naWNUYWdzIjpbXSwiYXV0b0NvdW50cnlMYW5nIjpmYWxzZSwiYm9va21hcmtJY29uU2VsZWN0IjoiIiwiYm9va21hcmtJY29uVW5zZWxlY3QiOiIiLCJjYXJkU3R5bGUiOiJoYWxmLWhlaWdodCIsImNhcmRUaXRsZUFjY2Vzc2liaWxpdHlMZXZlbCI6NiwiY29sbGVjdGlvbkJ0blN0eWxlIjoicHJpbWFyeSIsImNvbGxlY3Rpb25OYW1lIjoiIiwiY29sbGVjdGlvblRpdGxlIjoiIiwiY29sbGVjdGlvblNpemUiOiIiLCJjb250YWluZXIiOiIxMjAwTWF4V2lkdGgiLCJjb250ZW50VHlwZVRhZ3MiOltdLCJjb3VudHJ5IjoiY2Fhczpjb3VudHJ5L3VzIiwiY3VzdG9tQ2FyZCI6IiIsImN0YUFjdGlvbiI6Il9ibGFuayIsImRvTm90TGF6eUxvYWQiOmZhbHNlLCJkaXNhYmxlQmFubmVycyI6ZmFsc2UsImRyYWZ0RGIiOmZhbHNlLCJlbmRwb2ludCI6Ind3dy5hZG9iZS5jb20vY2hpbWVyYS1hcGkvY29sbGVjdGlvbiIsImVudmlyb25tZW50IjoiIiwiZXhjbHVkZWRDYXJkcyI6W10sImV4Y2x1ZGVUYWdzIjpbXSwiZmFsbGJhY2tFbmRwb2ludCI6IiIsImZlYXR1cmVkQ2FyZHMiOltdLCJmaWx0ZXJFdmVudCI6IiIsImZpbHRlckJ1aWxkUGFuZWwiOiJhdXRvbWF0aWMiLCJmaWx0ZXJMb2NhdGlvbiI6ImxlZnQiLCJmaWx0ZXJMb2dpYyI6Im9yIiwiZmlsdGVycyI6W10sImZpbHRlcnNDdXN0b20iOltdLCJmaWx0ZXJzU2hvd0VtcHR5IjpmYWxzZSwiZ3V0dGVyIjoiNHgiLCJoZWFkZXJzIjpbXSwiaGlkZUN0YUlkcyI6W10sImhpZGVDdGFUYWdzIjpbXSwiaW5jbHVkZVRhZ3MiOltdLCJsYW5ndWFnZSI6ImNhYXM6bGFuZ3VhZ2UvZW4iLCJsYXlvdXRUeXBlIjoiNHVwIiwibG9hZE1vcmVCdG5TdHlsZSI6InByaW1hcnkiLCJvbmx5U2hvd0Jvb2ttYXJrZWRDYXJkcyI6ZmFsc2UsIm9yTG9naWNUYWdzIjpbXSwicGFnaW5hdGlvbkFuaW1hdGlvblN0eWxlIjoicGFnZWQiLCJwYWdpbmF0aW9uRW5hYmxlZCI6ZmFsc2UsInBhZ2luYXRpb25RdWFudGl0eVNob3duIjpmYWxzZSwicGFnaW5hdGlvblR5cGUiOiJwYWdpbmF0b3IiLCJwYWdpbmF0aW9uVXNlVGhlbWUzIjpmYWxzZSwicGxhY2Vob2xkZXJVcmwiOiIiLCJyZXN1bHRzUGVyUGFnZSI6NSwic2VhcmNoRmllbGRzIjpbXSwic2V0Q2FyZEJvcmRlcnMiOmZhbHNlLCJzaG93Qm9va21hcmtzRmlsdGVyIjpmYWxzZSwic2hvd0Jvb2ttYXJrc09uQ2FyZHMiOmZhbHNlLCJzaG93RmlsdGVycyI6ZmFsc2UsInNob3dTZWFyY2giOmZhbHNlLCJzaG93VG90YWxSZXN1bHRzIjpmYWxzZSwic29ydERhdGVBc2MiOmZhbHNlLCJzb3J0RGF0ZURlc2MiOmZhbHNlLCJzb3J0RGF0ZU1vZGlmaWVkIjpmYWxzZSwic29ydERlZmF1bHQiOiJkYXRlRGVzYyIsInNvcnRFbmFibGVQb3B1cCI6ZmFsc2UsInNvcnRFbmFibGVSYW5kb21TYW1wbGluZyI6ZmFsc2UsInNvcnRFdmVudFNvcnQiOmZhbHNlLCJzb3J0RmVhdHVyZWQiOmZhbHNlLCJzb3J0TW9kaWZpZWRBc2MiOmZhbHNlLCJzb3J0TW9kaWZpZWREZXNjIjpmYWxzZSwic29ydFJhbmRvbSI6ZmFsc2UsInNvcnRSZXNlcnZvaXJQb29sIjoxMDAwLCJzb3J0UmVzZXJ2b2lyU2FtcGxlIjozLCJzb3J0VGl0bGVBc2MiOmZhbHNlLCJzb3J0VGl0bGVEZXNjIjpmYWxzZSwic291cmNlIjpbImhhd2tzIl0sInRhZ3NVcmwiOiJ3d3cuYWRvYmUuY29tL2NoaW1lcmEtYXBpL3RhZ3MiLCJ0YXJnZXRBY3Rpdml0eSI6IiIsInRhcmdldEVuYWJsZWQiOmZhbHNlLCJ0aGVtZSI6ImxpZ2h0ZXN0IiwiZGV0YWlsc1RleHRPcHRpb24iOiJkZWZhdWx0IiwidGl0bGVIZWFkaW5nTGV2ZWwiOiJoMyIsInRvdGFsQ2FyZHNUb1Nob3ciOjEwLCJ1c2VMaWdodFRleHQiOmZhbHNlLCJ1c2VPdmVybGF5TGlua3MiOmZhbHNlLCJjb2xsZWN0aW9uQnV0dG9uU3R5bGUiOiJwcmltYXJ5IiwidXNlckluZm8iOltdfQ==')
+ expect(copyTextArea.value.split('#')[1]).to.equal('eyJhZGRpdGlvbmFsUmVxdWVzdFBhcmFtcyI6W10sImFuYWx5dGljc0NvbGxlY3Rpb25OYW1lIjoiIiwiYW5hbHl0aWNzVHJhY2tJbXByZXNzaW9uIjpmYWxzZSwiYW5kTG9naWNUYWdzIjpbXSwiYXV0b0NvdW50cnlMYW5nIjpmYWxzZSwiYm9va21hcmtJY29uU2VsZWN0IjoiIiwiYm9va21hcmtJY29uVW5zZWxlY3QiOiIiLCJjYXJkU3R5bGUiOiJoYWxmLWhlaWdodCIsImNhcmRUaXRsZUFjY2Vzc2liaWxpdHlMZXZlbCI6NiwiY29sbGVjdGlvbkJ0blN0eWxlIjoicHJpbWFyeSIsImNvbGxlY3Rpb25OYW1lIjoiIiwiY29sbGVjdGlvblRpdGxlIjoiIiwiY29sbGVjdGlvblNpemUiOiIiLCJjb250YWluZXIiOiIxMjAwTWF4V2lkdGgiLCJjb250ZW50VHlwZVRhZ3MiOltdLCJjb3VudHJ5IjoiY2Fhczpjb3VudHJ5L3VzIiwiY3VzdG9tQ2FyZCI6IiIsImN0YUFjdGlvbiI6Il9zZWxmIiwiZG9Ob3RMYXp5TG9hZCI6ZmFsc2UsImRpc2FibGVCYW5uZXJzIjpmYWxzZSwiZHJhZnREYiI6ZmFsc2UsImVuZHBvaW50Ijoid3d3LmFkb2JlLmNvbS9jaGltZXJhLWFwaS9jb2xsZWN0aW9uIiwiZW52aXJvbm1lbnQiOiIiLCJleGNsdWRlZENhcmRzIjpbXSwiZXhjbHVkZVRhZ3MiOltdLCJmYWxsYmFja0VuZHBvaW50IjoiIiwiZmVhdHVyZWRDYXJkcyI6W10sImZpbHRlckV2ZW50IjoiIiwiZmlsdGVyQnVpbGRQYW5lbCI6ImF1dG9tYXRpYyIsImZpbHRlckxvY2F0aW9uIjoibGVmdCIsImZpbHRlckxvZ2ljIjoib3IiLCJmaWx0ZXJzIjpbXSwiZmlsdGVyc0N1c3RvbSI6W10sImZpbHRlcnNTaG93RW1wdHkiOmZhbHNlLCJndXR0ZXIiOiI0eCIsImhlYWRlcnMiOltdLCJoaWRlQ3RhSWRzIjpbXSwiaGlkZUN0YVRhZ3MiOltdLCJpbmNsdWRlVGFncyI6W10sImxhbmd1YWdlIjoiY2FhczpsYW5ndWFnZS9lbiIsImxheW91dFR5cGUiOiI0dXAiLCJsb2FkTW9yZUJ0blN0eWxlIjoicHJpbWFyeSIsIm9ubHlTaG93Qm9va21hcmtlZENhcmRzIjpmYWxzZSwib3JMb2dpY1RhZ3MiOltdLCJwYWdpbmF0aW9uQW5pbWF0aW9uU3R5bGUiOiJwYWdlZCIsInBhZ2luYXRpb25FbmFibGVkIjpmYWxzZSwicGFnaW5hdGlvblF1YW50aXR5U2hvd24iOmZhbHNlLCJwYWdpbmF0aW9uVHlwZSI6InBhZ2luYXRvciIsInBhZ2luYXRpb25Vc2VUaGVtZTMiOmZhbHNlLCJwbGFjZWhvbGRlclVybCI6IiIsInJlc3VsdHNQZXJQYWdlIjo1LCJzZWFyY2hGaWVsZHMiOltdLCJzZXRDYXJkQm9yZGVycyI6ZmFsc2UsInNob3dCb29rbWFya3NGaWx0ZXIiOmZhbHNlLCJzaG93Qm9va21hcmtzT25DYXJkcyI6ZmFsc2UsInNob3dGaWx0ZXJzIjpmYWxzZSwic2hvd1NlYXJjaCI6ZmFsc2UsInNob3dUb3RhbFJlc3VsdHMiOmZhbHNlLCJzb3J0RGF0ZUFzYyI6ZmFsc2UsInNvcnREYXRlRGVzYyI6ZmFsc2UsInNvcnREYXRlTW9kaWZpZWQiOmZhbHNlLCJzb3J0RGVmYXVsdCI6ImRhdGVEZXNjIiwic29ydEVuYWJsZVBvcHVwIjpmYWxzZSwic29ydEVuYWJsZVJhbmRvbVNhbXBsaW5nIjpmYWxzZSwic29ydEV2ZW50U29ydCI6ZmFsc2UsInNvcnRGZWF0dXJlZCI6ZmFsc2UsInNvcnRNb2RpZmllZEFzYyI6ZmFsc2UsInNvcnRNb2RpZmllZERlc2MiOmZhbHNlLCJzb3J0UmFuZG9tIjpmYWxzZSwic29ydFJlc2Vydm9pclBvb2wiOjEwMDAsInNvcnRSZXNlcnZvaXJTYW1wbGUiOjMsInNvcnRUaXRsZUFzYyI6ZmFsc2UsInNvcnRUaXRsZURlc2MiOmZhbHNlLCJzb3VyY2UiOlsiaGF3a3MiXSwidGFnc1VybCI6Ind3dy5hZG9iZS5jb20vY2hpbWVyYS1hcGkvdGFncyIsInRhcmdldEFjdGl2aXR5IjoiIiwidGFyZ2V0RW5hYmxlZCI6ZmFsc2UsInRoZW1lIjoibGlnaHRlc3QiLCJkZXRhaWxzVGV4dE9wdGlvbiI6ImRlZmF1bHQiLCJ0aXRsZUhlYWRpbmdMZXZlbCI6ImgzIiwidG90YWxDYXJkc1RvU2hvdyI6MTAsInVzZUxpZ2h0VGV4dCI6ZmFsc2UsInVzZU92ZXJsYXlMaW5rcyI6ZmFsc2UsImNvbGxlY3Rpb25CdXR0b25TdHlsZSI6InByaW1hcnkiLCJ1c2VySW5mbyI6W119')
});
it('Clones an object', () => {
diff --git a/test/blocks/caas-config/expectedConfigs/defaultConfig.js b/test/blocks/caas-config/expectedConfigs/defaultConfig.js
index 21be703400..1711b2883f 100644
--- a/test/blocks/caas-config/expectedConfigs/defaultConfig.js
+++ b/test/blocks/caas-config/expectedConfigs/defaultConfig.js
@@ -34,7 +34,7 @@ const defaultConfig = {
useLightText: false,
disableBanners: false,
reservoir: { sample: 3, pool: 1000 },
- ctaAction: '_blank',
+ ctaAction: '_self',
additionalRequestParams: {},
},
headers: [],
diff --git a/test/blocks/caas/mocks/utils.js b/test/blocks/caas/mocks/utils.js
index 45890ab7be..81d347ed5a 100644
--- a/test/blocks/caas/mocks/utils.js
+++ b/test/blocks/caas/mocks/utils.js
@@ -8,6 +8,14 @@ export const loadScript = stub();
export const utf8ToB64 = (str) => window.btoa(unescape(encodeURIComponent(str)));
+export const b64ToUtf8 = (str) => decodeURIComponent(escape(window.atob(str)));
+
+export function getMetadata(name, doc = document) {
+ const attr = name && name.includes(':') ? 'property' : 'name';
+ const meta = doc.head.querySelector(`meta[${attr}="${name}"]`);
+ return meta && meta.content;
+}
+
export function createIntersectionObserver({ el, callback /* , once = true, options = {} */ }) {
// fire immediately
callback(el, { target: el });
diff --git a/test/blocks/caas/utils.test.js b/test/blocks/caas/utils.test.js
index 7643f3dfcf..7b83c03203 100644
--- a/test/blocks/caas/utils.test.js
+++ b/test/blocks/caas/utils.test.js
@@ -166,11 +166,11 @@ describe('getConfig', () => {
collectionButtonStyle: 'primary',
resultsPerPage: 5,
endpoint:
- 'https://www.adobe.com/chimera-api/collection/myTargetActivity.json?originSelection=hawks&contentTypeTags=&collectionTags=&excludeContentWithTags=&language=en&country=us&complexQuery=((%22caas%3Aproducts%2Findesign%22%2BAND%2B%22caas%3Aproducts%2Freader%22)%2BAND%2B(%22caas%3Acountry%2Fbr%22%2BOR%2B%22caas%3Acountry%2Fca%22))%2BAND%2B((%22caas%3Acontent-type%2Fvideo%22%2BAND%2B%22caas%3Acontent-type%2Fblog%22))&excludeIds=¤tEntityId=&featuredCards=a%2Cb&environment=&draft=false&size=10&flatFile=false',
+ 'https://www.adobe.com/chimera-api/collection/myTargetActivity.json?originSelection=hawks&contentTypeTags=&collectionTags=&excludeContentWithTags=&language=en&country=us&complexQuery=((%22caas%3Aproducts%2Findesign%22%2BAND%2B%22caas%3Aproducts%2Freader%22)%2BAND%2B(%22caas%3Acountry%2Fbr%22%2BOR%2B%22caas%3Acountry%2Fca%22))%2BAND%2B((%22caas%3Acontent-type%2Fvideo%22%2BAND%2B%22caas%3Acontent-type%2Fblog%22))&excludeIds=¤tEntityId=&featuredCards=a%2Cb&environment=&draft=true&size=10&flatFile=false',
fallbackEndpoint: '',
totalCardsToShow: 10,
cardStyle: 'half-height',
- ctaAction: '_blank',
+ ctaAction: '_self',
detailsTextOption: 'default',
showTotalResults: false,
i18n: {
@@ -197,7 +197,7 @@ describe('getConfig', () => {
reservoir: { sample: 3, pool: 1000 },
},
featuredCards: ['a', 'b'],
- headers: [],
+ headers: [['X-Adobe-Floodgate', 'pink']],
hideCtaIds: [''],
hideCtaTags: [],
filterPanel: {
@@ -361,11 +361,11 @@ describe('getConfig', () => {
collectionButtonStyle: 'primary',
resultsPerPage: 5,
endpoint:
- 'https://www.adobe.com/chimera-api/collection/myTargetActivity.json?originSelection=hawks&contentTypeTags=&collectionTags=&excludeContentWithTags=&language=fr&country=be&complexQuery=((%22caas%3Aproducts%2Findesign%22%2BAND%2B%22caas%3Aproducts%2Freader%22)%2BAND%2B(%22caas%3Acountry%2Fbr%22%2BOR%2B%22caas%3Acountry%2Fca%22))%2BAND%2B((%22caas%3Acontent-type%2Fvideo%22%2BAND%2B%22caas%3Acontent-type%2Fblog%22))&excludeIds=¤tEntityId=&featuredCards=a%2Cb&environment=&draft=false&size=10&flatFile=false',
+ 'https://www.adobe.com/chimera-api/collection/myTargetActivity.json?originSelection=hawks&contentTypeTags=&collectionTags=&excludeContentWithTags=&language=fr&country=be&complexQuery=((%22caas%3Aproducts%2Findesign%22%2BAND%2B%22caas%3Aproducts%2Freader%22)%2BAND%2B(%22caas%3Acountry%2Fbr%22%2BOR%2B%22caas%3Acountry%2Fca%22))%2BAND%2B((%22caas%3Acontent-type%2Fvideo%22%2BAND%2B%22caas%3Acontent-type%2Fblog%22))&excludeIds=¤tEntityId=&featuredCards=a%2Cb&environment=&draft=true&size=10&flatFile=false',
fallbackEndpoint: '',
totalCardsToShow: 10,
cardStyle: 'half-height',
- ctaAction: '_blank',
+ ctaAction: '_self',
detailsTextOption: 'default',
showTotalResults: false,
i18n: {
@@ -392,7 +392,7 @@ describe('getConfig', () => {
reservoir: { sample: 3, pool: 1000 },
},
featuredCards: ['a', 'b'],
- headers: [],
+ headers: [['X-Adobe-Floodgate', 'pink']],
hideCtaIds: [''],
hideCtaTags: [],
filterPanel: {
@@ -597,3 +597,193 @@ describe('getCountryAndLang', () => {
});
});
});
+
+describe('getFloodgateCaasConfig', () => {
+ const caasFgState = defaultState;
+ caasFgState.fetchCardsFromFloodgateTree = true;
+ caasFgState.draftDb = true;
+
+ it('should return a floodgate enabled caas config object', async () => {
+ const caasFgConfig = await getConfig(caasFgState, strings);
+ expect(caasFgConfig).to.be.eql({
+ collection: {
+ mode: 'lightest',
+ layout: { type: '4up', gutter: '4x', container: '1200MaxWidth' },
+ button: { style: 'primary' },
+ collectionButtonStyle: 'primary',
+ resultsPerPage: 5,
+ endpoint:
+ 'https://www.adobe.com/chimera-api/collection/myTargetActivity.json?originSelection=hawks&contentTypeTags=&collectionTags=&excludeContentWithTags=&language=en&country=us&complexQuery=((%22caas%3Aproducts%2Findesign%22%2BAND%2B%22caas%3Aproducts%2Freader%22)%2BAND%2B(%22caas%3Acountry%2Fbr%22%2BOR%2B%22caas%3Acountry%2Fca%22))%2BAND%2B((%22caas%3Acontent-type%2Fvideo%22%2BAND%2B%22caas%3Acontent-type%2Fblog%22))&excludeIds=¤tEntityId=&featuredCards=a%2Cb&environment=&draft=true&size=10&flatFile=false',
+ fallbackEndpoint: '',
+ totalCardsToShow: 10,
+ cardStyle: 'half-height',
+ ctaAction: '_blank',
+ detailsTextOption: 'default',
+ showTotalResults: false,
+ i18n: {
+ cardTitleAccessibilityLevel: 6,
+ lastModified: 'Last modified {date}',
+ prettyDateIntervalFormat: '{ddd}, {LLL} {dd} | {timeRange} {timeZone}',
+ totalResultsText: '{total} Results',
+ title: '',
+ onErrorTitle: 'Error Loading Title',
+ onErrorDescription: 'Error Desc',
+ titleHeadingLevel: 'h3',
+ },
+ setCardBorders: false,
+ useOverlayLinks: false,
+ additionalRequestParams: {},
+ banner: {
+ register: { description: 'Sign Up', url: '#registration' },
+ upcoming: { description: 'Upcoming' },
+ live: { description: 'Live' },
+ onDemand: { description: 'On Demand' },
+ },
+ useLightText: false,
+ disableBanners: false,
+ reservoir: { sample: 3, pool: 1000 },
+ },
+ featuredCards: ['a', 'b'],
+ headers: [['X-Adobe-Floodgate', 'pink']],
+ hideCtaIds: [''],
+ hideCtaTags: [],
+ filterPanel: {
+ enabled: true,
+ eventFilter: '',
+ type: 'left',
+ showEmptyFilters: false,
+ filters: [
+ {
+ group: 'Life Sciences',
+ id: 'caas:industry/life-sciences',
+ items: [],
+ openedOnLoad: true,
+ },
+ {
+ group: 'Journey Phase',
+ icon: '/path/to/icon.svg',
+ id: 'caas:journey-phase',
+ items: [
+ {
+ id: 'caas:journey-phase/acceleration',
+ label: 'Acceleration',
+ },
+ {
+ id: 'caas:journey-phase/acquisition',
+ label: 'Acquisition',
+ },
+ {
+ id: 'caas:journey-phase/discover',
+ label: 'Discover',
+ },
+ {
+ id: 'caas:journey-phase/evaluate',
+ label: 'Evaluate',
+ },
+ {
+ id: 'caas:journey-phase/explore',
+ label: 'Explore',
+ },
+ {
+ id: 'caas:journey-phase/retention',
+ label: 'Retention',
+ },
+ ],
+ openedOnLoad: false,
+ },
+ ],
+ filterLogic: 'or',
+ i18n: {
+ leftPanel: {
+ header: 'Refine Your Results',
+ clearAllFiltersText: 'Clear All',
+ mobile: {
+ filtersBtnLabel: 'Filters',
+ panel: {
+ header: 'Filter by',
+ totalResultsText: '{total} Results',
+ applyBtnText: 'Apply',
+ clearFilterText: 'Clear',
+ doneBtnText: 'Done',
+ },
+ group: {
+ totalResultsText: '{total} Results',
+ applyBtnText: 'Apply',
+ clearFilterText: 'Clear',
+ doneBtnText: 'Done',
+ },
+ },
+ },
+ topPanel: {
+ groupLabel: 'Filters:',
+ clearAllFiltersText: 'Clear All',
+ moreFiltersBtnText: 'More Filters +',
+ mobile: {
+ group: {
+ totalResultsText: '{total} Results',
+ applyBtnText: 'Apply',
+ clearFilterText: 'Clear',
+ doneBtnText: 'Done',
+ },
+ },
+ },
+ },
+ },
+ sort: {
+ enabled: false,
+ defaultSort: 'dateDesc',
+ options: [],
+ },
+ pagination: {
+ animationStyle: 'paged',
+ enabled: false,
+ resultsQuantityShown: false,
+ loadMoreButton: { style: 'primary', useThemeThree: false },
+ type: 'paginator',
+ i18n: {
+ loadMore: { btnText: 'Load More', resultsQuantityText: '{start} of {end} displayed' },
+ paginator: {
+ resultsQuantityText: '{start} - {end} of {total} results',
+ prevLabel: 'Prev',
+ nextLabel: 'Next',
+ },
+ },
+ },
+ bookmarks: {
+ showOnCards: false,
+ leftFilterPanel: {
+ bookmarkOnlyCollection: false,
+ showBookmarksFilter: false,
+ selectBookmarksIcon: '',
+ unselectBookmarksIcon: '',
+ },
+ i18n: {
+ leftFilterPanel: { filterTitle: 'My favorites' },
+ card: { saveText: 'Save Card', unsaveText: 'Unsave Card' },
+ },
+ },
+ search: {
+ enabled: false,
+ searchFields: [],
+ i18n: {
+ noResultsTitle: 'No Results Found',
+ noResultsDescription: 'Try checking your spelling or broadening your search.',
+ leftFilterPanel: { searchTitle: 'Search', searchPlaceholderText: 'Search Here' },
+ topFilterPanel: { searchPlaceholderText: 'Search Here' },
+ filterInfo: { searchPlaceholderText: 'Search Here' },
+ },
+ },
+ language: 'en',
+ country: 'us',
+ customCard: [
+ 'card',
+ 'return ``',
+ ],
+ analytics: { trackImpressions: '', collectionIdentifier: '' },
+ target: {
+ enabled: true,
+ lastViewedSession: '',
+ },
+ });
+ });
+});
diff --git a/test/blocks/merch/merch.test.js b/test/blocks/merch/merch.test.js
index 3f0795a0ce..78616d1347 100644
--- a/test/blocks/merch/merch.test.js
+++ b/test/blocks/merch/merch.test.js
@@ -17,6 +17,28 @@ const config = {
env: { name: 'prod' },
};
+/**
+ * utility function that tests Price spans against mock HTML
+ *
+ * @param {util} selector price span selector
+ * @param {*} expectedAttributes {
:
+ * }
+ */
+const validatePriceSpan = async (selector, expectedAttributes) => {
+ const el = await merch(document.querySelector(
+ selector,
+ ));
+ const { nodeName, dataset } = await el.onceSettled();
+ expect(nodeName).to.equal('SPAN');
+ if (!expectedAttributes.template) {
+ expect(dataset.template).to.be.undefined;
+ }
+ Object.keys(expectedAttributes).forEach((key) => {
+ const value = expectedAttributes[key];
+ expect(dataset[key], ` ${key} should equal ${value}`).to.equal(value);
+ });
+};
+
describe('Merch Block', () => {
after(async () => {
delete window.lana;
@@ -48,156 +70,72 @@ describe('Merch Block', () => {
});
describe('Prices', () => {
- it('renders merch link to price without term', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.hide-term',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.displayRecurrence).to.equal('false');
+ it('renders merch link to price without term (new)', async () => {
+ await validatePriceSpan('.merch.price.hide-term', { displayRecurrence: 'false' });
});
it('renders merch link to price with term', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.term',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.displayRecurrence).to.be.undefined;
+ await validatePriceSpan('.merch.price.term', { displayRecurrence: undefined });
});
it('renders merch link to price with term and seat', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.seat',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.displayPerUnit).to.equal('true');
+ await validatePriceSpan('.merch.price.seat', { displayPerUnit: 'true' });
});
it('renders merch link to price with term and tax', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.tax',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.displayTax).to.equal('true');
+ await validatePriceSpan('.merch.price.tax', { displayTax: 'true' });
});
it('renders merch link to price with term, seat and tax', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.seat.tax',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.displayTax).to.equal('true');
+ await validatePriceSpan('.merch.price.seat.tax', { displayTax: 'true' });
});
it('renders merch link to strikethrough price with term, seat and tax', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.strikethrough',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.equal('strikethrough');
+ await validatePriceSpan('.merch.price.strikethrough', { template: 'strikethrough' });
});
it('renders merch link to optical price with term, seat and tax', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.optical',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.equal('optical');
+ await validatePriceSpan('.merch.price.optical', { template: 'optical' });
+ });
+
+ it('renders merch link to tax exclusive price with tax exclusive attribute', async () => {
+ await validatePriceSpan('.merch.price.tax-exclusive', { forceTaxExclusive: 'true' });
});
});
describe('Promo Prices', () => {
it('renders merch link to promo price with discount', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.oldprice',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.promotionCode).to.equal(undefined);
+ await validatePriceSpan('.merch.price.oldprice', { promotionCode: undefined });
});
it('renders merch link to promo price without discount', async () => {
- const el = await merch(document.querySelector(
- '.merch.strikethrough.oldprice',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.equal('strikethrough');
- expect(dataset.promotionCode).to.equal(undefined);
+ await validatePriceSpan('.merch.strikethrough.oldprice', { template: 'strikethrough', promotionCode: undefined });
});
it('renders merch link to promo price with discount', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.promo',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.promotionCode).to.equal('nicopromo');
+ await validatePriceSpan('.merch.price.promo', { promotionCode: 'nicopromo' });
});
it('renders merch link to full promo price', async () => {
- const el = await merch(document.querySelector(
- '.merch.price.promo',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.promotionCode).to.equal('nicopromo');
+ await validatePriceSpan('.merch.price.promo', { promotionCode: 'nicopromo' });
});
});
describe('Promo Prices in a fragment', () => {
it('renders merch link to promo price with discount', async () => {
- const el = await merch(document.querySelector(
- '.fragment .merch.price.oldprice',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.promotionCode).to.equal(undefined);
+ await validatePriceSpan('.fragment .merch.price.oldprice', { promotionCode: undefined });
});
it('renders merch link to promo price without discount', async () => {
- const el = await merch(document.querySelector(
- '.fragment .merch.strikethrough.oldprice',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.equal('strikethrough');
- expect(dataset.promotionCode).to.equal(undefined);
+ await validatePriceSpan('.fragment .merch.strikethrough.oldprice', { template: 'strikethrough', promotionCode: undefined });
});
it('renders merch link to promo price with discount', async () => {
- const el = await merch(document.querySelector(
- '.fragment .merch.price.promo',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.promotionCode).to.equal('nicopromo');
+ await validatePriceSpan('.fragment .merch.price.promo', { promotionCode: 'nicopromo' });
});
it('renders merch link to full promo price', async () => {
- const el = await merch(document.querySelector(
- '.fragment .merch.price.promo',
- ));
- const { nodeName, dataset } = await el.onceSettled();
- expect(nodeName).to.equal('SPAN');
- expect(dataset.template).to.be.undefined;
- expect(dataset.promotionCode).to.equal('nicopromo');
+ await validatePriceSpan('.fragment .merch.price.promo', { promotionCode: 'nicopromo' });
});
});
diff --git a/test/blocks/merch/mocks/body.html b/test/blocks/merch/mocks/body.html
index 973997bed1..02229bb355 100644
--- a/test/blocks/merch/mocks/body.html
+++ b/test/blocks/merch/mocks/body.html
@@ -15,6 +15,9 @@ Regular prices
Hide term: Price - 632B3ADD940A7FBB7864AA5AD19B8D28 - All Apps
+Force tax to be exclusive: Price - 632B3ADD940A7FBB7864AA5AD19B8D28 - All Apps
+
Display term and seat texts: Price - 632B3ADD940A7FBB7864AA5AD19B8D28 - All Apps
diff --git a/test/blocks/ost/ost.test.js b/test/blocks/ost/ost.test.js
index 5652f8d6cb..598bcb0497 100644
--- a/test/blocks/ost/ost.test.js
+++ b/test/blocks/ost/ost.test.js
@@ -80,11 +80,19 @@ describe('function "createLinkMarkup"', () => {
const displayRecurrence = true;
const displayPerUnit = true;
const displayTax = true;
- const link = createLink({ displayRecurrence, displayPerUnit, displayTax, type });
+ const forceTaxExclusive = true;
+ const link = createLink({
+ displayRecurrence,
+ displayPerUnit,
+ displayTax,
+ forceTaxExclusive,
+ type,
+ });
assertLink(link, perpM2M, {
term: displayRecurrence,
seat: displayPerUnit,
tax: displayTax,
+ exclusive: forceTaxExclusive,
osi,
type,
});
diff --git a/tools/send-to-caas/send-utils.js b/tools/send-to-caas/send-utils.js
index ce1b31f97a..aec500379b 100644
--- a/tools/send-to-caas/send-utils.js
+++ b/tools/send-to-caas/send-utils.js
@@ -416,7 +416,7 @@ const props = {
cardimage: () => getCardImageUrl(),
cardimagealttext: (s) => s || getCardImageAltText(),
contentid: (_, options) => {
- const floodGateColor = getMetadata('floodGateColor') || '';
+ const floodGateColor = getMetadata('floodgatecolor') || '';
return getUuid(`${options.prodUrl}${floodGateColor}`);
},
contenttype: (s) => s || getMetaContent('property', 'og:type') || getConfig().contentType,
@@ -459,7 +459,7 @@ const props = {
eventduration: 0,
eventend: (s) => getDateProp(s, `Invalid Event End Date: ${s}`),
eventstart: (s) => getDateProp(s, `Invalid Event Start Date: ${s}`),
- floodgatecolor: (s) => s || getMetadata('floodGateColor') || 'default',
+ floodgatecolor: (s) => s || getMetadata('floodgatecolor') || 'default',
lang: async (s, options) => {
if (s) return s;
const { lang } = await getCountryAndLang(options);
diff --git a/tools/sidekick/config.json b/tools/sidekick/config.json
index 58df0abdde..9f07415da8 100644
--- a/tools/sidekick/config.json
+++ b/tools/sidekick/config.json
@@ -32,6 +32,17 @@
"excludePaths": [ "/**" ],
"includePaths": [ "**/:x**" ]
},
+ {
+ "containerId": "tools",
+ "id": "localize-v2",
+ "title": "Localize project (V2)",
+ "environments": [ "edit" ],
+ "url": "https://locui--milo--adobecom.hlx.page/tools/loc",
+ "passReferrer": true,
+ "passConfig": true,
+ "excludePaths": [ "/**" ],
+ "includePaths": [ "**/:x**" ]
+ },
{
"containerId": "tools",
"id": "floodgate",