557314 - Need cancel button after clicking Reset Sync

Status: VERIFIED FIXED

(Firefox :: Sync, defect)

Description

[Tony Chung [:tchung]]

There's no way to exit the merge data window once the user has entered the "Reset Sync" page.   This leaves the user unable to cancel the operation or scroll back to the main window.  Even closing prefpane and reopening the weave tab takes user back to the merge data page.   

The only way to move forward is to merge the data, and people may not want that. 

Possibly a regression from bug 539057.

Repro:
1) Install weave 1.2b3
2) sign in
3) click "Reset Sync"
4) Page lands on merge data window
5) Verify there is no way to cancel the operation or go back to main page without finishing the merge

Expected:
- cancel or back option

Actual:
- merge forward only

Comment 1

[Mike Connor [:mconnor]]

* Add an Undo or Cancel button in the case where this is clicked
* Do _not_ block on picking an option here (IOW, don't set firstSync to notReady except in the "setting up a new/different account" case.)  if the user closes the window, it's a no-op.

Comment 2

[Paul O'Shannessy [:zpao] (not bugmail, email directly)]

Attachment: Patch v0.1

bam!

Comment 3

[Paul O'Shannessy [:zpao] (not bugmail, email directly)]

Comment on attachment 437430 [details] [diff] [review]
Patch v0.1

Will also need the following in handleChoice:
> this._resettingSync = false;

Mardak also proposed just calling |this.page = 2;| instead of going through updateWeavePrefs(), which I think would work, you just lose the Weave.Clients.update() call (which might be pretty important, not sure if we do that again later before doing anything with clients)

Comment 4

[Mike Connor [:mconnor]]

Comment on attachment 437430 [details] [diff] [review]
Patch v0.1

Not sure on the strings, but we should get a full string review ASAP.

Comment 5

[Paul O'Shannessy [:zpao] (not bugmail, email directly)]

(In reply to comment #3)
> (From update of attachment 437430 [details] [diff] [review])
> Will also need the following in handleChoice:
> > this._resettingSync = false;

Actually, no I don't (but I'm going to in case the flow changes here). The only way out is to close the window (which will recreate gWeavePane) or to go back & press cancel (which does set it to false). moving forward (Start syncing now) also closes the window.

Comment 6

[Paul O'Shannessy [:zpao] (not bugmail, email directly)]

Pushed http://hg.mozilla.org/labs/weave/rev/bc49ad0a6956
Added a cancel button that only shows on the sync options page when resetting.
Also removed the pref usage, so that resetting is properly cancelable (by pressing cancel, closing the window, or quitting).

(In reply to comment #3)
> (From update of attachment 437430 [details] [diff] [review])
> Will also need the following in handleChoice:
> > this._resettingSync = false;

I did this in setupInitialSync (since that's the same place the startOver button was hidden)

Comment 7

[Tracy Walker [:tracy]]

verified with Weave 1.2.b4 on Fx 3.6.3