Skip to content

Allow canceling unarchive#53463

Merged
rtfeldman merged 3 commits intomainfrom
azure-falcon
Apr 9, 2026
Merged

Allow canceling unarchive#53463
rtfeldman merged 3 commits intomainfrom
azure-falcon

Conversation

@rtfeldman
Copy link
Copy Markdown
Contributor

@rtfeldman rtfeldman commented Apr 9, 2026

Now you can cancel the Unarchive operation if it's taking too long.

(No release notes because this unarchive behavior isn't even on Preview yet.)

Release Notes:

  • N/A

@rtfeldman rtfeldman self-assigned this Apr 9, 2026
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Apr 9, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Apr 9, 2026
@rtfeldman rtfeldman force-pushed the azure-falcon branch 2 times, most recently from 37e7a72 to aae043c Compare April 9, 2026 01:10
Stay on the archive view when clicking unarchive and show a loading
spinner on the entry while git restoration runs in the background.
Only switch to the thread list and unarchive the thread in the metadata
store once restoration completes successfully.

On failure, clear the spinner and show an error toast while keeping the
user on the archive view.
Stay on the archive view when clicking unarchive and show a loading
spinner on the entry while git restoration runs in the background.
Only switch to the thread list and unarchive the thread in the metadata
store once restoration completes successfully.

A cancel button appears next to the spinner, allowing the user to abort
the in-flight restore and return the entry to its archived state.

On failure, clear the spinner and show an error toast while keeping the
user on the archive view.
@rtfeldman rtfeldman changed the title Show spinner on archive entry during unarchive restoration Allow canceling unarchive Apr 9, 2026
@rtfeldman rtfeldman marked this pull request as ready for review April 9, 2026 01:37
@rtfeldman rtfeldman enabled auto-merge (squash) April 9, 2026 17:24
@rtfeldman rtfeldman merged commit 58e59b1 into main Apr 9, 2026
67 of 71 checks passed
@rtfeldman rtfeldman deleted the azure-falcon branch April 9, 2026 18:11
@rtfeldman
Copy link
Copy Markdown
Contributor Author

/cherry-pick preview

@zed-zippy
Copy link
Copy Markdown
Contributor

zed-zippy bot commented Apr 9, 2026

🍒💥 Cherry-pick did not succeed
https://github.com/zed-industries/zed/actions/runs/24213906147

rtfeldman added a commit that referenced this pull request Apr 10, 2026
Now you can cancel the Unarchive operation if it's taking too long.

(No release notes because this unarchive behavior isn't even on Preview
yet.)

Release Notes:

- N/A
maxbrunsfeld pushed a commit that referenced this pull request Apr 10, 2026
Now you can cancel the Unarchive operation if it's taking too long.

(No release notes because this unarchive behavior isn't even on Preview
yet.)

Release Notes:

- N/A
maxbrunsfeld added a commit that referenced this pull request Apr 10, 2026
Cherry-picked PRs (in order applied):

1. #53386
2. #53400
3. #53396
4. #53428
5. #53356
6. #53215
7. #53429
8. #53458
9. #53436
10. #53451
11. #53454
12. #53419
13. #53287
14. #53521
15. #53463
16. #52848
17. #53544
18. #53556
19. #53566
20. #53579
21. #53575
22. #53550
23. #53585
24. #53510
25. #53599
26. #53099
27. #53662
28. #53660
29. #53657
30. #53654


Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Anthony Eid <anthony@zed.dev>
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Co-authored-by: Eric Holk <eric@zed.dev>
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Co-authored-by: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Co-authored-by: Katie Geer <katie@zed.dev>
Co-authored-by: ojpro <contact@ojpro.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants