[Woo POS][Non-Simple Products] Filter downloadable options from variations endpoint #13313

AnirudhBhat · 2025-01-15T08:58:55Z

Please review and merge this Flux PR before merging this one. Also, please ensure to update the fluxc hash before merging this PR.

Description

This PR removes client side filtering logic of downloadable variations and filters it from the API instead. Doing this avoids pagination issues on the client side.

Steps to reproduce

Checking downloadable filter

Navigate to POS (more menu -> POS)
Click on any variable product where some of its variations are set as downloadable
Ensure you don't see any downloadable variations in the list

The tests that have been performed

Tested above scenario as well as checked endpoint to ensure proper value for downloadable parameter is being passed.

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.

wpmobilebot · 2025-01-15T09:03:33Z

📲 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	`9f7fcbe`
	Direct Download	`woocommerce-wear-prototype-build-pr13313-9f7fcbe.apk`

…sue/13309-filter-downloadable-options-from-api-variations # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/variations/WooPosVariationsDataSource.kt

wpmobilebot · 2025-01-15T09:11:44Z

Project dependencies changes

The following changes in project dependencies were detected (configuration vanillaReleaseRuntimeClasspath):

list

Upgraded Dependencies
org.wordpress.fluxc.plugins:woocommerce:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213, (changed from trunk-0264533ce612f74e1ae6fcbaefeb69b252163774)
org.wordpress.fluxc:fluxc-annotations:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213, (changed from trunk-0264533ce612f74e1ae6fcbaefeb69b252163774)
org.wordpress:fluxc:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213, (changed from trunk-0264533ce612f74e1ae6fcbaefeb69b252163774)

tree

-+--- org.wordpress:fluxc:trunk-0264533ce612f74e1ae6fcbaefeb69b252163774
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25 -> 2.0.21
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*)
-|    |    +--- 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.6.1 (*)
-|    +--- androidx.room:room-ktx:2.6.1
-|    |    +--- androidx.room:room-common:2.6.1 (*)
-|    |    +--- androidx.room:room-runtime:2.6.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
-|    |    +--- androidx.room:room-common:2.6.1 (c)
-|    |    \--- androidx.room:room-runtime:2.6.1 (c)
-|    +--- com.google.dagger:dagger:2.51.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-0264533ce612f74e1ae6fcbaefeb69b252163774
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- org.greenrobot:eventbus-java: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.8.1 (*)
-|    |    |    \--- 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.8.7 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.8.7 (*)
-|    |    \--- 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:1.9.25 -> 2.0.21 (*)
++--- org.wordpress:fluxc:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25 -> 2.0.21
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*)
+|    |    +--- 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.6.1 (*)
+|    +--- androidx.room:room-ktx:2.6.1
+|    |    +--- androidx.room:room-common:2.6.1 (*)
+|    |    +--- androidx.room:room-runtime:2.6.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
+|    |    +--- androidx.room:room-common:2.6.1 (c)
+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
+|    +--- com.google.dagger:dagger:2.51.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- org.greenrobot:eventbus-java: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.8.1 (*)
+|    |    |    \--- 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.8.7 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.8.7 (*)
+|    |    \--- 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:1.9.25 -> 2.0.21 (*)
-\--- org.wordpress.fluxc.plugins:woocommerce:trunk-0264533ce612f74e1ae6fcbaefeb69b252163774
-     +--- org.wordpress:fluxc:trunk-0264533ce612f74e1ae6fcbaefeb69b252163774 (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.51.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-     +--- androidx.room:room-runtime:2.6.1 (*)
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:trunk-0264533ce612f74e1ae6fcbaefeb69b252163774
-     +--- androidx.room:room-ktx:2.6.1 (*)
-     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)
+\--- org.wordpress.fluxc.plugins:woocommerce:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
+     +--- org.wordpress:fluxc:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213 (*)
+     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     +--- com.google.dagger:dagger:2.51.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+     +--- androidx.room:room-runtime:2.6.1 (*)
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
+     +--- androidx.room:room-ktx:2.6.1 (*)
+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)

wpmobilebot · 2025-01-15T09:25:00Z

📲 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	`9f7fcbe`
	Direct Download	`woocommerce-prototype-build-pr13313-9f7fcbe.apk`

codecov-commenter · 2025-01-15T12:42:27Z

Codecov Report

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

Project coverage is 41.17%. Comparing base (fab5daa) to head (9f7fcbe).
Report is 10 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...variations/selector/VariationSelectorRepository.kt	0.00%	1 Missing ⚠️
...ome/items/variations/WooPosVariationsDataSource.kt	80.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##              trunk   #13313   +/-   ##
=========================================
  Coverage     41.17%   41.17%           
+ Complexity     6443     6442    -1     
=========================================
  Files          1323     1323           
  Lines         77258    77260    +2     
  Branches      10669    10669           
=========================================
+ Hits          31812    31813    +1     
  Misses        42618    42618           
- Partials       2828     2829    +1

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

samiuelson

LGTM

dangermattic · 2025-01-22T09:11:35Z

	1 Warning
⚠️	This PR is assigned to the milestone 21.5. 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

…options-from-api-variations # Conflicts: # gradle/libs.versions.toml

AnirudhBhat added 2 commits January 15, 2025 13:45

pass in filter options in VariationSelectorRepository

2b5bd13

pass in filter options in WooPosVariationsDataSource

a0519a6

AnirudhBhat added type: task An internally driven task. feature: point of sale POS project labels Jan 15, 2025

AnirudhBhat added this to the 21.5 milestone Jan 15, 2025

AnirudhBhat requested a review from samiuelson January 15, 2025 08:58

AnirudhBhat added 2 commits January 15, 2025 14:36

Merge branch 'refs/heads/issue/13293-remove-null-price-check' into is…

604ca21

…sue/13309-filter-downloadable-options-from-api-variations # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/variations/WooPosVariationsDataSource.kt

update fluxc hash

d2e6b5c

Fixed failing tests

5851857

Add client side downloadable filter until WC 9.7 is released

7c06b0f

Base automatically changed from issue/13293-remove-null-price-check to trunk January 16, 2025 11:14

samiuelson self-assigned this Jan 16, 2025

samiuelson approved these changes Jan 21, 2025

View reviewed changes

Update fluxc hash

8f25974

Merge branch 'refs/heads/trunk' into issue/13309-filter-downloadable-…

fcd8db4

…options-from-api-variations # Conflicts: # gradle/libs.versions.toml

AnirudhBhat enabled auto-merge January 22, 2025 09:12

Update login hash

9f7fcbe

AnirudhBhat merged commit 4f7a3cf into trunk Jan 22, 2025
15 checks passed

AnirudhBhat deleted the issue/13309-filter-downloadable-options-from-api-variations branch January 22, 2025 10:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Woo POS][Non-Simple Products] Filter downloadable options from variations endpoint #13313

[Woo POS][Non-Simple Products] Filter downloadable options from variations endpoint #13313

Uh oh!

AnirudhBhat commented Jan 15, 2025 •

edited by samiuelson

Loading

Uh oh!

wpmobilebot commented Jan 15, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Jan 15, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Jan 15, 2025 •

edited

Loading

Uh oh!

codecov-commenter commented Jan 15, 2025 •

edited

Loading

Uh oh!

samiuelson left a comment

Uh oh!

dangermattic commented Jan 22, 2025

Uh oh!

Uh oh!

Uh oh!

[Woo POS][Non-Simple Products] Filter downloadable options from variations endpoint #13313

[Woo POS][Non-Simple Products] Filter downloadable options from variations endpoint #13313

Uh oh!

Conversation

AnirudhBhat commented Jan 15, 2025 • edited by samiuelson Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Please review and merge this Flux PR before merging this one. Also, please ensure to update the fluxc hash before merging this PR.

Description

Steps to reproduce

Checking downloadable filter

The tests that have been performed

Images/gif

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

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Project dependencies changes

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

samiuelson left a comment

Choose a reason for hiding this comment

Uh oh!

dangermattic commented Jan 22, 2025

Uh oh!

Uh oh!

Uh oh!

AnirudhBhat commented Jan 15, 2025 •

edited by samiuelson

Loading

wpmobilebot commented Jan 15, 2025 •

edited

Loading

wpmobilebot commented Jan 15, 2025 •

edited

Loading

wpmobilebot commented Jan 15, 2025 •

edited

Loading

codecov-commenter commented Jan 15, 2025 •

edited

Loading