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-160511: badge & switch to AEM Prod #3094

Merged
merged 7 commits into from
Nov 4, 2024
Merged

Conversation

3ch023
Copy link
Contributor

@3ch023 3ch023 commented Oct 28, 2024

This PR will have to go to stage after #3063, so for now it's based on the Axels feature branch

  • add badge
  • fix fonts
  • switch to Odin prod

Resolves: MWPW-160511

CCD test page is not yet ready, waiting for the Prod publish of CFs:
MWPW-160511-badge--milo--adobecom.hlx.page/libs/features/mas/docs/ccd.html

Test URLs:

Copy link
Contributor

aem-code-sync bot commented Oct 28, 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 Oct 28, 2024

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

@3ch023 3ch023 changed the title Mwpw 160511 badge MWPW-160511: badge & switch to AEM Prod Oct 28, 2024
@@ -25,7 +25,10 @@ export class CCDSuggested extends VariantLayout {
return html`
<div style="${this.stripStyle}" class="body">
<div class="header">
<slot name="icons"></slot>
<div class="top-section">
<slot name="icons"></slot>
Copy link
Contributor

Choose a reason for hiding this comment

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

should we rename the slot to mnemonics?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i'd say yes, but then we need to touch all variants? it's 'icons' across the whole thing

Copy link
Contributor Author

Choose a reason for hiding this comment

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

maybe it's my laziness, but imo we for now could just rename the authoring UI and keep them icons in code, since it's clear enough what it is. but up to you

Copy link
Contributor

Choose a reason for hiding this comment

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

we have a mechanism already to map properties to slot names:
https://github.com/adobecom/milo/blob/stage/libs/features/mas/web-components/src/variants/ccd-suggested.js#L10

so we can afford mnemonic slot and map it correctly.
later it would be good, when someone inspects the DOM and sees icon instead of mnemonic.

@@ -68,6 +71,9 @@ styles.innerHTML = `
--merch-color-focus-ring: #1473E6;
--merch-color-grey-60: var(--spectrum-global-color-gray-600, #6D6D6D);
--merch-color-grey-80: #2c2c2c;
/* beware, 'gray' not 'grey'*/
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the grey comment is not needed. but message is understood.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah i was wondering if it's helpful or not..
i had a bit of pain noticing the diff, so decided to add a note for the next person

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed the message and actually renamed it to 'grey' to be consistent.

libs/features/mas/web-components/src/aem-fragment.js Outdated Show resolved Hide resolved
@aem-code-sync aem-code-sync bot temporarily deployed to MWPW-160511-badge October 28, 2024 13:16 Inactive
Copy link
Member

@Axelcureno Axelcureno left a comment

Choose a reason for hiding this comment

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

lgtm

Base automatically changed from ccd-axel-changes to stage October 29, 2024 08:01
@milo-pr-merge milo-pr-merge bot requested a review from a team as a code owner October 29, 2024 08:01
Copy link
Contributor

@yesil yesil left a comment

Choose a reason for hiding this comment

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

this PR doesn't seem to have merged stage into correctly.

already merged changes are reported as new here: https://github.com/adobecom/milo/blob/stage/libs/blocks/merch/merch.js#L48

@3ch023 3ch023 force-pushed the MWPW-160511-badge branch from c031e94 to a1506e9 Compare October 29, 2024 15:24
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link

codecov bot commented Oct 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.35%. Comparing base (fa39a05) to head (5dc725b).
Report is 11 commits behind head on stage.

Additional details and impacted files
@@           Coverage Diff           @@
##            stage    #3094   +/-   ##
=======================================
  Coverage   96.34%   96.35%           
=======================================
  Files         245      245           
  Lines       56312    56329   +17     
=======================================
+ Hits        54252    54274   +22     
+ Misses       2060     2055    -5     

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

@3ch023 3ch023 added the run-nala Run Nala Test Automation against PR label Oct 29, 2024
libs/features/mas/web-components/merch-card.md Outdated Show resolved Hide resolved
Copy link
Contributor

This pull request is not passing all required checks. Please see this discussion for information on how to get all checks passing. Inconsistent checks can be manually retried. If a test absolutely can not pass for a good reason, please add a comment with an explanation to the PR.

@3ch023 3ch023 force-pushed the MWPW-160511-badge branch from 70504ef to 53a4864 Compare October 30, 2024 11:57
@afmicka
Copy link
Contributor

afmicka commented Oct 30, 2024

@3ch023 Do you know what exactly size the badge font should be?
On stage it is 14px, on your branch 16px and in figma when i inspect i see it 12px.
stage:
Screenshot 2024-10-30 at 17 26 03
this PR:
Screenshot 2024-10-30 at 17 25 55

Copy link
Contributor

Choose a reason for hiding this comment

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

@3ch023 why this file is in your PR? Are you fixing a flaky test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes. it was failing on my PR and i have a feeling it fails for other prs sometimes.
trying to be a good samaritan :D

@afmicka afmicka added verified PR has been E2E tested by a reviewer Ready for Stage labels Oct 31, 2024
@afmicka
Copy link
Contributor

afmicka commented Oct 31, 2024

Approving the PR to unblock the work. As agreed created the follow-up jira for the above observations. https://jira.corp.adobe.com/browse/MWPW-161357

cc: @3ch023 @Roycethan

@milo-pr-merge milo-pr-merge bot merged commit 277e00f into stage Nov 4, 2024
22 checks passed
@milo-pr-merge milo-pr-merge bot deleted the MWPW-160511-badge branch November 4, 2024 17:50
@milo-pr-merge milo-pr-merge bot mentioned this pull request Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
commerce 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.

5 participants