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

Mwpw 147034: Custom border color + badge/border color decoupling [merch card] #2613

Merged
merged 9 commits into from
Jul 29, 2024

Conversation

Axelcureno
Copy link
Member

@Axelcureno Axelcureno commented Jul 23, 2024

Adds ability to decouple border and badge colors in authoring of merch card.
Adds ability to set custom border color without using a badge in merch card.

This is a dependency consumption PR, milo changes already merged.

Mas PR: adobecom/mas#15

Resolves: MWPW-147034

Test URLs:

Before: https://main--milo--adobecom.hlx.page/drafts/axel/custom-border-badge?martech=off
After: https://mwpw-147034--milo--adobecom.hlx.page/drafts/axel/custom-border-badge?martech=off

Copy link
Contributor

aem-code-sync bot commented Jul 23, 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

@Axelcureno Axelcureno added run-nala Run Nala Test Automation against PR commerce needs-verification PR requires E2E testing by a reviewer merch card labels Jul 23, 2024
Copy link
Contributor

aem-code-sync bot commented Jul 23, 2024

Page Scores Audits Google
/drafts/axel/custom-border-badge?martech=off PERFORMANCE A11Y SEO BEST PRACTICES SI FCP LCP TBT CLS PSI

Copy link

codecov bot commented Jul 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.70%. Comparing base (ee4f063) to head (d1f85d1).
Report is 1 commits behind head on stage.

Additional details and impacted files
@@            Coverage Diff             @@
##            stage    #2613      +/-   ##
==========================================
- Coverage   95.70%   95.70%   -0.01%     
==========================================
  Files         172      172              
  Lines       45361    45361              
==========================================
- Hits        43412    43411       -1     
- Misses       1949     1950       +1     

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

@Roycethan Roycethan added verified PR has been E2E tested by a reviewer and removed needs-verification PR requires E2E testing by a reviewer labels Jul 23, 2024
Copy link
Contributor

@overmyheadandbody overmyheadandbody left a comment

Choose a reason for hiding this comment

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

Some conflicts need to be resolved before being able to merge this

@milo-pr-merge
Copy link
Contributor

milo-pr-merge bot commented Jul 25, 2024

Error merging 2613: Mwpw 147034: Custom border color + badge/border color decoupling [merch card] file is not defined

@milo-pr-merge
Copy link
Contributor

milo-pr-merge bot commented Jul 25, 2024

Skipped 2613: "Mwpw 147034: Custom border color + badge/border color decoupling [merch card]" due to file "libs/deps/merch-card.js" overlap. Merging will be attempted in the next batch

Copy link
Contributor

This PR does not qualify for the zero-impact label as it touches code outside of the allowed areas. The label is auto applied, do not manually apply the label.

@Axelcureno Axelcureno added the do not merge PR should not be merged yet label Jul 25, 2024
@Axelcureno Axelcureno removed the do not merge PR should not be merged yet label Jul 25, 2024
@milo-pr-merge milo-pr-merge bot merged commit 925af3f into stage Jul 29, 2024
12 checks passed
@milo-pr-merge milo-pr-merge bot deleted the MWPW-147034 branch July 29, 2024 08:22
@milo-pr-merge milo-pr-merge bot mentioned this pull request Jul 29, 2024
rohitsahu pushed a commit to rohitsahu/milo that referenced this pull request Jul 29, 2024
* stage:
  MWPW-150557 - Split Marquee CLS issues on consuming sites (adobecom#2636)
  Mwpw 147034: Custom border color + badge/border color decoupling [merch card] (adobecom#2613)
  [MWPW-151517] - Remove condition for promobar hidden on mobile from gnav (adobecom#2538)

# Conflicts:
#	libs/deps/merch-card.js
rohitsahu pushed a commit to rohitsahu/milo that referenced this pull request Jul 30, 2024
* stage:
  [MWPW-153611] [Gray Box] environment aware links (adobecom#2622)
  MWPW-153580: Add Opt-In Feature for CaaS Badge Display (adobecom#2625)
  [MWPW-154335] [callout] Spacing issue encountered when the call-out section is added (adobecom#2628)
  MWPW-150557 - Split Marquee CLS issues on consuming sites (adobecom#2636)
  Mwpw 147034: Custom border color + badge/border color decoupling [merch card] (adobecom#2613)
  [MWPW-151517] - Remove condition for promobar hidden on mobile from gnav (adobecom#2538)
  MWPW-154998 [MEP][MILO] Manifests do not execute in the right order when there is a disabled manifest (adobecom#2632)
  mwpw-154965: Fetch federal stage content from hlx.page instead of stage.adobe.com (adobecom#2618)
  Correct error messages for duplicate files on the stage to main workflow (adobecom#2621)
  MWPW-153245 [merch][analytics] dispatch wcomp events, and let default lh (adobecom#2610)
  Revert "MWPW-146528[MILO][MEP][ANALYTICS] Add attribute to content changed by Target for analytics and MWPW-152274" (adobecom#2627)
  MWPW-128600 Locale Tool: Langstore points to langstore/en (adobecom#2615)
  Fix for errors in dynamically loaded scripts in test cases (adobecom#2619)
  MWPW-146528[MILO][MEP][ANALYTICS] Add attribute to content changed by Target for analytics and MWPW-152274 (adobecom#2593)
  Bootstrapper script for milo feds blocks (adobecom#2560)
  Revert "[MWPW-152968] mWeb - Passing ECID to Branch.io banner - Implementation" (adobecom#2612)

# Conflicts:
#	libs/deps/merch-card.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
commerce merch card Ready for Stage run-nala Run Nala Test Automation against PR verified PR has been E2E tested by a reviewer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants