Skip to content

Fix: Fixed an issue where the restore option was missing from recycle bin #10004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

QuaintMako
Copy link
Contributor

Resolved / Related Issues

What has been done

  • Added Restore action to recycle bin flyout when nothing is selected.
  • Added Restore action to inner toolbar in recycle bin.
  • Added Empty / Restore selection in inner toolbar.
  • Added Empty selection to flyout when items are selected.
  • Move Restore/Delete code from src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs to src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs

Validation
How did you test these changes?

  • Built and ran the app
  • Tested the changes for accessibility

Screenshots (optional)

Toolbar

Selection

SelectionFlyout

flyout

@yaira2
Copy link
Member

yaira2 commented Sep 16, 2022

The option to "Empty Selection" is a bit redundant as there is already the delete option.

@QuaintMako
Copy link
Contributor Author

The option to "Empty Selection" is a bit redundant as there is already the delete option.

It is indeed, but it's something that was asked for during the previous PR for that issue : #9795 (comment).

I can remove it if it's no longer asked for.

@yaira2
Copy link
Member

yaira2 commented Sep 16, 2022

My apologies, I wasn't accounting for the existing delete option at the time.

@QuaintMako
Copy link
Contributor Author

Alright, so nuking it?

@yaira2
Copy link
Member

yaira2 commented Sep 16, 2022

Yeah

@QuaintMako
Copy link
Contributor Author

Got it.

Should the "Empty Recycle Bin" button disappear from the toolbar when selecting items? Leaving just the "Restore Selection" one.

@yaira2
Copy link
Member

yaira2 commented Sep 16, 2022

I think that should always be visible

@QuaintMako
Copy link
Contributor Author

QuaintMako commented Sep 19, 2022

Somehow the last merge done using Github interface messed up the project generation.
Looking into it.

EDIT: Coming from the merge on the localization files apparently. Will fix it during the day most likely.

@QuaintMako QuaintMako marked this pull request as draft September 19, 2022 06:30
@QuaintMako QuaintMako marked this pull request as ready for review September 19, 2022 09:28
@QuaintMako
Copy link
Contributor Author

That should do it. The "Empty Selection" action has been fully removed and the merge issues have been fixed.

@yaira2
Copy link
Member

yaira2 commented Sep 20, 2022

This might work for the restore icon 

@QuaintMako
Copy link
Contributor Author

Changed the restore icon, the one proposed it way better.

@yaira2 yaira2 changed the title Feature: Enhancing Restoring & Emptying the recycle bin. Fix: Fixed an issue where the restore option was missing from recycle bin Sep 21, 2022
@yaira2 yaira2 added ready to merge Pull requests that are approved and ready to merge and removed needs - code review labels Sep 21, 2022
@yaira2 yaira2 merged commit ccecdb3 into files-community:main Sep 21, 2022
@QuaintMako QuaintMako deleted the 9561_RestoreEmptyEnhancedRecycleBin branch September 23, 2022 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge Pull requests that are approved and ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: Restore option is missing from recycle bin
2 participants