[Watch App] Integrate OrderDetailsViewModel with FetchOrderProducts use case #11528

ThomazFB · 2024-05-16T05:57:45Z

Summary

Fix issue #11342 by adding the proper Order Details UI and some overall improvements to the screen loading behaviors and timeouts.

Update release notes:

I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

dangermattic · 2024-05-16T05:58: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-05-16T06:07:04Z

📲 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	`c53d8d8`
	Direct Download	`woocommerce-prototype-build-pr11528-c53d8d8.apk`

…ieval

…alizedProductsText

codecov-commenter · 2024-05-21T00:08:20Z

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 40.28%. Comparing base (1345b1a) to head (c53d8d8).
Report is 221 commits behind head on feature/introduce-wear-app.

Files	Patch %	Lines
...merce/android/wear/WearableConnectionRepository.kt	0.00%	3 Missing ⚠️
...rc/main/java/com/woocommerce/commons/wear/Paths.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@                       Coverage Diff                        @@
##             feature/introduce-wear-app   #11528      +/-   ##
================================================================
- Coverage                         40.64%   40.28%   -0.36%     
- Complexity                         5180     5200      +20     
================================================================
  Files                              1083     1096      +13     
  Lines                             62605    63293     +688     
  Branches                           8544     8669     +125     
================================================================
+ Hits                              25444    25497      +53     
- Misses                            34873    35501     +628     
- Partials                           2288     2295       +7

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

…r-details-ui-data

wpmobilebot · 2024-05-21T01:59:51Z

Found 1 violations:

The PR caused the following dependency changes:

expand

-+--- org.wordpress:fluxc:3004-3cd94e757327cfa3d5127087023a2bace033eacd
-|    +--- 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:3004-3cd94e757327cfa3d5127087023a2bace033eacd
-|    +--- 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:3004-86f23e18b0dbe068c6f106e8ef137cbda092fe28
+|    +--- 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:3004-86f23e18b0dbe068c6f106e8ef137cbda092fe28
+|    +--- 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:3004-3cd94e757327cfa3d5127087023a2bace033eacd
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:3004-3cd94e757327cfa3d5127087023a2bace033eacd
-     +--- 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:3004-3cd94e757327cfa3d5127087023a2bace033eacd (*)
-     +--- 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:3004-86f23e18b0dbe068c6f106e8ef137cbda092fe28
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:3004-86f23e18b0dbe068c6f106e8ef137cbda092fe28
+     +--- 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:3004-86f23e18b0dbe068c6f106e8ef137cbda092fe28 (*)
+     +--- 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

Integrate OrderDetailsViewModel with FetchOrderProducts use case

6ace51d

ThomazFB added 25 commits May 16, 2024 12:25

Add Products mapping support into FormatOrderData

cb61113

Combine site and products data before fetching the Order data

4c23893

Configure the UI basics for the Product list

99356fc

Adjust combineWithTimeout to allow custom timeout values

308fb0c

Add Site ID parameter to every request sent to the watch

d53b225

Update OrdersRepository to demand for the siteID during the data retr…

ce6ddb0

…ieval

Adjust Order fetching use cases to also observe the site ID

2075980

Refactor OrderDetailsViewModel flow structures

c8ff48f

Immediately abort the FetchOrderProducts when phone is not available

5890168

Enforce site ID from DataMap for every data received

7e4bfb3

Fix stats loading not appearing when site takes too long to be fetched

10846ad

Migrate to the wearableStore usage

b0e65ff

Rename ObserveLoginRequest.kt to FetchSiteData.kt

3e8dd02

Fix FetchSiteDataTest

740700c

Improve Order fetch strategy with proper database usage

a00b32b

Simplify LoginViewModel site fetching strategy

0acc36d

FIx lint issues

b14a082

Start Orders loading immediately after the ViewModel starts

c62c5ae

Add bottom padding to the OrderDetailsScreen

5adba04

Add wearableStore usage to the WearableConnectionRepository

d4761ae

Add remaining string resources from Order Details

58a354c

Remove all string literals from OrderDetailsScreen and introduce plur…

f24049d

…alizedProductsText

Fix lint issues

e0ff5f5

Update FluxC

9038374

Merge branch 'trunk' into issue/adjust-wear-order-details-ui-data

6984d92

ThomazFB marked this pull request as ready for review May 21, 2024 00:42

ThomazFB requested a review from a team as a code owner May 21, 2024 00:42

Base automatically changed from feature/introduce-wear-app to trunk May 21, 2024 00:47

ThomazFB force-pushed the trunk branch from 6436814 to 75b99e8 Compare May 21, 2024 01:10

ThomazFB changed the base branch from trunk to feature/introduce-wear-app May 21, 2024 01:16

Merge branch 'feature/introduce-wear-app' into issue/adjust-wear-orde…

085be05

…r-details-ui-data

ThomazFB added type: task An internally driven task. feature: android wear labels May 21, 2024

ThomazFB removed the request for review from a team May 21, 2024 11:24

ThomazFB added 4 commits May 21, 2024 09:08

Fix LoginViewModelTest

dede395

Introduce initial structure for FetchOrdersTest

12b6e97

Improve FetchOrders use case to avoid duplicated updates

13d1ff1

Fix lint issues

c53d8d8

ThomazFB linked an issue May 21, 2024 that may be closed by this pull request

Introduce Order details screen #11342

Closed

ThomazFB merged commit 49dfe37 into feature/introduce-wear-app May 21, 2024
14 checks passed

ThomazFB deleted the issue/adjust-wear-order-details-ui-data branch May 21, 2024 13:06

ThomazFB mentioned this pull request May 31, 2024

[Feature] Introduce WooCommerce Wear #11557

Merged

1 task

ThomazFB changed the title ~~Integrate OrderDetailsViewModel with FetchOrderProducts use case~~ [Watch App] Integrate OrderDetailsViewModel with FetchOrderProducts use case May 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Watch App] Integrate OrderDetailsViewModel with FetchOrderProducts use case #11528

[Watch App] Integrate OrderDetailsViewModel with FetchOrderProducts use case #11528

Uh oh!

ThomazFB commented May 16, 2024 •

edited

Loading

Uh oh!

dangermattic commented May 16, 2024 •

edited

Loading

Uh oh!

wpmobilebot commented May 16, 2024 •

edited

Loading

Uh oh!

codecov-commenter commented May 21, 2024 •

edited

Loading

Uh oh!

wpmobilebot commented May 21, 2024

Uh oh!

Uh oh!

Uh oh!

[Watch App] Integrate OrderDetailsViewModel with FetchOrderProducts use case #11528

[Watch App] Integrate OrderDetailsViewModel with FetchOrderProducts use case #11528

Uh oh!

Conversation

ThomazFB commented May 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

codecov-commenter commented May 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

wpmobilebot commented May 21, 2024

The PR caused the following dependency changes:

Uh oh!

Uh oh!

Uh oh!

ThomazFB commented May 16, 2024 •

edited

Loading

dangermattic commented May 16, 2024 •

edited

Loading

wpmobilebot commented May 16, 2024 •

edited

Loading

codecov-commenter commented May 21, 2024 •

edited

Loading