Merge branch 'stage' into MWPW-167901-hlx4-cleanup

adobecom · Mar 6, 2025 · 0d24b20 · 0d24b20
2 parents 9b23256 + cb872f4
commit 0d24b20
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 22 deletions.
diff --git 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
@@ -5,8 +5,8 @@ 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 { getFedsPlaceholderConfig } = await import(`${miloLibs}/utils/federated.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
@@ -13,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 { getFedsPlaceholderConfig } = await import (`${miloLibs}/utils/federated.js`);
 

diff --git a/eds/blocks/partners-navigation/partners-navigation.js b/eds/blocks/partners-navigation/partners-navigation.js
@@ -48,13 +48,12 @@ const {
   loadIms,
   decorateLinks,
   loadScript,
+  getFedsPlaceholderConfig,
   getGnavSource,
 } = await import(`${miloLibs}/utils/utils.js`);
 const { replaceKey, replaceKeyArray } = await import(`${miloLibs}/features/placeholders.js`);
 // End
 
-const { getFedsPlaceholderConfig } = await import(`${miloLibs}/utils/federated.js`);
-
 const SIGNIN_CONTEXT = getConfig()?.signInContext;
 
 function getHelpChildren() {

diff --git a/eds/blocks/partners-navigation/utilities/utilities.js b/eds/blocks/partners-navigation/utilities/utilities.js
@@ -5,9 +5,17 @@ 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, getFedsPlaceholderConfig } = await import(`${miloLibs}/utils/federated.js`);
+
 const { processTrackingLabels } = await import(`${miloLibs}/martech/attributes.js`);
 const { replaceText } = await import(`${miloLibs}/features/placeholders.js`);
 // End

diff --git 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

diff --git 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 {};

diff --git 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',