Fix: Check ability to create patterns on the add new pattern modal. #62633
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
jorgefilipecosta
added
[Type] Bug
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
|
Size Change: +42 B (0%) Total Size: 1.76 MB
ℹ️ View Unchanged
|
carolinan
reviewed
Jun 19, 2024
| ?.add_new_item, | ||
| addNewTemplatePartLabel: getPostType( TEMPLATE_PART_POST_TYPE ) | ||
| ?.labels?.add_new_item, | ||
| canCreatePattern: canUser( 'create', 'blocks' ), |
There was a problem hiding this comment.
It can be confusing that 'blocks' here represents patterns. I wonder if this needs a comment.
There was a problem hiding this comment.
Is blocks referring to the CPT?
There was a problem hiding this comment.
Yes, blocks refer to wp_blocks CPT, one needs to be able to create a post there to create a pattern otherwise things fail.
There was a problem hiding this comment.
This is why I think a comment about it would help.
|
This PR does hide the "Add new pattern" button, but the Duplicate option is still available from the action menu, is there a separate PR for that? |
ellatrix
reviewed
Jun 20, 2024
| @@ -36,21 +36,29 @@ export default function AddNewPattern() { | |||
| const [ showPatternModal, setShowPatternModal ] = useState( false ); | |||
| const [ showTemplatePartModal, setShowTemplatePartModal ] = | |||
| useState( false ); | |||
| // eslint-disable-next-line @wordpress/no-unused-vars-before-return | |||
| const { createPatternFromFile } = unlock( useDispatch( patternsStore ) ); | |||
There was a problem hiding this comment.
Another trick is to use useRegistry, call dispatch and unlock in the action callback.
ellatrix
reviewed
Jun 20, 2024
| label={ | ||
| canCreatePattern | ||
| ? addNewPatternLabel | ||
| : addNewTemplatePartLabel |
There was a problem hiding this comment.
Why are we switching here now? What if you can do neither?
There was a problem hiding this comment.
It felt strange to have a menu saying Add New Pattern, while adding a template part was the option. If the user can not add template parts and can not add patterns, the condition if ( controls.length === 0 ) { will be true and we will not render any menu.
There was a problem hiding this comment.
There's also a check for addNewPatternLabel which is maybe a bit strange now.
There was a problem hiding this comment.
Hi @ellatrix, I reverted this change and now we just focus on checking permissions before rendering controls.
jorgefilipecosta
force-pushed
the
fix/check-ability-to-create-patterns-on-the-add-new-pattern-modal
branch
from
f808c13
to
a2e93e7
Compare
Hi @carolinan, thank you for the review. I plan on fixing the duplicate pattern action in a separate PR following the same approach we ended up deciding on for the trash post-action that is being discussed at #62633. |
jorgefilipecosta
deleted the
fix/check-ability-to-create-patterns-on-the-add-new-pattern-modal
branch
This was referenced Jun 21, 2024
ellatrix
added a commit
that referenced
this pull request
Jun 25, 2024
…62633) Co-authored-by: jorgefilipecosta <jorgefilipecosta@git.wordpress.org> Co-authored-by: carolinan <poena@git.wordpress.org> Co-authored-by: ellatrix <ellatrix@git.wordpress.org>
|
I just cherry-picked this PR to the wp/6.6-rc-1 branch to get it included in the next release: d493024 |
ellatrix
added
Backported to WP Core
ellatrix
added a commit
that referenced
this pull request
Jun 25, 2024
…62633) Co-authored-by: jorgefilipecosta <jorgefilipecosta@git.wordpress.org> Co-authored-by: carolinan <poena@git.wordpress.org> Co-authored-by: ellatrix <ellatrix@git.wordpress.org>
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.
A user may have permission to edit patterns and should see the patterns section but may not have permission to create new patterns.
If the user has no permission to create patterns we currently show the option to create and import anyway but when using these features there is a crash.
This PR adds a check for the capability to create patterns, and also a check for the capability to create template parts. The check for the capability to create template parts would not be strictly necessary because currently the capability to create template parts just depends on edit_theme_options, and if edit_theme_options is not available the site editor does not even load. But let us add the check anyway for template parts in case things change or some capability management plugin does something we are not expecting.
Testing Instructions
I pasted the following test code that removes the ability to create patterns (while still allowing to edit them).
I went to wp-admin/site-editor.php?postType=wp_block verified patterns loaded well and I could edit them, but the ability to create new patterns was not available.