Asset browser: include folders in the paginated results #2928
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.
This PR could close #2829.
In this solution folders and assets are treated as one collection and the pagination works correctly now. The folders are shown on the first page(s) before all the assets.
If this is accepted as the way to go, the browser Vue component's template could also be simplified a bit, now that folders and assets are treated more uniformly.
Discussion
I would be glad to hear any feedback. Here's a few of my thoughts:
Controller
, which doesn't feel completely right. Perhaps moving these to a customQueryBuilder
for combined folder/asset results, if possible, would be better.FolderItem
uses introspection, which is sometimes considered to be a code smell. I think it is justified / allright here though.