Skip to content

Jetpack Section: Connect Activity Log Detail with Restore#13979

Merged
zwarm merged 12 commits intodevelopfrom
issue/13328-connect-activity-log-detail-with-restore
Feb 5, 2021
Merged

Jetpack Section: Connect Activity Log Detail with Restore#13979
zwarm merged 12 commits intodevelopfrom
issue/13328-connect-activity-log-detail-with-restore

Conversation

@ParaskP7
Copy link
Copy Markdown
Contributor

@ParaskP7 ParaskP7 commented Feb 5, 2021

Parent #13328

This PR connects the restore flow the activity log detail screen. This means that this PR makes sure that when a user presses the RESTORE button within the Activity Log Detail screen, then instead of getting a Rewind Dialog they get redirected to the Restore screen and the new restore flow. Also, when a restore gets triggered from within the new restore flow, this PR makes sure that the user get redirected back to the Activity Log screen, skipping the Activity Log Detail screen and starts seeing the restore progress row within that screen.

To test:

  • Open app and go to My Site tab.
  • Launch Activity Log or Backup screen,
  • Find a rewindable item from the list and click on it. You will now enter the Activity Log Detail screen.
  • On that screen, click the RESTORE button to launch the Restore screen,
  • Click the Restore site button. On the confirmation screen, click on the Confirm restore site button.
  • Click the Ok, notify me! or navigate back manually (by clicking the X toolbar button or pressing/swiping back).
  • You should automatically be navigated back to the Activity Log screen, skipping the Activity Log Detail screen and a restore status will be triggered,
  • The restore progress item should immediately appears. Make sure the restore timestamp is available on this progress item.
  • Try doing the same steps again, but this time when within the Restore screen and flows, go back.
  • Make sure that going back will navigate to to the Activity Log Detail screen.

  • Since the restore feature flag now defaults to true, in order to test the old flow you will need to manually override the default to false.
  • Do that and make sure that the old flow, through the Rewind Dialog works as well.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

This new 'NavigationEvents' class will then help with navigating to the
'Restore' screen as well.
Also, this commit updates the already existing test to take into
consideration the restore feature flag as well.

These tests will fail as the implementation is not ready yet. The next
commit will make the tests pass (TDD).
This commit makes the previous failing test pass (TDD).
This commit will make sure to forward the activity result from the
restore flow to the activity log through the activity log detail screen.

And, on the activity log screen the restore feature flag will
differentiate between the corresponding navigation flows, the old and
the new one.
@ParaskP7 ParaskP7 added this to the 16.7 milestone Feb 5, 2021
@ParaskP7 ParaskP7 requested a review from zwarm February 5, 2021 15:57
@ParaskP7 ParaskP7 self-assigned this Feb 5, 2021
@peril-wordpress-mobile
Copy link
Copy Markdown

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@ParaskP7 ParaskP7 mentioned this pull request Feb 5, 2021
30 tasks
@peril-wordpress-mobile
Copy link
Copy Markdown

You can test the changes on this Pull Request by downloading the APK here.

Copy link
Copy Markdown
Contributor

@zwarm zwarm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ParaskP7 - Everything works as expected. I am returned to activity log when explicitly exiting the flow and remain on detail when if I wait to end. LGTM 🎉

@zwarm zwarm merged commit fc1ca7f into develop Feb 5, 2021
@zwarm zwarm deleted the issue/13328-connect-activity-log-detail-with-restore branch February 5, 2021 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants