From 17d657d7c6a9018407045dc3253e9d4bfc45c439 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Wed, 25 Sep 2024 13:25:33 -0700 Subject: [PATCH 1/8] Style updates --- acrobat/blocks/prompt-card/prompt-card.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acrobat/blocks/prompt-card/prompt-card.css b/acrobat/blocks/prompt-card/prompt-card.css index 95406622..94506c3c 100644 --- a/acrobat/blocks/prompt-card/prompt-card.css +++ b/acrobat/blocks/prompt-card/prompt-card.css @@ -69,14 +69,14 @@ flex: 1 0 0; flex-direction: column; justify-content: space-between; - padding: 20px 20px 24px; + padding: 16px 16px 24px; transition-delay: 3s; transition-property: border; max-width: 276px; } .prompt-blade:hover { - box-shadow: 3px 6px 6px 0 rgba(0, 0, 0, .16) + box-shadow: 0 3px 6px rgba(0, 0, 0, 16%) } .prompt-blade:active { @@ -153,7 +153,7 @@ font-style: normal; font-weight: 400; line-height: 150%; - padding: 2px 8px + padding: 2px 16px } .prompt-copy-btn:after { From 688e9297575ce4989a054aefdde5843226ab0703 Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Wed, 25 Sep 2024 15:11:56 -0600 Subject: [PATCH 2/8] MWPW-159098 --- acrobat/blocks/verb-widget/verb-widget.js | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/acrobat/blocks/verb-widget/verb-widget.js b/acrobat/blocks/verb-widget/verb-widget.js index 55984a15..829943e1 100644 --- a/acrobat/blocks/verb-widget/verb-widget.js +++ b/acrobat/blocks/verb-widget/verb-widget.js @@ -5,8 +5,32 @@ import verbAnalytics from '../../scripts/alloy/verb-widget.js'; const miloLibs = setLibs('/libs'); const { createTag } = await import(`${miloLibs}/utils/utils.js`); +const fallBack = 'https://www.adobe.com/go/acrobat-overview'; const EOLBrowserPage = 'https://acrobat.adobe.com/home/index-browser-eol.html'; +const verbRedirMap = { + createpdf: 'createpdf', + 'crop-pages': 'crop', + 'delete-pages': 'deletepages', + 'extract-pages': 'extract', + 'combine-pdf': 'combine', + 'protect-pdf': 'protect', + 'add-comment': 'addcomment', + 'pdf-to-image': 'pdftoimage', + 'reorder-pages': 'reorderpages', + sendforsignature: 'sendforsignature', + 'rotate-pages': 'rotatepages', + fillsign: 'fillsign', + 'split-pdf': 'split', + 'insert-pdf': 'insert', + 'compress-pdf': 'compress', + 'png-to-pdf': 'jpgtopdf', + 'number-pages': 'number', + 'ocr-pdf': 'ocr', + 'chat-pdf': 'chat', + 'chat-pdf-student': 'study', +}; + const setUser = () => { localStorage.setItem('unity.user', 'true'); }; @@ -36,6 +60,19 @@ function initiatePrefetch(verb) { } } +function redDir(verb) { + const hostname = window?.location?.hostname; + const ENV = getEnv(); + const VERB = verb; + let newLocation; + if (hostname !== 'www.adobe.com' && hostname !== 'sign.ing' && hostname !== 'edit.ing') { + newLocation = `https://www.adobe.com/go/acrobat-${verbRedirMap[VERB] || VERB.split('-').join('')}-${ENV}`; + } else { + newLocation = `https://www.adobe.com/go/acrobat-${verbRedirMap[VERB] || VERB.split('-').join('')}` || fallBack; + } + window.location.href = newLocation; +} + export default async function init(element) { if (isOldBrowser()) { window.location.href = EOLBrowserPage; @@ -99,6 +136,13 @@ export default async function init(element) { element.append(widget, footer); + window.addEventListener('IMS:Ready', async () => { + if (window.adobeIMS?.isSignedInUser() + && window.adobeIMS?.getAccountType() !== 'type1') { + redDir(VERB); + } + }); + // Analytics verbAnalytics('landing:shown', VERB); From 586423b7a9f0c30e5031e26a9e1c7f862e5a13d9 Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Wed, 25 Sep 2024 15:43:22 -0600 Subject: [PATCH 3/8] Update verb-widget.js --- acrobat/blocks/verb-widget/verb-widget.js | 1 + 1 file changed, 1 insertion(+) diff --git a/acrobat/blocks/verb-widget/verb-widget.js b/acrobat/blocks/verb-widget/verb-widget.js index 829943e1..fc951ff7 100644 --- a/acrobat/blocks/verb-widget/verb-widget.js +++ b/acrobat/blocks/verb-widget/verb-widget.js @@ -137,6 +137,7 @@ export default async function init(element) { element.append(widget, footer); window.addEventListener('IMS:Ready', async () => { + console.log('IMS:Ready 😎') if (window.adobeIMS?.isSignedInUser() && window.adobeIMS?.getAccountType() !== 'type1') { redDir(VERB); From 93c3532dda94d79ba95594c0fbbeda82a1bc1bf4 Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Wed, 25 Sep 2024 15:52:56 -0600 Subject: [PATCH 4/8] MWPW-159098 --- acrobat/blocks/verb-widget/verb-widget.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/acrobat/blocks/verb-widget/verb-widget.js b/acrobat/blocks/verb-widget/verb-widget.js index 829943e1..fb18dc5d 100644 --- a/acrobat/blocks/verb-widget/verb-widget.js +++ b/acrobat/blocks/verb-widget/verb-widget.js @@ -136,12 +136,20 @@ export default async function init(element) { element.append(widget, footer); - window.addEventListener('IMS:Ready', async () => { - if (window.adobeIMS?.isSignedInUser() - && window.adobeIMS?.getAccountType() !== 'type1') { + // Redirect after IMS:Ready + window.addEventListener('IMS:Ready', () => { + console.log('IMS:Ready 😎'); + if (window.adobeIMS.isSignedInUser() + && window.adobeIMS.getAccountType() !== 'type1') { redDir(VERB); } }); + // Race Condition + if (window.adobeIMS?.isSignedInUser() + && window.adobeIMS?.getAccountType() !== 'type1') { + console.log('Race Con ⏩'); + redDir(VERB); + } // Analytics verbAnalytics('landing:shown', VERB); From fe9573d764e6325dc62b050be903722dae6c5e76 Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Thu, 26 Sep 2024 12:29:21 -0600 Subject: [PATCH 5/8] MWPW-158122 --- acrobat/blocks/verb-widget/verb-widget.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/acrobat/blocks/verb-widget/verb-widget.js b/acrobat/blocks/verb-widget/verb-widget.js index fb18dc5d..d2f6a102 100644 --- a/acrobat/blocks/verb-widget/verb-widget.js +++ b/acrobat/blocks/verb-widget/verb-widget.js @@ -162,6 +162,7 @@ export default async function init(element) { button.addEventListener('click', () => { verbAnalytics('filepicker:shown', VERB); + verbAnalytics('dropzone:choose-file-clicked', VERB); initiatePrefetch(VERB); }); @@ -191,7 +192,7 @@ export default async function init(element) { window.addEventListener('unity:track-analytics', (e) => { if (e.detail?.event === 'change') { - verbAnalytics('choose-file:open', VERB); + verbAnalytics('choose-file:open', VERB, e.detail?.data); setUser(); } // maybe new event name files-dropped? @@ -200,10 +201,6 @@ export default async function init(element) { setDraggingClass(widget, false); setUser(); } - if (e.detail?.event === 'choose-file-clicked') { - verbAnalytics('dropzone:choose-file-clicked', VERB, e.detail?.data); - setUser(); - } if (e.detail?.event === 'uploading') { verbAnalytics('job:uploading', VERB, e.detail?.data); From e41b220b6d35d0b72751289200761f71646e4881 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Fri, 27 Sep 2024 14:25:44 -0700 Subject: [PATCH 6/8] Bug fix --- acrobat/blocks/prompt-card/prompt-card.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acrobat/blocks/prompt-card/prompt-card.js b/acrobat/blocks/prompt-card/prompt-card.js index 4b5b45a1..0154b2be 100644 --- a/acrobat/blocks/prompt-card/prompt-card.js +++ b/acrobat/blocks/prompt-card/prompt-card.js @@ -79,7 +79,7 @@ async function createBlocks(element, blockArray, templateCfg) { } element.remove(); - if (templateCfg.rows && parentNode.classList.contains('section')) { + if (templateCfg?.rows && parentNode.classList.contains('section')) { const resizeObserver = new ResizeObserver(() => { const computedStyle = window.getComputedStyle(parentNode); if (/^(\d+(\.\d+)?(px|fr|em|rem|%))( (\d+(\.\d+)?(px|fr|em|rem|%)))*$/.test(computedStyle.gridTemplateColumns)) { From 50bfee8ede4deecd314f914ccec5e12773ccb703 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Fri, 27 Sep 2024 14:40:20 -0700 Subject: [PATCH 7/8] Fix test --- test/scripts/scripts-preloads.test.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/scripts/scripts-preloads.test.js b/test/scripts/scripts-preloads.test.js index 0d00f757..177a4a6f 100644 --- a/test/scripts/scripts-preloads.test.js +++ b/test/scripts/scripts-preloads.test.js @@ -1,10 +1,12 @@ import { expect } from '@esm-bundle/chai'; +import { waitForElement } from '../helpers/waitfor.js'; describe('Test scripts.js configurable preloads', () => { it('has preload metadata', async () => { document.head.innerHTML = ''; document.body.innerHTML = '
'; await import('../../acrobat/scripts/scripts.js'); + await waitForElement('link[rel="stylesheet"][href="/acrobat/styles/styles.css"]'); const js = document.querySelector('link[rel="preload"][href="https://main--milo--adobecom.hlx.page/libs/blocks/marquee/marquee.js"]'); const css = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.page/libs/blocks/marquee/marquee.css"]'); const other = document.querySelector('link[rel="preload"][href="https://www.example.com/abc.js"]'); From 73baf4b4be26ffad541cb2e786a1b76a33426549 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Fri, 27 Sep 2024 14:55:46 -0700 Subject: [PATCH 8/8] Fix a test --- test/scripts/scripts-preloads.test.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/scripts/scripts-preloads.test.js b/test/scripts/scripts-preloads.test.js index 177a4a6f..4aa79465 100644 --- a/test/scripts/scripts-preloads.test.js +++ b/test/scripts/scripts-preloads.test.js @@ -6,12 +6,11 @@ describe('Test scripts.js configurable preloads', () => { document.head.innerHTML = ''; document.body.innerHTML = '
'; await import('../../acrobat/scripts/scripts.js'); - await waitForElement('link[rel="stylesheet"][href="/acrobat/styles/styles.css"]'); - const js = document.querySelector('link[rel="preload"][href="https://main--milo--adobecom.hlx.page/libs/blocks/marquee/marquee.js"]'); - const css = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.page/libs/blocks/marquee/marquee.css"]'); + const js = document.querySelector('link[rel="preload"][href="https://main--milo--adobecom.hlx.live/libs/blocks/marquee/marquee.js"]'); + const css = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.live/libs/blocks/marquee/marquee.css"]'); const other = document.querySelector('link[rel="preload"][href="https://www.example.com/abc.js"]'); const acrobatcss = document.querySelector('link[rel="stylesheet"][href="/acrobat/styles/styles.css"]'); - const milocss = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.page/libs/styles/styles.css"]'); + const milocss = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.live/libs/styles/styles.css"]'); expect(js).not.to.be.null; expect(css).not.to.be.null; expect(other).not.to.be.null;