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

Update shippings settings phase 1 #2699

Merged
merged 91 commits into from
Dec 2, 2024
Merged

Conversation

ianlin
Copy link
Member

@ianlin ianlin commented Nov 29, 2024

Changes proposed in this Pull Request:

Project: pcTzPl-2qP-p2

This is the umbrella PR that contains all the changes for shipping phase 1 implementation. The PRs includes:

Screenshots:

Detailed test instructions:

All the PRs have already been reviewed and tested, but it might be good to have an extra set of eyes to double check everything works as expected.

Additional details:

Changelog entry

Update - New shipping settings: phase 1

Add Shipping Max time column in gla_shipping_times Table
Copy link

codecov bot commented Nov 29, 2024

Codecov Report

Attention: Patch coverage is 71.76471% with 48 lines in your changes missing coverage. Please review.

Project coverage is 65.7%. Comparing base (399add5) to head (48fb03c).
Report is 92 commits behind head on develop.

Files with missing lines Patch % Lines
src/DB/Migration/Migration20240813T1653383133.php 0.0% 9 Missing ⚠️
...trollers/MerchantCenter/ShippingTimeController.php 84.8% 5 Missing ⚠️
...-time/shipping-time-setup/getCountriesTimeArray.js 0.0% 3 Missing and 1 partial ⚠️
.../free-listings/setup-free-listings/form-content.js 0.0% 3 Missing and 1 partial ⚠️
...ponents/free-listings/setup-free-listings/index.js 0.0% 2 Missing and 2 partials ⚠️
js/src/hooks/useSaveShippingTimes.js 0.0% 3 Missing and 1 partial ⚠️
src/DB/Table/ShippingTimeTable.php 0.0% 4 Missing ⚠️
.../components/adaptive-form/adaptive-form-context.js 0.0% 3 Missing ⚠️
...hipping-time/shipping-time-setup/countries-form.js 0.0% 3 Missing ⚠️
...condition-section/order-value-condition-section.js 33.3% 2 Missing ⚠️
... and 5 more
Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             develop   #2699      +/-   ##
============================================
+ Coverage       62.2%   65.7%    +3.5%     
- Complexity         0    4671    +4671     
============================================
  Files            335     818     +483     
  Lines           5147   24701   +19554     
  Branches        1256    1275      +19     
============================================
+ Hits            3204   16230   +13026     
- Misses          1769    8296    +6527     
- Partials         174     175       +1     
Flag Coverage Δ
js-unit-tests 63.5% <69.5%> (+1.2%) ⬆️
php-unit-tests 66.3% <74.7%> (?)

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

Files with missing lines Coverage Δ
...listings/configure-product-listings/checkErrors.js 100.0% <100.0%> (ø)
...time-setup/add-time-button/add-time-modal/index.js 100.0% <100.0%> (+88.9%) ⬆️
...me-input/edit-time-button/edit-time-modal/index.js 94.1% <100.0%> (+87.5%) ⬆️
.../shipping-time-setup/countries-time-input/index.js 91.7% <100.0%> (+81.7%) ⬆️
...g-time/shipping-time-setup/min-max-inputs/index.js 100.0% <100.0%> (ø)
...ing-time/shipping-time-setup/time-stepper/index.js 100.0% <100.0%> (ø)
...inimum-order-card/calculateValueFromGroupChange.js 100.0% <ø> (ø)
...oupShippingRatesByCurrencyFreeShippingThreshold.js 100.0% <ø> (ø)
...n-section/minimum-order-card/minimum-order-card.js 96.0% <100.0%> (ø)
...-order-form-modals/add-minimum-order-form-modal.js 100.0% <ø> (ø)
... and 28 more

... and 474 files with indirect coverage changes

@ianlin ianlin self-assigned this Nov 29, 2024
@ianlin ianlin requested a review from a team November 29, 2024 13:50
@ianlin ianlin marked this pull request as ready for review November 29, 2024 13:51
@puntope
Copy link
Contributor

puntope commented Nov 29, 2024

Do we need to update the applicable version here in the migration file?

puntope
puntope previously approved these changes Nov 29, 2024
Copy link
Contributor

@puntope puntope left a comment

Choose a reason for hiding this comment

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

@puntope puntope dismissed their stale review November 29, 2024 16:12

E2E tests failing

Copy link
Member

@eason9487 eason9487 left a comment

Choose a reason for hiding this comment

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

Had a quick look at the frontend code and wanted to report a few minor issues that could be fixed quickly.

@ianlin
Copy link
Member Author

ianlin commented Dec 2, 2024

@puntope

Do we need to update the applicable version here in the migration file?

I think normally it would be updated manually when doing the release. (See the 5th checkbox in the release PR).

Also wanted to discuss maybe we may want to release this new shipping phase 1 as 2.10.0?

E2E tests seem to fail

Thanks for testing it, I missed checking e2e part. I fixed the e2e related to shipping phase 1, however, the e2e test still failed using the branch of this PR. It also failed when I ran e2e on the develop branch. Given the G4W release time is tomorrow, I will create a follow up issue regarding the e2e tests and we can check that after it release. WDYT?

@ianlin
Copy link
Member Author

ianlin commented Dec 2, 2024

@eason9487

Had a quick look at the frontend code and wanted to report a few minor issues that could be fixed quickly.

Thanks for catching them, I've updated the code regarding your suggestions.

@ianlin ianlin requested review from eason9487 and puntope December 2, 2024 08:38
@puntope
Copy link
Contributor

puntope commented Dec 2, 2024

@ianlin I approved #2705 (review) That seems to be fixing the E2E

However- there are some conflicts

puntope
puntope previously approved these changes Dec 2, 2024
@puntope puntope dismissed their stale review December 2, 2024 09:31

Just some conflicts in the tests

Copy link
Member

@eason9487 eason9487 left a comment

Choose a reason for hiding this comment

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

Thanks for the additional adjustments.

It also failed when I ran e2e on the develop branch.

E2E on the develop branch has been fixed by #2705. I also merged it into this PR and resolved the code conflict in 48fb03c.

@ianlin
Copy link
Member Author

ianlin commented Dec 2, 2024

Thanks @eason9487 and @puntope's team work, merging it now.

@ianlin ianlin merged commit 81f9998 into develop Dec 2, 2024
16 checks passed
@ianlin ianlin deleted the update/shippings-settings-phase-1 branch December 2, 2024 11:47
@puntope puntope mentioned this pull request Dec 3, 2024
22 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog: update Big changes to something that wasn't broken.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants