fix(next): ensure query preset from url is applied#15323
Merged
Conversation
Contributor
📦 esbuild Bundle Analysis for payloadThis analysis was generated by esbuild-bundle-analyzer. 🤖
Largest pathsThese visualization shows top 20 largest paths in the bundle.Meta file: packages/next/meta_index.json, Out file: esbuild/index.js
Meta file: packages/payload/meta_index.json, Out file: esbuild/index.js
Meta file: packages/payload/meta_shared.json, Out file: esbuild/exports/shared.js
Meta file: packages/richtext-lexical/meta_client.json, Out file: esbuild/exports/client_optimized/index.js
Meta file: packages/ui/meta_client.json, Out file: esbuild/exports/client_optimized/index.js
Meta file: packages/ui/meta_shared.json, Out file: esbuild/exports/shared_optimized/index.js
DetailsNext to the size is how much the size has increased or decreased compared with the base branch of this PR.
|
AlessioGr
commented
Jan 23, 2026
| } | ||
| } | ||
|
|
||
| if (collectionPreferences?.preset) { |
Member
Author
There was a problem hiding this comment.
Moved this piece of code to the top of the function, as data returned here needs to be used earlier to apply the preset
AlessioGr
commented
Jan 23, 2026
| collectionConfig: clientCollectionConfig, | ||
| collectionSlug, | ||
| columns: collectionPreferences?.columns, | ||
| columns: columnPreference, |
Member
Author
There was a problem hiding this comment.
columns can now come from the preset => we shouldn't just blindly take them from the preferences
AlessioGr
commented
Jan 23, 2026
| await expect(field.locator('.react-select--single-value')).toHaveText(fieldLabel) | ||
|
|
||
| await expect(page).toHaveURL(new RegExp(`&groupBy=${fieldPath}`)) | ||
| await expect(page).toHaveURL(new RegExp(`[&?]groupBy=${fieldPath}`)) |
Member
Author
There was a problem hiding this comment.
The position of groupBy in the URL does not matter, we only need to assert that it is present
AlessioGr
commented
Jan 23, 2026
| if (queryPreset?.where && !query.where) { | ||
| query.where = queryPreset.where | ||
| } | ||
| query.groupBy = query.groupBy ?? queryPreset?.groupBy ?? collectionPreferences?.groupBy |
Member
Author
There was a problem hiding this comment.
The priority: query > preset > preferences.
The expectation is that if ONLY preset is present in query params, we take the where/groupBy from the preset.
If preset is present with the where query, we need to respect the where query even if it differs from the preset's where query. Otherwise, the following will not work anymore:
- select preset
- update where query in ui
- click on "update preset". Wouldn't work if we don't respect the where query update
AlessioGr
requested review from
JarrodMFlesch and
jacobsfletch
as code owners
jacobsfletch
approved these changes
Jan 26, 2026
jacobsfletch
changed the title
Contributor
|
🚀 This is included in version v3.74.0 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Previously, if you visited the list view from a URL that contains the
presetparam (e.g.http://localhost:3000/admin/collections/pages?preset=69728460f29c932fb002feb9), the preset would not be applied.This PR is ensured the preset is applied and adds an e2e test to verify this functionality