[Woo POS][Non-Simple Products] Handle empty state on variation screen #13209

AnirudhBhat · 2024-12-27T05:23:40Z

Please review this fluxc PR before merging this PR and also ensure to update the fluxc has before merging this PR

Closes: #13206

Description

This PR

Handles empty variations state - Display proper empty screen similar to products when a variable product has no variations.
Modifies filter logic on products and variations screen so that variable product with no price set is displayed on products screen and variations that are disabled are not shown in variations screen.

Decision: pdfdoF-62l-p2#comment-7224

Steps to reproduce

Variable products with no variations published

Ensure you have a variable product with variations that are created but not published (Products screen > variation product > variations > disable variation)
Navigate to POS (more menu -> POS)
Ensure you see this variable product in the list
Ensure you see empty screen when opened

Variable products with no variations

Ensure you have a variable product with no variations created
Navigate to POS (more menu -> POS)
Ensure you see this variable product in the list
Ensure you see empty screen when opened

The tests that have been performed

Tested the above scenario by disabling variations both from the app and from the admin page.

Images/gif

variations_empty_state.mp4

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 · 2024-12-27T05:29:19Z

📲 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	`6cddac3`
	Direct Download	`woocommerce-wear-prototype-build-pr13209-6cddac3.apk`

wpmobilebot · 2024-12-27T05:44: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
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`6cddac3`
	Direct Download	`woocommerce-prototype-build-pr13209-6cddac3.apk`

codecov-commenter · 2024-12-27T05:49:17Z

Codecov Report

Attention: Patch coverage is 19.04762% with 51 lines in your changes missing coverage. Please review.

Project coverage is 40.79%. Comparing base (4cfa309) to head (6cddac3).
Report is 18 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...ce/android/ui/woopos/home/items/WooPosItemsList.kt	0.00%	29 Missing ⚠️
...oducts/variations/selector/VariationListHandler.kt	23.52%	13 Missing ⚠️
...variations/selector/VariationSelectorRepository.kt	0.00%	7 Missing ⚠️
...ome/items/variations/WooPosVariationsDataSource.kt	77.77%	0 Missing and 2 partials ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #13209      +/-   ##
============================================
- Coverage     40.80%   40.79%   -0.02%     
- Complexity     6411     6415       +4     
============================================
  Files          1353     1353              
  Lines         77679    77733      +54     
  Branches      10692    10696       +4     
============================================
+ Hits          31698    31709      +11     
- Misses        43172    43215      +43     
  Partials       2809     2809

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

…ull to be shown as well

…able

samiuelson

LGTM

samiuelson · 2025-01-08T13:43:17Z

...kotlin/com/woocommerce/android/ui/woopos/home/items/variations/WooPosVariationsDataSource.kt

@@ -89,5 +89,5 @@ sealed class FetchResult<out T> {
 }

 private fun List<ProductVariation>.applyFilter(): List<ProductVariation> {
-    return filter { it.price != null && !it.isDownloadable }
+    return filter { it.price != null && !it.isDownloadable && it.isPurchasable }


👋 @AnirudhBhat, during engineering sync call today, @malinajirka mentioned we should not rely on isPurchasable field. Wdut?

For context, and future reference:

Purchasable for simple products and variations means not free, and published

Grouped products are never purchasable – when we start supporting them in the POS, we'll want to show them.

Bottom line is, that it might have different meanings for different types, and it doesn't say whether the product should or shouldn't be displayed in the POS.

Based on the discussion here p2-pdfdoF-62l#comment-7224, we decided to show free products, so right now that's the main reason, we likely want to update this PR and remove the purchasable check.

Thanks for bringing this up, @samiuelson, and for the clarification, @malinajirka. I’ve been using this flag primarily to filter out variations that are created but not enabled. It seems the isVisible flag already provides information on whether a variation is enabled and should be displayed.

Given this, I suggest we ask the backend team to consider including this flag in the variations endpoint. This would allow us to eliminate client-side filtering for this purpose. What do you think?

Sounds good to me, let's try to remove all client side filtering.

# Conflicts: # WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/variations/WooPosVariationsDataSourceTest.kt # gradle/libs.versions.toml

wpmobilebot · 2025-01-10T06:06:26Z

Project dependencies changes

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

list

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

tree

-+--- org.wordpress:fluxc:2.102.0
-|    +--- 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 -> 2.53.1
-|    |    +--- jakarta.inject:jakarta.inject-api:2.0.1
-|    |    +--- javax.inject:javax.inject:1
-|    |    \--- org.jspecify:jspecify:1.0.0
-|    +--- 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:2.102.0
-|    +--- 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-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 -> 2.53.1
+|    |    +--- jakarta.inject:jakarta.inject-api:2.0.1
+|    |    +--- javax.inject:javax.inject:1
+|    |    \--- org.jspecify:jspecify:1.0.0
+|    +--- 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.plugins:woocommerce:2.102.0
-     +--- org.wordpress:fluxc:2.102.0 (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.51.1 -> 2.53.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:2.102.0
-     +--- androidx.room:room-ktx:2.6.1 (*)
-     \--- 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 -> 2.53.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 (*)

wpmobilebot · 2025-01-10T11:35:34Z

Version 21.4 has now entered code-freeze, so the milestone of this PR has been updated to 21.5.

samiuelson

LGTM!

# Conflicts: # gradle/libs.versions.toml

AnirudhBhat added 5 commits December 26, 2024 10:29

Add string resource

94add9c

Extract empty screen composable into WooPosItemsList.kt

5c4d6ac

Use ItemsEmptyList component in WooPosItemsScreen

f5993af

Use ItemsEmptyList component in WooPosVariationsScreen

cb59c48

Fix detekt error

024a9fb

AnirudhBhat added type: task An internally driven task. feature: point of sale POS project labels Dec 27, 2024

AnirudhBhat added this to the 21.4 milestone Dec 27, 2024

AnirudhBhat added 5 commits December 30, 2024 10:51

Modify products filter to allow variable products with price set to n…

32a4564

…ull to be shown as well

Modify variations filter to not allow variations that are not purchas…

70763a6

…able

expose purchasable property for creating test variation

f78d619

Add test to verify variable products with no price are shown

57f3bcc

Add test to verify non-purchasable variations are not shown

676af27

AnirudhBhat requested a review from samiuelson December 30, 2024 05:43

AnirudhBhat marked this pull request as ready for review December 30, 2024 05:43

samiuelson self-assigned this Jan 8, 2025

samiuelson approved these changes Jan 8, 2025

View reviewed changes

samiuelson reviewed Jan 8, 2025

View reviewed changes

AnirudhBhat added 2 commits January 10, 2025 10:29

Pass in status filter options for variations endpoint

aea4f5c

Remove unnecessary test

d5cb69a

AnirudhBhat mentioned this pull request Jan 10, 2025

Pass in status filter options for variations endpoint wordpress-mobile/WordPress-FluxC-Android#3124

Merged

AnirudhBhat added 3 commits January 10, 2025 11:21

Update fluxc hash version

9c7d148

Merge branch 'refs/heads/trunk' into issue/13206-handle-empty-variations

5ea21ca

# Conflicts: # WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/variations/WooPosVariationsDataSourceTest.kt # gradle/libs.versions.toml

Fix detekt errors

15b6d9f

wpmobilebot modified the milestones: 21.4, 21.5 Jan 10, 2025

samiuelson approved these changes Jan 10, 2025

View reviewed changes

AnirudhBhat added 2 commits January 13, 2025 08:44

update fluxc hash version

a5478e7

Merge branch 'refs/heads/trunk' into issue/13206-handle-empty-variations

6cddac3

# Conflicts: # gradle/libs.versions.toml

AnirudhBhat enabled auto-merge January 13, 2025 03:16

AnirudhBhat merged commit ec8e302 into trunk Jan 13, 2025
14 of 15 checks passed

AnirudhBhat deleted the issue/13206-handle-empty-variations branch January 13, 2025 03:47

joshheald mentioned this pull request Jan 23, 2025

[Woo POS] [Variable Products] Add empty state for variation lists woocommerce/woocommerce-ios#14965

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Woo POS][Non-Simple Products] Handle empty state on variation screen #13209

[Woo POS][Non-Simple Products] Handle empty state on variation screen #13209

AnirudhBhat commented Dec 27, 2024 •

edited

Loading

wpmobilebot commented Dec 27, 2024 •

edited

Loading

wpmobilebot commented Dec 27, 2024 •

edited

Loading

codecov-commenter commented Dec 27, 2024 •

edited

Loading

samiuelson left a comment

samiuelson Jan 8, 2025 •

edited

Loading

malinajirka Jan 8, 2025

AnirudhBhat Jan 9, 2025

malinajirka Jan 9, 2025

wpmobilebot commented Jan 10, 2025 •

edited

Loading

wpmobilebot commented Jan 10, 2025

samiuelson left a comment

[Woo POS][Non-Simple Products] Handle empty state on variation screen #13209

[Woo POS][Non-Simple Products] Handle empty state on variation screen #13209

Conversation

AnirudhBhat commented Dec 27, 2024 • edited Loading

Please review this fluxc PR before merging this PR and also ensure to update the fluxc has before merging this PR

Description

Steps to reproduce

Variable products with no variations published

Variable products with no variations

The tests that have been performed

Images/gif

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

wpmobilebot commented Dec 27, 2024 • edited Loading

wpmobilebot commented Dec 27, 2024 • edited Loading

codecov-commenter commented Dec 27, 2024 • edited Loading

Codecov Report

samiuelson left a comment

Choose a reason for hiding this comment

samiuelson Jan 8, 2025 • edited Loading

Choose a reason for hiding this comment

malinajirka Jan 8, 2025

Choose a reason for hiding this comment

AnirudhBhat Jan 9, 2025

Choose a reason for hiding this comment

malinajirka Jan 9, 2025

Choose a reason for hiding this comment

wpmobilebot commented Jan 10, 2025 • edited Loading

Project dependencies changes

wpmobilebot commented Jan 10, 2025

samiuelson left a comment

Choose a reason for hiding this comment

AnirudhBhat commented Dec 27, 2024 •

edited

Loading

wpmobilebot commented Dec 27, 2024 •

edited

Loading

wpmobilebot commented Dec 27, 2024 •

edited

Loading

codecov-commenter commented Dec 27, 2024 •

edited

Loading

samiuelson Jan 8, 2025 •

edited

Loading

wpmobilebot commented Jan 10, 2025 •

edited

Loading