fix: show more details in trash overview filter when filtering is active #949
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull Request Overview
The PR enhances the trash overview footer to display how many trash bins are empty when filtering is active.
- Introduces
emptyTrashSpacescalculation infooterTextTotal - Updates translation strings to include empty-trash count
- Adds conditional logic to show the additional detail only when there are empty bins
Comments suppressed due to low confidence (2)
packages/web-app-files/src/views/trash/Overview.vue:167
- There are no tests covering the branch when there are empty trash spaces; consider adding unit tests for
footerTextTotalto verify both conditional outputs.
const footerTextTotal = computed(() => {
packages/web-app-files/src/views/trash/Overview.vue:171
- These new translation strings introduce additional keys; ensure the project's i18n catalogs are updated so translators see and handle the new variants.
return $ngettext(
Comment on lines
+168
to
+176
| const emptyTrashSpaces = unref(spaces).filter((s) => s.hasTrashedItems === false) | ||
| if (!emptyTrashSpaces.length) { | ||
| return $ngettext( | ||
| '%{spaceCount} trash bin in total', | ||
| '%{spaceCount} trash bins in total', | ||
| unref(spaces).length, | ||
| { | ||
| spaceCount: unref(spaces).length.toString() |
There was a problem hiding this comment.
Repeatedly calling unref(spaces) for filtering and counting could be optimized by storing the unwrapped array in a local variable once, then deriving emptyTrashSpaces and totalSpaces from it.
Suggested change
| const emptyTrashSpaces = unref(spaces).filter((s) => s.hasTrashedItems === false) | |
| if (!emptyTrashSpaces.length) { | |
| return $ngettext( | |
| '%{spaceCount} trash bin in total', | |
| '%{spaceCount} trash bins in total', | |
| unref(spaces).length, | |
| { | |
| spaceCount: unref(spaces).length.toString() | |
| const unwrappedSpaces = unref(spaces) | |
| const emptyTrashSpaces = unwrappedSpaces.filter((s) => s.hasTrashedItems === false) | |
| if (!emptyTrashSpaces.length) { | |
| return $ngettext( | |
| '%{spaceCount} trash bin in total', | |
| '%{spaceCount} trash bins in total', | |
| unwrappedSpaces.length, | |
| { | |
| spaceCount: unwrappedSpaces.length.toString() |
JammingBen
approved these changes
Jul 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Related Issue
How Has This Been Tested?
Types of changes