fix: removes array & blocks & group fields from sort
#6574
Merged
Conversation
This file contains 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
3 tasks
DanRibbens
requested changes
May 31, 2024
| @@ -29,6 +29,8 @@ const SortColumn: React.FC<Props> = (props) => { | |||
| const descClasses = [`${baseClass}__desc`] | |||
| if (sort === desc) descClasses.push(`${baseClass}--active`) | |||
|
|
|||
| const shouldRenderButtons = !disable && type !== 'array' && type !== 'group' && type !== 'blocks' | |||
There was a problem hiding this comment.
In my opinion the SortColumn shouldn't have to know about the specifics between different types of fields. It already gets a disabled prop which should be enough to know whether to include the controls or not.
There was a problem hiding this comment.
@DanRibbens so field.disableSort is not a real prop, it really just needs to be removed - the condition would never be hit by anything.
However, I do agree that there should be just one source of truth - aka the disable prop
I've went ahead and updated the PR to essentially transferring the conditional to buildColumns and pass it into the disable prop there.
Let me know what you think.
packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx
Outdated
Show resolved
Hide resolved
DanRibbens
approved these changes
Jun 10, 2024
PatrikKozak
added a commit
that referenced
this pull request
Jun 10, 2024
## Description V2 PR [here](#6574) - [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] Bug fix (non-breaking change which fixes an issue) ## Checklist: - [x] Existing test suite passes locally with my changes
JessChowdhury
pushed a commit
that referenced
this pull request
Jun 12, 2024
## Description V2 PR [here](#6574) - [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] Bug fix (non-breaking change which fixes an issue) ## Checklist: - [x] Existing test suite passes locally with my changes
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
Fixes #6469
Type of change
Checklist: