This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
Add LocalPickupSelect component
#8634
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This will be used to render the local pickup options and also display a title if there are more than one package (e.g. if WC subs adds them)
|
The release ZIP for this PR is accessible via: Script Dependencies ReportThere is no changed script dependency between this branch and trunk. This comment was automatically generated by the TypeScript Errors Report
🎉 🎉 This PR does not introduce new TS errors. |
|
Size Change: +15.7 kB (+1%) Total Size: 1.12 MB
ℹ️ View Unchanged
|
tarhi-saad
reviewed
Mar 7, 2023
There was a problem hiding this comment.
Hello @opr! Thank you for working on this PR! I only have one question that you kind check below!
| } } | ||
| selected={ selectedOption } | ||
| options={ pickupLocations.map( ( location ) => | ||
| renderPickupLocation( location, pickupLocations.length ) |
There was a problem hiding this comment.
I believe we should check the length of the shippingRates instead of pickupLocations, the same in this line: https://github.com/woocommerce/woocommerce-blocks/blob/trunk/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/block.tsx#L152
There was a problem hiding this comment.
Hey @tarhi-saad I updated some internal testing notes and added one to test for this. Thanks for spotting it!
tarhi-saad
approved these changes
Mar 10, 2023
There was a problem hiding this comment.
Thank you, @opr, for the changes! Everything works as expected! 🙌 There is just one minor TS error in the unit tests file (see the message below). And I have some questions/suggestions about the internal testing notes:
- In
step 1, we ask to remove theRadioControlrendered byBlock. But it's already replaced in the last commit: Add packageCount as an option to LocalPickupSelect - I added
packageCount={ shippingRates.length }to the code snippet fromstep 1 - In
step 8, I replaceddepending on what you entered in step 1withdepending on what you entered in step 7
| selectedOptionOverride?: null | ( ( value: string ) => void ); | ||
| onSelectRateOverride?: null | ( ( value: string ) => void ); | ||
| } ) => ( | ||
| <LocalPickupSelect |
There was a problem hiding this comment.
We have a TS error here: Property 'packageCount' is missing
|
Hey @tarhi-saad thanks for the review, ok in 10b1dc9 the component was not supposed to change, that's my bad! I will revert it so the testing instructions make sense. I'll also address that TS issue. Thanks! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is part of #7998. I am splitting the work up so it is easier to review. There will be a followup where this component is actually used and passed through to Slot/Fill.
This PR adds a new component,
LocalPickupSelect(and unit tests for it) which incorporates the existingRadioControlbut wraps it in a div and outputs an optional title (if one is supplied).This component is required because when showing multiple packages in WC Subscriptions, it is helpful to know the names of the packages.
Without this PR, WC subs would need to render a
RadioControland title separately, resulting in a poorer DX.This change also allows us to have a focused and dedicated component for displaying pickup rates, which is more explicitly named, making it easier to reason with in future.
Testing
Automated Tests
User Facing Testing
Internal testing notes
assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/block.tsxand remove theRadioControlrendered byBlockand replace it with:WooCommerce -> Settings -> Shipping -> Local pickup, add a cost for local pickup on theAdd a price for customers who choose local pickupoption.WooCommerce -> Settings -> Multiple Packagesand enable it. In the "Group by" option, choose "Product (individual)`. Save the settings.$5.00 x 5 packages(the numbers will be different for you depending on what you entered in step 7, and how many items are in your cart).WooCommerce Visibility
Changelog