Block Directory: Filter out disallowed blocks before showing available blocks #25926
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
ryelle
added
the
[Feature] Block Directory
6 tasks
|
Size Change: +274 B (0%) Total Size: 1.28 MB
ℹ️ View Unchanged
|
ntsekouras
reviewed
Oct 8, 2020
packages/block-directory/src/components/downloadable-blocks-panel/index.js
Outdated
Show resolved
Hide resolved
ntsekouras
reviewed
Oct 8, 2020
There was a problem hiding this comment.
Hey @ryelle - thanks for your work here 👍 .
I tested it and seems to be working well! I've left a couple of comments but nothing major.
ryelle
force-pushed
the
update/block-directory-caninsertblocktype-again
branch
from
7025c56 to
fd89921
Compare
|
I'm not sure what the issue is with the tests — I can't reproduce the |
ryelle
force-pushed
the
update/block-directory-caninsertblocktype-again
branch
from
fd89921 to
1930bfc
Compare
ryelle
force-pushed
the
update/block-directory-caninsertblocktype-again
branch
from
1930bfc to
6208e90
Compare
|
@ryelle Is there anything specific left for this PR before it can be merged? |
@StevenDufresne It's been awhile since the original PR, if you could just check it over to make sure nothing slipped by in the rebase I'd appreciate it. |
StevenDufresne
approved these changes
Jan 14, 2021
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
Some blocks (or post types) have a restricted list of what can be added (
allowedBlocks, aka child blocks), and we might not be able to add a new block to those containers. Currently, we list all found blocks regardless of this issue, which causes unexpected results when the user tries to add them.This PR follows from #22240 & #24148, but should fix the root issue at both.
I've updated the
canInsertBlockTypeselector to accept an object for the blockType. If an object is passed in, it will not usegetBlockType, which would only work for an already-installed block type. This should be fine for existing uses of the selector, since they'll pass in a string & behavior will stay the same. For the block directory, we can pass in our block object, so that potential downloadable blocks can be checked against the current container.How has this been tested?
You can download & install this example container block that only allows
"core/image", "core/heading", "core/paragraph", "book-review-block/book-review"in the container, and has a filter in the PHP file to restrict blocks in all post types to justNow search for "Stars", and you'll see two results in the main editor content, and 1 available result in the demo block. Search for something totally different (ex, recipe), and you'll get the "No blocks found in your library." result.
Screenshots
In the post, I've set allowedBlocks to allow these 2 blocks that return for the query
stars(in reality, 4 blocks are returned)In this container block, only one block matches allowedBlocks, so only one is shown: