From 30ed47f2b9679014484ae221c20e0e23f3afedce Mon Sep 17 00:00:00 2001 From: apganapa Date: Thu, 8 Jun 2023 13:26:25 -0600 Subject: [PATCH 1/9] MWPW-132350 | Invoking stage specific IMS domain on stage URLs --- express/scripts/gnav.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/express/scripts/gnav.js b/express/scripts/gnav.js index 5dc9a26cd..04e448e28 100644 --- a/express/scripts/gnav.js +++ b/express/scripts/gnav.js @@ -69,7 +69,12 @@ function loadIMS() { locale: getLocale(window.location), environment: 'prod', }; - loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); + if (!['www.stage.adobe.com'].includes(window.location.hostname)) { + loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); + } else { + loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); + window.adobeid.environment = 'stg1'; + } } async function loadFEDS() { From 46c4ceb88fccc115b51e1aa6a1b1b0f349093817 Mon Sep 17 00:00:00 2001 From: apganapa Date: Thu, 8 Jun 2023 13:45:21 -0600 Subject: [PATCH 2/9] MWPW-132350 | Invoking stage specific IMS domain on stage URLs --- express/scripts/gnav.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/express/scripts/gnav.js b/express/scripts/gnav.js index 04e448e28..6030993b3 100644 --- a/express/scripts/gnav.js +++ b/express/scripts/gnav.js @@ -72,7 +72,7 @@ function loadIMS() { if (!['www.stage.adobe.com'].includes(window.location.hostname)) { loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); } else { - loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); + loadScript('https://auth-stg1.services.adobe.com/imslib/imslib.min.js'); window.adobeid.environment = 'stg1'; } } From f3fb8392313e889ec22830007400a82b0aa3d60f Mon Sep 17 00:00:00 2001 From: Jingle Huang Date: Mon, 26 Jun 2023 17:27:48 -0700 Subject: [PATCH 3/9] fix empty breadcrumbs --- express/blocks/template-list/breadcrumbs.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/express/blocks/template-list/breadcrumbs.js b/express/blocks/template-list/breadcrumbs.js index ae9da74de..f475c6b3d 100644 --- a/express/blocks/template-list/breadcrumbs.js +++ b/express/blocks/template-list/breadcrumbs.js @@ -93,8 +93,12 @@ function getCrumbsForSEOPage(templatesUrl, allTemplatesMetadata, taskCategories, } crumbs.push(segmentCrumb); }); + const shortTitle = getMetadata('short-title'); + if (!shortTitle) { + return crumbs; + } const lastCrumb = createTag('li'); - lastCrumb.textContent = getMetadata('short-title'); + lastCrumb.textContent = shortTitle; crumbs.push(lastCrumb); return crumbs; } From 54b6c94516c18eb3c27994125e9e242d87abafd0 Mon Sep 17 00:00:00 2001 From: redvelvet511 <113856982+redvelvet511@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:59:20 -0400 Subject: [PATCH 4/9] Bug Fix for Safari on browse-by-category block --- express/blocks/browse-by-category/browse-by-category.css | 1 - 1 file changed, 1 deletion(-) diff --git a/express/blocks/browse-by-category/browse-by-category.css b/express/blocks/browse-by-category/browse-by-category.css index af055f341..78aad68dd 100644 --- a/express/blocks/browse-by-category/browse-by-category.css +++ b/express/blocks/browse-by-category/browse-by-category.css @@ -160,7 +160,6 @@ main .browse-by-category-wrapper.fullwidth { object-fit: contain; max-width: 110px; max-height: 97px; - height: 100%; transform: matrix(1, -0.01, 0.01, 1, 0, 0); box-shadow: 0 0 6px #0000001f; border-radius: 8px; From 494352291a7356674cc72d61d082158dbade295b Mon Sep 17 00:00:00 2001 From: Qiyun Dai Date: Sun, 2 Jul 2023 11:29:00 -0500 Subject: [PATCH 5/9] regression fix for mini version of the template-list block --- express/blocks/template-list/template-list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/express/blocks/template-list/template-list.js b/express/blocks/template-list/template-list.js index b7076137a..90c0aee14 100644 --- a/express/blocks/template-list/template-list.js +++ b/express/blocks/template-list/template-list.js @@ -1606,7 +1606,7 @@ export async function decorateTemplateList($block, props) { } } - if (placeholders['template-filter-premium']) { + if (placeholders['template-filter-premium'] && !$block.classList.contains('mini')) { document.addEventListener('linkspopulated', async (e) => { // desktop/mobile fires the same event if ($parent.contains(e.detail[0])) { From 5592dd343ba439cb3b73857fe85e9c56c6c5ca26 Mon Sep 17 00:00:00 2001 From: apganapa Date: Thu, 8 Jun 2023 13:26:25 -0600 Subject: [PATCH 6/9] MWPW-132350 | Invoking stage specific IMS domain on stage URLs --- express/scripts/gnav.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/express/scripts/gnav.js b/express/scripts/gnav.js index a84059a12..7b5815d70 100644 --- a/express/scripts/gnav.js +++ b/express/scripts/gnav.js @@ -69,7 +69,12 @@ function loadIMS() { locale: getLocale(window.location), environment: 'prod', }; - loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); + if (!['www.stage.adobe.com'].includes(window.location.hostname)) { + loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); + } else { + loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); + window.adobeid.environment = 'stg1'; + } } async function loadFEDS() { From 4c73582cd1090de1e14528eae4f757e99dc107f7 Mon Sep 17 00:00:00 2001 From: apganapa Date: Thu, 8 Jun 2023 13:45:21 -0600 Subject: [PATCH 7/9] MWPW-132350 | Invoking stage specific IMS domain on stage URLs --- express/scripts/gnav.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/express/scripts/gnav.js b/express/scripts/gnav.js index 7b5815d70..4cd8f7e4c 100644 --- a/express/scripts/gnav.js +++ b/express/scripts/gnav.js @@ -72,7 +72,7 @@ function loadIMS() { if (!['www.stage.adobe.com'].includes(window.location.hostname)) { loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); } else { - loadScript('https://auth.services.adobe.com/imslib/imslib.min.js'); + loadScript('https://auth-stg1.services.adobe.com/imslib/imslib.min.js'); window.adobeid.environment = 'stg1'; } } From f821342b24c4fb82ad492c2eccf1c2b32d0b6d1f Mon Sep 17 00:00:00 2001 From: redvelvet511 <113856982+redvelvet511@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:59:20 -0400 Subject: [PATCH 8/9] Bug Fix for Safari on browse-by-category block --- express/blocks/browse-by-category/browse-by-category.css | 1 - 1 file changed, 1 deletion(-) diff --git a/express/blocks/browse-by-category/browse-by-category.css b/express/blocks/browse-by-category/browse-by-category.css index af055f341..78aad68dd 100644 --- a/express/blocks/browse-by-category/browse-by-category.css +++ b/express/blocks/browse-by-category/browse-by-category.css @@ -160,7 +160,6 @@ main .browse-by-category-wrapper.fullwidth { object-fit: contain; max-width: 110px; max-height: 97px; - height: 100%; transform: matrix(1, -0.01, 0.01, 1, 0, 0); box-shadow: 0 0 6px #0000001f; border-radius: 8px; From befded4fe446602700866cb7ab3a6cf514e56a55 Mon Sep 17 00:00:00 2001 From: Qiyun Dai Date: Sun, 2 Jul 2023 11:29:00 -0500 Subject: [PATCH 9/9] regression fix for mini version of the template-list block --- express/blocks/template-list/template-list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/express/blocks/template-list/template-list.js b/express/blocks/template-list/template-list.js index b7076137a..90c0aee14 100644 --- a/express/blocks/template-list/template-list.js +++ b/express/blocks/template-list/template-list.js @@ -1606,7 +1606,7 @@ export async function decorateTemplateList($block, props) { } } - if (placeholders['template-filter-premium']) { + if (placeholders['template-filter-premium'] && !$block.classList.contains('mini')) { document.addEventListener('linkspopulated', async (e) => { // desktop/mobile fires the same event if ($parent.contains(e.detail[0])) {