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 #2309

Merged
merged 21 commits into from
May 16, 2024
Merged

[Release] Stage to Main #2309

merged 21 commits into from
May 16, 2024

Conversation

sanrai and others added 12 commits May 14, 2024 05:59
…change (#2248)

Potential fix for bulk publisher issues

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Sheridan Sunier <sunier92@gmail.com>
Updating how alt text is used and displayed in preflight

Co-authored-by: Ryan Clayton <rclayton@adobe.com>
Co-authored-by: Brad Johnson <fullcolorcoder@gmail.com>
Co-authored-by: Sheridan Sunier <sunier@sheridans-mbp.corp.adobe.com>
remove role attribute on dd elements

Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>
…2198)

* MWPW-147158: adds support for footer divider at the collection level

* Updatest unit-test files

* Update windows copy hash

* Update OSX copy hash

* Updates OSX hash again

* Removes console log

* Adds console logs for debbuging

* Removes console logs

* Adds console logs for debbuging again

* Removes console log

* Updates OSX hash

* Adds debuging message to test

* Update os-hash check logic

* trim() generated hash

* Changes the comparison logic for the hash

* Reverts last attempt

* new attempt to fix test

---------

Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>
…sidekick (#2244)

* Fix for origin always being upper cased

* Update tools/send-to-caas/send-utils.js

changing to const

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>
* Stage process improvements

* Remove team reviewers

* Formatting

* Simplify PR bodies

---------

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Remove label & merge workflows

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
* Initial quiz-entry block with ml field

* MWPW-144810: Quiz Entry - Add option cards and text to the block (#2095)

* Quiz entry block (#2103)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-146243 - Quiz entry code optimization (#2121)

* MWPW-146243 - Quiz entry code optimization

* Restores code optimization that was lost in previous PRs

Resolves: [MWPW-146243](https://jira.corp.adobe.com/browse/MWPW-146243)

* Update utils.js

* Update quiz-entry.js

Set button to use string values

* Update quiz-entry.js

Fixed to use new strings object

* MWPW-146034 - Quiz entry block accessibility (#2139)

* resolved accessibility concerns when the ml input is used
* general code refinements for more clarity, specifically for getting string values

Resolves: [MWPW-146034](https://jira.corp.adobe.com/browse/MWPW-146034)

* MWPW-146036 - Rig up quiz entry button (#2190)

* Support for ml filtering
* Debug support using ?debug=quiz-entry
* Store quizState in local storage and redirect to the quiz

Resolves: [MWPW-146036](https://jira.corp.adobe.com/browse/MWPW-146036)

* Quiz entry block (#2204)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-147031:Add Analytics for Quiz Entry Block, MWPW-146080: Integrate Auto-Complete for Open Text Field on UAR Exposed Front Door

* fix eslint

* fix code according feedbacks

* MWPW-144022: Quiz entry block (#2227)

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* MWPW-147482 - ML Input Bulletproofing (#2242)

* add support for fallback fi codes
* add lana logging for ml field failures
* fix so the redirect checks for maxQuestions

Resolves: [MWPW-147482](https://jira.corp.adobe.com/browse/MWPW-147482)

**Test URLs:**
- Before: https://main--milo--adobecom.hlx.page/?martech=off
- After: https://<branch>--milo--adobecom.hlx.page/?martech=off

* MWPW-147683 - CSS Cleanup (#2267)

* MWPW-147683 - CSS Cleanup

* Final pass on the css
* Edits to markup where necessary

Resolves: [MWPW-147683](https://jira.corp.adobe.com/browse/MWPW-147683)

* pr feedback for vars and eslint errors

* more PR feedback on icon placement

* pr feedback for button border

* cleaned up the carousel widths so it's consistent it all times as it was previously 8px short.

* pr feedback on the location of the input clear X.

* PR feedback - reduced border on input, fixed a card disable bug, addressed card layout in tablet

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* Tests

* working tests update

* Small font size fixes that design has asked for

* linting

* linting

* Update quiz-entry.js with default vals

* Bring back debug

* debugging debug

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/quiz-entry.test.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/quiz-entry.test.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* added quiz-entry to utils.js (#2296)

Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>

* MWPW-148206: Update Spectra ML host from cchome-dev to cchome for PROD

---------

Co-authored-by: Jacky Sun <67350368+JackySun9@users.noreply.github.com>
Co-authored-by: Brad Johnson <fullcolorcoder@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>
Co-authored-by: Jacky Sun <XIASUN@ADOBE.COM>
* MWPW-147472: auto adjust commerce iframe.

* typo fix

* fix for potential bfcache issues

* improve modal selector query w.r.t hash

improve test.

---------

Co-authored-by: Mira Fedas <30750556+mirafedas@users.noreply.github.com>
* Initial graybox overlay

* Add title & desc support

* Use more variables

* Add tests; fix issues found with tests

* Add blue design changes + body outline

* Fix blue border on device preview.  Small bug fixes.

* Only enable on -graybox urls or with graybox url param

* Update graybox check to use hostname instead of path

* Small bug fixes to handle when graybox url param already present

* Add check for localhost for unit tests

* PR feedback

* Add metadata check; code cov tweaks

* Change metadata setting

* add .page/.live selector

* Disable georouting modal when graybox is enabled

---------

Co-authored-by: Sunil Kamat <107644736+sukamat@users.noreply.github.com>
Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
* Initial quiz-entry block with ml field

* MWPW-144810: Quiz Entry - Add option cards and text to the block (#2095)

* Quiz entry block (#2103)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-146243 - Quiz entry code optimization (#2121)

* MWPW-146243 - Quiz entry code optimization

* Restores code optimization that was lost in previous PRs

Resolves: [MWPW-146243](https://jira.corp.adobe.com/browse/MWPW-146243)

* Update utils.js

* Update quiz-entry.js

Set button to use string values

* Update quiz-entry.js

Fixed to use new strings object

* MWPW-146034 - Quiz entry block accessibility (#2139)

* resolved accessibility concerns when the ml input is used
* general code refinements for more clarity, specifically for getting string values

Resolves: [MWPW-146034](https://jira.corp.adobe.com/browse/MWPW-146034)

* MWPW-146036 - Rig up quiz entry button (#2190)

* Support for ml filtering
* Debug support using ?debug=quiz-entry
* Store quizState in local storage and redirect to the quiz

Resolves: [MWPW-146036](https://jira.corp.adobe.com/browse/MWPW-146036)

* Quiz entry block (#2204)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-147031:Add Analytics for Quiz Entry Block, MWPW-146080: Integrate Auto-Complete for Open Text Field on UAR Exposed Front Door

* fix eslint

* fix code according feedbacks

* MWPW-144022: Quiz entry block (#2227)

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* MWPW-147482 - ML Input Bulletproofing (#2242)

* add support for fallback fi codes
* add lana logging for ml field failures
* fix so the redirect checks for maxQuestions

Resolves: [MWPW-147482](https://jira.corp.adobe.com/browse/MWPW-147482)

**Test URLs:**
- Before: https://main--milo--adobecom.hlx.page/?martech=off
- After: https://<branch>--milo--adobecom.hlx.page/?martech=off

* MWPW-147683 - CSS Cleanup (#2267)

* MWPW-147683 - CSS Cleanup

* Final pass on the css
* Edits to markup where necessary

Resolves: [MWPW-147683](https://jira.corp.adobe.com/browse/MWPW-147683)

* pr feedback for vars and eslint errors

* more PR feedback on icon placement

* pr feedback for button border

* cleaned up the carousel widths so it's consistent it all times as it was previously 8px short.

* pr feedback on the location of the input clear X.

* PR feedback - reduced border on input, fixed a card disable bug, addressed card layout in tablet

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* Tests

* working tests update

* linting

* linting

* Update quiz-entry.js with default vals

* Bring back debug

* debugging debug

* Improved test coverage

* resolve conflicts

* restore style

* formatting fix

---------

Co-authored-by: Cody Lloyd <colloyd@adobe.com>
Co-authored-by: Jacky Sun <67350368+JackySun9@users.noreply.github.com>
Co-authored-by: Cody Lloyd <119891065+colloyd@users.noreply.github.com>
Copy link
Contributor

aem-code-sync bot commented May 15, 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 May 15, 2024

Page Scores Audits Google
/?martech=off Lighthouse returned error: Something went wrong. PSI

@mokimo
Copy link
Contributor

mokimo commented May 15, 2024

Hm, squashed the last commit from stage into main, now we got a bunch of conflicts 😬
That's why we shouldn't allow anyone to do things by hand, myself included 😆

mokimo and others added 5 commits May 15, 2024 19:02
* Initial quiz-entry block with ml field

* MWPW-144810: Quiz Entry - Add option cards and text to the block (#2095)

* Quiz entry block (#2103)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-146243 - Quiz entry code optimization (#2121)

* MWPW-146243 - Quiz entry code optimization

* Restores code optimization that was lost in previous PRs

Resolves: [MWPW-146243](https://jira.corp.adobe.com/browse/MWPW-146243)

* Update utils.js

* Update quiz-entry.js

Set button to use string values

* Update quiz-entry.js

Fixed to use new strings object

* MWPW-146034 - Quiz entry block accessibility (#2139)

* resolved accessibility concerns when the ml input is used
* general code refinements for more clarity, specifically for getting string values

Resolves: [MWPW-146034](https://jira.corp.adobe.com/browse/MWPW-146034)

* MWPW-146036 - Rig up quiz entry button (#2190)

* Support for ml filtering
* Debug support using ?debug=quiz-entry
* Store quizState in local storage and redirect to the quiz

Resolves: [MWPW-146036](https://jira.corp.adobe.com/browse/MWPW-146036)

* Quiz entry block (#2204)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-147031:Add Analytics for Quiz Entry Block, MWPW-146080: Integrate Auto-Complete for Open Text Field on UAR Exposed Front Door

* fix eslint

* fix code according feedbacks

* MWPW-144022: Quiz entry block (#2227)

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* MWPW-147482 - ML Input Bulletproofing (#2242)

* add support for fallback fi codes
* add lana logging for ml field failures
* fix so the redirect checks for maxQuestions

Resolves: [MWPW-147482](https://jira.corp.adobe.com/browse/MWPW-147482)

**Test URLs:**
- Before: https://main--milo--adobecom.hlx.page/?martech=off
- After: https://<branch>--milo--adobecom.hlx.page/?martech=off

* MWPW-147683 - CSS Cleanup (#2267)

* MWPW-147683 - CSS Cleanup

* Final pass on the css
* Edits to markup where necessary

Resolves: [MWPW-147683](https://jira.corp.adobe.com/browse/MWPW-147683)

* pr feedback for vars and eslint errors

* more PR feedback on icon placement

* pr feedback for button border

* cleaned up the carousel widths so it's consistent it all times as it was previously 8px short.

* pr feedback on the location of the input clear X.

* PR feedback - reduced border on input, fixed a card disable bug, addressed card layout in tablet

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* Tests

* working tests update

* linting

* linting

* Update quiz-entry.js with default vals

* Bring back debug

* debugging debug

* Improved test coverage

* resolve conflicts

* restore style

* formatting fix

---------

Co-authored-by: Cody Lloyd <colloyd@adobe.com>
Co-authored-by: Jacky Sun <67350368+JackySun9@users.noreply.github.com>
Co-authored-by: Cody Lloyd <119891065+colloyd@users.noreply.github.com>
@mokimo
Copy link
Contributor

mokimo commented May 15, 2024

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

Copy link

codecov bot commented May 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.66%. Comparing base (5bfa650) to head (9ce9b30).

❗ Current head 9ce9b30 differs from pull request most recent head 8417da3. Consider uploading reports for the commit 8417da3 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2309      +/-   ##
==========================================
+ Coverage   95.25%   95.66%   +0.41%     
==========================================
  Files         171      173       +2     
  Lines       44725    45018     +293     
==========================================
+ Hits        42602    43066     +464     
+ Misses       2123     1952     -171     

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

@meganthecoder meganthecoder requested a review from a team May 15, 2024 17:37
@meganthecoder
Copy link
Contributor

@mokimo Why does the PR have 19 commits but only 3 are listed in the description?

@mokimo
Copy link
Contributor

mokimo commented May 15, 2024

@meganthecoder I accidently 'squashed' the last merge to main & then had to merge main into stage, it messed up the history. The OP has the right PRs and the lines of code/files changed matches with the 3 PRs that are linked in the opening post.

human error is the exact reason the merge to main will be automated too, to avoid those inconsistencies

@Roycethan
Copy link

@mokimo @Blainegunn Plz revert this PR #2251 this having an issue on Safari which will impact twp modals over checkout-links: tracked here: https://jira.corp.adobe.com/browse/MWPW-148283
discussed with @yesil @mirafedas

Revert "MWPW-147472: auto adjust commerce iframe (#2251)"

This reverts commit 481bbcb.
@JackySun9 JackySun9 added MIQ SOT👌 run-nala Run Nala Test Automation against PR labels May 15, 2024
Copy link
Contributor

Reminder to set the Ready for Stage label - to queue this to get merged to stage & production.

)

* 05-13-24 ivan dc0944 first

* Update libs/mep/dc0944/aside/aside.js

Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>

* 05-13-24 ivan dc0944 add css changes and js optimization

* Update libs/mep/dc0944/aside/aside.js

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>

* Update libs/mep/dc0944/aside/aside.js

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>

* Update libs/mep/dc0944/aside/aside.js

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>

* Update libs/mep/dc0944/aside/aside.js

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>

* Update libs/mep/dc0944/aside/aside.js

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>

* 05-14-24 ivan renamed mep test folder dc0994

* 05-14-24 ivan fix sticky banner close btn

---------

Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>
Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: markpadbe <markp@adobe.com>
@mokimo
Copy link
Contributor

mokimo commented May 16, 2024

Included #2298 post testing as it's zero impact and contained within the MEP folder.

@mokimo mokimo merged commit a17d00c into main May 16, 2024
9 of 10 checks passed
@tedAir tedAir self-requested a review May 16, 2024 12:27
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.