Skip to content

[WP 7.2] Editor: Guard entity preload filters and share entity actions/fields logic - #85499

Merged
mirka merged 1 commit into
wp/7.2from
backport/85390-wp-7.2
Oct 26, 2026
Merged

mirka merged 1 commit into
wp/7.2from
backport/85390-wp-7.2

Conversation

@t-hamano

@t-hamano t-hamano commented Oct 24, 2026 •

Copy link
Copy Markdown
Contributor

What?

Manual backport of #85390 to the wp/7.2 branch.

Why?

E2E tests on wp/7.2 have been failing since r64686 changed the return shape of the entity actions/fields module functions in core. #85390 is the Gutenberg counterpart of that change, but it was not backported to wp/7.2.

How?

Cherry-picked #85390. The conflicts came from comment changes in #85070, which is not on wp/7.2, so they were resolved without bringing in #85070.

Testing Instructions

Check that the E2E and PHP unit tests pass.

Use of AI Tools

Claude Code was used to investigate the failure, cherry-pick the commit and resolve the conflicts. I reviewed the result.

…logic (#85390)

Co-authored-by: oandregal <oandregal@git.wordpress.org>
Co-authored-by: jorgefilipecosta <jorgefilipecosta@git.wordpress.org>
(cherry picked from commit fa27521)

Co-authored-by: t-hamano <54422211+t-hamano@users.noreply.github.com>
@t-hamano t-hamano added [Type] Bug An existing feature does not function as intended Backport from WordPress Core Pull request that needs to be backported to a Gutenberg release from WordPress Core labels Oct 24, 2026
@t-hamano t-hamano self-assigned this Oct 24, 2026
@github-actions

github-actions Bot commented Oct 24, 2026 •

Copy link
Copy Markdown

🤖 PR meta 🤖

Preview in WordPress Playground

🎉 Props

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: oandregal <oandregal@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: mirka <0mirka00@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.


Props Bot commands

You can trigger Props Bot actions by commenting on this PR:

  • @propsbot add <username> to give props to a GitHub user. Requires write access.
  • @propsbot remove <username> to leave a user out of the props. Requires write access.
  • @propsbot refresh to refresh this list. Adding the props-bot label works too.

Updated as activity occurs, without notifying anyone named here. Add the props-bot label to refresh.

🏁 Flaky tests

Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

Regression: updating a specific option will only change its value and will not corrupt others in /test/e2e/specs/editor/various/core-settings.spec.js, passed after 1 failed attempt.
Error: expect(received).toStrictEqual(expected) // deep equality

- Expected  - 1
+ Received  + 1

  Array [
    "rewrite_rules",
-   "SERIALIZED DATA",
+   "",
  ]
    at forEach (/home/runner/work/gutenberg/gutenberg/test/e2e/specs/editor/various/core-settings.spec.js:46:26)
    at /home/runner/work/gutenberg/gutenberg/test/e2e/specs/editor/various/core-settings.spec.js:43:35
drags a multi-selection from a block nested in a selected block in /test/e2e/specs/editor/various/draggable-blocks.spec.js, passed after 1 failed attempt.
TypeError: Cannot read properties of null (reading 'y')
    at /home/runner/work/gutenberg/gutenberg/test/e2e/specs/editor/various/draggable-blocks.spec.js:989:57
    at /home/runner/work/gutenberg/gutenberg/test/e2e/specs/editor/various/draggable-blocks.spec.js:988:3
refuses the drop and uploads nothing in /test/e2e/specs/editor/various/single-file-placeholder-drop.spec.js, passed after 1 failed attempt.
Error: expect(received).toHaveLength(expected)

Expected length: 0
Received length: 1
Received array:  [{"_links": {"about": [{"href": "http://localhost:8889/wp-json/wp/v2/types/attachment"}], "author": [{"embeddable": true, "href": "http://localhost:8889/wp-json/wp/v2/users/1"}], "collection": [{"href": "http://localhost:8889/wp-json/wp/v2/media"}], "curies": [{"href": "https://api.w.org/{rel}", "name": "wp", "templated": true}], "replies": [{"embeddable": true, "href": "http://localhost:8889/wp-json/wp/v2/comments?post=223"}], "self": [{"href": "http://localhost:8889/wp-json/wp/v2/media/223", "targetHints": {"allow": ["GET", "POST", "PUT", "PATCH", "DELETE"]}}], "wp:attached-to": [{"embeddable": true, "href": "http://localhost:8889/wp-json/wp/v2/posts/222", "id": 222, "post_type": "post"}]}, "alt_text": "", "author": 1, "caption": {"rendered": ""}, "class_list": ["post-223", "attachment", "type-attachment", "status-inherit", "hentry", "entry"], "comment_status": "open", "date": "2026-10-24T01:23:08", "date_gmt": "2026-10-24T01:23:08", "description": {"rendered": "<p class=\"attachment\"><a href='http://localhost:8889/wp-content/uploads/2026/10/53be6031-f569-4af2-a013-d845c10229c9.png'><img loading=\"lazy\" decoding=\"async\" width=\"10\" height=\"10\" src=\"http://localhost:8889/wp-content/uploads/2026/10/53be6031-f569-4af2-a013-d845c10229c9.png\" class=\"attachment-medium size-medium\" alt=\"\" style=\"width:100%;height:100%;max-width:10px;\" /></a></p>
"}, "featured_media": 0, "filename": "53be6031-f569-4af2-a013-d845c10229c9.png", "filesize": 80, "guid": {"rendered": "http://localhost:8889/wp-content/uploads/2026/10/53be6031-f569-4af2-a013-d845c10229c9.png"}, "id": 223, "link": "http://localhost:8889/?attachment_id=223", "media_details": {"file": "2026/10/53be6031-f569-4af2-a013-d845c10229c9.png", "filesize": 80, "height": 10, "image_meta": {"alt": "", "aperture": "0", "camera": "", "caption": "", "copyright": "", "created_timestamp": "0", "credit": "", "focal_length": "0", "iso": "0", "keywords": [], "orientation": "0", "shutter_speed": "0", "title": ""}, "sizes": {}, "width": 10}, "media_type": "image", "meta": [], "mime_type": "image/png", "modified": "2026-10-24T01:23:08", "modified_gmt": "2026-10-24T01:23:08", "ping_status": "closed", "post": 222, "slug": "53be6031-f569-4af2-a013-d845c10229c9", "source_url": "http://localhost:8889/wp-content/uploads/2026/10/53be6031-f569-4af2-a013-d845c10229c9.png", "status": "inherit", "template": "", "title": {"rendered": "53be6031-f569-4af2-a013-d845c10229c9"}, "type": "attachment"}]
    at /home/runner/work/gutenberg/gutenberg/test/e2e/specs/editor/various/single-file-placeholder-drop.spec.js:71:45

819bd0a Run

@t-hamano t-hamano added [Feature] DataViews Work surrounding upgrading and evolving views in the site editor and beyond [Type] Enhancement A suggestion for improvement. and removed [Type] Bug An existing feature does not function as intended labels Oct 24, 2026
@t-hamano

Copy link
Copy Markdown
Contributor Author

Note: The performance tests are failing because the site editor is broken on the wp/7.2 branch. They will keep failing until this PR is merged.

@mirka

mirka commented Oct 26, 2026

Copy link
Copy Markdown
Member

I'm going to merge to unblock the branch.

@mirka
mirka merged commit a661fbb into wp/7.2 Oct 26, 2026
108 of 113 checks passed
@mirka
mirka deleted the backport/85390-wp-7.2 branch October 26, 2026 09:43
wporg-sync pushed a commit to WordPress/wordpress-develop that referenced this pull request Oct 27, 2026
This updates the pinned commit hash of the Gutenberg repository from `be6a50be6834e922b9db12c75c9a2cd817b2db59` to `d72020a651eda64dcc53b5dbd5b9d5bd511c4cc9` (version 24.3.0-rc.1).

A full list of changes included in this commit can be found on GitHub: WordPress/gutenberg@be6a50b...d72020a

- BorderControl: Remove double focus outline (WordPress/gutenberg#85173)
- Snackbar: Use design system focus ring (WordPress/gutenberg#85168)
- SelectControl: Fix default options showing the `Select` placeholder (WordPress/gutenberg#85172)
- Actions API: Remove the unsupported `single` action context (WordPress/gutenberg#85186)
- Client-side media: Upgrade wasm-vips to 0.0.19 and raise memory budgets accordingly (WordPress/gutenberg#84980)
- Styles: Fix inconsistent 'Elements' tools panel heading level (WordPress/gutenberg#85247)
- `media-utils`/MediaEdit: use design system focus ring (WordPress/gutenberg#84940)
- Icons: Add new form based icons. (WordPress/gutenberg#84074) (WordPress/gutenberg#85360)
- Navigation: keep custom CSS off inner list containers (WordPress/gutenberg#84881) (WordPress/gutenberg#85367)
- Navigation: keep Global Styles custom CSS off inner list containers (WordPress/gutenberg#85366)
- Edit as HTML: Show design system focus ring on the HTML textarea (WordPress/gutenberg#85266) (WordPress/gutenberg#85359)
- Icons: Restore the missing speech bubble in postComments (WordPress/gutenberg#85275)
- Block Directory: Standardize downloadable block focus indicators (WordPress/gutenberg#85307)
- Global Styles: Add icons and tweak styling for element and block buttons (WordPress/gutenberg#85363) (WordPress/gutenberg#85414)
- Tests: Stop asserting Core lacks the core fields functions (WordPress/gutenberg#85201)
- Meta Boxes: Use the design system focus ring for the panel toggle (WordPress/gutenberg#85355) (WordPress/gutenberg#85410)
- DataViews: Use the design system focus ring for list items. (WordPress/gutenberg#85358) (WordPress/gutenberg#85435)
- Components: Standardize checkbox and radio focus outlines (WordPress/gutenberg#85379) (WordPress/gutenberg#85436)
- UI: Use solid brand highlights for popup items (WordPress/gutenberg#84087)
- Media: Preserve EXIF metadata when converting HEIC to JPEG client-side (WordPress/gutenberg#82040)
- Icons: Add error, info and postComments to the core-admin collection (WordPress/gutenberg#85452)
- UnitControl: Use the design system outline for the unit select focus ring (WordPress/gutenberg#85444)
- Page List: Keep pages visible in the Navigation sidebar in contentOnly (WordPress/gutenberg#85357)
- Icons: Add new asterisk icon (WordPress/gutenberg#85442) (WordPress/gutenberg#85498)
- wp-env: Keep Debian security updates in Bullseye-based images (WordPress/gutenberg#85469)
- Editor: Guard entity preload filters and share entity actions/fields logic (WordPress/gutenberg#85390) (WordPress/gutenberg#85499)
- UI: Scale Spinner stroke width with its size (WordPress/gutenberg#85378)
- [WP 7.2] Fix the block-library TypeScript test project (WordPress/gutenberg#85533)
- Editor: Vertically center the Categories loading spinner (WordPress/gutenberg#85563)
- DataViews: Render table bulk actions outside the table (WordPress/gutenberg#85250) (WordPress/gutenberg#85571)
- Record e2e traces only when a failed test is retried (WordPress/gutenberg#85428)
- Writing flow: fix triple click in a list item selecting the next item (WordPress/gutenberg#85569)
- Build: Limit concurrent wp-build builds (WordPress/gutenberg#79889)
- Icons: Promote Dashicon replacements to `core-admin` and map their Dashicons (WordPress/gutenberg#85541)
  
Props peterwilsoncc, mamaduka.
See #66340

git-svn-id: https://develop.svn.wordpress.org/trunk@64796 602fd350-edb4-49c9-b593-d223f7449a82
wporg-sync pushed a commit to WordPress/WordPress that referenced this pull request Oct 27, 2026
This updates the pinned commit hash of the Gutenberg repository from `be6a50be6834e922b9db12c75c9a2cd817b2db59` to `d72020a651eda64dcc53b5dbd5b9d5bd511c4cc9` (version 24.3.0-rc.1).

A full list of changes included in this commit can be found on GitHub: WordPress/gutenberg@be6a50b...d72020a

- BorderControl: Remove double focus outline (WordPress/gutenberg#85173)
- Snackbar: Use design system focus ring (WordPress/gutenberg#85168)
- SelectControl: Fix default options showing the `Select` placeholder (WordPress/gutenberg#85172)
- Actions API: Remove the unsupported `single` action context (WordPress/gutenberg#85186)
- Client-side media: Upgrade wasm-vips to 0.0.19 and raise memory budgets accordingly (WordPress/gutenberg#84980)
- Styles: Fix inconsistent 'Elements' tools panel heading level (WordPress/gutenberg#85247)
- `media-utils`/MediaEdit: use design system focus ring (WordPress/gutenberg#84940)
- Icons: Add new form based icons. (WordPress/gutenberg#84074) (WordPress/gutenberg#85360)
- Navigation: keep custom CSS off inner list containers (WordPress/gutenberg#84881) (WordPress/gutenberg#85367)
- Navigation: keep Global Styles custom CSS off inner list containers (WordPress/gutenberg#85366)
- Edit as HTML: Show design system focus ring on the HTML textarea (WordPress/gutenberg#85266) (WordPress/gutenberg#85359)
- Icons: Restore the missing speech bubble in postComments (WordPress/gutenberg#85275)
- Block Directory: Standardize downloadable block focus indicators (WordPress/gutenberg#85307)
- Global Styles: Add icons and tweak styling for element and block buttons (WordPress/gutenberg#85363) (WordPress/gutenberg#85414)
- Tests: Stop asserting Core lacks the core fields functions (WordPress/gutenberg#85201)
- Meta Boxes: Use the design system focus ring for the panel toggle (WordPress/gutenberg#85355) (WordPress/gutenberg#85410)
- DataViews: Use the design system focus ring for list items. (WordPress/gutenberg#85358) (WordPress/gutenberg#85435)
- Components: Standardize checkbox and radio focus outlines (WordPress/gutenberg#85379) (WordPress/gutenberg#85436)
- UI: Use solid brand highlights for popup items (WordPress/gutenberg#84087)
- Media: Preserve EXIF metadata when converting HEIC to JPEG client-side (WordPress/gutenberg#82040)
- Icons: Add error, info and postComments to the core-admin collection (WordPress/gutenberg#85452)
- UnitControl: Use the design system outline for the unit select focus ring (WordPress/gutenberg#85444)
- Page List: Keep pages visible in the Navigation sidebar in contentOnly (WordPress/gutenberg#85357)
- Icons: Add new asterisk icon (WordPress/gutenberg#85442) (WordPress/gutenberg#85498)
- wp-env: Keep Debian security updates in Bullseye-based images (WordPress/gutenberg#85469)
- Editor: Guard entity preload filters and share entity actions/fields logic (WordPress/gutenberg#85390) (WordPress/gutenberg#85499)
- UI: Scale Spinner stroke width with its size (WordPress/gutenberg#85378)
- [WP 7.2] Fix the block-library TypeScript test project (WordPress/gutenberg#85533)
- Editor: Vertically center the Categories loading spinner (WordPress/gutenberg#85563)
- DataViews: Render table bulk actions outside the table (WordPress/gutenberg#85250) (WordPress/gutenberg#85571)
- Record e2e traces only when a failed test is retried (WordPress/gutenberg#85428)
- Writing flow: fix triple click in a list item selecting the next item (WordPress/gutenberg#85569)
- Build: Limit concurrent wp-build builds (WordPress/gutenberg#79889)
- Icons: Promote Dashicon replacements to `core-admin` and map their Dashicons (WordPress/gutenberg#85541)
  
Props peterwilsoncc, mamaduka.
See #66340
Built from https://develop.svn.wordpress.org/trunk@64796


git-svn-id: http://core.svn.wordpress.org/trunk@63946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
arshidkv12 pushed a commit to arshidkv12/wordpress-develop that referenced this pull request Nov 21, 2026
This updates the pinned commit hash of the Gutenberg repository from `be6a50be6834e922b9db12c75c9a2cd817b2db59` to `d72020a651eda64dcc53b5dbd5b9d5bd511c4cc9` (version 24.3.0-rc.1).

A full list of changes included in this commit can be found on GitHub: WordPress/gutenberg@be6a50b...d72020a

- BorderControl: Remove double focus outline (WordPress/gutenberg#85173)
- Snackbar: Use design system focus ring (WordPress/gutenberg#85168)
- SelectControl: Fix default options showing the `Select` placeholder (WordPress/gutenberg#85172)
- Actions API: Remove the unsupported `single` action context (WordPress/gutenberg#85186)
- Client-side media: Upgrade wasm-vips to 0.0.19 and raise memory budgets accordingly (WordPress/gutenberg#84980)
- Styles: Fix inconsistent 'Elements' tools panel heading level (WordPress/gutenberg#85247)
- `media-utils`/MediaEdit: use design system focus ring (WordPress/gutenberg#84940)
- Icons: Add new form based icons. (WordPress/gutenberg#84074) (WordPress/gutenberg#85360)
- Navigation: keep custom CSS off inner list containers (WordPress/gutenberg#84881) (WordPress/gutenberg#85367)
- Navigation: keep Global Styles custom CSS off inner list containers (WordPress/gutenberg#85366)
- Edit as HTML: Show design system focus ring on the HTML textarea (WordPress/gutenberg#85266) (WordPress/gutenberg#85359)
- Icons: Restore the missing speech bubble in postComments (WordPress/gutenberg#85275)
- Block Directory: Standardize downloadable block focus indicators (WordPress/gutenberg#85307)
- Global Styles: Add icons and tweak styling for element and block buttons (WordPress/gutenberg#85363) (WordPress/gutenberg#85414)
- Tests: Stop asserting Core lacks the core fields functions (WordPress/gutenberg#85201)
- Meta Boxes: Use the design system focus ring for the panel toggle (WordPress/gutenberg#85355) (WordPress/gutenberg#85410)
- DataViews: Use the design system focus ring for list items. (WordPress/gutenberg#85358) (WordPress/gutenberg#85435)
- Components: Standardize checkbox and radio focus outlines (WordPress/gutenberg#85379) (WordPress/gutenberg#85436)
- UI: Use solid brand highlights for popup items (WordPress/gutenberg#84087)
- Media: Preserve EXIF metadata when converting HEIC to JPEG client-side (WordPress/gutenberg#82040)
- Icons: Add error, info and postComments to the core-admin collection (WordPress/gutenberg#85452)
- UnitControl: Use the design system outline for the unit select focus ring (WordPress/gutenberg#85444)
- Page List: Keep pages visible in the Navigation sidebar in contentOnly (WordPress/gutenberg#85357)
- Icons: Add new asterisk icon (WordPress/gutenberg#85442) (WordPress/gutenberg#85498)
- wp-env: Keep Debian security updates in Bullseye-based images (WordPress/gutenberg#85469)
- Editor: Guard entity preload filters and share entity actions/fields logic (WordPress/gutenberg#85390) (WordPress/gutenberg#85499)
- UI: Scale Spinner stroke width with its size (WordPress/gutenberg#85378)
- [WP 7.2] Fix the block-library TypeScript test project (WordPress/gutenberg#85533)
- Editor: Vertically center the Categories loading spinner (WordPress/gutenberg#85563)
- DataViews: Render table bulk actions outside the table (WordPress/gutenberg#85250) (WordPress/gutenberg#85571)
- Record e2e traces only when a failed test is retried (WordPress/gutenberg#85428)
- Writing flow: fix triple click in a list item selecting the next item (WordPress/gutenberg#85569)
- Build: Limit concurrent wp-build builds (WordPress/gutenberg#79889)
- Icons: Promote Dashicon replacements to `core-admin` and map their Dashicons (WordPress/gutenberg#85541)
  
Props peterwilsoncc, mamaduka.
See #66340

git-svn-id: https://develop.svn.wordpress.org/trunk@64796 602fd350-edb4-49c9-b593-d223f7449a82
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backport from WordPress Core Pull request that needs to be backported to a Gutenberg release from WordPress Core [Feature] DataViews Work surrounding upgrading and evolving views in the site editor and beyond [Type] Enhancement A suggestion for improvement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants