Skip to content

[Release] Stage to Main - #6750

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

milo-pr-merge[bot] merged 12 commits into
mainfrom
stage

Conversation

vgoodric and others added 4 commits September 17, 2026 08:51
* Initial checkin. Placeholder logic.

* Added consent check. Changed list to tooltip.

* Warning message WIP.

* Refactor manifest status checks to improve error handling and messaging

* Remove warning for missing manifest-changes-offers value in getManifestStatus function

* Rename checkManifestConsent to checkPromoRange for clarity and update references

* Fix fetchData check and enhance manifest data validation in getManifestConfig function

* Move error handling for malformed manifests in getManifestStatus function since malformed manifests negate the need for any other checks.

* Update error message for malformed manifest in buildManifestCard test

* Enhance error handling for malformed manifests by including error details in buildMalformedManifestEntry and updating getManifestStatus to reflect specific errors.

* Refactor getManifestConfig to streamline data fetching and error handling

* Update error message for malformed manifest in buildManifestCard test

* Add error field to manifestErrors for broken manifest in buildManifestCard test

* restore ability to have no info tab for now

* Add error details to manifestErrors for broken and empty manifests

* Add geoDisabled flag to manifestConfig when geoRestriction is not met

* Rename geoRestriction to countryRestriction across the codebase for clarity and consistency

* Refactor consent handling and country restrictions in MEP

- Renamed geoRestriction to countryRestriction for clarity.
- Introduced consentType to replace mktgAction in various functions and components.
- Added logic to handle consent requirements, including consentNotSpecified and consentEnabled flags.
- Updated manifest error handling to include consent-related errors.
- Modified tests to reflect changes in consent handling and ensure proper functionality.
- Enhanced analytics tracking based on consent requirements.

* Update consentState keys in tests for clarity and accuracy

* Update manifest status label from 'Ineligible' to 'Disabled'

* Remove unused parameter 'mktgAction' from buildManifestEntry function

* Changed warning color from yellow to gray.

* Add disabledPromo property to activity and manifest handling

* Refactor geo restriction and manifest serving logic to support async operations

* Enhance geo restriction logic to utilize countryIPPromise if available

* Update consent message for clarity in manifest status

* Add consent type checks for non-personalized and personalized offers in manifest status

* Revert "Enhance geo restriction logic to utilize countryIPPromise if available"

This reverts commit e2f1341.

because the issue is fixed in #6611 instead

* Fix: Remove redundant fallback in persData assignment in getManifestConfig function

* Merge branch 'mep-disabled-manifests-v2' into mepcountrytogeo

* Merge branch 'mepcountrytogeo' into mepconsent

* Fix: Enhance persData assignment to handle array data in getManifestConfig function

* Fix unresolved merge conflict markers left in stage merge commit

The merge of stage into mepconsent (789740e) was committed while
these files still contained literal conflict markers, breaking JS
parsing. Resolves them by keeping mepconsent's consentType model
(over stage's simpler mktgAction), dropping the dead mepgeolocation
flag superseded by #6611, and fixing a stale test that asserted
against the no-longer-read akamaiCode field instead of countryIP.

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

* Normalize consent type handling to be case-insensitive and update tests accordingly

* fix: enforce mep param > country > consent variant override priority

Reorder setCountryEnabled() before setConsentEnabled() in
getManifestConfig() and short-circuit the non-personalized offer test
substitution when countryEnabled is false, so pickNonPznVariant() is
never invoked for geo-ineligible users. Prevents a real variant from
being allocated and persisted to localStorage before geo eligibility
is evaluated.

Add integration test covering non-personalized offer test +
performance consent off + non-matching country, asserting
variantOverride[path] === 'Default' and localStorage['mep-'] is not
written.

---------

Co-authored-by: AdobeLinhart <dlinhart@adobe.com>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
* TypeKit load strategy challenger

* [MWPW-198891] Load brand fonts quicker
No upgrade block on the page makes querySelector return null; the next
getAttribute call threw, rejecting getCheckoutAction's Promise.all and
discarding the CRM modal action, so logged-in non-Acrobat users got a
dead CTA. Return early when there is no upgrade offer.
* support for a launch url override via the launch-url metadata property

* updates based on feedback

* remove whitespace
@milo-pr-merge

milo-pr-merge Bot commented Sep 17, 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

@milo-pr-merge
milo-pr-merge Bot requested review from a team as code owners September 17, 2026 08:51
@aem-code-sync

aem-code-sync Bot commented Sep 17, 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: 0000019c1eec85a3-22a9112e

@narcis-radu
narcis-radu deployed to milo_pr_merge September 17, 2026 09:08 — with GitHub Actions Active
* MWPW-203780: Support carousel-c2 with two slides

* MWPW-203780: Address review feedback on carousel-c2 two-slide support

- Replace per-clone MutationObserver with a single MILO_EVENTS.DEFERRED
  listener; refreshCloneBackgrounds now rebuilds both padded hint clones
  and permanent loop-ring clones once their source background decorates
- Move loading=eager into createSlideClone so rebuilt clones keep it
- Guard against fewer than two slides and clear the block instead of
  throwing / leaving raw config rows in the DOM
- Extract SLIDES_TO_SHOW constant for the pad/ring count
- Add tests for ring-clone rebuild and the single-slide guard

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* Avoid twice adding attribute to the clone slide img.

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
@mokimo
mokimo deployed to milo_pr_merge September 17, 2026 09:10 — with GitHub Actions Active
…he default (#6699)

* Add within-firewall auth bypass and make mep-next the default

Lets employees on the corp network skip AEM Sidekick sign-in for MEP
overlay access via a DNS-only reachability check against an internal
host, with a "Check again" link on the login card to re-run the
check. Also flips the mepnext gate so mep-next loads by default,
with ?mepnext=off retained as the legacy preview.js escape hatch.

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

* Add tests for isWithinFirewall and update onSidekickAuth to await firewall checks

* Add fetch stub rejection for isWithinFirewall() to test timeout Sidekick-auth path

* make unit test more strict to pass security check

* Update logged out button css.

* fix(mep): avoid firewall delay blocking Sidekick auth

add timeout to corp firewall reachability probe
initialize Sidekick auth listeners immediately instead of waiting on the probe
allow a successful firewall check to grant access and stop further auth checks
update unit tests for concurrent firewall auth behavior and override semantics

* fix(auth): enhance Sidekick auth handling and improve firewall integration

* fix: update isMepNextOverlay logic for better URL parameter handling

* fix: avoid duplicate MEP overlay initialization

---------

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: AdobeLinhart <dlinhart@adobe.com>
…t Spaces Frictionless pages (#6746)

fix

Co-authored-by: Ketaki Deshwandikar <ketaki@youremail.com>
@milo-pr-merge
milo-pr-merge Bot requested a review from a team as a code owner September 17, 2026 12:34
…6623)

* Add MEP Next spoof-country-ip and "Manifest Parameters" preview toggle

- Pair Target's mboxOverride.browserIp with akamaiLocale in the MEP
  spoofers via applyGeoSpoof (spoof-country-ip.js + test).
- Add a Toggle-card switch that omits the `mep` param from the preview
  URL so the previewed page loads with no manifest parameters applied.
  Wired into setPreviewButton; covered by two overlay-logic tests.

* Fix Spoof Geo card collapsing when radio buttons are clicked

The card collapse handler matched any `svg` inside a `.mep-card`, so
clicking a Spoof Geo radio-row icon (an svg in the card body) bubbled up
and toggled the card. Scope the trigger to `.mep-card h1 svg` so only the
header chevron collapses the card. Adds a regression test.

* Persist Manifest Parameters toggle across preview reloads

Store the toggle state in sessionStorage so it survives a preview reload
but clears when the tab closes (avoids a sticky, forgotten "don't apply
manifests" state across QA sessions). Restored in setDefaultValues and
written from the drawer change handler.

* MWPW-204279 [MEP] Keep bare mep param when manifest params excluded

The Manifest Parameters toggle deleted the mep param entirely, which hides
the MEP button in prod (utils gates the preview path on mepParam === '').
Keep a valueless mep param instead: the button still renders and no manifest
parameters are applied. Serialize it as a bare `mep` (no trailing `=`).
@JackySun9

Copy link
Copy Markdown
Contributor

I saw error on this page, is that expected? https://www.stage.adobe.com/error-pages/404.html

@JackySun9 JackySun9 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.

@mokimo
mokimo deployed to milo_pr_merge September 18, 2026 18:50 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 18, 2026 22:14 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 19, 2026 03:01 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 19, 2026 08:29 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 19, 2026 12:41 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 19, 2026 15:19 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 19, 2026 18:23 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 19, 2026 22:05 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 20, 2026 03:17 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 20, 2026 09:02 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 20, 2026 13:13 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 20, 2026 15:23 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 20, 2026 18:27 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 20, 2026 22:09 — with GitHub Actions Active
@mokimo
mokimo deployed to milo_pr_merge September 21, 2026 03:13 — with GitHub Actions Active
…p-next the default" (#6766)

Revert "MWPW-207055 [MEP] Add within-firewall auth bypass and make mep-next t…"

This reverts commit 9522c65.
@narcis-radu
narcis-radu dismissed JackySun9’s stale review September 21, 2026 08:16

Faulty code has been reverted. Dismissing Jacky's review.

@narcis-radu
narcis-radu deployed to milo_pr_merge September 21, 2026 08:16 — with GitHub Actions Active
@milo-pr-merge
milo-pr-merge Bot merged commit f64061b into main Sep 21, 2026
25 checks passed
@milo-pr-merge
milo-pr-merge Bot deployed to milo_pr_merge September 21, 2026 08:16 Active

This branch was successfully deployed

2 active deployments
milo_pr_merge 870fc06b Deployed Sep 21, 2026 by milo-pr-merge[bot] via merge-to-stage #6825
stage 870fc06b Deployed Sep 21, 2026 by aem-code-sync[bot]
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.