Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release] Stage to Main #2479

Merged
merged 7 commits into from
Jun 18, 2024
Merged

[Release] Stage to Main #2479

merged 7 commits into from
Jun 18, 2024

Conversation

Axelcureno and others added 4 commits June 17, 2024 09:14
…2229)

* MWPW-146856: Left/right padding missing on segment cards on mobile

Fixes Left/right padding missing on segment cards on mobile viewport.

Tacocat PR: https://git.corp.adobe.com/wcms/tacocat.js/pull/584

Resolves: MWPW-146856

Test URLs:

Before: https://main--milo--adobecom.hlx.page/?martech=off
After: https://MWPW-146856--milo--adobecom.hlx.page/?martech=off

* Update merch-card.js

* Update merch-card.js

* Update merch-card.js

* updated dependency

* Update merch-card.js
* modified georouting and pep so that pep only appears if a) GRM is not shown or b) GRM is dismissed

* Unit test for GRM/PEP interaction

* changed grmActive to geoRoutinActive

* Fixed unit test for grm/pep interaction

* removed unused imports

* Cleaned up the implementation

* Changed from polling to listening for an event

* removed an unnecessary line

* Modified unit test

* Changed the implementation to use polling for any modal

* Changed pep loading logic to poll for modals only after the close modal dialog comes through
* MWPW-147206 making promo schedule geo aware

mostly to allow authors enabling promos in separate smaller files, schedule directive has now a locales setting to narrow its activation to those countries

promoEnabled parameter passed to getPromoManifests in promo utils is now an object that has entries for each region promo name that are fetched at very early time (no geo resolution), default being kept for backward compatibility reasons with key `manifestnames`. getPromoManifests then resolves current locale and serves merged manifests between regional specific ones (if locale matches), and 'global' ones.

* lint & ut fix

* MWPW-147206 removing non matching manifests

* lint fix

* review fixes

* MWPW-147206 rares changes
* Removing data layer descriptions from fields

* removing console.log
@milo-pr-merge
Copy link
Contributor Author

milo-pr-merge bot commented Jun 17, 2024

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

Copy link
Contributor

aem-code-sync bot commented Jun 17, 2024

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

  • Re-run PSI checks
  • Re-sync branch
Commits

Copy link
Contributor

aem-code-sync bot commented Jun 17, 2024

Page Scores Audits Google
/?martech=off PERFORMANCE A11Y SEO BEST PRACTICES SI FCP LCP TBT CLS PSI

Copy link

codecov bot commented Jun 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.71%. Comparing base (0cdd84a) to head (16c64e4).
Report is 9 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2479      +/-   ##
==========================================
+ Coverage   95.66%   95.71%   +0.04%     
==========================================
  Files         173      174       +1     
  Lines       45397    45641     +244     
==========================================
+ Hits        43431    43686     +255     
+ Misses       1966     1955      -11     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

* [MWPW-151172] Package updates

* [MWPW-151172] Update dependencies; add zero-impact file
mwpw-152624: improve stage communication
@aem-code-sync aem-code-sync bot temporarily deployed to stage June 17, 2024 12:16 Inactive
* Mwpw-136871: TwP merch card (#2088)

* MWPW-136871: TwP Merch Card

* unit tests

* TWP block draft (#2105)

* add draft for a merch-twp block

---------

Co-authored-by: Axel Cureno Basurto <[email protected]>

* Mwpw 136871: Price display inside TwP merch card (#2110)

* MWPW-136871: TwP Merch Card

* unit tests

* twp card

* price display in TwP

* deps update

* Mwpw 136871 (#2154)

* MWPW-136871: TwP Merch Card

* unit tests

* twp card

* price display in TwP

* deps update

* MWPW-138927: merch-twp WIP (#2160)

Merging proactively for a GWP demo.

* MWPW-138927: desktop step 2 layout WIP

* remove comment

* pr feedback

* update deps

* update deps

* update deps

* update deps

* fixed tests

* fix lagging subscription panel

* WIP

* fix tests

* fix tests

* wip

* fix failing test

* fix failing tests

* remove files

* improve code coverage

* address first batch of comments

* fix dependencies

* fix unit tests

* add missing test cases

---------

Co-authored-by: Axel Cureno Basurto <[email protected]>
Co-authored-by: Mariia Lukianets <[email protected]>
Co-authored-by: Axel Cureno Basurto <[email protected]>
@JackySun9 JackySun9 added the run-nala Run Nala Test Automation against PR label Jun 17, 2024
@milo-pr-merge milo-pr-merge bot merged commit ddbdf7a into main Jun 18, 2024
42 checks passed
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.