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.

Sign up for GitHub

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

Jump to bottom

[Release] Stage to Main #2019

Merged
merged 11 commits into from
Mar 18, 2024
Merged

[Release] Stage to Main #2019

merged 11 commits into from
Mar 18, 2024

Conversation

yesil
Copy link
Contributor

@yesil yesil commented Mar 15, 2024

Sartxi and others added 6 commits March 14, 2024 14:27
@Sartxi @Blainegunn
MWPW-143648 - [Action Item] Fix float icon position (#1957)
2d9de74 
* display main image block and add inline flex to floated icon

* revert inline flex rull on floated icon

---------

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
@mirafedas @Blainegunn
MWPW-142798 + MWPW-142872: Made the height-fit-content class to be se…
27f8507 
…t automatically (#1946)

fixed height auto adjustment and iframe styles in modal

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
@Axelcureno
MWPW-144575: Fix for commerce modal height (#2014)
0e512db 
There's a potential CSO lurking
@overmyheadandbody
[MWPW-144516] Handle cross cloud menu block error (#2006)
1786b5a
@sharath-kannan @robert-bogos @Blainegunn
fix(MWPW-142248): Accessibility for carousels containing focusable el…
56bbeb1 
…ements. (#1901)

* MWPW-142248

* fixed linting errors

* revert package.json

* revert package_lock.json

* Accessibility for the show-x variants of carousel

* test cases for code coverage

---------

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
@mirafedas
MWPW-144575: Modal-Iframe for apps-whats-included is broken for Deskt…
52bb962 
…op resolutions (#2016)

fixed CSS selector commerce-frame section and fragment
@yesil yesil requested review from a team March 15, 2024 13:18
@yesil yesil requested review from a team and rgclayton as code owners March 15, 2024 13:18
@aem-code-sync AEM Code Sync
Copy link
Contributor

aem-code-sync bot commented Mar 15, 2024 •
edited
Loading

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

@yesil yesil added run-nala Run Nala Test Automation against PR needs-verification PR requires E2E testing by a reviewer labels Mar 15, 2024
@codecov Codecov
Copy link

codecov bot commented Mar 15, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.28%. Comparing base (f648d1b) to head (7af20af).

❗ Current head 7af20af differs from pull request most recent head 9b3dad1. Consider uploading reports for the commit 9b3dad1 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2019      +/-   ##
==========================================
- Coverage   96.32%   96.28%   -0.05%     
==========================================
  Files         165      166       +1     
  Lines       42274    42324      +50     
==========================================
+ Hits        40721    40751      +30     
- Misses       1553     1573      +20

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

Roycethan
Roycethan requested changes Mar 15, 2024
View reviewed changes
Copy link

@Roycethan Roycethan left a comment

Choose a reason for hiding this comment

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

@yesil I have few issues mentioned in https://jira.corp.adobe.com/browse/MWPW-144575 which needs to be fixed before this goes to Main , hence won't be able to sign off at the moment... discussed with @mirafedas on those

@Ruchika4
Copy link
Contributor

Ruchika4 commented Mar 15, 2024 •
edited
Loading

CC team is still seeing some issue with the modal in iphone with the fix going in this PR. Please see the details in the ticket here https://jira.corp.adobe.com/browse/MWPW-144601

cc @sigadamvenkata @spadmasa @dstrong23 @salonijain3 @yesil @mirafedas

vhargrave and others added 4 commits March 18, 2024 13:55
@vhargrave @yesil
@Blainegunn @thedoc31 @meganthecoder @robert-bogos @cmiqueo
Sync stage with main (#2025)
d2f377e 
* [Release] Stage to Main (#2005)

MWPW-143673: Load Milo fragment modals from co links #1972
MWPW-142894: fragments can lead to invalid html #1937
High Priority
Caas-Marquee: Fixes integration with martech.js issues #2003
MWPW-143591 Fix Contextual Search Duplicates #1990
Zero Impact
MWPW-143708 and MWPW-143712 add kodiak auto-ticketing #2002
---------
Co-authored-by: J. Casalino <casalino@adobe.com>
Co-authored-by: Megan Thomas <methomas@adobe.com>
Co-authored-by: ilyas Stéphane Türkben <tuerkben@adobe.com>
Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: cmiqueo <64917520+cmiqueo@users.noreply.github.com>

* [Release] Stage to Main (#2010)


* Update martech.main.standard.min.js (#2008)

---------
Co-authored-by: Chris Peyer <chrischrischris@users.noreply.github.com>

* fix merge empty line

---------

Co-authored-by: ilyas Stéphane Türkben <tuerkben@adobe.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: J. Casalino <casalino@adobe.com>
Co-authored-by: Megan Thomas <methomas@adobe.com>
Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: cmiqueo <64917520+cmiqueo@users.noreply.github.com>
@yesil
Merge remote-tracking branch 'upstream/main' into main-to-stage
79455a6
@yesil
remove extra line
9754674
@vhargrave
Main to stage (#2027)
7af20af
@spadmasa
Copy link

Validation done from CC and details are updated in https://jira.corp.adobe.com/browse/MWPW-144601

@mirafedas @Axelcureno
MWPW-144575: fix for the modal duplication (#2021)
9b3dad1 
added checking to not create a modal when it is already present in DOM

Co-authored-by: Axel Cureno Basurto <axelcureno@gmail.com>
@Roycethan
Copy link

@yesil I have few issues mentioned in https://jira.corp.adobe.com/browse/MWPW-144575 which needs to be fixed before this goes to Main , hence won't be able to sign off at the moment... discussed with @mirafedas on those

Fixed with #2021

@Roycethan Roycethan self-requested a review March 18, 2024 18:39
@Blainegunn Blainegunn merged commit 2144700 into main Mar 18, 2024
11 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JFernandezAdobe JFernandezAdobe JFernandezAdobe approved these changes

@Roycethan Roycethan Roycethan approved these changes

@JackySun9 JackySun9 JackySun9 approved these changes

@Dli3 Dli3 Dli3 approved these changes

@aishwaryamathuria aishwaryamathuria aishwaryamathuria approved these changes

@fullcolorcoder fullcolorcoder fullcolorcoder approved these changes

@rgclayton rgclayton Awaiting requested review from rgclayton rgclayton is a code owner

Assignees
No one assigned
Labels
BAcom SOT 👌 CC SOT 👌 DC SOT 👌 Homepage SOT 👌 MIQ SOT👌 needs-verification PR requires E2E testing by a reviewer run-nala Run Nala Test Automation against PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.