From dc4f270228bd5ff31c018f12dba6143e01d4189d Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:33:07 -0800 Subject: [PATCH 01/14] Readme update (#168) * Update README.md * Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8539620b0..62ec0208d 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ The Franklin based project for creative cloud pages on www.adobe.com. Based off of milo-college. ## Developing -1. Install the [Helix CLI](https://github.com/adobe/helix-cli): `sudo npm install -g @adobe/helix-cli` -2. Run `hlx up` this repo's folder. (opens your browser at `http://localhost:3000`) +1. Install the [AEM CLI](https://github.com/adobe/helix-cli): `sudo npm install -g @adobe/aem-cli` +2. Run `aem up` this repo's folder. (opens your browser at `http://localhost:3000`) 3. Open this repo's folder in your favorite editor and start coding. ## Testing Milo Changes on CC Pages -1. Run 'hlx up' in this folder to ensure the cc site is running locally. +1. Run 'aem up' in this folder to ensure the cc site is running locally. 2. Make changes in milo, and then from the milo folder, run `npm run libs`. 3. Milo will run at: ``` From b0d97d0a4e49ab88dcb95a9bf97870d2833ef59b Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:33:51 -0800 Subject: [PATCH 02/14] [main]MWPW-140914-Redirect user directly to firefly product page from firefly marketing page (#174) * Update firefly-interactive.js * remove redirect for firefly product page on page load for signed in user * Redirect signed in user to firefly product page --- .../features/firefly/firefly-interactive.js | 6 ++-- .../features/firefly/firefly-susi.js | 30 ++++++++----------- creativecloud/scripts/scripts.js | 11 +------ 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/creativecloud/features/firefly/firefly-interactive.js b/creativecloud/features/firefly/firefly-interactive.js index bfb32796f..35d7ab200 100644 --- a/creativecloud/features/firefly/firefly-interactive.js +++ b/creativecloud/features/firefly/firefly-interactive.js @@ -30,7 +30,7 @@ function eventOnGenerate(generateButton, media) { const btnConfig = btnConfigs[className]; const dall = userprompt === '' ? btnConfig[0] : btnConfig[1]; e.target.setAttribute('daa-ll', dall); - const { signIn } = await import('./firefly-susi.js'); + const { default: signIn } = await import('./firefly-susi.js'); signIn(prompt, btnConfig[2]); } }); @@ -73,7 +73,7 @@ async function eventOnSelectorOption(option, prompt, media, mediaP, createPrompt genfilprompt.classList.add('genfill-promptbar'); const genFillButton = media.querySelector('#genfill'); genFillButton.addEventListener('click', async () => { - const { signIn } = await import('./firefly-susi.js'); + const { default: signIn } = await import('./firefly-susi.js'); signIn('', 'goToFireflyGenFill'); }); } else { @@ -167,7 +167,7 @@ export default async function setInteractiveFirefly(el) { media.append(genfillPrompt, fireflyPrompt); const genFillButton = media.querySelector('#genfill'); genFillButton.addEventListener('click', async () => { - const { signIn } = await import('./firefly-susi.js'); + const { default: signIn } = await import('./firefly-susi.js'); signIn('', 'goToFireflyGenFill'); }); } diff --git a/creativecloud/features/firefly/firefly-susi.js b/creativecloud/features/firefly/firefly-susi.js index d8b53065e..fe90ca72a 100644 --- a/creativecloud/features/firefly/firefly-susi.js +++ b/creativecloud/features/firefly/firefly-susi.js @@ -10,31 +10,25 @@ function generateRandomSeed(min = 1, max = 100000) { return Math.floor(Math.random() * (max - min + 1)) + min; } -export function redirectWithParam() { - const url = new URL(window.location.href); - let prompt; +function redirectUrl(prompt, paramKey) { let windowLocation = ''; const queryParam = 'ff_channel=adobe_com&ff_campaign=ffly_homepage&ff_source=firefly_seo'; - if (window.location.search.includes('goToFireflyGenFill')) { + if (paramKey === 'goToFireflyGenFill') { windowLocation = env === 'prod' ? `${fireflyprod}/upload/inpaint?${queryParam}` : `${fireflystage}/upload/inpaint?&${queryParam}`; - } else if (window.location.search.includes('goToFireflyEffects')) { - prompt = url.searchParams.get('goToFireflyEffects'); - const effectsPath = `generate/font-styles?prompt=${prompt}&${queryParam}`; + } else if (paramKey === 'goToFireflyEffects') { + const effectsPath = `generate/font-styles?prompt=${encodeURI(prompt)}&${queryParam}`; windowLocation = env === 'prod' ? `${fireflyprod}/${effectsPath}` : `${fireflystage}/${effectsPath}`; - } else if (window.location.search.includes('goToFirefly')) { - prompt = url.searchParams.get('goToFirefly'); - const fireflyPath = `generate/images?prompt=${prompt}&${queryParam}&seed=${generateRandomSeed()}&seed=${generateRandomSeed()}&seed=${generateRandomSeed()}&seed=${generateRandomSeed()}&modelInputVersion=v2&modelConfig=v2`; + } else if (paramKey === 'goToFirefly') { + const fireflyPath = `generate/images?prompt=${encodeURI(prompt)}&${queryParam}&seed=${generateRandomSeed()}&seed=${generateRandomSeed()}&seed=${generateRandomSeed()}&seed=${generateRandomSeed()}&modelInputVersion=v2&modelConfig=v2`; windowLocation = env === 'prod' ? `${fireflyprod}/${fireflyPath}` : `${fireflystage}/${fireflyPath}`; } - if (windowLocation) window.location = windowLocation; + return windowLocation; } -export const signIn = (prompt, paramKey) => { - const url = new URL(window.location.href); - url.searchParams.delete('goToFirefly', 'goToFireflyEffects', 'goToFireflyGenFill', 'prompt', 'seed', 'ff_channel', 'ff_campaign', 'ff_source'); - url.searchParams.set(paramKey, encodeURI(prompt)); - const stageSigninObj = { dctx_id: 'v:2,s,f,bg:firefly2023,2e2b3d80-4e50-11ee-acbc-ab67eaa89524', redirect_uri: url.href }; - const prodSigninObj = { dctx_id: 'v:2,s,f,bg:firefly2023,cea19bc0-4e72-11ee-888a-c95a795c7f23', redirect_uri: url.href }; +export default function signIn(prompt, paramKey) { + const redirectUri = redirectUrl(prompt, paramKey); + const stageSigninObj = { dctx_id: 'v:2,s,f,bg:firefly2023,2e2b3d80-4e50-11ee-acbc-ab67eaa89524', redirect_uri: redirectUri }; + const prodSigninObj = { dctx_id: 'v:2,s,f,bg:firefly2023,cea19bc0-4e72-11ee-888a-c95a795c7f23', redirect_uri: redirectUri }; if (env === 'stage') window.adobeIMS?.signIn(stageSigninObj); else window.adobeIMS?.signIn(prodSigninObj); -}; +} diff --git a/creativecloud/scripts/scripts.js b/creativecloud/scripts/scripts.js index 27e388912..4116bd0e2 100644 --- a/creativecloud/scripts/scripts.js +++ b/creativecloud/scripts/scripts.js @@ -161,7 +161,7 @@ const CONFIG = { */ const miloLibs = setLibs(LIBS); -const { loadArea, setConfig, loadLana, loadIms } = await import(`${miloLibs}/utils/utils.js`); +const { loadArea, setConfig, loadLana } = await import(`${miloLibs}/utils/utils.js`); setConfig({ ...CONFIG, miloLibs }); decorateArea(); @@ -179,13 +179,4 @@ decorateArea(); (async function loadPage() { loadLana({ clientId: 'cc' }); await loadArea(); - if ((window.location.search.includes('goToFirefly') - || window.location.search.includes('goToFireflyEffects') - || window.location.search.includes('goToFireflyGenFill'))) { - try { await loadIms(); } catch { return; } - if (window.adobeIMS?.isSignedInUser()) { - const { redirectWithParam } = await import('../features/firefly/firefly-susi.js'); - redirectWithParam(); - } - } }()); From e8d82ba462ae580c8c01b96d5a334fb0232f1054 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:34:17 -0800 Subject: [PATCH 03/14] MWPW-141962-Fix interactive marquee css issues (#172) * Update milo-marquee.css * Update milo-marquee.css * Update firefly-interactive.css * Update firefly-interactive.css --- .../blocks/interactive-marquee/milo-marquee.css | 5 +++-- creativecloud/features/firefly/firefly-interactive.css | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/creativecloud/blocks/interactive-marquee/milo-marquee.css b/creativecloud/blocks/interactive-marquee/milo-marquee.css index eb681ac58..9546af830 100644 --- a/creativecloud/blocks/interactive-marquee/milo-marquee.css +++ b/creativecloud/blocks/interactive-marquee/milo-marquee.css @@ -27,6 +27,7 @@ .interactive-marquee .media { max-width: 300px; position: relative; + padding: 0; } .interactive-marquee .text { @@ -59,8 +60,8 @@ .interactive-marquee .icon-text { margin: auto var(--spacing-xs); font-weight: 700; - font-size: 18px; - line-height: 22.5px; + font-size: var(--type-heading-m-size); + line-height: var(--type-heading-m-lh); font-style: normal; } diff --git a/creativecloud/features/firefly/firefly-interactive.css b/creativecloud/features/firefly/firefly-interactive.css index b117a7f20..6c6a5aff2 100644 --- a/creativecloud/features/firefly/firefly-interactive.css +++ b/creativecloud/features/firefly/firefly-interactive.css @@ -92,7 +92,11 @@ .interactive-marquee.firefly .media { top: 8px; - } + } + + .interactive-marquee.firefly .foreground { + padding-top: 0; + } } @media (min-width: 600px) and (max-width: 1199px) { @@ -116,6 +120,10 @@ .interactive-marquee.firefly .interactive-container { height: 813px; } + + .interactive-marquee.firefly .foreground { + padding-top: 0; + } } @media screen and (min-width: 1200px) { From e17dc36ed3e45be8cf0079721770f311131dc7e8 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:58:42 -0800 Subject: [PATCH 04/14] [Main]MWPW-142331-Batch1B ROW Sitemap (#178) * MWPW-141042 card indexes for ROW (#175) * batch 1B-ROW * 1B ROW * Update helix-query.yaml * Update helix-sitemap.yaml * fix typo --------- Co-authored-by: Nicolas Peltier <1032754+npeltier@users.noreply.github.com> --- helix-query.yaml | 593 +++++++++++++++++++++++++++++++++++++++++++-- helix-sitemap.yaml | 141 +++++++++++ 2 files changed, 708 insertions(+), 26 deletions(-) diff --git a/helix-query.yaml b/helix-query.yaml index 51f0c1603..c8f495578 100644 --- a/helix-query.yaml +++ b/helix-query.yaml @@ -31,18 +31,54 @@ indices: robots: select: head > meta[name="robots"] value: attribute(el, 'content') + + merch-cards: &merch-cards + include: + - /cc-shared/fragments/merch/**/merch-card/** + target: /cc-shared/assets/query-index-cards.xslx + properties: + lastModified: + select: none + value: parseTimestamp(headers["last-modified"], "ddd, DD MMM YYYY hh:mm:ss GMT") + title: + select: head > meta[property="og:title"] + value: attribute(el, "content") + cardClasses: + select: main div.merch-card + value: attribute(el, "className") + cardContent: + select: main > div + value: innerHTML(el) + tags: + select: head > meta[property="article:tag"] + values: attribute(el, "content") + publicationDate: + select: none + value: parseTimestamp(headers["date"], "ddd, DD MMM YYYY hh:mm:ss GMT") creativecloud-au: <<: *def include: - /au/creativecloud/** target: /au/cc-shared/assets/query-index.xlsx + + cards-au: + <<: *merch-cards + include: + - /au/cc-shared/fragments/merch/**/merch-card/** + target: /au/cc-shared/assets/query-index-cards.xslx creativecloud-de: <<: *def include: - /de/creativecloud/** target: /de/cc-shared/assets/query-index.xlsx + + cards-de: + <<: *merch-cards + include: + - /de/cc-shared/fragments/merch/**/merch-card/** + target: /de/cc-shared/assets/query-index-cards.xslx creativecloud-es: <<: *def @@ -50,17 +86,35 @@ indices: - /es/creativecloud/** target: /es/cc-shared/assets/query-index.xlsx + cards-es: + <<: *merch-cards + include: + - /es/cc-shared/fragments/merch/**/merch-card/** + target: /es/cc-shared/assets/query-index-cards.xslx + creativecloud-fr: <<: *def include: - /fr/creativecloud/** target: /fr/cc-shared/assets/query-index.xlsx + cards-fr: + <<: *merch-cards + include: + - /fr/cc-shared/fragments/merch/**/merch-card/** + target: /fr/cc-shared/assets/query-index-cards.xslx + creativecloud-it: <<: *def include: - /it/creativecloud/** target: /it/cc-shared/assets/query-index.xlsx + + cards-it: + <<: *merch-cards + include: + - /it/cc-shared/fragments/merch/**/merch-card/** + target: /it/cc-shared/assets/query-index-cards.xslx creativecloud-jp: <<: *def @@ -68,23 +122,47 @@ indices: - /jp/creativecloud/** target: /jp/cc-shared/assets/query-index.xlsx + cards-jp: + <<: *merch-cards + include: + - /jp/cc-shared/fragments/merch/**/merch-card/** + target: /jp/cc-shared/assets/query-index-cards.xslx + creativecloud-kr: <<: *def include: - /kr/creativecloud/** target: /kr/cc-shared/assets/query-index.xlsx + cards-kr: + <<: *merch-cards + include: + - /kr/cc-shared/fragments/merch/**/merch-card/** + target: /kr/cc-shared/assets/query-index-cards.xslx + creativecloud-ru: <<: *def include: - /ru/creativecloud/** target: /ru/cc-shared/assets/query-index.xlsx + cards-ru: + <<: *merch-cards + include: + - /ru/cc-shared/fragments/merch/**/merch-card/** + target: /ru/cc-shared/assets/query-index-cards.xslx + creativecloud-hk_zh: <<: *def include: - /hk_zh/creativecloud/** - target: /hk_zh/cc-shared/assets/query-index.xlsx + target: /hk_zh/cc-shared/assets/query-index.xlsx + + cards-hk_zh: + <<: *merch-cards + include: + - /hk_zh/cc-shared/fragments/merch/**/merch-card/** + target: /hk_zh/cc-shared/assets/query-index-cards.xslx creativecloud-tw: <<: *def @@ -92,77 +170,155 @@ indices: - /tw/creativecloud/** target: /tw/cc-shared/assets/query-index.xlsx + cards-tw: + <<: *merch-cards + include: + - /tw/cc-shared/fragments/merch/**/merch-card/** + target: /tw/cc-shared/assets/query-index-cards.xslx + creativecloud-nl: <<: *def include: - /nl/creativecloud/** target: /nl/cc-shared/assets/query-index.xlsx + cards-nl: + <<: *merch-cards + include: + - /nl/cc-shared/fragments/merch/**/merch-card/** + target: /nl/cc-shared/assets/query-index-cards.xslx + creativecloud-pl: <<: *def include: - /pl/creativecloud/** target: /pl/cc-shared/assets/query-index.xlsx + cards-pl: + <<: *merch-cards + include: + - /pl/cc-shared/fragments/merch/**/merch-card/** + target: /pl/cc-shared/assets/query-index-cards.xslx + creativecloud-tr: <<: *def include: - /tr/creativecloud/** target: /tr/cc-shared/assets/query-index.xlsx + cards-tr: + <<: *merch-cards + include: + - /tr/cc-shared/fragments/merch/**/merch-card/** + target: /tr/cc-shared/assets/query-index-cards.xslx + creativecloud-uk: <<: *def include: - /uk/creativecloud/** target: /uk/cc-shared/assets/query-index.xlsx + cards-uk: + <<: *merch-cards + include: + - /uk/cc-shared/fragments/merch/**/merch-card/** + target: /uk/cc-shared/assets/query-index-cards.xslx + creativecloud-ca: <<: *def include: - /ca/creativecloud/** target: /ca/cc-shared/assets/query-index.xlsx + cards-ca: + <<: *merch-cards + include: + - /ca/cc-shared/fragments/merch/**/merch-card/** + target: /ca/cc-shared/assets/query-index-cards.xslx + creativecloud-cn: <<: *def include: - /cn/creativecloud/** target: /cn/cc-shared/assets/query-index.xlsx + cards-cn: + <<: *merch-cards + include: + - /cn/cc-shared/fragments/merch/**/merch-card/** + target: /cn/cc-shared/assets/query-index-cards.xslx + creativecloud-ae_ar: <<: *def include: - /ae_ar/creativecloud/** target: /ae_ar/cc-shared/assets/query-index.xlsx + cards-ae_ar: + <<: *merch-cards + include: + - /ae_ar/cc-shared/fragments/merch/**/merch-card/** + target: /ae_ar/cc-shared/assets/query-index-cards.xslx + creativecloud-ae_en: <<: *def include: - /ae_en/creativecloud/** target: /ae_en/cc-shared/assets/query-index.xlsx + cards-ae_en: + <<: *merch-cards + include: + - /ae_en/cc-shared/fragments/merch/**/merch-card/** + target: /ae_en/cc-shared/assets/query-index-cards.xslx + creativecloud-at: <<: *def include: - /at/creativecloud/** target: /at/cc-shared/assets/query-index.xlsx + cards-at: + <<: *merch-cards + include: + - /at/cc-shared/fragments/merch/**/merch-card/** + target: /at/cc-shared/assets/query-index-cards.xslx + creativecloud-be_en: <<: *def include: - /be_en/creativecloud/** target: /be_en/cc-shared/assets/query-index.xlsx + cards-be_en: + <<: *merch-cards + include: + - /be_en/cc-shared/fragments/merch/**/merch-card/** + target: /be_en/cc-shared/assets/query-index-cards.xslx + creativecloud-be_fr: <<: *def include: - /be_fr/creativecloud/** target: /be_fr/cc-shared/assets/query-index.xlsx + cards-be_fr: + <<: *merch-cards + include: + - /be_fr/cc-shared/fragments/merch/**/merch-card/** + target: /be_fr/cc-shared/assets/query-index-cards.xslx + creativecloud-ca_fr: <<: *def include: - /ca_fr/creativecloud/** target: /ca_fr/cc-shared/assets/query-index.xlsx + + cards-ca_fr: + <<: *merch-cards + include: + - /ca_fr/cc-shared/fragments/merch/**/merch-card/** + target: /ca_fr/cc-shared/assets/query-index-cards.xslx creativecloud-ch_de: <<: *def @@ -170,269 +326,540 @@ indices: - /ch_de/creativecloud/** target: /ch_de/cc-shared/assets/query-index.xlsx + cards-ch_de: + <<: *merch-cards + include: + - /ch_de/cc-shared/fragments/merch/**/merch-card/** + target: /ch_de/cc-shared/assets/query-index-cards.xslx + creativecloud-ch_fr: <<: *def include: - /ch_fr/creativecloud/** target: /ch_fr/cc-shared/assets/query-index.xlsx + cards-ch_fr: + <<: *merch-cards + include: + - /ch_fr/cc-shared/fragments/merch/**/merch-card/** + target: /ch_fr/cc-shared/assets/query-index-cards.xslx + creativecloud-cl: <<: *def include: - /cl/creativecloud/** target: /cl/cc-shared/assets/query-index.xlsx + cards-cl: + <<: *merch-cards + include: + - /cl/cc-shared/fragments/merch/**/merch-card/** + target: /cl/cc-shared/assets/query-index-cards.xslx + creativecloud-cy_en: <<: *def include: - /cy_en/creativecloud/** target: /cy_en/cc-shared/assets/query-index.xlsx + cards-cy_en: + <<: *merch-cards + include: + - /cy_en/cc-shared/fragments/merch/**/merch-card/** + target: /cy_en/cc-shared/assets/query-index-cards.xslx + creativecloud-gr_en: <<: *def include: - /gr_en/creativecloud/** target: /gr_en/cc-shared/assets/query-index.xlsx + cards-gr_en: + <<: *merch-cards + include: + - /gr_en/cc-shared/fragments/merch/**/merch-card/** + target: /gr_en/cc-shared/assets/query-index-cards.xslx + creativecloud-hk_en: <<: *def include: - /hk_en/creativecloud/** target: /hk_en/cc-shared/assets/query-index.xlsx + cards-hk_en: + <<: *merch-cards + include: + - /hk_en/cc-shared/fragments/merch/**/merch-card/** + target: /hk_en/cc-shared/assets/query-index-cards.xslx + creativecloud-ie: <<: *def include: - /ie/creativecloud/** target: /ie/cc-shared/assets/query-index.xlsx + cards-ie: + <<: *merch-cards + include: + - /ie/cc-shared/fragments/merch/**/merch-card/** + target: /ie/cc-shared/assets/query-index-cards.xslx + creativecloud-il_en: <<: *def include: - /il_en/creativecloud/** target: /il_en/cc-shared/assets/query-index.xlsx + cards-il_en: + <<: *merch-cards + include: + - /il_en/cc-shared/fragments/merch/**/merch-card/** + target: /il_en/cc-shared/assets/query-index-cards.xslx + creativecloud-in: <<: *def include: - /in/creativecloud/** target: /in/cc-shared/assets/query-index.xlsx - + + cards-in: + <<: *merch-cards + include: + - /in/cc-shared/fragments/merch/**/merch-card/** + target: /in/cc-shared/assets/query-index-cards.xslx + creativecloud-lt: <<: *def include: - /lt/creativecloud/** target: /lt/cc-shared/assets/query-index.xlsx + cards-lt: + <<: *merch-cards + include: + - /lt/cc-shared/fragments/merch/**/merch-card/** + target: /lt/cc-shared/assets/query-index-cards.xslx + creativecloud-lu_de: <<: *def include: - /lu_de/creativecloud/** target: /lu_de/cc-shared/assets/query-index.xlsx + cards-lu_de: + <<: *merch-cards + include: + - /lu_de/cc-shared/fragments/merch/**/merch-card/** + target: /lu_de/cc-shared/assets/query-index-cards.xslx + creativecloud-lu_en: <<: *def include: - /lu_en/creativecloud/** target: /lu_en/cc-shared/assets/query-index.xlsx + cards-lu_en: + <<: *merch-cards + include: + - /lu_en/cc-shared/fragments/merch/**/merch-card/** + target: /lu_en/cc-shared/assets/query-index-cards.xslx + creativecloud-lu_fr: <<: *def include: - /lu_fr/creativecloud/** target: /lu_fr/cc-shared/assets/query-index.xlsx + cards-lu_fr: + <<: *merch-cards + include: + - /lu_fr/cc-shared/fragments/merch/**/merch-card/** + target: /lu_fr/cc-shared/assets/query-index-cards.xslx + creativecloud-mena_en: <<: *def include: - /mena_en/creativecloud/** target: /mena_en/cc-shared/assets/query-index.xlsx + cards-mena_en: + <<: *merch-cards + include: + - /mena_en/cc-shared/fragments/merch/**/merch-card/** + target: /mena_en/cc-shared/assets/query-index-cards.xslx + creativecloud-mt: <<: *def include: - /mt/creativecloud/** target: /mt/cc-shared/assets/query-index.xlsx + cards-mt: + <<: *merch-cards + include: + - /mt/cc-shared/fragments/merch/**/merch-card/** + target: /mt/cc-shared/assets/query-index-cards.xslx + creativecloud-nz: <<: *def include: - /nz/creativecloud/** target: /nz/cc-shared/assets/query-index.xlsx + cards-nz: + <<: *merch-cards + include: + - /nz/cc-shared/fragments/merch/**/merch-card/** + target: /nz/cc-shared/assets/query-index-cards.xslx + creativecloud-sa_ar: <<: *def include: - /sa_ar/creativecloud/** target: /sa_ar/cc-shared/assets/query-index.xlsx + cards-sa_ar: + <<: *merch-cards + include: + - /sa_ar/cc-shared/fragments/merch/**/merch-card/** + target: /sa_ar/cc-shared/assets/query-index-cards.xslx + creativecloud-sa_en: <<: *def include: - /sa_en/creativecloud/** target: /sa_en/cc-shared/assets/query-index.xlsx - + + cards-sa_en: + <<: *merch-cards + include: + - /sa_en/cc-shared/fragments/merch/**/merch-card/** + target: /sa_en/cc-shared/assets/query-index-cards.xslx + creativecloud-th_en: <<: *def include: - /th_en/creativecloud/** target: /th_en/cc-shared/assets/query-index.xlsx + cards-th_en: + <<: *merch-cards + include: + - /th_en/cc-shared/fragments/merch/**/merch-card/** + target: /th_en/cc-shared/assets/query-index-cards.xslx + creativecloud-th_th: <<: *def include: - /th_th/creativecloud/** target: /th_th/cc-shared/assets/query-index.xlsx + cards-th_th: + <<: *merch-cards + include: + - /th_th/cc-shared/fragments/merch/**/merch-card/** + target: /th_th/cc-shared/assets/query-index-cards.xslx + creativecloud-za: <<: *def include: - /za/creativecloud/** target: /za/cc-shared/assets/query-index.xlsx + cards-za: + <<: *merch-cards + include: + - /za/cc-shared/fragments/merch/**/merch-card/** + target: /za/cc-shared/assets/query-index-cards.xslx + creativecloud-africa: <<: *def include: - /africa/creativecloud/** target: /africa/cc-shared/assets/query-index.xlsx + cards-africa: + <<: *merch-cards + include: + - /africa/cc-shared/fragments/merch/**/merch-card/** + target: /africa/cc-shared/assets/query-index-cards.xslx + creativecloud-ar: <<: *def include: - /ar/creativecloud/** target: /ar/cc-shared/assets/query-index.xlsx + cards-ar: + <<: *merch-cards + include: + - /ar/cc-shared/fragments/merch/**/merch-card/** + target: /ar/cc-shared/assets/query-index-cards.xslx + creativecloud-co: <<: *def include: - /co/creativecloud/** target: /co/cc-shared/assets/query-index.xlsx + cards-co: + <<: *merch-cards + include: + - /co/cc-shared/fragments/merch/**/merch-card/** + target: /co/cc-shared/assets/query-index-cards.xslx + creativecloud-cr: <<: *def include: - /cr/creativecloud/** target: /cr/cc-shared/assets/query-index.xlsx + cards-cr: + <<: *merch-cards + include: + - /cr/cc-shared/fragments/merch/**/merch-card/** + target: /cr/cc-shared/assets/query-index-cards.xslx + creativecloud-ec: <<: *def include: - /ec/creativecloud/** target: /ec/cc-shared/assets/query-index.xlsx + cards-ec: + <<: *merch-cards + include: + - /ec/cc-shared/fragments/merch/**/merch-card/** + target: /ec/cc-shared/assets/query-index-cards.xslx + creativecloud-eg_ar: <<: *def include: - /eg_ar/creativecloud/** target: /eg_ar/cc-shared/assets/query-index.xlsx + cards-eg_ar: + <<: *merch-cards + include: + - /eg_ar/cc-shared/fragments/merch/**/merch-card/** + target: /eg_ar/cc-shared/assets/query-index-cards.xslx + creativecloud-eg_en: <<: *def include: - /eg_en/creativecloud/** target: /eg_en/cc-shared/assets/query-index.xlsx + cards-eg_en: + <<: *merch-cards + include: + - /eg_en/cc-shared/fragments/merch/**/merch-card/** + target: /eg_en/cc-shared/assets/query-index-cards.xslx + creativecloud-gr_el: <<: *def include: - /gr_el/creativecloud/** target: /gr_el/cc-shared/assets/query-index.xlsx + cards-gr_el: + <<: *merch-cards + include: + - /gr_el/cc-shared/fragments/merch/**/merch-card/** + target: /gr_el/cc-shared/assets/query-index-cards.xslx + creativecloud-gt: <<: *def include: - /gt/creativecloud/** target: /gt/cc-shared/assets/query-index.xlsx + cards-gt: + <<: *merch-cards + include: + - /gt/cc-shared/fragments/merch/**/merch-card/** + target: /gt/cc-shared/assets/query-index-cards.xslx + creativecloud-id_en: <<: *def include: - /id_en/creativecloud/** target: /id_en/cc-shared/assets/query-index.xlsx - + + cards-id_en: + <<: *merch-cards + include: + - /id_en/cc-shared/fragments/merch/**/merch-card/** + target: /id_en/cc-shared/assets/query-index-cards.xslx + creativecloud-id_id: <<: *def include: - /id_id/creativecloud/** target: /id_id/cc-shared/assets/query-index.xlsx + cards-id_id: + <<: *merch-cards + include: + - /id_id/cc-shared/fragments/merch/**/merch-card/** + target: /id_id/cc-shared/assets/query-index-cards.xslx + creativecloud-in_hi: <<: *def include: - /in_hi/creativecloud/** target: /in_hi/cc-shared/assets/query-index.xlsx + + cards-in_hi: + <<: *merch-cards + include: + - /in_hi/cc-shared/fragments/merch/**/merch-card/** + target: /in_hi/cc-shared/assets/query-index-cards.xslx + creativecloud-kw_ar: <<: *def include: - /kw_ar/creativecloud/** target: /kw_ar/cc-shared/assets/query-index.xlsx + cards-kw_ar: + <<: *merch-cards + include: + - /kw_ar/cc-shared/fragments/merch/**/merch-card/** + target: /kw_ar/cc-shared/assets/query-index-cards.xslx + creativecloud-kw_en: <<: *def include: - /kw_en/creativecloud/** target: /kw_en/cc-shared/assets/query-index.xlsx + cards-kw_en: + <<: *merch-cards + include: + - /kw_en/cc-shared/fragments/merch/**/merch-card/** + target: /kw_en/cc-shared/assets/query-index-cards.xslx + creativecloud-my_en: <<: *def include: - /my_en/creativecloud/** target: /my_en/cc-shared/assets/query-index.xlsx + cards-my_en: + <<: *merch-cards + include: + - /my_en/cc-shared/fragments/merch/**/merch-card/** + target: /my_en/cc-shared/assets/query-index-cards.xslx + creativecloud-my_ms: <<: *def include: - /my_ms/creativecloud/** target: /my_ms/cc-shared/assets/query-index.xlsx + cards-my_ms: + <<: *merch-cards + include: + - /my_ms/cc-shared/fragments/merch/**/merch-card/** + target: /my_ms/cc-shared/assets/query-index-cards.xslx + creativecloud-ng: <<: *def include: - /ng/creativecloud/** target: /ng/cc-shared/assets/query-index.xlsx + cards-ng: + <<: *merch-cards + include: + - /ng/cc-shared/fragments/merch/**/merch-card/** + target: /ng/cc-shared/assets/query-index-cards.xslx + creativecloud-pe: <<: *def include: - /pe/creativecloud/** target: /pe/cc-shared/assets/query-index.xlsx + cards-pe: + <<: *merch-cards + include: + - /pe/cc-shared/fragments/merch/**/merch-card/** + target: /pe/cc-shared/assets/query-index-cards.xslx + creativecloud-ph_en: <<: *def include: - /ph_en/creativecloud/** target: /ph_en/cc-shared/assets/query-index.xlsx + cards-ph_en: + <<: *merch-cards + include: + - /ph_en/cc-shared/fragments/merch/**/merch-card/** + target: /ph_en/cc-shared/assets/query-index-cards.xslx + creativecloud-ph_fil: <<: *def include: - /ph_fil/creativecloud/** target: /ph_fil/cc-shared/assets/query-index.xlsx + cards-ph_fil: + <<: *merch-cards + include: + - /ph_fil/cc-shared/fragments/merch/**/merch-card/** + target: /ph_fil/cc-shared/assets/query-index-cards.xslx + creativecloud-pr: <<: *def include: - /pr/creativecloud/** target: /pr/cc-shared/assets/query-index.xlsx + cards-pr: + <<: *merch-cards + include: + - /pr/cc-shared/fragments/merch/**/merch-card/** + target: /pr/cc-shared/assets/query-index-cards.xslx + creativecloud-qa_ar: <<: *def include: - /qa_ar/creativecloud/** target: /qa_ar/cc-shared/assets/query-index.xlsx + cards-qa_ar: + <<: *merch-cards + include: + - /qa_ar/cc-shared/fragments/merch/**/merch-card/** + target: /qa_ar/cc-shared/assets/query-index-cards.xslx + creativecloud-qa_en: <<: *def include: - /qa_en/creativecloud/** target: /qa_en/cc-shared/assets/query-index.xlsx + cards-qa_en: + <<: *merch-cards + include: + - /qa_en/cc-shared/fragments/merch/**/merch-card/** + target: /qa_en/cc-shared/assets/query-index-cards.xslx + creativecloud-vn_en: <<: *def include: - /vn_en/creativecloud/** target: /vn_en/cc-shared/assets/query-index.xlsx + + cards-vn_en: + <<: *merch-cards + include: + - /vn_en/cc-shared/fragments/merch/**/merch-card/** + target: /vn_en/cc-shared/assets/query-index-cards.xslx creativecloud-vn_vi: <<: *def @@ -440,26 +867,140 @@ indices: - /vn_vi/creativecloud/** target: /vn_vi/cc-shared/assets/query-index.xlsx - merch-cards: + cards-vn_vi: + <<: *merch-cards include: - - /cc-shared/fragments/merch/**/merch-card/** - target: /cc-shared/assets/query-index-cards.xslx - properties: - lastModified: - select: none - value: parseTimestamp(headers["last-modified"], "ddd, DD MMM YYYY hh:mm:ss GMT") - title: - select: head > meta[property="og:title"] - value: attribute(el, "content") - cardClasses: - select: main div.merch-card - value: attribute(el, "className") - cardContent: - select: main > div - value: innerHTML(el) - tags: - select: head > meta[property="article:tag"] - values: attribute(el, "content") - publicationDate: - select: none - value: parseTimestamp(headers["date"], "ddd, DD MMM YYYY hh:mm:ss GMT") + - /vn_vi/cc-shared/fragments/merch/**/merch-card/** + target: /vn_vi/cc-shared/assets/query-index-cards.xslx + + creativecloud-dk: + <<: *def + include: + - /dk/creativecloud/** + target: /dk/cc-shared/assets/query-index.xlsx + + creativecloud-fi: + <<: *def + include: + - /fi/creativecloud/** + target: /fi/cc-shared/assets/query-index.xlsx + + creativecloud-no: + <<: *def + include: + - /no/creativecloud/** + target: /no/cc-shared/assets/query-index.xlsx + + creativecloud-se: + <<: *def + include: + - /se/creativecloud/** + target: /se/cc-shared/assets/query-index.xlsx + + creativecloud-la: + <<: *def + include: + - /la/creativecloud/** + target: /la/cc-shared/assets/query-index.xlsx + + creativecloud-mx: + <<: *def + include: + - /mx/creativecloud/** + target: /mx/cc-shared/assets/query-index.xlsx + + creativecloud-be_nl: + <<: *def + include: + - /be_nl/creativecloud/** + target: /be_nl/cc-shared/assets/query-index.xlsx + + creativecloud-bg: + <<: *def + include: + - /bg/creativecloud/** + target: /bg/cc-shared/assets/query-index.xlsx + + creativecloud-ch_it: + <<: *def + include: + - /ch_it/creativecloud/** + target: /ch_it/cc-shared/assets/query-index.xlsx + + creativecloud-cz: + <<: *def + include: + - /cz/creativecloud/** + target: /cz/cc-shared/assets/query-index.xlsx + + creativecloud-ee: + <<: *def + include: + - /ee/creativecloud/** + target: /ee/cc-shared/assets/query-index.xlsx + + creativecloud-hu: + <<: *def + include: + - /hu/creativecloud/** + target: /hu/cc-shared/assets/query-index.xlsx + + creativecloud-il_he: + <<: *def + include: + - /il_he/creativecloud/** + target: /il_he/cc-shared/assets/query-index.xlsx + + creativecloud-lv: + <<: *def + include: + - /lv/creativecloud/** + target: /lv/cc-shared/assets/query-index.xlsx + + creativecloud-mena_ar: + <<: *def + include: + - /mena_ar/creativecloud/** + target: /mena_ar/cc-shared/assets/query-index.xlsx + + creativecloud-pt: + <<: *def + include: + - /pt/creativecloud/** + target: /pt/cc-shared/assets/query-index.xlsx + + creativecloud-ro: + <<: *def + include: + - /ro/creativecloud/** + target: /ro/cc-shared/assets/query-index.xlsx + + creativecloud-si: + <<: *def + include: + - /si/creativecloud/** + target: /si/cc-shared/assets/query-index.xlsx + + creativecloud-sk: + <<: *def + include: + - /sk/creativecloud/** + target: /sk/cc-shared/assets/query-index.xlsx + + creativecloud-ua: + <<: *def + include: + - /ua/creativecloud/** + target: /ua/cc-shared/assets/query-index.xlsx + + creativecloud-za: + <<: *def + include: + - /za/creativecloud/** + target: /za/cc-shared/assets/query-index.xlsx + + creativecloud-sg: + <<: *def + include: + - /sg/creativecloud/** + target: /sg/cc-shared/assets/query-index.xlsx diff --git a/helix-sitemap.yaml b/helix-sitemap.yaml index aee8417cb..93261c202 100644 --- a/helix-sitemap.yaml +++ b/helix-sitemap.yaml @@ -424,3 +424,144 @@ sitemaps: alternate: /vn_vi/{path}.html destination: /vn_vi/cc-shared/assets/sitemap.xml hreflang: vi-VN + + dk: + source: /dk/cc-shared/assets/query-index.json + alternate: /dk/{path}.html + destination: /dk/cc-shared/assets/sitemap.xml + hreflang: da-DK + + fi: + source: /fi/cc-shared/assets/query-index.json + alternate: /fi/{path}.html + destination: /fi/cc-shared/assets/sitemap.xml + hreflang: fi-FI + + no: + source: /no/cc-shared/assets/query-index.json + alternate: /no/{path}.html + destination: /no/cc-shared/assets/sitemap.xml + hreflang: no-NO + + se: + source: /se/cc-shared/assets/query-index.json + alternate: /se/{path}.html + destination: /se/cc-shared/assets/sitemap.xml + hreflang: sv-SE + + la: + source: /la/cc-shared/assets/query-index.json + alternate: /la/{path}.html + destination: /la/cc-shared/assets/sitemap.xml + hreflang: + - es-PA + - es-SV + - es-VE + + mx: + source: /mx/cc-shared/assets/query-index.json + alternate: /mx/{path}.html + destination: /mx/cc-shared/assets/sitemap.xml + hreflang: es-MX + + be_nl: + source: /be_nl/cc-shared/assets/query-index.json + alternate: /be_nl/{path}.html + destination: /be_nl/cc-shared/assets/sitemap.xml + hreflang: nl-BE + + bg: + source: /bg/cc-shared/assets/query-index.json + alternate: /bg/{path}.html + destination: /bg/cc-shared/assets/sitemap.xml + hreflang: bg-BG + + ch_it: + source: /ch_it/cc-shared/assets/query-index.json + alternate: /ch_it/{path}.html + destination: /ch_it/cc-shared/assets/sitemap.xml + hreflang: it-CH + + cz: + source: /cz/cc-shared/assets/query-index.json + alternate: /cz/{path}.html + destination: /cz/cc-shared/assets/sitemap.xml + hreflang: cs-CZ + + ee: + source: /ee/cc-shared/assets/query-index.json + alternate: /ee/{path}.html + destination: /ee/cc-shared/assets/sitemap.xml + hreflang: et-EE + + hu: + source: /hu/cc-shared/assets/query-index.json + alternate: /hu/{path}.html + destination: /hu/cc-shared/assets/sitemap.xml + hreflang: hu-HU + + il_he: + source: /il_he/cc-shared/assets/query-index.json + alternate: /il_he/{path}.html + destination: /il_he/cc-shared/assets/sitemap.xml + hreflang: he + + lv: + source: /lv/cc-shared/assets/query-index.json + alternate: /lv/{path}.html + destination: /lv/cc-shared/assets/sitemap.xml + hreflang: lv-LV + + mena_ar: + source: /mena_ar/cc-shared/assets/query-index.json + alternate: /mena_ar/{path}.html + destination: /mena_ar/cc-shared/assets/sitemap.xml + hreflang: + - ar-IL + - ar-IQ + - ar-JO + - ar-LB + - ar-MA + - ar-OM + + pt: + source: /pt/cc-shared/assets/query-index.json + alternate: /pt/{path}.html + destination: /pt/cc-shared/assets/sitemap.xml + hreflang: pt-PT + + ro: + source: /ro/cc-shared/assets/query-index.json + alternate: /ro/{path}.html + destination: /ro/cc-shared/assets/sitemap.xml + hreflang: ro-RO + + si: + source: /si/cc-shared/assets/query-index.json + alternate: /si/{path}.html + destination: /si/cc-shared/assets/sitemap.xml + hreflang: sl-SI + + sk: + source: /sk/cc-shared/assets/query-index.json + alternate: /sk/{path}.html + destination: /sk/cc-shared/assets/sitemap.xml + hreflang: sk-SK + + ua: + source: /ua/cc-shared/assets/query-index.json + alternate: /ua/{path}.html + destination: /ua/cc-shared/assets/sitemap.xml + hreflang: uk-UA + + za: + source: /za/cc-shared/assets/query-index.json + alternate: /za/{path}.html + destination: /za/cc-shared/assets/sitemap.xml + hreflang: en-ZA + + sg: + source: /sg/cc-shared/assets/query-index.json + alternate: /sg/{path}.html + destination: /sg/cc-shared/assets/sitemap.xml + hreflang: en-SG From 45d396028c156558adaa393d86a893ab6a062366 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Thu, 15 Feb 2024 10:12:23 -0800 Subject: [PATCH 05/14] Update scripts.js (#180) --- creativecloud/scripts/scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/creativecloud/scripts/scripts.js b/creativecloud/scripts/scripts.js index 4116bd0e2..0d99074b4 100644 --- a/creativecloud/scripts/scripts.js +++ b/creativecloud/scripts/scripts.js @@ -151,6 +151,7 @@ const CONFIG = { }, htmlExclude: [ /www\.adobe\.com\/(\w\w(_\w\w)?\/)?express(\/.*)?/, + /www\.adobe\.com\/(\w\w(_\w\w)?\/)?go(\/.*)?/, ], }; From b8150ba1b7cd4ede2db08db9e177b08f6bbf9996 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Tue, 20 Feb 2024 22:23:40 -0800 Subject: [PATCH 06/14] MWPW-142331-Remove duplicate entry (#182) (#183) * Update helix-query.yaml * Update helix-sitemap.yaml --- helix-query.yaml | 6 ------ helix-sitemap.yaml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/helix-query.yaml b/helix-query.yaml index c8f495578..170c255d9 100644 --- a/helix-query.yaml +++ b/helix-query.yaml @@ -993,12 +993,6 @@ indices: - /ua/creativecloud/** target: /ua/cc-shared/assets/query-index.xlsx - creativecloud-za: - <<: *def - include: - - /za/creativecloud/** - target: /za/cc-shared/assets/query-index.xlsx - creativecloud-sg: <<: *def include: diff --git a/helix-sitemap.yaml b/helix-sitemap.yaml index 93261c202..39b1a1e7b 100644 --- a/helix-sitemap.yaml +++ b/helix-sitemap.yaml @@ -554,12 +554,6 @@ sitemaps: destination: /ua/cc-shared/assets/sitemap.xml hreflang: uk-UA - za: - source: /za/cc-shared/assets/query-index.json - alternate: /za/{path}.html - destination: /za/cc-shared/assets/sitemap.xml - hreflang: en-ZA - sg: source: /sg/cc-shared/assets/query-index.json alternate: /sg/{path}.html From 58d32caea675b49791094ae4c088bbc68cacaf53 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Wed, 21 Feb 2024 20:09:19 -0800 Subject: [PATCH 07/14] MWPW-143055-fix sitemap issues for batch 1B ROW (#189) * fix sitemap issues * Update helix-sitemap.yaml --------- Co-authored-by: Ruchika Sinha --- helix-query.yaml | 8 +++++++- helix-sitemap.yaml | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/helix-query.yaml b/helix-query.yaml index 170c255d9..c647f4262 100644 --- a/helix-query.yaml +++ b/helix-query.yaml @@ -997,4 +997,10 @@ indices: <<: *def include: - /sg/creativecloud/** - target: /sg/cc-shared/assets/query-index.xlsx + target: /sg/cc-shared/assets/query-index.xlsx + + creativecloud-br: + <<: *def + include: + - /br/creativecloud/** + target: /br/cc-shared/assets/query-index.xlsx diff --git a/helix-sitemap.yaml b/helix-sitemap.yaml index 39b1a1e7b..0d3227458 100644 --- a/helix-sitemap.yaml +++ b/helix-sitemap.yaml @@ -504,7 +504,7 @@ sitemaps: source: /il_he/cc-shared/assets/query-index.json alternate: /il_he/{path}.html destination: /il_he/cc-shared/assets/sitemap.xml - hreflang: he + hreflang: he-IL lv: source: /lv/cc-shared/assets/query-index.json @@ -558,4 +558,10 @@ sitemaps: source: /sg/cc-shared/assets/query-index.json alternate: /sg/{path}.html destination: /sg/cc-shared/assets/sitemap.xml - hreflang: en-SG + hreflang: en-SG + + br: + source: /br/cc-shared/assets/query-index.json + alternate: /br/{path}.html + destination: /br/cc-shared/assets/sitemap.xml + hreflang: pt-BR From ee2a98dc84203c8f6e3e4c88efc8337319313aa2 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:10:07 -0800 Subject: [PATCH 08/14] update index file (#190) Co-authored-by: Ruchika Sinha --- creativecloud/sitemap-index.xml | 66 +++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/creativecloud/sitemap-index.xml b/creativecloud/sitemap-index.xml index 305b77287..82c77c4e6 100644 --- a/creativecloud/sitemap-index.xml +++ b/creativecloud/sitemap-index.xml @@ -207,4 +207,70 @@ https://www.adobe.com/vn_en/cc-shared/assets/sitemap.xml + + https://www.adobe.com/dk/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/fi/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/no/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/se/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/la/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/mx/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/be_nl/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/bg/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/ch_it/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/cz/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/ee/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/hu/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/il_he/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/lv/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/mena_ar/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/pt/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/ro/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/si/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/sk/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/ua/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/sg/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/br/cc-shared/assets/sitemap.xml + From f57f7c61464ee8b6c4e2f8f7e4a40d88f142e371 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Mon, 4 Mar 2024 07:47:12 -0800 Subject: [PATCH 09/14] Sync main with stage (#198) * universal promo terms 1st commit * Added API failure case handler * Remove console.log and updated the failure case. * nit: typo * Setting default api_key * nit: TODO * icon / other original content support, css to hide header/footer completely. * poc reviewd * api key updated * nit: eslint update * nit: eslint update * nit: eslint update * nit: eslint update * nit: eslint update * nit: eslint update * test added * added test * MWPW-142280 Firefly single feature marquee (#191) * firefly single feature * fix lint issue * fix blinking cursor issue on mobile and tablet * optimize --------- Co-authored-by: Ruchika Sinha * MWPW-143215 [sidenav] make re-ordering possible with camel case (#192) * service_providers is now optional as api_key * update test * MWPW-143533-Handle css for 2 values in selector tray (#195) * MWPW-143533 * fix issues --------- Co-authored-by: Ruchika Sinha * [Universal promo terms] update env logic (#197) * stage condition added for env * check prod URL instead --------- Co-authored-by: Sean Choi Co-authored-by: Ruchika Sinha Co-authored-by: Nicolas Peltier <1032754+npeltier@users.noreply.github.com> --- creativecloud/blocks/sidenav/sidenav.js | 2 +- .../universal-promo-terms.css | 9 ++ .../universal-promo-terms.js | 52 ++++++++++++ .../features/firefly/firefly-interactive.css | 32 +++++++- .../features/firefly/firefly-interactive.js | 66 ++++++++++----- test/blocks/sidenav/sidenav.test.html | 4 +- test/blocks/sidenav/sidenav.test.html.js | 7 +- .../universal-promo-terms/mocks/body.html | 3 + .../universal.promo.terms.test.js | 22 +++++ .../firefly/firefly-interactive.test.js | 48 +++++++++++ test/features/firefly/mocks/body.html | 82 +++++++++++++++++++ wtr | 0 12 files changed, 297 insertions(+), 30 deletions(-) create mode 100644 creativecloud/blocks/universal-promo-terms/universal-promo-terms.css create mode 100644 creativecloud/blocks/universal-promo-terms/universal-promo-terms.js create mode 100644 test/blocks/universal-promo-terms/mocks/body.html create mode 100644 test/blocks/universal-promo-terms/universal.promo.terms.test.js create mode 100644 wtr diff --git a/creativecloud/blocks/sidenav/sidenav.js b/creativecloud/blocks/sidenav/sidenav.js index f82b24d8b..43d07537a 100644 --- a/creativecloud/blocks/sidenav/sidenav.js +++ b/creativecloud/blocks/sidenav/sidenav.js @@ -5,7 +5,7 @@ import '../../deps/merch-sidenav.js'; const CATEGORY_ID_PREFIX = 'categories/'; const TYPE_ID_PREFIX = 'types/'; -const getIdLeaf = (id) => (id?.substring(id.lastIndexOf('/') + 1) || id); +const getIdLeaf = (id) => (id?.substring(id.lastIndexOf('/') + 1) || id).toLowerCase(); const getCategories = (items, isMultilevel, mapCategories) => { const configuration = { manageTabIndex: true }; diff --git a/creativecloud/blocks/universal-promo-terms/universal-promo-terms.css b/creativecloud/blocks/universal-promo-terms/universal-promo-terms.css new file mode 100644 index 000000000..d878b768f --- /dev/null +++ b/creativecloud/blocks/universal-promo-terms/universal-promo-terms.css @@ -0,0 +1,9 @@ +@media (min-width: 900px) { + body .feds-topnav-wrapper { + border: 0; + } +} + +body .global-footer { + background: none; +} diff --git a/creativecloud/blocks/universal-promo-terms/universal-promo-terms.js b/creativecloud/blocks/universal-promo-terms/universal-promo-terms.js new file mode 100644 index 000000000..11debfd40 --- /dev/null +++ b/creativecloud/blocks/universal-promo-terms/universal-promo-terms.js @@ -0,0 +1,52 @@ +const OFFER_ID_API_BASE = 'https://aos.adobe.io/offers/'; +const SELECTOR_ID_API_BASE = 'https://aos.adobe.io/offers:search.selector'; +const STAGE_OFFER_ID_API_BASE = 'https://aos-stage.adobe.io/offers/'; +const STAGE_SELECTOR_ID_API_BASE = 'https://aos-stage.adobe.io/offers:search.selector'; +const API_KEY = 'universalPromoTerm'; +const SERVICE_PROVIDERS = 'PROMO_TERMS'; + +function getEnv(env) { + if (env) return env; + if (window.location.origin.hostname === 'www.adobe.com') return 'production'; + return 'stage'; +} + +async function getTermsHTML(params, el, env, search) { + const locationSearch = search ?? window.location.search; + let promoTerms; + if (!params.get('offer_selector_ids')) { + let fetchURL = `${env === 'stage' ? STAGE_OFFER_ID_API_BASE : OFFER_ID_API_BASE}${params.get('offer_id')}${locationSearch}`; + fetchURL += params.get('api_key') ? '' : `&api_key=${API_KEY}`; + fetchURL += params.get('service_providers') ? '' : `&service_providers=${SERVICE_PROVIDERS}`; + + const res = await fetch(fetchURL); + if (!res.ok) return false; + const json = await res.json(); + promoTerms = json[0]?.promo_terms; + } else { + let fetchURL = `${env === 'stage' ? STAGE_SELECTOR_ID_API_BASE : SELECTOR_ID_API_BASE}${locationSearch}`; + fetchURL += params.get('api_key') ? '' : `&api_key=${API_KEY}`; + fetchURL += params.get('service_providers') ? '' : `&service_providers=${SERVICE_PROVIDERS}`; + + const res = await fetch(fetchURL); + if (!res.ok) return false; + const json = await res.json(); + promoTerms = json[0]?.offers[0]?.promo_terms; + } + + if (!promoTerms || !promoTerms.header || !promoTerms.text) { + return false; + } + return `
${el.innerHTML}

${promoTerms.header}

${promoTerms.text}

`; +} + +export default async function init(el, search) { + const params = new URLSearchParams(search ?? window.location.search); + const env = getEnv(params.get('env')); + const termsHTML = await getTermsHTML(params, el, env, search); + if (!termsHTML && env !== 'stage') { + window.location = '404.html'; + } else { + el.innerHTML = termsHTML; + } +} diff --git a/creativecloud/features/firefly/firefly-interactive.css b/creativecloud/features/firefly/firefly-interactive.css index 6c6a5aff2..3580afa72 100644 --- a/creativecloud/features/firefly/firefly-interactive.css +++ b/creativecloud/features/firefly/firefly-interactive.css @@ -79,11 +79,16 @@ @media (max-width: 600px) { .firefly-selectortray { - min-width: 110%; - margin-inline: -22px 16px; justify-content: center; margin-top: -7px; margin-bottom: 24px; + width: 80%; + margin-inline-start: 20px; + } + + .firefly-selectortray.three-options { + width: 110%; + margin-inline: -22px 16px; } .interactive-marquee.firefly .interactive-container { @@ -91,12 +96,17 @@ } .interactive-marquee.firefly .media { - top: 8px; + top: 24px; } .interactive-marquee.firefly .foreground { padding-top: 0; } + + .interactive-marquee.firefly.ff-text-effects .interactive-container, + .interactive-marquee.firefly.ff-text-to-image .interactive-container { + height: 346px; + } } @media (min-width: 600px) and (max-width: 1199px) { @@ -113,6 +123,11 @@ .firefly-selectortray { top: 0; + width: 50%; + margin-inline: 126px; + } + + .firefly-selectortray.three-options { margin-inline: 42px; width: 80%; } @@ -124,15 +139,24 @@ .interactive-marquee.firefly .foreground { padding-top: 0; } + + .interactive-marquee.firefly.ff-text-effects .interactive-container, + .interactive-marquee.firefly.ff-text-to-image .interactive-container { + height: 662px; + } } @media screen and (min-width: 1200px) { .firefly-selectortray { - top: 144px; + top: 187px; position: absolute; right: -122px; } + .firefly-selectortray.three-options { + top: 144px; + } + [dir="rtl"] .firefly-selectortray { left: -122px; right: 446px; diff --git a/creativecloud/features/firefly/firefly-interactive.js b/creativecloud/features/firefly/firefly-interactive.js index 35d7ab200..809de22cb 100644 --- a/creativecloud/features/firefly/firefly-interactive.js +++ b/creativecloud/features/firefly/firefly-interactive.js @@ -1,21 +1,26 @@ import { getLibs } from '../../scripts/utils.js'; +const { default: defineDeviceByScreenSize } = await import('../../scripts/decorate.js'); + function focusOnInput(media, createTag) { const input = media.querySelector('.prompt-text'); if (input) { - input.focus(); + const device = defineDeviceByScreenSize(); + const blinkingCursor = createTag('div', { class: 'blinking-cursor' }); + if (input.classList.contains('light')) blinkingCursor.classList.add('blink-light'); + if (device === 'MOBILE' || device === 'TABLET') { + input.insertAdjacentElement('beforebegin', blinkingCursor); + } else input.focus(); input.addEventListener('focusout', () => { - if (document.querySelector('.locale-modal-v2')) { - const blinkingCursor = createTag('div', { class: 'blinking-cursor' }); + if (document.querySelector('.locale-modal-v2') && device === 'DESKTOP') { input.insertAdjacentElement('beforebegin', blinkingCursor); - if (input.classList.contains('light')) blinkingCursor.classList.add('blink-light'); } }, { once: true }); input.addEventListener('click', () => { document.querySelector('.blinking-cursor')?.remove(); }); } } -function eventOnGenerate(generateButton, media) { +function eventOnGenerate(generateButton, media, fireflyfeature = '') { const btnConfigs = { TextToImage: ['SubmitTextToImage', 'SubmitTextToImageUserContent', 'goToFirefly'], TextEffects: ['SubmitTextEffects', 'SubmitTextEffectsUserContent', 'goToFireflyEffects'], @@ -24,8 +29,11 @@ function eventOnGenerate(generateButton, media) { const userprompt = media.querySelector('.prompt-text')?.value; const placeholderprompt = media.querySelector('.prompt-text')?.getAttribute('placeholder'); const prompt = userprompt || placeholderprompt; - const selected = media.querySelector('.selected'); - const className = selected.getAttribute('class').split(' ')[1].trim(); + let className = ''; + if (fireflyfeature === '') { + const selected = media.querySelector('.selected'); + className = selected.getAttribute('class').split(' ')[1].trim(); + } else className = fireflyfeature; if (Object.keys(btnConfigs).includes(className)) { const btnConfig = btnConfigs[className]; const dall = userprompt === '' ? btnConfig[0] : btnConfig[1]; @@ -86,6 +94,16 @@ async function eventOnSelectorOption(option, prompt, media, mediaP, createPrompt } } +async function singleFireflyFeature(promptDet, mode, createPromptField, media, feature, createTag) { + const firstOptionDetail = promptDet.innerText.split('|'); + const fireflyPrompt = await createPromptField(`${firstOptionDetail[0]}`, `${firstOptionDetail[1]}`, mode); + fireflyPrompt.classList.add('firefly-prompt'); + media.appendChild(fireflyPrompt); + const generateButton = media.querySelector('#promptbutton'); + eventOnGenerate(generateButton, media, feature); + focusOnInput(media, createTag); +} + export default async function setInteractiveFirefly(el) { const enticementMode = el.classList.contains('light') ? 'light' : 'dark'; const interactiveElemMode = el.classList.contains('light') ? 'dark' : 'light'; @@ -128,7 +146,6 @@ export default async function setInteractiveFirefly(el) { }; selections.push(option); }); - [...allP].forEach((s) => { if (!s.querySelector('picture') && !s.querySelector('video')) s.remove(); }); const mediaP = media.querySelectorAll('p:not(:empty)'); [...mediaP].forEach((image) => { image.classList.add('hide'); }); @@ -139,24 +156,31 @@ export default async function setInteractiveFirefly(el) { const enticementIcon = allAnchorTag[0].href; const enticementDiv = await createEnticement(`${enticementText}|${enticementIcon}`, enticementMode); media.appendChild(enticementDiv, media.firstChild); - + const { createTag } = await import(`${getLibs()}/utils/utils.js`); + if (el.classList.contains('ff-text-effects')) { + mediaP[0].classList.remove('hide'); + singleFireflyFeature(allP[2], interactiveElemMode, createPromptField, media, 'TextEffects', createTag); + return; + } + if (el.classList.contains('ff-text-to-image')) { + mediaP[0].classList.remove('hide'); + singleFireflyFeature(allP[2], interactiveElemMode, createPromptField, media, 'TextToImage', createTag); + return; + } const fireflyOptions = await createSelectorTray(selections, interactiveElemMode); fireflyOptions.classList.add('firefly-selectortray'); + if (selections.length === 3) fireflyOptions.classList.add('three-options'); media.append(fireflyOptions); - const ttiOption = media.querySelector('.TextToImage'); const genFillOption = media.querySelector('.GenerativeFill'); const teOption = media.querySelector('.TextEffects'); const firstOption = media.querySelector('.selector-tray > button'); - hideRemoveElements(firstOption, media, mediaP); - const { createTag } = await import(`${getLibs()}/utils/utils.js`); - - const genfillPrompt = createGenFillPrompt(genfDetail.promptpos, createTag); // Create prompt field for first option on page load const firstOptionDetail = allP[3].innerText.split('|'); - const fireflyPrompt = await createPromptField(`${firstOptionDetail[0]}`, `${firstOptionDetail[1]}`, interactiveElemMode); + const mode = firstOption.classList.contains('GenerativeFill') ? 'genfill' : interactiveElemMode; + const fireflyPrompt = await createPromptField(`${firstOptionDetail[0]}`, `${firstOptionDetail[1]}`, mode); if (firstOption.classList.contains('TextToImage') || firstOption.classList.contains('TextEffects')) { fireflyPrompt.classList.add('firefly-prompt'); media.appendChild(fireflyPrompt); @@ -164,6 +188,7 @@ export default async function setInteractiveFirefly(el) { eventOnGenerate(generateButton, media); } else if (firstOption.classList.contains('GenerativeFill')) { fireflyPrompt.classList.add('genfill-promptbar'); + const genfillPrompt = createGenFillPrompt(genfDetail.promptpos, createTag); media.append(genfillPrompt, fireflyPrompt); const genFillButton = media.querySelector('#genfill'); genFillButton.addEventListener('click', async () => { @@ -171,20 +196,17 @@ export default async function setInteractiveFirefly(el) { signIn('', 'goToFireflyGenFill'); }); } - focusOnInput(media, createTag); /* Handle action on click of each firefly option button */ - - ttiOption.addEventListener('click', () => { + ttiOption?.addEventListener('click', () => { eventOnSelectorOption(ttiOption, ttiDetail, media, mediaP, createPromptField, createTag); }); - - genFillOption.addEventListener('click', () => { + genFillOption?.addEventListener('click', () => { eventOnSelectorOption(genFillOption, genfDetail, media, mediaP, createPromptField); + const genfillPrompt = createGenFillPrompt(genfDetail.promptpos, createTag); media.appendChild(genfillPrompt); }); - - teOption.addEventListener('click', () => { + teOption?.addEventListener('click', () => { eventOnSelectorOption(teOption, teDetail, media, mediaP, createPromptField, createTag); }); } diff --git a/test/blocks/sidenav/sidenav.test.html b/test/blocks/sidenav/sidenav.test.html index 19e1b3b7f..d50e7e1a6 100644 --- a/test/blocks/sidenav/sidenav.test.html +++ b/test/blocks/sidenav/sidenav.test.html @@ -35,8 +35,8 @@

REFINE YOUR RESULTS

  • Social-media
  • Pdf
  • Esignatures
    • -
  • Coldfusion
    • -
  • Elearning
    • +
  • ColdFusion
    • +
  • ELearning
  • Print-imaging
  • Technical-communication
  • Insight-audiences
    • diff --git a/test/blocks/sidenav/sidenav.test.html.js b/test/blocks/sidenav/sidenav.test.html.js index c4de81ff5..51131de2c 100644 --- a/test/blocks/sidenav/sidenav.test.html.js +++ b/test/blocks/sidenav/sidenav.test.html.js @@ -36,6 +36,9 @@ runTests(async () => { expect(newRoot.title).to.equal('REFINE YOUR RESULTS'); const items = newRoot.querySelectorAll('sp-sidenav-item'); expect(items.length).to.equal(expectedItemCount); + const found = Array.from(items).find((item) => item.getAttribute('label') === 'ColdFusion'); + expect(found).to.not.be.undefined; + expect(found.getAttribute('value')).to.equal('coldfusion'); const search = newRoot.querySelector('sp-search'); expect(search.getAttribute('placeholder')).to.equal('Search all your products'); expect(newRoot.querySelectorAll('sp-checkbox').length).to.equal(3); @@ -49,7 +52,9 @@ runTests(async () => { }); it('does create nice reordered categories sidenav', async () => { - await testCategorySidenav('.reordered-categories', 17, 11); + // 16 items from html requirements, 2 parents from taxonomy, + // and special-offer special case is 19 + await testCategorySidenav('.reordered-categories', 19, 13); }); it('does create nice plans sidenav', async () => { diff --git a/test/blocks/universal-promo-terms/mocks/body.html b/test/blocks/universal-promo-terms/mocks/body.html new file mode 100644 index 000000000..22fa7c98e --- /dev/null +++ b/test/blocks/universal-promo-terms/mocks/body.html @@ -0,0 +1,3 @@ +
    +
    +
    diff --git a/test/blocks/universal-promo-terms/universal.promo.terms.test.js b/test/blocks/universal-promo-terms/universal.promo.terms.test.js new file mode 100644 index 000000000..e7b4939ae --- /dev/null +++ b/test/blocks/universal-promo-terms/universal.promo.terms.test.js @@ -0,0 +1,22 @@ +import { readFile } from '@web/test-runner-commands'; +import { expect } from '@esm-bundle/chai'; +import sinon from 'sinon'; + +document.body.innerHTML = await readFile({ path: './mocks/body.html' }); +const { default: init } = await import('../../../creativecloud/blocks/universal-promo-terms/universal-promo-terms.js'); + +describe('universal-promo-terms', () => { + const block = document.body.querySelector('.universal-promo-terms'); + beforeEach(() => { + sinon.spy(console, 'log'); + }); + + afterEach(() => { + console.log.restore(); + }); + + it('Get API from query parameters', async () => { + await init(block, '?offer_id=1B365A793986BBEEE26F3E372BDAAB09&locale=de_DE&promotion_code=fixed_dis_20&country=DE&env=stage'); + expect(document.querySelector('.universal-promo-terms').textContent).to.not.equal('false'); + }); +}); diff --git a/test/features/firefly/firefly-interactive.test.js b/test/features/firefly/firefly-interactive.test.js index 9b7122e07..2334ec68c 100644 --- a/test/features/firefly/firefly-interactive.test.js +++ b/test/features/firefly/firefly-interactive.test.js @@ -64,3 +64,51 @@ describe('firefly-marquee', () => { expect(texteffectPrompt).to.exist; }); }); + +describe('firefly-text-effect-marquee', () => { + before(async () => { + document.body.innerHTML = await readFile({ path: './mocks/body.html' }); + await init(document.querySelector('.ff-text-effects')); + }); + + it('Prompt should exist', async () => { + const promptbar = await waitForElement('.promptbar'); + expect(promptbar).to.exist; + }); + + it('Prompt should be placed at proper place in interactive container', async () => { + const fireflypromptbar = await waitForElement('.firefly-prompt'); + expect(fireflypromptbar).to.exist; + }); + + it('Enticement should exist', async () => { + const enticementText = await waitForElement('.enticement-text'); + const enticementArrow = await waitForElement('.enticement-arrow'); + expect(enticementText).to.exist; + expect(enticementArrow).to.exist; + }); +}); + +describe('firefly-text-to-image-marquee', () => { + before(async () => { + document.body.innerHTML = await readFile({ path: './mocks/body.html' }); + await init(document.querySelector('.ff-text-to-image')); + }); + + it('Prompt should exist', async () => { + const promptbar = await waitForElement('.promptbar'); + expect(promptbar).to.exist; + }); + + it('Prompt should be placed at proper place in interactive container', async () => { + const fireflypromptbar = await waitForElement('.firefly-prompt'); + expect(fireflypromptbar).to.exist; + }); + + it('Enticement should exist', async () => { + const enticementText = await waitForElement('.enticement-text'); + const enticementArrow = await waitForElement('.enticement-arrow'); + expect(enticementText).to.exist; + expect(enticementArrow).to.exist; + }); +}); diff --git a/test/features/firefly/mocks/body.html b/test/features/firefly/mocks/body.html index 9a70e2233..9865a5716 100644 --- a/test/features/firefly/mocks/body.html +++ b/test/features/firefly/mocks/body.html @@ -44,3 +44,85 @@

    Your imagination’s new best friend. +
    +
    +
    linear-gradient(90deg, rgba(238,174,202,1) 0%, rgba(148,187,233,1) 100% +
    +
    +
    +
    +

    + + Adobe Firefly +

    +

    Your imagination’s new best friend.

    +

    Use simple prompts and generative AI to create anything you can imagine with the new Adobe Firefly web app. + From photorealistic portraits and fantasy creatures to text effects and fresh color palettes, the + possibilities + are pure magic. Now available for commercial use.

    +

    Get Firefly Free

    +
    +
    +

    Try it

    +

    -----------------------------------------------------------

    +

    Tiger Fur|Generate

    +

    + + + + + + +

    +
    +
    +
    +
    +
    +
    linear-gradient(90deg, rgba(238,174,202,1) 0%, rgba(148,187,233,1) 100% +
    +
    +
    +
    +

    + + Adobe Firefly +

    +

    Your imagination’s new best friend.

    +

    Use simple prompts and generative AI to create anything you can imagine with the new Adobe Firefly web app. + From photorealistic portraits and fantasy creatures to text effects and fresh color palettes, the + possibilities + are pure magic. Now available for commercial use.

    +

    Get Firefly Free

    +
    +
    +

    Try it

    +

    -----------------------------------------------------------

    +

    Tiger Fur|Generate

    +

    + + + + + + +

    +
    +
    +
    diff --git a/wtr b/wtr new file mode 100644 index 000000000..e69de29bb From bcff584cca851d4867a79ec12f5bc4dc4943b74f Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Mon, 4 Mar 2024 09:28:39 -0800 Subject: [PATCH 10/14] add cis_ru (#200) --- creativecloud/scripts/scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/creativecloud/scripts/scripts.js b/creativecloud/scripts/scripts.js index 0d99074b4..50ed62262 100644 --- a/creativecloud/scripts/scripts.js +++ b/creativecloud/scripts/scripts.js @@ -116,6 +116,7 @@ const locales = { gr_el: { ietf: 'el', tk: 'fnx0rsr.css' }, // Greece (Greek) vn_en: { ietf: 'en-GB', tk: 'hah7vzn.css' }, vn_vi: { ietf: 'vi', tk: 'qxw8hzm.css' }, + cis_ru: { ietf: 'ru', tk: 'qxw8hzm.css' }, }; // Add any config options. From d03a6a70032ed3cdf90e236da48fe9940a3a7086 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:20:32 -0800 Subject: [PATCH 11/14] Update scripts.js (#206) --- creativecloud/scripts/scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/creativecloud/scripts/scripts.js b/creativecloud/scripts/scripts.js index 50ed62262..e2d35d842 100644 --- a/creativecloud/scripts/scripts.js +++ b/creativecloud/scripts/scripts.js @@ -117,6 +117,7 @@ const locales = { vn_en: { ietf: 'en-GB', tk: 'hah7vzn.css' }, vn_vi: { ietf: 'vi', tk: 'qxw8hzm.css' }, cis_ru: { ietf: 'ru', tk: 'qxw8hzm.css' }, + cis_en: { ietf: 'en', tk: 'pps7abe.css' }, }; // Add any config options. From 881cbccdbdf509542b53908385e2659bb63eb0c7 Mon Sep 17 00:00:00 2001 From: Mariia Lukianets Date: Wed, 6 Mar 2024 18:14:12 +0100 Subject: [PATCH 12/14] add cis sitemaps (#205) --- helix-query.yaml | 157 ++++++++++++++++++++++++++++++++++++++++++++- helix-sitemap.yaml | 12 ++++ 2 files changed, 168 insertions(+), 1 deletion(-) diff --git a/helix-query.yaml b/helix-query.yaml index c647f4262..098c4bf50 100644 --- a/helix-query.yaml +++ b/helix-query.yaml @@ -710,7 +710,6 @@ indices: - /in_hi/creativecloud/** target: /in_hi/cc-shared/assets/query-index.xlsx - cards-in_hi: <<: *merch-cards include: @@ -879,113 +878,227 @@ indices: - /dk/creativecloud/** target: /dk/cc-shared/assets/query-index.xlsx + cards-dk: + <<: *merch-cards + include: + - /dk/cc-shared/fragments/merch/**/merch-card/** + target: /dk/cc-shared/assets/query-index-cards.xslx + creativecloud-fi: <<: *def include: - /fi/creativecloud/** target: /fi/cc-shared/assets/query-index.xlsx + cards-fi: + <<: *merch-cards + include: + - /fi/cc-shared/fragments/merch/**/merch-card/** + target: /fi/cc-shared/assets/query-index-cards.xslx + creativecloud-no: <<: *def include: - /no/creativecloud/** target: /no/cc-shared/assets/query-index.xlsx + cards-no: + <<: *merch-cards + include: + - /no/cc-shared/fragments/merch/**/merch-card/** + target: /no/cc-shared/assets/query-index-cards.xslx + creativecloud-se: <<: *def include: - /se/creativecloud/** target: /se/cc-shared/assets/query-index.xlsx + cards-se: + <<: *merch-cards + include: + - /se/cc-shared/fragments/merch/**/merch-card/** + target: /se/cc-shared/assets/query-index-cards.xslx + creativecloud-la: <<: *def include: - /la/creativecloud/** target: /la/cc-shared/assets/query-index.xlsx + cards-la: + <<: *merch-cards + include: + - /la/cc-shared/fragments/merch/**/merch-card/** + target: /la/cc-shared/assets/query-index-cards.xslx + creativecloud-mx: <<: *def include: - /mx/creativecloud/** target: /mx/cc-shared/assets/query-index.xlsx + cards-mx: + <<: *merch-cards + include: + - /mx/cc-shared/fragments/merch/**/merch-card/** + target: /mx/cc-shared/assets/query-index-cards.xslx + creativecloud-be_nl: <<: *def include: - /be_nl/creativecloud/** target: /be_nl/cc-shared/assets/query-index.xlsx + cards-be_nl: + <<: *merch-cards + include: + - /be_nl/cc-shared/fragments/merch/**/merch-card/** + target: /be_nl/cc-shared/assets/query-index-cards.xslx + creativecloud-bg: <<: *def include: - /bg/creativecloud/** target: /bg/cc-shared/assets/query-index.xlsx + cards-bg: + <<: *merch-cards + include: + - /bg/cc-shared/fragments/merch/**/merch-card/** + target: /bg/cc-shared/assets/query-index-cards.xslx + creativecloud-ch_it: <<: *def include: - /ch_it/creativecloud/** target: /ch_it/cc-shared/assets/query-index.xlsx + cards-ch_it: + <<: *merch-cards + include: + - /ch_it/cc-shared/fragments/merch/**/merch-card/** + target: /ch_it/cc-shared/assets/query-index-cards.xslx + creativecloud-cz: <<: *def include: - /cz/creativecloud/** target: /cz/cc-shared/assets/query-index.xlsx + cards-cz: + <<: *merch-cards + include: + - /cz/cc-shared/fragments/merch/**/merch-card/** + target: /cz/cc-shared/assets/query-index-cards.xslx + creativecloud-ee: <<: *def include: - /ee/creativecloud/** target: /ee/cc-shared/assets/query-index.xlsx + cards-ee: + <<: *merch-cards + include: + - /ee/cc-shared/fragments/merch/**/merch-card/** + target: /ee/cc-shared/assets/query-index-cards.xslx + creativecloud-hu: <<: *def include: - /hu/creativecloud/** target: /hu/cc-shared/assets/query-index.xlsx + cards-hu: + <<: *merch-cards + include: + - /hu/cc-shared/fragments/merch/**/merch-card/** + target: /hu/cc-shared/assets/query-index-cards.xslx + creativecloud-il_he: <<: *def include: - /il_he/creativecloud/** target: /il_he/cc-shared/assets/query-index.xlsx + cards-il_he: + <<: *merch-cards + include: + - /il_he/cc-shared/fragments/merch/**/merch-card/** + target: /il_he/cc-shared/assets/query-index-cards.xslx + creativecloud-lv: <<: *def include: - /lv/creativecloud/** target: /lv/cc-shared/assets/query-index.xlsx + cards-lv: + <<: *merch-cards + include: + - /lv/cc-shared/fragments/merch/**/merch-card/** + target: /lv/cc-shared/assets/query-index-cards.xslx + creativecloud-mena_ar: <<: *def include: - /mena_ar/creativecloud/** target: /mena_ar/cc-shared/assets/query-index.xlsx + cards-mena_ar: + <<: *merch-cards + include: + - /mena_ar/cc-shared/fragments/merch/**/merch-card/** + target: /mena_ar/cc-shared/assets/query-index-cards.xslx + creativecloud-pt: <<: *def include: - /pt/creativecloud/** target: /pt/cc-shared/assets/query-index.xlsx + cards-pt: + <<: *merch-cards + include: + - /pt/cc-shared/fragments/merch/**/merch-card/** + target: /pt/cc-shared/assets/query-index-cards.xslx + creativecloud-ro: <<: *def include: - /ro/creativecloud/** target: /ro/cc-shared/assets/query-index.xlsx + cards-ro: + <<: *merch-cards + include: + - /ro/cc-shared/fragments/merch/**/merch-card/** + target: /ro/cc-shared/assets/query-index-cards.xslx + creativecloud-si: <<: *def include: - /si/creativecloud/** target: /si/cc-shared/assets/query-index.xlsx + cards-si: + <<: *merch-cards + include: + - /si/cc-shared/fragments/merch/**/merch-card/** + target: /si/cc-shared/assets/query-index-cards.xslx + creativecloud-sk: <<: *def include: - /sk/creativecloud/** target: /sk/cc-shared/assets/query-index.xlsx + + cards-sk: + <<: *merch-cards + include: + - /sk/cc-shared/fragments/merch/**/merch-card/** + target: /sk/cc-shared/assets/query-index-cards.xslx creativecloud-ua: <<: *def @@ -993,14 +1106,56 @@ indices: - /ua/creativecloud/** target: /ua/cc-shared/assets/query-index.xlsx + cards-ua: + <<: *merch-cards + include: + - /ua/cc-shared/fragments/merch/**/merch-card/** + target: /ua/cc-shared/assets/query-index-cards.xslx + creativecloud-sg: <<: *def include: - /sg/creativecloud/** target: /sg/cc-shared/assets/query-index.xlsx + cards-sg: + <<: *merch-cards + include: + - /sg/cc-shared/fragments/merch/**/merch-card/** + target: /sg/cc-shared/assets/query-index-cards.xslx + creativecloud-br: <<: *def include: - /br/creativecloud/** target: /br/cc-shared/assets/query-index.xlsx + + cards-br: + <<: *merch-cards + include: + - /br/cc-shared/fragments/merch/**/merch-card/** + target: /br/cc-shared/assets/query-index-cards.xslx + + creativecloud-cis_en: + <<: *def + include: + - /cis_en/creativecloud/** + target: /cis_en/cc-shared/assets/query-index.xlsx + + cards-cis_en: + <<: *merch-cards + include: + - /cis_en/cc-shared/fragments/merch/**/merch-card/** + target: /cis_en/cc-shared/assets/query-index-cards.xslx + + creativecloud-cis_ru: + <<: *def + include: + - /cis_ru/creativecloud/** + target: /cis_ru/cc-shared/assets/query-index.xlsx + + cards-cis_ru: + <<: *merch-cards + include: + - /cis_ru/cc-shared/fragments/merch/**/merch-card/** + target: /cis_ru/cc-shared/assets/query-index-cards.xslx diff --git a/helix-sitemap.yaml b/helix-sitemap.yaml index 0d3227458..b8d3b5a4c 100644 --- a/helix-sitemap.yaml +++ b/helix-sitemap.yaml @@ -565,3 +565,15 @@ sitemaps: alternate: /br/{path}.html destination: /br/cc-shared/assets/sitemap.xml hreflang: pt-BR + + cis_en: + source: /cis_en/cc-shared/assets/query-index.json + alternate: /cis_en/{path}.html + destination: /cis_en/cc-shared/assets/sitemap.xml + hreflang: en-BY + + cis_ru: + source: /cis_ru/cc-shared/assets/query-index.json + alternate: /cis_ru/{path}.html + destination: /cis_ru/cc-shared/assets/sitemap.xml + hreflang: ru-BY From 144f8feae6c209291c1ec62f0fd12b9a97a94032 Mon Sep 17 00:00:00 2001 From: Mariia Lukianets Date: Wed, 6 Mar 2024 20:27:50 +0100 Subject: [PATCH 13/14] [Main] add Products to sitemap index (#217) * add products to indes * add sitemaps live links --- creativecloud/sitemap-index.xml | 6 +++ helix-query.yaml | 92 +++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/creativecloud/sitemap-index.xml b/creativecloud/sitemap-index.xml index 82c77c4e6..6477f71c9 100644 --- a/creativecloud/sitemap-index.xml +++ b/creativecloud/sitemap-index.xml @@ -273,4 +273,10 @@ https://www.adobe.com/br/cc-shared/assets/sitemap.xml + + https://www.adobe.com/cis_en/cc-shared/assets/sitemap.xml + + + https://www.adobe.com/cis_ru/cc-shared/assets/sitemap.xml + diff --git a/helix-query.yaml b/helix-query.yaml index 098c4bf50..532a35d6a 100644 --- a/helix-query.yaml +++ b/helix-query.yaml @@ -60,6 +60,7 @@ indices: <<: *def include: - /au/creativecloud/** + - /au/products/** target: /au/cc-shared/assets/query-index.xlsx cards-au: @@ -72,6 +73,7 @@ indices: <<: *def include: - /de/creativecloud/** + - /de/products/** target: /de/cc-shared/assets/query-index.xlsx cards-de: @@ -84,6 +86,7 @@ indices: <<: *def include: - /es/creativecloud/** + - /es/products/** target: /es/cc-shared/assets/query-index.xlsx cards-es: @@ -96,6 +99,7 @@ indices: <<: *def include: - /fr/creativecloud/** + - /fr/products/** target: /fr/cc-shared/assets/query-index.xlsx cards-fr: @@ -108,6 +112,7 @@ indices: <<: *def include: - /it/creativecloud/** + - /it/products/** target: /it/cc-shared/assets/query-index.xlsx cards-it: @@ -120,6 +125,7 @@ indices: <<: *def include: - /jp/creativecloud/** + - /jp/products/** target: /jp/cc-shared/assets/query-index.xlsx cards-jp: @@ -132,6 +138,7 @@ indices: <<: *def include: - /kr/creativecloud/** + - /kr/products/** target: /kr/cc-shared/assets/query-index.xlsx cards-kr: @@ -144,6 +151,7 @@ indices: <<: *def include: - /ru/creativecloud/** + - /ru/products/** target: /ru/cc-shared/assets/query-index.xlsx cards-ru: @@ -156,6 +164,7 @@ indices: <<: *def include: - /hk_zh/creativecloud/** + - /hk_zh/products/** target: /hk_zh/cc-shared/assets/query-index.xlsx cards-hk_zh: @@ -168,6 +177,7 @@ indices: <<: *def include: - /tw/creativecloud/** + - /tw/products/** target: /tw/cc-shared/assets/query-index.xlsx cards-tw: @@ -180,6 +190,7 @@ indices: <<: *def include: - /nl/creativecloud/** + - /nl/products/** target: /nl/cc-shared/assets/query-index.xlsx cards-nl: @@ -192,6 +203,7 @@ indices: <<: *def include: - /pl/creativecloud/** + - /pl/products/** target: /pl/cc-shared/assets/query-index.xlsx cards-pl: @@ -204,6 +216,7 @@ indices: <<: *def include: - /tr/creativecloud/** + - /tr/products/** target: /tr/cc-shared/assets/query-index.xlsx cards-tr: @@ -216,6 +229,7 @@ indices: <<: *def include: - /uk/creativecloud/** + - /uk/products/** target: /uk/cc-shared/assets/query-index.xlsx cards-uk: @@ -228,6 +242,7 @@ indices: <<: *def include: - /ca/creativecloud/** + - /ca/products/** target: /ca/cc-shared/assets/query-index.xlsx cards-ca: @@ -240,6 +255,7 @@ indices: <<: *def include: - /cn/creativecloud/** + - /cn/products/** target: /cn/cc-shared/assets/query-index.xlsx cards-cn: @@ -252,6 +268,7 @@ indices: <<: *def include: - /ae_ar/creativecloud/** + - /ae_ar/products/** target: /ae_ar/cc-shared/assets/query-index.xlsx cards-ae_ar: @@ -264,6 +281,7 @@ indices: <<: *def include: - /ae_en/creativecloud/** + - /ae_en/products/** target: /ae_en/cc-shared/assets/query-index.xlsx cards-ae_en: @@ -276,6 +294,7 @@ indices: <<: *def include: - /at/creativecloud/** + - /at/products/** target: /at/cc-shared/assets/query-index.xlsx cards-at: @@ -288,6 +307,7 @@ indices: <<: *def include: - /be_en/creativecloud/** + - /be_en/products/** target: /be_en/cc-shared/assets/query-index.xlsx cards-be_en: @@ -300,6 +320,7 @@ indices: <<: *def include: - /be_fr/creativecloud/** + - /be_fr/products/** target: /be_fr/cc-shared/assets/query-index.xlsx cards-be_fr: @@ -312,6 +333,7 @@ indices: <<: *def include: - /ca_fr/creativecloud/** + - /ca_fr/products/** target: /ca_fr/cc-shared/assets/query-index.xlsx cards-ca_fr: @@ -324,6 +346,7 @@ indices: <<: *def include: - /ch_de/creativecloud/** + - /ch_de/products/** target: /ch_de/cc-shared/assets/query-index.xlsx cards-ch_de: @@ -336,6 +359,7 @@ indices: <<: *def include: - /ch_fr/creativecloud/** + - /ch_fr/products/** target: /ch_fr/cc-shared/assets/query-index.xlsx cards-ch_fr: @@ -348,6 +372,7 @@ indices: <<: *def include: - /cl/creativecloud/** + - /cl/products/** target: /cl/cc-shared/assets/query-index.xlsx cards-cl: @@ -360,6 +385,7 @@ indices: <<: *def include: - /cy_en/creativecloud/** + - /cy_en/products/** target: /cy_en/cc-shared/assets/query-index.xlsx cards-cy_en: @@ -372,6 +398,7 @@ indices: <<: *def include: - /gr_en/creativecloud/** + - /gr_en/products/** target: /gr_en/cc-shared/assets/query-index.xlsx cards-gr_en: @@ -384,6 +411,7 @@ indices: <<: *def include: - /hk_en/creativecloud/** + - /hk_en/products/** target: /hk_en/cc-shared/assets/query-index.xlsx cards-hk_en: @@ -396,6 +424,7 @@ indices: <<: *def include: - /ie/creativecloud/** + - /ie/products/** target: /ie/cc-shared/assets/query-index.xlsx cards-ie: @@ -408,6 +437,7 @@ indices: <<: *def include: - /il_en/creativecloud/** + - /il_en/products/** target: /il_en/cc-shared/assets/query-index.xlsx cards-il_en: @@ -420,6 +450,7 @@ indices: <<: *def include: - /in/creativecloud/** + - /in/products/** target: /in/cc-shared/assets/query-index.xlsx cards-in: @@ -432,6 +463,7 @@ indices: <<: *def include: - /lt/creativecloud/** + - /lt/products/** target: /lt/cc-shared/assets/query-index.xlsx cards-lt: @@ -444,6 +476,7 @@ indices: <<: *def include: - /lu_de/creativecloud/** + - /lu_de/products/** target: /lu_de/cc-shared/assets/query-index.xlsx cards-lu_de: @@ -456,6 +489,7 @@ indices: <<: *def include: - /lu_en/creativecloud/** + - /lu_en/products/** target: /lu_en/cc-shared/assets/query-index.xlsx cards-lu_en: @@ -468,6 +502,7 @@ indices: <<: *def include: - /lu_fr/creativecloud/** + - /lu_fr/products/** target: /lu_fr/cc-shared/assets/query-index.xlsx cards-lu_fr: @@ -480,6 +515,7 @@ indices: <<: *def include: - /mena_en/creativecloud/** + - /mena_en/products/** target: /mena_en/cc-shared/assets/query-index.xlsx cards-mena_en: @@ -492,6 +528,7 @@ indices: <<: *def include: - /mt/creativecloud/** + - /mt/products/** target: /mt/cc-shared/assets/query-index.xlsx cards-mt: @@ -504,6 +541,7 @@ indices: <<: *def include: - /nz/creativecloud/** + - /nz/products/** target: /nz/cc-shared/assets/query-index.xlsx cards-nz: @@ -516,6 +554,7 @@ indices: <<: *def include: - /sa_ar/creativecloud/** + - /sa_ar/products/** target: /sa_ar/cc-shared/assets/query-index.xlsx cards-sa_ar: @@ -528,6 +567,7 @@ indices: <<: *def include: - /sa_en/creativecloud/** + - /sa_en/products/** target: /sa_en/cc-shared/assets/query-index.xlsx cards-sa_en: @@ -540,6 +580,7 @@ indices: <<: *def include: - /th_en/creativecloud/** + - /th_en/products/** target: /th_en/cc-shared/assets/query-index.xlsx cards-th_en: @@ -552,6 +593,7 @@ indices: <<: *def include: - /th_th/creativecloud/** + - /th_th/products/** target: /th_th/cc-shared/assets/query-index.xlsx cards-th_th: @@ -564,6 +606,7 @@ indices: <<: *def include: - /za/creativecloud/** + - /za/products/** target: /za/cc-shared/assets/query-index.xlsx cards-za: @@ -576,6 +619,7 @@ indices: <<: *def include: - /africa/creativecloud/** + - /africa/products/** target: /africa/cc-shared/assets/query-index.xlsx cards-africa: @@ -588,6 +632,7 @@ indices: <<: *def include: - /ar/creativecloud/** + - /ar/products/** target: /ar/cc-shared/assets/query-index.xlsx cards-ar: @@ -600,6 +645,7 @@ indices: <<: *def include: - /co/creativecloud/** + - /co/products/** target: /co/cc-shared/assets/query-index.xlsx cards-co: @@ -612,6 +658,7 @@ indices: <<: *def include: - /cr/creativecloud/** + - /cr/products/** target: /cr/cc-shared/assets/query-index.xlsx cards-cr: @@ -624,6 +671,7 @@ indices: <<: *def include: - /ec/creativecloud/** + - /ec/products/** target: /ec/cc-shared/assets/query-index.xlsx cards-ec: @@ -636,6 +684,7 @@ indices: <<: *def include: - /eg_ar/creativecloud/** + - /eg_ar/products/** target: /eg_ar/cc-shared/assets/query-index.xlsx cards-eg_ar: @@ -648,6 +697,7 @@ indices: <<: *def include: - /eg_en/creativecloud/** + - /eg_en/products/** target: /eg_en/cc-shared/assets/query-index.xlsx cards-eg_en: @@ -660,6 +710,7 @@ indices: <<: *def include: - /gr_el/creativecloud/** + - /gr_el/products/** target: /gr_el/cc-shared/assets/query-index.xlsx cards-gr_el: @@ -672,6 +723,7 @@ indices: <<: *def include: - /gt/creativecloud/** + - /gt/products/** target: /gt/cc-shared/assets/query-index.xlsx cards-gt: @@ -684,6 +736,7 @@ indices: <<: *def include: - /id_en/creativecloud/** + - /id_en/products/** target: /id_en/cc-shared/assets/query-index.xlsx cards-id_en: @@ -696,6 +749,7 @@ indices: <<: *def include: - /id_id/creativecloud/** + - /id_id/products/** target: /id_id/cc-shared/assets/query-index.xlsx cards-id_id: @@ -708,6 +762,7 @@ indices: <<: *def include: - /in_hi/creativecloud/** + - /in_hi/products/** target: /in_hi/cc-shared/assets/query-index.xlsx cards-in_hi: @@ -720,6 +775,7 @@ indices: <<: *def include: - /kw_ar/creativecloud/** + - /kw_ar/products/** target: /kw_ar/cc-shared/assets/query-index.xlsx cards-kw_ar: @@ -732,6 +788,7 @@ indices: <<: *def include: - /kw_en/creativecloud/** + - /kw_en/products/** target: /kw_en/cc-shared/assets/query-index.xlsx cards-kw_en: @@ -744,6 +801,7 @@ indices: <<: *def include: - /my_en/creativecloud/** + - /my_en/products/** target: /my_en/cc-shared/assets/query-index.xlsx cards-my_en: @@ -756,6 +814,7 @@ indices: <<: *def include: - /my_ms/creativecloud/** + - /my_ms/products/** target: /my_ms/cc-shared/assets/query-index.xlsx cards-my_ms: @@ -768,6 +827,7 @@ indices: <<: *def include: - /ng/creativecloud/** + - /ng/products/** target: /ng/cc-shared/assets/query-index.xlsx cards-ng: @@ -780,6 +840,7 @@ indices: <<: *def include: - /pe/creativecloud/** + - /pe/products/** target: /pe/cc-shared/assets/query-index.xlsx cards-pe: @@ -792,6 +853,7 @@ indices: <<: *def include: - /ph_en/creativecloud/** + - /ph_en/products/** target: /ph_en/cc-shared/assets/query-index.xlsx cards-ph_en: @@ -804,6 +866,7 @@ indices: <<: *def include: - /ph_fil/creativecloud/** + - /ph_fil/products/** target: /ph_fil/cc-shared/assets/query-index.xlsx cards-ph_fil: @@ -816,6 +879,7 @@ indices: <<: *def include: - /pr/creativecloud/** + - /pr/products/** target: /pr/cc-shared/assets/query-index.xlsx cards-pr: @@ -828,6 +892,7 @@ indices: <<: *def include: - /qa_ar/creativecloud/** + - /qa_ar/products/** target: /qa_ar/cc-shared/assets/query-index.xlsx cards-qa_ar: @@ -840,6 +905,7 @@ indices: <<: *def include: - /qa_en/creativecloud/** + - /qa_en/products/** target: /qa_en/cc-shared/assets/query-index.xlsx cards-qa_en: @@ -852,6 +918,7 @@ indices: <<: *def include: - /vn_en/creativecloud/** + - /vn_en/products/** target: /vn_en/cc-shared/assets/query-index.xlsx cards-vn_en: @@ -864,6 +931,7 @@ indices: <<: *def include: - /vn_vi/creativecloud/** + - /vn_vi/products/** target: /vn_vi/cc-shared/assets/query-index.xlsx cards-vn_vi: @@ -876,6 +944,7 @@ indices: <<: *def include: - /dk/creativecloud/** + - /dk/products/** target: /dk/cc-shared/assets/query-index.xlsx cards-dk: @@ -888,6 +957,7 @@ indices: <<: *def include: - /fi/creativecloud/** + - /fi/products/** target: /fi/cc-shared/assets/query-index.xlsx cards-fi: @@ -900,6 +970,7 @@ indices: <<: *def include: - /no/creativecloud/** + - /no/products/** target: /no/cc-shared/assets/query-index.xlsx cards-no: @@ -912,6 +983,7 @@ indices: <<: *def include: - /se/creativecloud/** + - /se/products/** target: /se/cc-shared/assets/query-index.xlsx cards-se: @@ -924,6 +996,7 @@ indices: <<: *def include: - /la/creativecloud/** + - /la/products/** target: /la/cc-shared/assets/query-index.xlsx cards-la: @@ -936,6 +1009,7 @@ indices: <<: *def include: - /mx/creativecloud/** + - /mx/products/** target: /mx/cc-shared/assets/query-index.xlsx cards-mx: @@ -948,6 +1022,7 @@ indices: <<: *def include: - /be_nl/creativecloud/** + - /be_nl/products/** target: /be_nl/cc-shared/assets/query-index.xlsx cards-be_nl: @@ -960,6 +1035,7 @@ indices: <<: *def include: - /bg/creativecloud/** + - /bg/products/** target: /bg/cc-shared/assets/query-index.xlsx cards-bg: @@ -972,6 +1048,7 @@ indices: <<: *def include: - /ch_it/creativecloud/** + - /ch_it/products/** target: /ch_it/cc-shared/assets/query-index.xlsx cards-ch_it: @@ -984,6 +1061,7 @@ indices: <<: *def include: - /cz/creativecloud/** + - /cz/products/** target: /cz/cc-shared/assets/query-index.xlsx cards-cz: @@ -996,6 +1074,7 @@ indices: <<: *def include: - /ee/creativecloud/** + - /ee/products/** target: /ee/cc-shared/assets/query-index.xlsx cards-ee: @@ -1008,6 +1087,7 @@ indices: <<: *def include: - /hu/creativecloud/** + - /hu/products/** target: /hu/cc-shared/assets/query-index.xlsx cards-hu: @@ -1020,6 +1100,7 @@ indices: <<: *def include: - /il_he/creativecloud/** + - /il_he/products/** target: /il_he/cc-shared/assets/query-index.xlsx cards-il_he: @@ -1032,6 +1113,7 @@ indices: <<: *def include: - /lv/creativecloud/** + - /lv/products/** target: /lv/cc-shared/assets/query-index.xlsx cards-lv: @@ -1044,6 +1126,7 @@ indices: <<: *def include: - /mena_ar/creativecloud/** + - /mena_ar/products/** target: /mena_ar/cc-shared/assets/query-index.xlsx cards-mena_ar: @@ -1056,6 +1139,7 @@ indices: <<: *def include: - /pt/creativecloud/** + - /pt/products/** target: /pt/cc-shared/assets/query-index.xlsx cards-pt: @@ -1068,6 +1152,7 @@ indices: <<: *def include: - /ro/creativecloud/** + - /ro/products/** target: /ro/cc-shared/assets/query-index.xlsx cards-ro: @@ -1080,6 +1165,7 @@ indices: <<: *def include: - /si/creativecloud/** + - /si/products/** target: /si/cc-shared/assets/query-index.xlsx cards-si: @@ -1092,6 +1178,7 @@ indices: <<: *def include: - /sk/creativecloud/** + - /sk/products/** target: /sk/cc-shared/assets/query-index.xlsx cards-sk: @@ -1104,6 +1191,7 @@ indices: <<: *def include: - /ua/creativecloud/** + - /ua/products/** target: /ua/cc-shared/assets/query-index.xlsx cards-ua: @@ -1116,6 +1204,7 @@ indices: <<: *def include: - /sg/creativecloud/** + - /sg/products/** target: /sg/cc-shared/assets/query-index.xlsx cards-sg: @@ -1128,6 +1217,7 @@ indices: <<: *def include: - /br/creativecloud/** + - /br/products/** target: /br/cc-shared/assets/query-index.xlsx cards-br: @@ -1140,6 +1230,7 @@ indices: <<: *def include: - /cis_en/creativecloud/** + - /cis_en/products/** target: /cis_en/cc-shared/assets/query-index.xlsx cards-cis_en: @@ -1152,6 +1243,7 @@ indices: <<: *def include: - /cis_ru/creativecloud/** + - /cis_ru/products/** target: /cis_ru/cc-shared/assets/query-index.xlsx cards-cis_ru: From 7be25a89fd5e2ff1281c0e2aa5394b475e23b3a3 Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Thu, 7 Mar 2024 11:17:53 +0530 Subject: [PATCH 14/14] Sync main from stage for final stage rebase (#218) Sync main from stage for final stage rebase Merging following PRs - #211 #212 --- .../blocks/universal-promo-terms/universal-promo-terms.js | 2 +- creativecloud/scripts/scripts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/creativecloud/blocks/universal-promo-terms/universal-promo-terms.js b/creativecloud/blocks/universal-promo-terms/universal-promo-terms.js index 11debfd40..7ac53648d 100644 --- a/creativecloud/blocks/universal-promo-terms/universal-promo-terms.js +++ b/creativecloud/blocks/universal-promo-terms/universal-promo-terms.js @@ -7,7 +7,7 @@ const SERVICE_PROVIDERS = 'PROMO_TERMS'; function getEnv(env) { if (env) return env; - if (window.location.origin.hostname === 'www.adobe.com') return 'production'; + if (window.location.hostname === 'www.adobe.com') return 'production'; return 'stage'; } diff --git a/creativecloud/scripts/scripts.js b/creativecloud/scripts/scripts.js index e2d35d842..00f74754f 100644 --- a/creativecloud/scripts/scripts.js +++ b/creativecloud/scripts/scripts.js @@ -133,7 +133,7 @@ const CONFIG = { stage: { marTechUrl: 'https://assets.adobedtm.com/d4d114c60e50/a0e989131fd5/launch-2c94beadc94f-development.min.js', edgeConfigId: '8d2805dd-85bf-4748-82eb-f99fdad117a6', - pdfViewerClientId: '8d2de6a43c194397933c3d41f6dadef5', + pdfViewerClientId: '9f7f19a46bd542e2b8548411e51eb4d4', pdfViewerReportSuite: 'adbadobenonacdcqa', }, live: {