Skip to content

Issue/13328 restore progress#13778

Merged
zwarm merged 15 commits intodevelopfrom
issue/13328-restore-progress
Jan 15, 2021
Merged

Issue/13328 restore progress#13778
zwarm merged 15 commits intodevelopfrom
issue/13328-restore-progress

Conversation

@zwarm
Copy link
Copy Markdown
Contributor

@zwarm zwarm commented Jan 14, 2021

Parent #13328

This PR implements the "progress" wizard step/view for the restore request and is mostly a clone of Backup Download progress with a few temporary navigations until the last step in the wizard has been implemented.

Merge Instructions

Cloned Classes
RestoreProgressAdapter
RestoreProgressFragment
RestoreProgressStateListItemBuilder

Notes:

  • Ignore styling - this is being handled separately
  • Ignore unit test placement in packages - this is being handled separately
  • RestoreActivity & RestoreViewModel (+unit tests) will continue to get updated as I move throughout the steps of the wizard

To test:
Warning: The Restore site button is hooked up, so if you press it your site will be backed up!

  • Launch the app with RestoreFeatureConfig flag on and the BackupFeatureFlag on
  • Navigate to ActivityLog
  • Tap the more menu
  • Select the restore option
  • Tap the Restore Site button on the Details View
  • Tap the Confirm restore site on the Warning View
    Verify
  • (1) The progress view is shown
  • (2) If there is an error, the wizard will close (eventually it will go to the complete view)
  • (3) When the restore finishes, the wizard will close (eventually it will go to the complete view)
  • (4) Tapping the OK, notify me button, Back Button and X will close the wizard

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.

@zwarm zwarm added this to the 16.6 milestone Jan 14, 2021
@zwarm zwarm requested a review from ParaskP7 January 14, 2021 21:07
@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Jan 14, 2021

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

@peril-wordpress-mobile
Copy link
Copy Markdown

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Jan 14, 2021

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

@ParaskP7 ParaskP7 self-assigned this Jan 15, 2021
Copy link
Copy Markdown
Contributor

@ParaskP7 ParaskP7 left a comment

Choose a reason for hiding this comment

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

👋 @zwarm !

I have reviewed and tested this PR as per the instruction, great job! Also, kudos for the Flow usage on the use case! 🌟 ❤️

I have left some comments (🔍 + ⚠️) and few questions (❓), which I would like to discuss before approving this PR.

Base automatically changed from issue/13328-restore-warning to develop January 15, 2021 14:34
@zwarm
Copy link
Copy Markdown
Contributor Author

zwarm commented Jan 15, 2021

@ParaskP7 - Let me know what else needs to be done before you give you approval? Thanks.

@ParaskP7
Copy link
Copy Markdown
Contributor

ParaskP7 commented Jan 15, 2021

@ParaskP7 - Let me know what else needs to be done before you give you approval? Thanks.

👋 @zwarm !

I have two pending questions for you, then I'll approve this PR. Can you check the comments I haven't yet resolved?

@zwarm
Copy link
Copy Markdown
Contributor Author

zwarm commented Jan 15, 2021

Many thanks @ParaskP7

@zwarm zwarm merged commit d523b6e into develop Jan 15, 2021
@zwarm zwarm deleted the issue/13328-restore-progress branch January 15, 2021 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants