Conflict Resolution: Tracking source

zwarm commented 4 weeks ago

Fixes #20655

This PR adds a source property to the Post Conflict Resolution tracking events "source=page|post"

Merge Instructions

Ensure PR #20635 has been merged
Remove Not Ready for merge label
Merge as normal

To Test:

Prereq

Install and launch the app from this PR
Set up some posts with version conflicts and autosave changes (2 of each)
Set up some pages with version conflicts and autosave changes (2 of each)

Test posts

Tap on a "version conflict" post to launch the resolution dialog
Tap around on the overlay to capture the following tracking events
✅ Validate the following events are shown 🔵 Tracked: resolve_conflict_screen_shown, Properties: {"source":"post"} 🔵 Tracked: resolve_conflict_cancel_tapped, Properties: {"source":"post"} 🔵 Tracked: resolve_conflict_close_tapped, Properties: {"source":"post"} 🔵 Tracked: resolve_conflict_confirm_tapped, Properties: {"confirm_type":"remote_version","source":"post"} 🔵 Tracked: resolve_conflict_dismissed, Properties: {"source":"post"}
Repeat the test with "autosave" post
✅ Validate the following events are shown 🔵 Tracked: resolve_autosave_conflict_screen_shown, Properties: {"source":"post"} 🔵 Tracked: resolve_autosave_conflict_cancel_tapped, Properties: {"source":"post"} 🔵 Tracked: resolve_autosave_conflict_close_tapped, Properties: {"source":"post"} 🔵 Tracked: resolve_autosave_conflict_confirm_tapped, Properties: {"confirm_type":"remote_version","source":"post"} 🔵 Tracked: resolve_autosave_conflict_dismissed, Properties: {"source":"post"}

Test pages

Tap on a "version conflict" page to launch the resolution dialog
Tap around on the overlay to capture the following tracking events
✅ Validate the following events are shown 🔵 Tracked: resolve_conflict_screen_shown, Properties: {"source":"page"} 🔵 Tracked: resolve_conflict_cancel_tapped, Properties: {"source":"page"} 🔵 Tracked: resolve_conflict_close_tapped, Properties: {"source":"page"} 🔵 Tracked: resolve_conflict_confirm_tapped, Properties: {"confirm_type":"remote_version","source":"page"} 🔵 Tracked: resolve_conflict_dismissed, Properties: {"source":"page"}
Repeat the test with "autosave" page 🔵 Tracked: resolve_autosave_conflict_screen_shown, Properties: {"source":"page"} 🔵 Tracked: resolve_autosave_conflict_cancel_tapped, Properties: {"source":"page"} 🔵 Tracked: resolve_autosave_conflict_close_tapped, Properties: {"source":"page"} 🔵 Tracked: resolve_autosave_conflict_confirm_tapped, Properties: {"confirm_type":"remote_version","source":"page"} 🔵 Tracked: resolve_autosave_conflict_dismissed, Properties: {"source":"page"}

Regression Notes

Potential unintended areas of impact The resolution overlay events are not tracked with a source property
What I did to test those areas of impact (or what existing automated tests I relied on) Updated unit tests
What automated tests I added (or what prevented me from doing so) N/A

PR Submission Checklist:

[X] I have completed the Regression Notes.
[X] I have considered adding accessibility improvements for my changes.
[X] I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Testing Checklist (strike-out the not-applying and unnecessary ones): N/A

wpmobilebot commented 4 weeks ago

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

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr20658-2c2ee66
	Commit	2c2ee66a17ca2f4132634aa0d2e8c929af4fd105
	Direct Download	`jetpack-prototype-build-pr20658-2c2ee66.apk`

Note: Google Login is not supported on these builds.

wpmobilebot commented 4 weeks ago

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

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr20658-2c2ee66
	Commit	2c2ee66a17ca2f4132634aa0d2e8c929af4fd105
	Direct Download	`wordpress-prototype-build-pr20658-2c2ee66.apk`

Note: Google Login is not supported on these builds.

codecov[bot] commented 4 weeks ago

Codecov Report

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

Project coverage is 40.43%. Comparing base (69b2625) to head (ab69822).

:exclamation: Current head ab69822 differs from pull request most recent head 2c2ee66. Consider uploading reports for the commit 2c2ee66 to get more accurate results

Files	Patch %	Lines
...android/ui/posts/PostResolutionOverlayViewModel.kt	0.00%	0 Missing and 5 partials :warning:

Additional details and impacted files

```diff @@ Coverage Diff @@ ## trunk #20658 +/- ## =========================================== - Coverage 82.58% 40.43% -42.15% =========================================== Files 15 1486 +1471 Lines 534 68543 +68009 Branches 50 11337 +11287 =========================================== + Hits 441 27716 +27275 - Misses 75 38326 +38251 - Partials 18 2501 +2483 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.