Skip to content

[Release] Stage to Main#5944

Merged
milo-pr-merge[bot] merged 7 commits into
mainfrom
stage
May 21, 2026
Merged

[Release] Stage to Main#5944
milo-pr-merge[bot] merged 7 commits into
mainfrom
stage

Conversation

hkuraware and others added 2 commits May 18, 2026 12:16
* feat(article-feed): sort articles newest-first

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(article-feed): fetch full index before sorting to get globally newest articles

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(article-feed): scope newest-first sort to da-blog only

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat(article-feed): sort articles newest-first using calculateExcelDate

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat(article-feed): sort articles newest-first using calculateExcelDate

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* chore(article-feed): remove unused getArticleDate

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(article-feed): fix max-len eslint error in sort

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Silviu Catalin Ghimposanu <sghimpos@Silvius-MacBook-Pro-4.local>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
@milo-pr-merge

milo-pr-merge Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor Author

Testing can start @adobecom/bacom-sot @adobecom/creative-cloud-sot @adobecom/document-cloud-sot @adobecom/express-sot @adobecom/homepage-sot @adobecom/miq-sot @adobecom/blog-sot

@aem-code-sync

aem-code-sync Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch.
In case there are problems, just click the checkbox below to rerun the respective action.

  • Re-sync branch
Commits

@github-actions

Copy link
Copy Markdown
Contributor

SNOW Change Request Transaction ID: 0000019c1ef37582-f4ff92f

@mokimo mokimo temporarily deployed to milo_pr_merge May 18, 2026 15:25 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 18, 2026 17:57 — with GitHub Actions Inactive
…preview (#5915)

* Add mep caas feature

* Fix mmm test

* [MWPW-194203] Address review feedback

- Scope CaaS highlight selectors to [data-caas-block] descendants
so unrelated [data-country] elements (pickers, forms) are unaffected
- Suppress per-card badge when data-card-path is empty (no resolvable URL)
- Strip data-card-path in removeCaasBadges so derived state doesn't persist after toggle-off
- Attach/detach MutationObserver on highlight toggle instead of observing for the lifetime of the page

* [MWPW-194204] Add MEP preview support for M@S surfaces

- Outline + Edit-in-Studio badges for collection / card / inline / OST /
  offer
- Sub-collection capture via aem:load listener + sibling badge
    (new preview-mas-subcollection.js)
- Shared mepMasStudioUrls WeakMap for authoring URL capture
    (new mas-mep-utils.js)
- Inline Fields row in MEP popup summary
- M@S supported-markets spoofer dropdown (standalone on non-Lingo pages,
    gated by checkbox alongside Lingo)
- Click delegation for ::before badge hit boxes
- Observer hygiene: listeners attach on highlight toggle-on, detach on
    toggle-off (matches CaaS pattern from review feedback)

* [MWPW-194204] Pass spoofed market country to OST tool for Edit OSI links

- preview.js: append &country= to Edit OSI URLs (both card action stack and standalone offers) using the resolved page market
- ost.js: read ?country= param and pass it into initService attributes so mas-commerce-service initializes with the correct country from the start
- update preview tests for new OST URL format

* [MWPW-194204] Fix Edit OSI clickability for pre-stamped data-mas-block="ost" and update test

* Fix inline field badge clickability and nested badge overlap

- Shorten inline badge label to prevent two-line wrapping
- Try all composedPath candidates in click handler so nested
    ost/offer badges don't shadow the outer inline hit box
- Flip nested ost/offer badges below their

* Add preview.js test coverage for CaaS badges, M@S fixes, and aem:load handler

* Refactor handleChildCardBadgeClick to satisfy no-continue lint

* Use textContent for user-derived strings in M@S preview to clear CodeQL XSS flow

Replace `createTag(tag, attrs, str)` with `createTag(tag, attrs)` + `el.textContent = str` for values that interpolate M@S CMS payload data (card market, sub-collection labels, OST/Edit-Card badges) and URL params (masHTML section). Removes the data-flow path from external input to `insertAdjacentHTML` that CodeQL flagged.

* MWPW-194204 [MEP] Address M@S highlight review feedback

- Include upt-link in MAS_OSI_SELECTOR (M1)
- Document inline-price data-ims-country gap (M3)
- Simplify MAS_LABELS — only `collection` reaches buildMasBadge (L1)
- Drop orphan market state classes; stamp `-mismatch` only (L2)
- Filter sub-collections by `queryLabel` instead of fieldName list (L3)
@rgclayton rgclayton requested review from a team, chrischrischris, cmiqueo and sanrai as code owners May 18, 2026 19:30
@mokimo mokimo temporarily deployed to milo_pr_merge May 18, 2026 21:08 — with GitHub Actions Inactive

@Roycethan Roycethan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@markpadbe cc @sunilkamat @Blainegunn @Axelcureno @3ch023
Few feedbacks on the M@S on MEP:
ex: https://www.stage.adobe.com/fr/acrobat/pricing/business.html?mep=%2Facrobat%2Fpricing-devicetype.json--default&mepMasHighlight=true&mepMasMarket=true&akamaiLocale=fr
On the Acrobat Pro pour les équipes card - click on View in OST for the promo price
Its taking me to below screen:

Image
  1. The promo code (TDAPCC_3LIC_7PT5) applied to the price is not carried over to the OST link, You can see Promotion field as empty
  2. Since its FR pricing how the authors will be able to see the OST link corresponds to FR, its taking to US equivalent...

@mokimo mokimo temporarily deployed to milo_pr_merge May 19, 2026 02:55 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 19, 2026 07:41 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 19, 2026 11:13 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 19, 2026 11:45 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 21, 2026 15:17 — with GitHub Actions Inactive
@Roycethan Roycethan self-requested a review May 21, 2026 15:22
@milo-pr-merge milo-pr-merge Bot merged commit 93a440f into main May 21, 2026
182 checks passed
@milo-pr-merge milo-pr-merge Bot temporarily deployed to milo_pr_merge May 21, 2026 15:26 Inactive
@hadobe hadobe self-requested a review May 21, 2026 15:39
@hadobe hadobe temporarily deployed to milo_pr_merge May 21, 2026 15:40 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 21, 2026 17:53 — with GitHub Actions Inactive
@aem-code-sync aem-code-sync Bot temporarily deployed to mep-lob-score-fix May 21, 2026 18:24 Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 21, 2026 21:24 — with GitHub Actions Inactive
@aem-code-sync aem-code-sync Bot temporarily deployed to mep-prod-auth-poc May 21, 2026 23:51 Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 22, 2026 03:24 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 22, 2026 07:40 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 22, 2026 10:46 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 22, 2026 11:32 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 22, 2026 14:32 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 22, 2026 17:48 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 22, 2026 21:06 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 23, 2026 02:44 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 23, 2026 06:32 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 23, 2026 09:48 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 23, 2026 10:16 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 23, 2026 16:56 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 23, 2026 20:46 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 24, 2026 02:57 — with GitHub Actions Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.