[Min/Max Quantities] Edit Support Core Implementation #11742

toupper · 2024-06-18T12:11:32Z

Part of: #11655

Description

With this PR we add edit support for the Quantity Rules in products and variations

Testing information

Product

Go to Products
Select a product
Tap on Quantity Rules
Edit the Quantity Rules with a valid result
Tap on back
Tap save
The quantity rules should be saved (you can check in wp-admin)

Screen_recording_20240618_150456.mp4

Variations

Go to Products
Select a variation
Tap on a variation that can edit quantity rules (the parent product enables quantity rules for variations)
Tap on Quantity Rules
Edit the Quantity Rules with a valid result
Tap on back
Tap save
The quantity rules should be saved (you can check in wp-admin)

Screen_recording_20240618_150611.mp4

Error

Go to Products
Select a product
Tap on Quantity Rules
Edit the Quantity Rules with a invalid result (e.g. min quantity is bigger than max)
Tap on back
Tap save
The quantity rules should not be saved and an error displayed (you can check in wp-admin or by going back to the Products list and back again to details)

Screen_recording_20240618_151258.mp4

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.

…ssue/11655-min-max-quantities-ui

…ssue/11655-min-max-quantities-ui # Conflicts: # WooCommerce/src/test/kotlin/com/woocommerce/android/ui/products/variations/GetProductVariationQuantityRulesTest.kt

dangermattic · 2024-06-18T12:16:11Z

	1 Warning
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2024-06-18T12:18:55Z

Found 1 violations:

The PR caused the following dependency changes:

expand

-+--- org.wordpress:fluxc:trunk-133baec149a2d4f4f947667b7f489f01a811da94
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-133baec149a2d4f4f947667b7f489f01a811da94
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
-|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.22
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.0 (*)
-|    |    +--- com.google.crypto.tink:tink-android:1.5.0
-|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0 (*)
-|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.2 (*)
-|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.2
-|    |    +--- androidx.room:room-common:2.5.2 (*)
-|    |    +--- androidx.room:room-runtime:2.5.2 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
-|    +--- com.google.dagger:dagger:2.42 -> 2.50
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
-|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
++--- org.wordpress:fluxc:trunk-3a921230842b2e49d65857a154ab4ab906902c25
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-3a921230842b2e49d65857a154ab4ab906902c25
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.22
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.0 (*)
+|    |    +--- com.google.crypto.tink:tink-android:1.5.0
+|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0 (*)
+|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.2 (*)
+|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.2
+|    |    +--- androidx.room:room-common:2.5.2 (*)
+|    |    +--- androidx.room:room-runtime:2.5.2 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
+|    +--- com.google.dagger:dagger:2.42 -> 2.50
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
-\--- org.wordpress.fluxc.plugins:woocommerce:trunk-133baec149a2d4f4f947667b7f489f01a811da94
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:trunk-133baec149a2d4f4f947667b7f489f01a811da94
-     +--- androidx.room:room-ktx:2.4.2 -> 2.5.2 (*)
-     +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
-     +--- org.wordpress:fluxc:trunk-133baec149a2d4f4f947667b7f489f01a811da94 (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.42 -> 2.50 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
-     \--- androidx.room:room-runtime:2.4.2 -> 2.5.2 (*)
+\--- org.wordpress.fluxc.plugins:woocommerce:trunk-3a921230842b2e49d65857a154ab4ab906902c25
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:trunk-3a921230842b2e49d65857a154ab4ab906902c25
+     +--- androidx.room:room-ktx:2.4.2 -> 2.5.2 (*)
+     +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
+     +--- org.wordpress:fluxc:trunk-3a921230842b2e49d65857a154ab4ab906902c25 (*)
+     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     +--- com.google.dagger:dagger:2.42 -> 2.50 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
+     \--- androidx.room:room-runtime:2.4.2 -> 2.5.2 (*)

Please review and act accordingly

wpmobilebot · 2024-06-18T12:35:35Z

📲 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
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`b457297`
	Direct Download	`woocommerce-prototype-build-pr11742-b457297.apk`

codecov-commenter · 2024-06-18T13:24:10Z

Codecov Report

Attention: Patch coverage is 65.45455% with 19 lines in your changes missing coverage. Please review.

Project coverage is 40.25%. Comparing base (f040b34) to head (b457297).

Files	Patch %	Lines
...cts/quantityRules/ProductQuantityRulesViewModel.kt	73.33%	6 Missing and 2 partials ⚠️
...roid/ui/products/details/ProductDetailViewModel.kt	55.55%	0 Missing and 4 partials ⚠️
...ui/products/variations/VariationDetailViewModel.kt	50.00%	0 Missing and 4 partials ⚠️
...in/kotlin/com/woocommerce/android/model/Product.kt	0.00%	0 Missing and 3 partials ⚠️

Additional details and impacted files

@@                                Coverage Diff                                @@
##             min-max-quantities-edit-support-main-branch   #11742      +/-   ##
=================================================================================
+ Coverage                                          40.24%   40.25%   +0.01%     
- Complexity                                          5331     5338       +7     
=================================================================================
  Files                                               1132     1131       -1     
  Lines                                              65288    65297       +9     
  Branches                                            9056     9054       -2     
=================================================================================
+ Hits                                               26273    26287      +14     
+ Misses                                             36594    36579      -15     
- Partials                                            2421     2431      +10

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

toupper added 15 commits June 4, 2024 12:00

Replace static text fields with editing ones.

de70e01

Add view model for quantity rules view

316c4bb

Wire new quantity rules to the product detail classes

496efc0

Merge branch 'issue/11590-min-max-quantities-networking-model' into i…

7f574a1

…ssue/11655-min-max-quantities-ui

Tweaks on UI

de63e15

Fix text binding to show the hints

6cd10e1

Remove unnecessary code

9b4cb9f

Support min/max quantities edition for variations

1c907b9

Merge branch 'issue/11590-min-max-quantities-networking-model' into i…

945d9f0

…ssue/11655-min-max-quantities-ui

Adapt unit tests to the new configuration

a15a6d8

Merge branch 'trunk' into issue/11655-min-max-quantities-ui

74e57e5

Merge branch 'issue/11590-min-max-quantities-networking-model' into i…

4cf8129

…ssue/11655-min-max-quantities-ui # Conflicts: # WooCommerce/src/test/kotlin/com/woocommerce/android/ui/products/variations/GetProductVariationQuantityRulesTest.kt

Merge branch 'trunk' into issue/11655-min-max-quantities-ui

40f5c33

Update unit tests to new implementation

ac0da4f

Update FluxC version

ed2ed84

toupper added type: task An internally driven task. feature: product details Related to adding or editing products, includes product settings. category: woo extensions Related to WC extensions or plugins. labels Jun 18, 2024

toupper added this to the 19.2 milestone Jun 18, 2024

Merge branch 'trunk' into issue/11655-min-max-quantities-ui

86c05b4

toupper added 2 commits June 18, 2024 14:38

Fix detekt issues

1ed44c8

Remove unused parameter

b457297

toupper changed the base branch from trunk to min-max-quantities-edit-support-main-branch June 18, 2024 13:00

toupper merged commit 3d807af into min-max-quantities-edit-support-main-branch Jun 18, 2024
14 checks passed

toupper deleted the issue/11655-min-max-quantities-ui branch June 18, 2024 13:49

toupper mentioned this pull request Jun 20, 2024

[Min-Max Quantities] Main Feature #11753

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Min/Max Quantities] Edit Support Core Implementation #11742

[Min/Max Quantities] Edit Support Core Implementation #11742

Uh oh!

toupper commented Jun 18, 2024 •

edited

Loading

Uh oh!

dangermattic commented Jun 18, 2024 •

edited

Loading

Uh oh!

wpmobilebot commented Jun 18, 2024

Uh oh!

wpmobilebot commented Jun 18, 2024 •

edited

Loading

Uh oh!

codecov-commenter commented Jun 18, 2024

Uh oh!

Uh oh!

Uh oh!

[Min/Max Quantities] Edit Support Core Implementation #11742

[Min/Max Quantities] Edit Support Core Implementation #11742

Uh oh!

Conversation

toupper commented Jun 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing information

Product

Variations

Error

Images/gif

Uh oh!

dangermattic commented Jun 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Jun 18, 2024

The PR caused the following dependency changes:

Uh oh!

wpmobilebot commented Jun 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Jun 18, 2024

Codecov Report

Uh oh!

Uh oh!

Uh oh!

toupper commented Jun 18, 2024 •

edited

Loading

dangermattic commented Jun 18, 2024 •

edited

Loading

wpmobilebot commented Jun 18, 2024 •

edited

Loading