From 7404ec8e0e30aced84f38e2babd765e9fb57371e Mon Sep 17 00:00:00 2001 From: st-angelo-adobe Date: Wed, 12 Feb 2025 09:00:54 +0200 Subject: [PATCH 1/7] MWPW-167548: POST request api key fix --- acrobat/blocks/rnr/rnr.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/acrobat/blocks/rnr/rnr.js b/acrobat/blocks/rnr/rnr.js index 950e038d..6801ee2a 100644 --- a/acrobat/blocks/rnr/rnr.js +++ b/acrobat/blocks/rnr/rnr.js @@ -9,9 +9,13 @@ const { createTag } = await import(`${miloLibs}/utils/utils.js`); // #region Constants -const isProd = window.location.hostname === 'main--dc--adobecom.hlx.page' - || window.location.hostname === 'main--dc--adobecom.hlx.live' - || window.location.hostname === 'www.adobe.com'; +const isProd = [ + 'main--dc--adobecom.aem.page', + 'main--dc--adobecom.aem.live', + 'main--dc--adobecom.hlx.page', + 'main--dc--adobecom.hlx.live', + 'www.adobe.com', +].includes(window.location.hostname); const COMMENTS_MAX_LENGTH = 500; const COMMENTS_MAX_LENGTH_ALLOWED = 10000; @@ -195,7 +199,7 @@ async function postReview(data) { const headers = { Accept: 'application/vnd.adobe-review.review-data-v1+json', 'Content-Type': 'application/vnd.adobe-review.review-request-v1+json', - 'x-api-key': 'rnr-client', + 'x-api-key': RNR_API_KEY, Authorization: window.adobeIMS.getAccessToken()?.token, }; From 0a55aecbf39f7eb10c2c4d95247df1c3d1db69f2 Mon Sep 17 00:00:00 2001 From: st-angelo-adobe Date: Wed, 12 Feb 2025 14:02:35 +0200 Subject: [PATCH 2/7] MWPW-156290 - RNR analytics --- acrobat/scripts/frictionless.js | 48 +++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/acrobat/scripts/frictionless.js b/acrobat/scripts/frictionless.js index e9fc3750..75ce7f37 100644 --- a/acrobat/scripts/frictionless.js +++ b/acrobat/scripts/frictionless.js @@ -1,38 +1,58 @@ +/* eslint-disable ecmalist/no-object-fromentries */ import reviewAlloy from './alloy/review.js'; import reviewFeedbackAlloy from './alloy/reviewFeedback.js'; -import browserExtAlloy from './alloy/browserExt.js' - -const reviewBlock = document.querySelectorAll('.review') +import browserExtAlloy from './alloy/browserExt.js'; export default function init(verb) { - // Review Alloy - if (reviewBlock) { + const miloReviewBlock = document.querySelector('.review'); + const rnrBlock = document.querySelector('.rnr'); + if (miloReviewBlock || rnrBlock) { reviewAlloy(); const reviewWait = setInterval(() => { - const reviewForm = document.querySelectorAll('.hlx-Review'); - if (reviewForm.length > 0) { + // Milo block handling + const [miloReviewForm] = document.querySelectorAll('.hlx-Review'); + if (miloReviewForm) { clearInterval(reviewWait); - reviewForm[0].addEventListener('submit', (e) => { + miloReviewForm.addEventListener('submit', (e) => { const data = Object.fromEntries(new FormData(e.target).entries()); // verb, rating, comment reviewFeedbackAlloy(verb, data.rating, data['rating-comments']); }); - const reviewTooltip = reviewBlock[0].querySelectorAll('.tooltip'); + const reviewTooltip = miloReviewForm.querySelectorAll('.tooltip'); if (reviewTooltip.length > 0) { reviewTooltip[3].addEventListener('click', () => { reviewFeedbackAlloy(verb, '4'); - }) + }); reviewTooltip[4].addEventListener('click', () => { reviewFeedbackAlloy(verb, '5'); - }) + }); + } + } + // Rnr block handling + const [rnrForm] = document.querySelectorAll('.rnr-form'); + if (rnrForm) { + clearInterval(reviewWait); + rnrForm.addEventListener('submit', (e) => { + const data = Object.fromEntries(new FormData(e.target).entries()); + // verb, rating, comment + reviewFeedbackAlloy(verb, data.rating, data.comments); + }); + const stars = rnrForm.querySelectorAll('.rnr-rating-fieldset input'); + if (stars.length > 0) { + stars[3]?.addEventListener('click', () => { + reviewFeedbackAlloy(verb, '4'); + }); + stars[4]?.addEventListener('click', () => { + reviewFeedbackAlloy(verb, '5'); + }); } } }, 1000); } // Browser Ext. Alloy - window.addEventListener('modal:open', ()=> { + window.addEventListener('modal:open', () => { let extName; const { name: browserName } = window.browser; if (browserName === 'Chrome') { @@ -42,12 +62,12 @@ export default function init(verb) { if (browserName === 'Microsoft Edge') { extName = '#edgeext'; } - const extensionWait = setInterval( ()=> { + const extensionWait = setInterval(() => { const browserExtModal = document.querySelector(extName); const browserExtClose = browserExtModal?.querySelector('.dialog-close'); const browserExtGetLink = browserExtModal?.querySelector('.browser-extension a'); - if(!browserExtModal || !browserExtClose || !browserExtGetLink){ + if (!browserExtModal || !browserExtClose || !browserExtGetLink) { return; } clearInterval(extensionWait); From 1dc83199fa4e74dc43247bd62a8a34ba8cc566a5 Mon Sep 17 00:00:00 2001 From: st-angelo-adobe Date: Wed, 12 Feb 2025 14:07:14 +0200 Subject: [PATCH 3/7] todo comment --- acrobat/scripts/frictionless.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/acrobat/scripts/frictionless.js b/acrobat/scripts/frictionless.js index 75ce7f37..7a555301 100644 --- a/acrobat/scripts/frictionless.js +++ b/acrobat/scripts/frictionless.js @@ -7,6 +7,10 @@ export default function init(verb) { // Review Alloy const miloReviewBlock = document.querySelector('.review'); const rnrBlock = document.querySelector('.rnr'); + /** + * TODO the milo block related code can be removed once all frictionless + * pages transition to rnr. For now, handle both. + */ if (miloReviewBlock || rnrBlock) { reviewAlloy(); const reviewWait = setInterval(() => { From f91e160b728767f11adffdafe7f125a6bd49e376 Mon Sep 17 00:00:00 2001 From: Joaquin Rivero Date: Wed, 12 Feb 2025 10:11:05 -0300 Subject: [PATCH 4/7] mWeb CTA adjust width for longer labels --- acrobat/blocks/verb-widget/verb-widget.css | 1 + 1 file changed, 1 insertion(+) diff --git a/acrobat/blocks/verb-widget/verb-widget.css b/acrobat/blocks/verb-widget/verb-widget.css index 6b7721bc..71136e5f 100644 --- a/acrobat/blocks/verb-widget/verb-widget.css +++ b/acrobat/blocks/verb-widget/verb-widget.css @@ -287,6 +287,7 @@ justify-content: center; align-items: center; width: 30%; + min-width: fit-content; } .verb-mobile-cta:hover, From f524e42b5e8969786053367074de37eaf9d730db Mon Sep 17 00:00:00 2001 From: Joaquin Rivero Date: Wed, 12 Feb 2025 10:26:51 -0300 Subject: [PATCH 5/7] Fill & sign new icon --- acrobat/blocks/verb-widget/icons.js | 2 +- acrobat/blocks/verb-widget/verb-widget.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acrobat/blocks/verb-widget/icons.js b/acrobat/blocks/verb-widget/icons.js index 777454b7..8b477251 100644 --- a/acrobat/blocks/verb-widget/icons.js +++ b/acrobat/blocks/verb-widget/icons.js @@ -3,7 +3,7 @@ // Object mapping icon names to SVG strings const ICONS = { WIDGET_ICON: '', - fillsign: '', + fillsign: '', 'compress-pdf': '', UPLOAD_ICON: '', SECURITY_ICON: '', diff --git a/acrobat/blocks/verb-widget/verb-widget.css b/acrobat/blocks/verb-widget/verb-widget.css index 6b7721bc..29e18dc2 100644 --- a/acrobat/blocks/verb-widget/verb-widget.css +++ b/acrobat/blocks/verb-widget/verb-widget.css @@ -552,7 +552,7 @@ } .mobile-app .verb-image { - width: 100%; + width: 129px; } .verb-col.right { From ca68e54897e8b56eccf478378db485c3986773bb Mon Sep 17 00:00:00 2001 From: Joaquin Rivero Date: Wed, 12 Feb 2025 14:54:34 -0300 Subject: [PATCH 6/7] Revert "MWPW-167190: Fill & sign new icon" --- acrobat/blocks/verb-widget/icons.js | 2 +- acrobat/blocks/verb-widget/verb-widget.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acrobat/blocks/verb-widget/icons.js b/acrobat/blocks/verb-widget/icons.js index 8b477251..777454b7 100644 --- a/acrobat/blocks/verb-widget/icons.js +++ b/acrobat/blocks/verb-widget/icons.js @@ -3,7 +3,7 @@ // Object mapping icon names to SVG strings const ICONS = { WIDGET_ICON: '', - fillsign: '', + fillsign: '', 'compress-pdf': '', UPLOAD_ICON: '', SECURITY_ICON: '', diff --git a/acrobat/blocks/verb-widget/verb-widget.css b/acrobat/blocks/verb-widget/verb-widget.css index bbf727a0..71136e5f 100644 --- a/acrobat/blocks/verb-widget/verb-widget.css +++ b/acrobat/blocks/verb-widget/verb-widget.css @@ -553,7 +553,7 @@ } .mobile-app .verb-image { - width: 129px; + width: 100%; } .verb-col.right { From 3c6e7c7909fa64324567d9cdc62de5a0817b89f4 Mon Sep 17 00:00:00 2001 From: Joaquin Rivero Date: Wed, 12 Feb 2025 15:16:59 -0300 Subject: [PATCH 7/7] Revert "MWPW-166686: mWeb CTA adjust width for longer labels" --- acrobat/blocks/verb-widget/verb-widget.css | 1 - 1 file changed, 1 deletion(-) diff --git a/acrobat/blocks/verb-widget/verb-widget.css b/acrobat/blocks/verb-widget/verb-widget.css index 71136e5f..6b7721bc 100644 --- a/acrobat/blocks/verb-widget/verb-widget.css +++ b/acrobat/blocks/verb-widget/verb-widget.css @@ -287,7 +287,6 @@ justify-content: center; align-items: center; width: 30%; - min-width: fit-content; } .verb-mobile-cta:hover,