From 0d5d02a431c9b634eea7fd6b2a00f98a509fae00 Mon Sep 17 00:00:00 2001 From: Sonja Popovic Date: Fri, 7 Feb 2025 17:05:36 +0100 Subject: [PATCH 1/4] MWPW-167030-follow up for milo refactoring of federals --- .../features/breadcrumbs/breadcrumbs.js | 3 +- .../features/profile/dropdown.js | 4 +-- .../features/search/gnav-search.js | 3 +- .../partners-navigation.js | 2 +- .../utilities/utilities.js | 29 ++++++------------- 5 files changed, 14 insertions(+), 27 deletions(-) diff --git a/eds/blocks/partners-navigation/features/breadcrumbs/breadcrumbs.js b/eds/blocks/partners-navigation/features/breadcrumbs/breadcrumbs.js index 3157465..ac0b3e0 100644 --- a/eds/blocks/partners-navigation/features/breadcrumbs/breadcrumbs.js +++ b/eds/blocks/partners-navigation/features/breadcrumbs/breadcrumbs.js @@ -1,8 +1,7 @@ // MWPW-159021 /* eslint-disable */ -import { getMetadata, getConfig } from '../../../../utils/utils.js'; +import { getMetadata, getConfig, getFederatedUrl } from '../../../../utils/utils.js'; import { toFragment, lanaLog } from '../../utilities/utilities.js'; -import { getFederatedUrl } from '../../../../utils/federated.js'; const metadata = { seo: 'breadcrumbs-seo', diff --git a/eds/blocks/partners-navigation/features/profile/dropdown.js b/eds/blocks/partners-navigation/features/profile/dropdown.js index 504fd24..761f01c 100644 --- a/eds/blocks/partners-navigation/features/profile/dropdown.js +++ b/eds/blocks/partners-navigation/features/profile/dropdown.js @@ -1,11 +1,11 @@ -import { toFragment, getFedsPlaceholderConfig, trigger, closeAllDropdowns, logErrorFor } from '../../utilities/utilities.js'; +import { toFragment, trigger, closeAllDropdowns, logErrorFor } from '../../utilities/utilities.js'; // MWPW-157751 import { getLibs } from '../../../../scripts/utils.js'; const miloLibs = getLibs(); const { replaceKeyArray } = await import(`${miloLibs}/features/placeholders.js`); -const { getConfig } = await import(`${miloLibs}/utils/utils.js`); +const { getConfig, getFedsPlaceholderConfig } = await import(`${miloLibs}/utils/utils.js`); const getLanguage = (ietfLocale) => { if (!ietfLocale.length) return 'en'; diff --git a/eds/blocks/partners-navigation/features/search/gnav-search.js b/eds/blocks/partners-navigation/features/search/gnav-search.js index e8bb6bc..bd84eb5 100644 --- a/eds/blocks/partners-navigation/features/search/gnav-search.js +++ b/eds/blocks/partners-navigation/features/search/gnav-search.js @@ -2,7 +2,6 @@ /* eslint-disable */ import { toFragment, - getFedsPlaceholderConfig, isDesktop, setCurtainState, trigger, @@ -14,7 +13,7 @@ import {generateRequestForSearchAPI} from "../../../utils/utils.js"; const miloLibs = getLibs(); const { replaceKeyArray } = await import(`${miloLibs}/features/placeholders.js`); -const { getConfig } = await import(`${miloLibs}/utils/utils.js`); +const { getConfig, getFedsPlaceholderConfig } = await import(`${miloLibs}/utils/utils.js`); const { debounce } = await import(`${miloLibs}/utils/action.js`); const CONFIG = { diff --git a/eds/blocks/partners-navigation/partners-navigation.js b/eds/blocks/partners-navigation/partners-navigation.js index 20c2ee5..146b5d0 100644 --- a/eds/blocks/partners-navigation/partners-navigation.js +++ b/eds/blocks/partners-navigation/partners-navigation.js @@ -8,7 +8,6 @@ import { getActiveLink, getAnalyticsValue, getExperienceName, - getFedsPlaceholderConfig, hasActiveLink, icons, isDesktop, @@ -44,6 +43,7 @@ const { loadIms, decorateLinks, loadScript, + getFedsPlaceholderConfig, } = await import(`${miloLibs}/utils/utils.js`); const { replaceKey, replaceKeyArray } = await import(`${miloLibs}/features/placeholders.js`); // End diff --git a/eds/blocks/partners-navigation/utilities/utilities.js b/eds/blocks/partners-navigation/utilities/utilities.js index 1db80b5..937b9ad 100644 --- a/eds/blocks/partners-navigation/utilities/utilities.js +++ b/eds/blocks/partners-navigation/utilities/utilities.js @@ -5,9 +5,16 @@ import { getLibs } from '../../../scripts/utils.js'; const miloLibs = getLibs(); const { - getConfig, getMetadata, loadStyle, loadLana, decorateLinks, localizeLink, + getConfig, + getMetadata, + loadStyle, + loadLana, + decorateLinks, + localizeLink, + getFederatedContentRoot, + getFederatedUrl, + getFedsPlaceholderConfig, } = await import(`${miloLibs}/utils/utils.js`); -const { getFederatedContentRoot, getFederatedUrl } = await import(`${miloLibs}/utils/federated.js`); const { processTrackingLabels } = await import(`${miloLibs}/martech/attributes.js`); const { replaceText } = await import(`${miloLibs}/features/placeholders.js`); // End @@ -112,24 +119,6 @@ export const federatePictureSources = ({ section, forceFederate } = {}) => { }); }; -let fedsPlaceholderConfig; -export const getFedsPlaceholderConfig = ({ useCache = true } = {}) => { - if (useCache && fedsPlaceholderConfig) return fedsPlaceholderConfig; - - const { locale, placeholders } = getConfig(); - const libOrigin = getFederatedContentRoot(); - - fedsPlaceholderConfig = { - locale: { - ...locale, - contentRoot: `${libOrigin}${locale.prefix}/federal/globalnav`, - }, - placeholders, - }; - - return fedsPlaceholderConfig; -}; - export function getAnalyticsValue(str, index) { if (typeof str !== 'string' || !str.length) return str; From f0960859adf6ab28181d5eefbe4ed7479a93d8bd Mon Sep 17 00:00:00 2001 From: Sonja Popovic Date: Fri, 21 Feb 2025 15:18:30 +0100 Subject: [PATCH 2/4] MWPW-167524-draft items fix --- eds/components/PartnerCards.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eds/components/PartnerCards.js b/eds/components/PartnerCards.js index bd2c234..b276eea 100644 --- a/eds/components/PartnerCards.js +++ b/eds/components/PartnerCards.js @@ -1,4 +1,4 @@ -import { getLibs } from '../scripts/utils.js'; +import { getLibs, prodHosts } from '../scripts/utils.js'; import { partnerCardsStyles, partnerCardsLoadMoreStyles, @@ -226,7 +226,7 @@ export default class PartnerCards extends LitElement { const cardsEvent = new Event('partner-cards-loaded'); document.dispatchEvent(cardsEvent); if (apiData?.cards) { - if (window.location.hostname === 'partners.adobe.com') { + if (prodHosts.includes(window.location.host)) { apiData.cards = apiData.cards.filter((card) => !card.contentArea.url?.includes('/drafts/')); } // eslint-disable-next-line no-return-assign From b6e5f335a9841406b85c3256bbeabd298fffb149 Mon Sep 17 00:00:00 2001 From: Sonja Popovic Date: Fri, 21 Feb 2025 15:26:37 +0100 Subject: [PATCH 3/4] MWPW-167119 -channelpartner is broken on iOS15 on XCode simulator --- eds/scripts/personalization.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eds/scripts/personalization.js b/eds/scripts/personalization.js index eda1b05..09bc8e6 100644 --- a/eds/scripts/personalization.js +++ b/eds/scripts/personalization.js @@ -100,11 +100,11 @@ function processRenew(profile) { } function processGnavElements(elements) { - const regex = /(?<=\().*?(?=\))/g; + const regex = /\((.*?)\)/g; return elements.map((el) => { - const matches = el.textContent.match(regex); - if (!matches?.length) return {}; - const match = matches[0]; + const matches = [...el.textContent.matchAll(regex)]; + if (!matches?.length || !matches[0][1]) return {}; + const match = matches[0][1]; el.textContent = el.textContent.replace(`(${match})`, ''); const conditions = match.split(',').map((condition) => condition.trim()); if (!conditions.length) return {}; From a4edd8637e53e5e8a985acd23d157f920e422fc2 Mon Sep 17 00:00:00 2001 From: cod17828 Date: Wed, 26 Feb 2025 15:39:40 +0100 Subject: [PATCH 4/4] commenting out safari tests --- playwright.config.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/playwright.config.js b/playwright.config.js index 9f4023f..61cdc41 100644 --- a/playwright.config.js +++ b/playwright.config.js @@ -57,13 +57,14 @@ const config = { use: { ...devices['Desktop Firefox'] }, bypassCSP: true, }, - { - name: 'dx-partners-live-webkit', - use: { - ...devices['Desktop Safari'], - }, - bypassCSP: true, - }, +// { +// name: 'dx-partners-live-webkit', +// use: { +// ...devices['Desktop Safari'], +// ignoreHTTPSErrors: true, +// }, +// bypassCSP: true, +// }, /* Test Against Mobile View ports */ // { // name: 'mobile-chrome-pixel5',