fix: resolve conflicts from 7355 #12486
Merged
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
In #12322 we prevented against accidental query preset lockout by throwing a validation error when the user is going to change the preset in a way that removes their own access to it. This, however, puts the responsibility on the user to make the corrections and is an unnecessary step. For example, the API currently forbids leaving yourself out of the `users` array when specifying the `specificUsers` constraint, but when you encounter this error, have to update the field manually and try again. To improve the experience, we now automatically inject the requesting user onto the `users` array when this constraint is selected. This will guarantee they have access and prevent an accidental lockout while also avoiding the API error feedback loop.
…JSXConvertersFunction type (#12478) Same as #10398 but for inline blocks. > Reproduction steps: > 1. Set `strict: true` in `templates/website/tsconfig.json` > 2. You will find a ts error in `templates/website/src/components/RichText/index.tsx`. > > This is because the blockType property of blocks is generated by Payload as a literal (e.g. "mediaBlock") and cannot be assigned to a string. > > To test this PR, you can make the change to `JSXConvertersFunction` in node_modules of the website template
Webstorm run configuration template files are trying to sneak into my commits.
Adds a new date field to take submission values for. It can help form serialisers render the right input for this kind of field as the submissions themselves don't do any validation right now. Disabled by default as to not cause any conflicts with existing projects potentially inserting their own date blocks. Can be enabled like this ```ts formBuilderPlugin({ fields: { date: true } }) ``` 
Fixes #8168, #8277 The fact that `lexicalHTMLField` doesn't work with live preview was already clarified at the beginning of the page. I mentioned it again in the dedicated section because it seems there was still confusion. Also, I reordered and hierarchized the headings correctly. The introduction said there were two ways to convert to HTML, but there were four headings with the same level. I also made the headings a little shorter to make the table of contents easier to parse.
…ng (#12481) ### What This PR adjusts the `gap` between buttons in the `SortColumn` component. The previous spacing (`calc(var(--base) / 4)`) caused too much visual separation between the sort buttons. It has been replaced with `gap: 0` to tighten their alignment. #### Before:  #### After: 
…7355) ## Description Group fields are shown as one column, this PR changes this so that the individual field is now shown separately. Before change: <img width="1227" alt="before change" src="https://github.com/user-attachments/assets/dfae58fd-8ad2-4329-84fd-ed1d4eb20854"> After change: <img width="1229" alt="after change" src="https://github.com/user-attachments/assets/d4fd78bb-c474-436e-a0f5-cac4638b91a4"> - [X] I have read and understand the [CONTRIBUTING.md](https://github.com/payloadcms/payload/blob/main/CONTRIBUTING.md) document in this repository. ## Type of change - [X] New feature (non-breaking change which adds functionality) ## Checklist: - [X] I have added tests that prove my fix is effective or that my feature works - [X] Existing test suite passes locally with my changes - [ ] I have made corresponding changes to the documentation --------- Co-authored-by: Patrik Kozak <35232443+PatrikKozak@users.noreply.github.com>
…-conflicts-from-7355
PatrikKozak changed the title 
DanRibbens approved these changes May 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
9 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.
Resolves conflicts from PR #7355