Skip to content

Enforce comment blocks allowlist on inner blocks #43573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: trunk
Choose a base branch
from

Conversation

dsas
Copy link
Contributor

@dsas dsas commented May 22, 2025

Fixes https://linear.app/a8c/issue/DOTCOM-13240/

Proposed changes:

Fixes an issue where disallowed blocks could be added as inner blocks

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

  • Go to '..'

@dsas dsas self-assigned this May 22, 2025
Copy link
Contributor

github-actions bot commented May 22, 2025

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (WordPress.com Site Helper), and enable the dotcom-13240-verbum_block_utilsremove_blocks-allows-disallowed-child branch.
  • To test on Simple, run the following command on your sandbox:
bin/jetpack-downloader test jetpack-mu-wpcom-plugin dotcom-13240-verbum_block_utilsremove_blocks-allows-disallowed-child

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

Copy link
Contributor

github-actions bot commented May 22, 2025

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Review, ...).
  • ✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
  3. You can use GitHub's Reviewers functionality to request a review.
  4. When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

@github-actions github-actions bot added the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label May 22, 2025
Copy link

jp-launch-control bot commented May 22, 2025

Code Coverage Summary

Coverage changed in 1 file.

File Coverage Δ% Δ Uncovered
projects/packages/jetpack-mu-wpcom/src/features/verbum-comments/assets/class-verbum-block-utils.php 55/58 (94.83%) -5.17% 3 ❤️‍🩹

Full summary · PHP report

@github-actions github-actions bot added the [mu wpcom Feature] Verbum Comments Verbum, a better comment experience, app developed in the mu-wpcom plugin label May 22, 2025
* @param array $blocks Array of blocks to filter.
* @return array Filtered blocks.
*/
private static function filter_blocks_recursive( $blocks ) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels like this shouldn't be so complicated, am I missing a convenience function or a better way of doing things?

@dsas dsas changed the title Dotcom 13240 verbum block utilsremove blocks allows disallowed child Enfore comment blocks allowlist on inner blocks May 22, 2025
@dsas dsas changed the title Enfore comment blocks allowlist on inner blocks Enforce comment blocks allowlist on inner blocks May 22, 2025
@dsas
Copy link
Contributor Author

dsas commented May 22, 2025

Hmm the static analysis is failing because:

Error: Plugin PhanPluginDuplicateExpressionAssignmentOperation Can simplify this assignment to $block['innerHTML'] ??= '' (requires php version 7.4 or newer)

But the PHPCS says <config name="testVersion" value="7.2-"/>....which version is it we're targeting?

.......yup, using a null coalesce fails pre-commit checks

--------------------------------------------------------------------------------
FOUND 1 ERROR AFFECTING 1 LINE
--------------------------------------------------------------------------------
 65 | ERROR | null coalesce equal operator (??=) is not present in PHP version
    |       | 7.3 or earlier
    |       | (PHPCompatibility.Operators.NewOperators.t_coalesce_equalFound)
--------------------------------------------------------------------------------

@dsas dsas added the [Type] Bug When a feature is broken and / or not performing as intended label May 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[mu wpcom Feature] Verbum Comments Verbum, a better comment experience, app developed in the mu-wpcom plugin [Package] Jetpack mu wpcom WordPress.com Features [Status] In Progress [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. [Tests] Includes Tests [Type] Bug When a feature is broken and / or not performing as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant