[Shipping labels] Remove shipment sheet #13924

irfano · 2025-04-16T14:43:29Z

Description

This adds a remove shipment sheet and displays it when the “Remove shipment” buttons on the split shipment screen are tapped. The removal action itself is not handled in this PR.

Steps to reproduce

Open the orders tab
Tap on an order eligible for shipping label creation. It’s better to choose one with multiple items.
Tap on Create shipping label.
Tap on Split shipment.
Choose some items and move them to a new shipment.

Testing information

Please also test in dark mode and landscape orientation.

The tests that have been performed

Steps above

Images/gif

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

Reviewer (or Author, in the case of optional code reviews):

Please make sure these conditions are met before approving the PR, or request changes if the PR needs improvement:

The PR is small and has a clear, single focus, or a valid explanation is provided in the description. If needed, please request to split it into smaller PRs.
Ensure Adequate Unit Test Coverage: The changes are reasonably covered by unit tests or an explanation is provided in the PR description.
Manual Testing: The author listed all the tests they ran, including smoke tests when needed (e.g., for refactorings). The reviewer confirmed that the PR works as expected on big (tablet) and small (phone) in case of UI changes, and no regressions are added.

…iewModel

dangermattic · 2025-04-16T14:44:22Z

	2 Warnings
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	This PR is assigned to the milestone 22.2. This milestone is due in less than 2 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

wpmobilebot · 2025-04-16T14:48:52Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`c9783ae`
	Direct Download	`woocommerce-wear-prototype-build-pr13924-c9783ae.apk`

irfano · 2025-04-16T14:49:51Z

...otlin/com/woocommerce/android/ui/orders/wooshippinglabels/split/RemoveShipmentBottomSheet.kt

+    var selectedShipmentKeyState by rememberSaveable {
+        mutableIntStateOf(removeShipmentSheet.otherShipments.keys.first())
+    }


Since the selected shipment logic is simple, I decided to use the composable as state owner.

irfano · 2025-04-16T14:51:41Z

...m/woocommerce/android/ui/orders/wooshippinglabels/split/WooShippingSplitShipmentViewModel.kt

+
+    @Suppress("UnusedParameter")
+    fun onRemoveShipment(removingShipmentKey: Int, movingToShipmentKey: Int) {
+        // TODO handle removing shipment


I'll handle onRemoveShipment later.

wpmobilebot · 2025-04-16T15:01:34Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`c9783ae`
	Direct Download	`woocommerce-prototype-build-pr13924-c9783ae.apk`

...otlin/com/woocommerce/android/ui/orders/wooshippinglabels/split/RemoveShipmentBottomSheet.kt

WooCommerce/src/main/res/drawable/ic_remove_shipment.xml

…ix/add-shipping-labels-remove-shipment-sheet

codecov-commenter · 2025-04-17T11:28:00Z

Codecov Report

Attention: Patch coverage is 6.58683% with 156 lines in your changes missing coverage. Please review.

Project coverage is 38.27%. Comparing base (aec5665) to head (c9783ae).
Report is 34 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...oshippinglabels/split/RemoveShipmentBottomSheet.kt	0.00%	142 Missing ⚠️
...glabels/split/WooShippingSplitShipmentViewModel.kt	44.00%	13 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #13924      +/-   ##
============================================
- Coverage     38.32%   38.27%   -0.06%     
+ Complexity     9407     9405       -2     
============================================
  Files          2098     2099       +1     
  Lines        115971   116118     +147     
  Branches      14831    14853      +22     
============================================
- Hits          44450    44446       -4     
- Misses        67477    67628     +151     
  Partials       4044     4044

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

hichamboushaba

Nice work @irfano, code looks good.

I just left one nit comment.

And a question, should this PR close the ticket given that it doesn't implement the removing yet?

hichamboushaba · 2025-04-17T13:07:12Z

...otlin/com/woocommerce/android/ui/orders/wooshippinglabels/split/RemoveShipmentBottomSheet.kt

+    ) {
+        Row(modifier = Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) {
+            Icon(
+                imageVector = ImageVector.vectorResource(id = R.drawable.ic_remove_shipment),


nit, the icon is just an arrow, so maybe we can name it as so to favor reusability if this icon ends up reused in other screens in the future, WDYT about ic_arrow_return (As this seems similar to this bootstrap icon)?

Good point! I renamed it: c9783ae

irfano · 2025-04-17T13:17:07Z

should this PR close the ticket given that it doesn't implement the removing yet?

Good catch! I overlooked that the "Close" keyword was in the description. I've removed it.

WooCommerce/src/main/res/drawable/ic_arrow_return.xml

+    <path
+        android:fillAlpha="0.6"
+        android:fillColor="#3C3C43"
+        android:pathData="M1.516,0.846c0.302,0 0.546,0.095 0.732,0.285 0.186,0.186 0.278,0.43 0.278,0.733 0,0.17 -0.007,0.361 -0.022,0.571 -0.014,0.21 -0.022,0.459 -0.022,0.747 0,1.02 0.137,1.848 0.41,2.483a2.688,2.688 0,0 0,1.334 1.392c0.61,0.293 1.42,0.44 2.431,0.44h6.27l2.226,0.116L12.626,5.3 10.261,2.91a1.037,1.037 0,0 1,-0.227 -0.322,0.967 0.967,0 0,1 -0.088,-0.41 0.94,0.94 0,0 1,0.285 -0.703,0.992 0.992,0 0,1 0.733,-0.286c0.268,0 0.513,0.107 0.732,0.322l6.248,6.24c0.22,0.22 0.33,0.479 0.33,0.777 0,0.298 -0.11,0.554 -0.33,0.769l-6.218,6.218c-0.123,0.122 -0.25,0.21 -0.381,0.264a0.902,0.902 0,0 1,-0.381 0.088,0.992 0.992,0 0,1 -0.733,-0.286 0.94,0.94 0,0 1,-0.285 -0.703c0,-0.147 0.027,-0.283 0.08,-0.41 0.059,-0.122 0.137,-0.23 0.235,-0.322l2.366,-2.388 2.519,-2.315 -2.22,0.11h-6.4c-1.426,0 -2.588,-0.224 -3.487,-0.674A4.255,4.255 0,0 1,1.047 6.8C0.622,5.868 0.41,4.68 0.41,3.233c0,-0.273 0.005,-0.532 0.014,-0.776 0.015,-0.249 0.04,-0.471 0.074,-0.666 0.029,-0.152 0.08,-0.298 0.153,-0.44a0.968,0.968 0,0 1,0.33 -0.359,0.92 0.92,0 0,1 0.535,-0.146Z" />


irfano added 8 commits April 16, 2025 15:05

Add ic_remove_shipment icon

45c1829

Add string resources for the remove shipment sheet

a7b854e

Add RemoveBottomSheet compose

3d87f88

Add previews for RemoveShipmentBottomSheet compose

f9a68ca

Rename removeShipmentSheet() function to onRemoveShipmentMenuTapped()

2e310a4

Add RemoveShipmentSheet data class

0e005f6

Show remove shipment sheet from split shipment screen

9e3a59a

Rename selectableItems to shipmentsUIMap in WooShippingSplitShipmentV…

8c9d485

…iewModel

irfano added the feature: shipping labels Related to creating, ordering, or printing shipping labels. label Apr 16, 2025

irfano added this to the 22.2 milestone Apr 16, 2025

irfano commented Apr 16, 2025

View reviewed changes

irfano requested review from hichamboushaba and JorgeMucientes April 16, 2025 14:52

github-advanced-security bot found potential problems Apr 16, 2025

View reviewed changes

Base automatically changed from fix/shipping-labels-incorrect-item-quantity to trunk April 16, 2025 18:51

irfano added 3 commits April 16, 2025 23:48

Remove redundant parameter from onUpdateSelection function

25e194a

Use itemId instead of productId in combine() for ShippableItemModel

eac6886

Simplify List<ShippableItemModel>.combine extension function

7a8147d

irfano added the type: task An internally driven task. label Apr 16, 2025

irfano changed the base branch from trunk to issue/13763-refactor-variations-data-source April 17, 2025 10:43

irfano changed the base branch from issue/13763-refactor-variations-data-source to issue/WOOMOB-282-fix-split-shipment-move-action April 17, 2025 10:43

Merge branch 'issue/WOOMOB-282-fix-split-shipment-move-action' into f…

1c4f5e7

…ix/add-shipping-labels-remove-shipment-sheet

irfano force-pushed the fix/add-shipping-labels-remove-shipment-sheet branch from e70e1fe to 1c4f5e7 Compare April 17, 2025 10:59

hichamboushaba self-assigned this Apr 17, 2025

hichamboushaba approved these changes Apr 17, 2025

View reviewed changes

Rename "ic_remove_shipment" drawable to "ic_arrow_return"

c9783ae

irfano changed the base branch from issue/WOOMOB-282-fix-split-shipment-move-action to trunk April 17, 2025 13:35

github-advanced-security bot found potential problems Apr 17, 2025

View reviewed changes

irfano enabled auto-merge April 17, 2025 13:36

irfano merged commit 98c979b into trunk Apr 17, 2025
19 checks passed

irfano deleted the fix/add-shipping-labels-remove-shipment-sheet branch April 17, 2025 13:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Shipping labels] Remove shipment sheet #13924

[Shipping labels] Remove shipment sheet #13924

Uh oh!

irfano commented Apr 16, 2025 •

edited

Loading

Uh oh!

dangermattic commented Apr 16, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Apr 16, 2025 •

edited

Loading

Uh oh!

irfano Apr 16, 2025

Uh oh!

irfano Apr 16, 2025

Uh oh!

wpmobilebot commented Apr 16, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Apr 17, 2025 •

edited

Loading

Uh oh!

hichamboushaba left a comment

Uh oh!

hichamboushaba Apr 17, 2025

Uh oh!

irfano Apr 17, 2025

Uh oh!

irfano commented Apr 17, 2025

Uh oh!

Check warning

Uh oh!

Uh oh!

[Shipping labels] Remove shipment sheet #13924

[Shipping labels] Remove shipment sheet #13924

Uh oh!

Conversation

irfano commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Steps to reproduce

Testing information

The tests that have been performed

Images/gif

Reviewer (or Author, in the case of optional code reviews):

Uh oh!

dangermattic commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

irfano Apr 16, 2025

Choose a reason for hiding this comment

Uh oh!

irfano Apr 16, 2025

Choose a reason for hiding this comment

Uh oh!

wpmobilebot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

hichamboushaba left a comment

Choose a reason for hiding this comment

Uh oh!

hichamboushaba Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

irfano Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

irfano commented Apr 17, 2025

Uh oh!

Check warning

Uh oh!

Uh oh!

irfano commented Apr 16, 2025 •

edited

Loading

dangermattic commented Apr 16, 2025 •

edited

Loading

wpmobilebot commented Apr 16, 2025 •

edited

Loading

wpmobilebot commented Apr 16, 2025 •

edited

Loading

codecov-commenter commented Apr 17, 2025 •

edited

Loading