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

[MILO][MEP] Update Manifest Type and Manifest Ordering v2 #1980

Merged
merged 12 commits into from
Mar 15, 2024

Conversation

vgoodric
Copy link
Contributor

@vgoodric vgoodric commented Mar 9, 2024

Redoing the PR. At some point file changes that weren't mine were being counted as my file updates.

Problem statement: The current order that MEP executes manifests is based on the source of the manifest. Instead, we need to use the manifest type to be sure that the manifests execute in a logical order.

Requirements:

  • Separate Manifest Type "Test or Promo" into 2 separate items in the dropdown.
  • Add a Manifest Execution Order, default value "normal", other values "first" and "last"
  • Manifest order will first be determined the the manifest execution order field: first, normal then last.
  • If there is more than one manifest of the same "execution order", the manifest type will break the tie. First Personalization, Promo then Test.

Note: previously, we would:

  1. run cleanManifestList to remove duplicates
  2. loop through the manifests
  3. fire runPersonalization for each manifest
  4. within runPersonalization we would fire getPersConfig to get manifest contents

Because we now need to know the contents to determine the order, we now:

  1. loop through the manifests
  2. fire getPersConfig on each manifest to get contents
  3. fire cleanAndSortManifestList to merge duplicate manifest data and sort manifests
  4. loop through the manifests in their new sorted order
  5. fire runPersonalization for each manifest

Resolves: MWPW-142965

Test URLs:
2 manifests (1 pzn and 1 test from Target):
Before: https://mepmoreactions--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/two-manifests-one-from-target
After: https://mepmanifestorder2--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/two-manifests-one-from-target

A bunch of additional Test URL's to test different use cases (these are all captured by unit tests as well):
3 manifests with one of each manifest type in the "wrong" execution order:
Before: https://mepmoreactions--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-all-normal
After: https://mepmanifestorder2--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-all-normal

Same as above but one manifest using first:
Before: https://mepmoreactions--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-one-first
After: https://mepmanifestorder2--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-one-first

Same as above but one manifest using last:
Before: https://mepmoreactions--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-one-last
After: https://mepmanifestorder2--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-one-last

Same as above but old "Test or Promo" type being used:
Before: https://mepmoreactions--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-one-test-or-promo
After: https://mepmanifestorder2--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-one-test-or-promo

Same as above but one has no info tab:
Before: https://mepmoreactions--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-one-no-type
After: https://mepmanifestorder2--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/three-manifest-types-one-no-type

Improved merge also solves: https://jira.corp.adobe.com/browse/MWPW-143068
Before: https://mepmoreactions--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/outdated-manifest
After: https://mepmanifestorder2--milo--adobecom.hlx.page/drafts/vgoodrich/fragments/2024/q1/mepmanifestorder/outdated-manifest

@vgoodric vgoodric requested a review from a team as a code owner March 9, 2024 06:04
Copy link
Contributor

aem-code-sync bot commented Mar 9, 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

@vgoodric vgoodric added high-impact Any PR that may affect consumers verified PR has been E2E tested by a reviewer labels Mar 9, 2024
@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 9, 2024 06:08 Inactive
@vgoodric vgoodric changed the base branch from stage to mepmoreactions March 9, 2024 06:15
@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 9, 2024 06:30 Inactive
@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 9, 2024 07:24 Inactive
@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 11, 2024 18:57 Inactive
@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 12, 2024 04:22 Inactive
@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 12, 2024 04:57 Inactive
Copy link

codecov bot commented Mar 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.27%. Comparing base (ecdf107) to head (ab71b35).

Additional details and impacted files
@@                Coverage Diff                 @@
##           mepmoreactions    #1980      +/-   ##
==================================================
+ Coverage           96.24%   96.27%   +0.03%     
==================================================
  Files                 165      165              
  Lines               42381    42404      +23     
==================================================
+ Hits                40790    40826      +36     
+ Misses               1591     1578      -13     

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

@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 12, 2024 05:12 Inactive
@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 13, 2024 17:26 Inactive
@aem-code-sync aem-code-sync bot temporarily deployed to mepmanifestorder2 March 15, 2024 03:56 Inactive
…ma (#1992)

* change delimiter to ---

* update unit tests
@vgoodric vgoodric merged commit db291d0 into mepmoreactions Mar 15, 2024
11 of 12 checks passed
@vgoodric vgoodric deleted the mepmanifestorder2 branch March 15, 2024 05:25
Blainegunn added a commit that referenced this pull request Mar 19, 2024
* stash

* start retro support (need to adjust replacefragment)

* save progress

* progress

* stash

* solid state

* reverse mep preview check

* update file for insertScript

* organized unit test files

* unit tests working

* remove file added by override

* add coverage to unit test

* PR comments

* use "section" to mean "section1"

* no longer need to pass mep to handleFragmentCommand

* Update libs/features/personalization/personalization.js

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

* Update libs/features/personalization/personalization.js

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

* add replace action with fragment selector not on page

* moving fragment that's not page unit test

* [MILO][MEP] Update Manifest Type and Manifest Ordering v2 (#1980)

* new branch to separate my updates from others

* export matchGlob

* see if removing matchGlob fixes unit test

* found unit test issue

* stash

* unit test repair

* increase coverage

* stop loading disabled promos

* update unit test

* only download disabled manifests if needed

* [MILO][MEP] MEP parameter spoof breaks if chosen experience has a comma (#1992)

* change delimiter to ---

* update unit tests

* Deconflicting for MWPW-136727 MEP: Support for simplified selectors (#1959)

* WIP

* Add tests

* stash

* stash

* stash

* merge select functions

* unit tests fixed

* fix for test or promo type

* create unit test file

* fix unit test error

* unit tests

* improve merge of duplicate manifests

* fix merge of Target with fresh manifest, add unit test

* new branch to separate my updates from others

* export matchGlob

* see if removing matchGlob fixes unit test

* found unit test issue

* stash

* unit test repair

* increase coverage

* merge conflicts

* remove duplicate from merge

* remove another duplicate from merge

---------

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

* more duplicates

* move normalization of manifestPath to before getting variant

* Unit test repair

* repair utils unit test

* only update path if needed

* force update sample scripts

* trigger try/catch

---------

Co-authored-by: vivgoodrich <vivian.goodrich@gmail.com>
Co-authored-by: Chris Peyer <chrischrischris@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
Blainegunn added a commit that referenced this pull request Mar 20, 2024
* MWPW-143648 - [Action Item] Fix float icon position (#1957)

* 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>

* MWPW-142798 + MWPW-142872: Made the height-fit-content class to be set automatically (#1946)

fixed height auto adjustment and iframe styles in modal

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>

* MWPW-144575: Fix for commerce modal height (#2014)

There's a potential CSO lurking

* [MWPW-144516] Handle cross cloud menu block error (#2006)

* fix(MWPW-142248): Accessibility for carousels containing focusable elements. (#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>

* MWPW-144575: Modal-Iframe for apps-whats-included is broken for Desktop resolutions (#2016)

fixed CSS selector commerce-frame section and fragment

* Sync stage with main (#2025)

* [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>

* remove extra line

* MWPW-144575: fix for the modal duplication (#2021)

added checking to not create a modal when it is already present in DOM

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

* [MWPW-137148] [PERFORMANCE] Load IMS from the same domain (#1996)

* Host imslib from milo libs/deps

* Fix formatting

* Minor script cleanup

* wp

* Serve ims, launch & launch development locally. Rewrite the workflow

* Remove launch dependency for now

---------

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>

* MWPW-142003: Mini Compare Chart Mobile styling (#1989)

Co-authored-by: ilyas Stéphane Türkben <isturkben@gmail.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>

* MWPW-143202 firefox gnav not appearing bug (#1969)

* try to catch error

* test without breaking things

* catch akamai failure

* add try catch

* attempt 2 to catch jsonp failure

* cleanup

* fix geo2 source

* test using proper fetch

* MWPW-143202 remove old jsonp request

* MWPW-143202 catch case if resp is not ok

* MWPW-143202 prevent caching of geo2 request

---------

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>

* Excluding modals from Active link check (#1942)

* Fix: Excluding modals from Active link check

---------

Co-authored-by: Bandana Laishram <blaishram@Bandanas-MacBook-Pro.local>

* [MWPW-144602] Ensure DNT functionality in top nav (#2020)

* Revert "MWPW-142003: Mini Compare Chart Mobile styling" (#2041)

Revert "MWPW-142003: Mini Compare Chart Mobile styling (#1989)"

This reverts commit 944ae19.

* MWPW-144026 Update Twitter Icon to X (#2030)

* Add support for bold as header if no header (#1997)

* Add support for bold as header if no header

* Add tracking to modal close button

* separate branches

* moving if on strong or B

---------

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>

* [MWPW-144112] send-to-caas: point to prod end-point (#1995)

[MWPW-144112] point to prod end-point

* [MILO] Allow svg or media files to be located in a fragments folder (#1966)

* fix if svg is located in fragments folder

* update to handle any file that is not a fragment

* unit test

* better placement

* update existing file reference

no idea how this was working with the incorrect reference

* add carve out for mp4

Noticed that there is code in this if statement for mp4 in the fragments folder that can't be reached

* save match result so I do not have to match twice

* update nameSplit to hasExtension per Slack request

* update hasExtension to use include instead of length

---------

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>

* Consolidate MEP PR's for stage (#1975)

* stash

* start retro support (need to adjust replacefragment)

* save progress

* progress

* stash

* solid state

* reverse mep preview check

* update file for insertScript

* organized unit test files

* unit tests working

* remove file added by override

* add coverage to unit test

* PR comments

* use "section" to mean "section1"

* no longer need to pass mep to handleFragmentCommand

* Update libs/features/personalization/personalization.js

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

* Update libs/features/personalization/personalization.js

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

* add replace action with fragment selector not on page

* moving fragment that's not page unit test

* [MILO][MEP] Update Manifest Type and Manifest Ordering v2 (#1980)

* new branch to separate my updates from others

* export matchGlob

* see if removing matchGlob fixes unit test

* found unit test issue

* stash

* unit test repair

* increase coverage

* stop loading disabled promos

* update unit test

* only download disabled manifests if needed

* [MILO][MEP] MEP parameter spoof breaks if chosen experience has a comma (#1992)

* change delimiter to ---

* update unit tests

* Deconflicting for MWPW-136727 MEP: Support for simplified selectors (#1959)

* WIP

* Add tests

* stash

* stash

* stash

* merge select functions

* unit tests fixed

* fix for test or promo type

* create unit test file

* fix unit test error

* unit tests

* improve merge of duplicate manifests

* fix merge of Target with fresh manifest, add unit test

* new branch to separate my updates from others

* export matchGlob

* see if removing matchGlob fixes unit test

* found unit test issue

* stash

* unit test repair

* increase coverage

* merge conflicts

* remove duplicate from merge

* remove another duplicate from merge

---------

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

* more duplicates

* move normalization of manifestPath to before getting variant

* Unit test repair

* repair utils unit test

* only update path if needed

* force update sample scripts

* trigger try/catch

---------

Co-authored-by: vivgoodrich <vivian.goodrich@gmail.com>
Co-authored-by: Chris Peyer <chrischrischris@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>

* UAR integration - Quiz Sync for state in local storage and accessibility (#2032)

* MWPW-139939 - Support for quiz state in local storage (#1956)

* MWPW-139939 - Support for quiz state in local storage

* Renders the quiz at any point as captured in local storage

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

* fix for no stored-quiz-state

* remove stored quiz data when advancing to the next quiz step via handleOnNextClick()

* stored quiz state unit tests

* MWPW-143799 - Quiz Accessibility Refinement (#2004)

* Add id to the h1
* set role and aria-labelledby on the option container
* swap to role-checkbox and aria-checked for option buttons
* use disabled instead of tabindex -1
Resolves: [MWPW-143799](https://jira.corp.adobe.com/browse/MWPW-143799)

---------

Co-authored-by: Sean Archibeque <sean.archibeque@gmail.com>
Co-authored-by: Mira Fedas <30750556+mirafedas@users.noreply.github.com>
Co-authored-by: Axel Cureno Basurto <axelcureno@gmail.com>
Co-authored-by: Rares Munteanu <overmyheadandbody@gmail.com>
Co-authored-by: sharath-kannan <138484653+sharath-kannan@users.noreply.github.com>
Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: Victor Hargrave <115231412+vhargrave@users.noreply.github.com>
Co-authored-by: ilyas Stéphane Türkben <tuerkben@adobe.com>
Co-authored-by: J. Casalino <casalino@adobe.com>
Co-authored-by: Megan Thomas <methomas@adobe.com>
Co-authored-by: cmiqueo <64917520+cmiqueo@users.noreply.github.com>
Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>
Co-authored-by: ilyas Stéphane Türkben <isturkben@gmail.com>
Co-authored-by: Bandana Laishram <bandanalaishram@gmail.com>
Co-authored-by: Bandana Laishram <blaishram@Bandanas-MacBook-Pro.local>
Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>
Co-authored-by: jedjedjedM <93785811+jedjedjedM@users.noreply.github.com>
Co-authored-by: vivgoodrich <vivian.goodrich@gmail.com>
Co-authored-by: Chris Peyer <chrischrischris@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Cody Lloyd <119891065+colloyd@users.noreply.github.com>
Co-authored-by: Victor Hargrave <vhargrave@adobe.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
high-impact Any PR that may affect consumers verified PR has been E2E tested by a reviewer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants