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

Merge onboarding improvements branch into consolidated ad #2627

Conversation

asvinb
Copy link
Collaborator

@asvinb asvinb commented Sep 27, 2024

Changes proposed in this Pull Request:

Merge #2458 and fix merge conflicts.

dsawardekar and others added 30 commits August 9, 2024 08:05
martynmjones and others added 20 commits September 5, 2024 15:34
Set WPCOM_API_STATUS transient for E2E tests
Release 2.8.5 - Merge `trunk` to `develop`
…nch-checklist-items

Remove pre launch checklist items
…nch-checklist

2492: Remove PreLaunchChecklist component
…election-ui-onboarding

Hide Tax UI during onboarding & keep in edit campaign
@github-actions github-actions bot added the changelog: update Big changes to something that wasn't broken. label Sep 27, 2024
Copy link

codecov bot commented Sep 27, 2024

Codecov Report

Attention: Patch coverage is 66.66667% with 45 lines in your changes missing coverage. Please review.

Project coverage is 61.0%. Comparing base (5343963) to head (5d727ba).
Report is 207 commits behind head on update/2535-consolidate-ad-creation-ccf-merged.

Files with missing lines Patch % Lines
...src/components/paid-ads/asset-group/asset-group.js 0.0% 12 Missing ⚠️
js/src/components/app-tooltip/index.js 50.0% 3 Missing and 1 partial ⚠️
js/src/components/tree-select-control/index.js 71.4% 3 Missing and 1 partial ⚠️
...ute-mapping/attribute-mapping-delete-rule-modal.js 0.0% 1 Missing and 1 partial ⚠️
.../attribute-mapping/attribute-mapping-rule-modal.js 50.0% 1 Missing and 1 partial ⚠️
.../free-listings/setup-free-listings/form-content.js 0.0% 1 Missing and 1 partial ⚠️
...c/components/paid-ads/ads-campaign/ads-campaign.js 0.0% 2 Missing ⚠️
...c/components/stepper/step-content-actions/index.js 33.3% 1 Missing and 1 partial ⚠️
js/src/components/tree-select-control/control.js 0.0% 1 Missing and 1 partial ⚠️
js/src/data/actions.js 50.0% 2 Missing ⚠️
... and 10 more
Additional details and impacted files

Impacted file tree graph

@@                               Coverage Diff                                @@
##           update/2535-consolidate-ad-creation-ccf-merged   #2627     +/-   ##
================================================================================
- Coverage                                            62.1%   61.0%   -1.1%     
================================================================================
  Files                                                 337     330      -7     
  Lines                                                5209    5183     -26     
  Branches                                             1253    1254      +1     
================================================================================
- Hits                                                 3236    3162     -74     
- Misses                                               1790    1832     +42     
- Partials                                              183     189      +6     
Flag Coverage Δ
js-unit-tests 61.0% <66.7%> (-1.1%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
js/src/attribute-mapping/index.js 100.0% <ø> (ø)
...ion/phone-number-card/verification-code-control.js 98.2% <100.0%> (-0.1%) ⬇️
...choose-audience-section/choose-audience-section.js 33.3% <ø> (+8.3%) ⬆️
...listings/configure-product-listings/checkErrors.js 100.0% <100.0%> (ø)
js/src/components/main-tab-nav/main-tab-nav.js 90.0% <100.0%> (ø)
...src/components/paid-ads/ads-campaign/faqs-panel.js 66.7% <100.0%> (ø)
...components/paid-ads/asset-group/images-selector.js 100.0% <ø> (ø)
...rc/components/stepper/step-content-footer/index.js 50.0% <100.0%> (+16.7%) ⬆️
js/src/components/tree-select-control/tags.js 92.9% <100.0%> (ø)
js/src/components/vertical-gap-layout/index.js 100.0% <ø> (ø)
... and 41 more

... and 14 files with indirect coverage changes

@joemcgill
Copy link
Collaborator

@asvinb I've updated feature/2459-campaign-creation-flow so that it includes the code from feature/2458-streamline-onboarding, which is the branch it will be merging into.

Now that this is done, #2623 is showing conflicts with the following files:

  • js/src/components/paid-ads/ads-campaign.js
  • js/src/components/paid-ads/audienceSection.test.js
  • js/src/setup-mc/setup-stepper/setup-paid-ads/setup-paid-ads.js

All of these seem to be handled in your latest commits after merging in the code from #2458.

I'm going to go ahead and merge this and then we can resolve any remaining conflicts in PR #2623, which will need to be reviewed and QAed before merging anyway.

@joemcgill joemcgill marked this pull request as ready for review September 30, 2024 19:08
@joemcgill joemcgill merged commit ab1f837 into update/2535-consolidate-ad-creation-ccf-merged Sep 30, 2024
12 of 17 checks passed
@joemcgill joemcgill deleted the update/2535-consolidate-ad-creation-ccf-onboarding-merged branch September 30, 2024 19:08
@eason9487 eason9487 added changelog: none Skip changelog entry for this PR and removed changelog: update Big changes to something that wasn't broken. labels Oct 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog: none Skip changelog entry for this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants