Skip to content
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

Standardise and fix parsing and serialization of blocks and nav menu items #31004

Merged
merged 48 commits into from
May 4, 2021

Conversation

getdave
Copy link
Contributor

@getdave getdave commented Apr 20, 2021

Description

Aims to fix #29793.

This PR does two things:

  1. Updates the Nav Editor and Nav Block to create the correct core/navigation-link block variations based on the menu item data from the database.
  2. Correctly converts the blocks back to matching nav menu objects for storage in the database, preserving the data necessary to ensure they:
  • can be converted back into the correct core/navigation-link block variation.
  • have the correct object id assigned to match the entity ID which they represent (eg: a Post or a Page...etc).

Known Bugs

Note in the process of working on this PR I've uncovered a few more bugs which I won't attempt to fix in this PR lest it get too large. I'm noting for future reference here:

How has this been tested?

Setup

Test

  • Open the Navigation editor at http://localhost:8889/wp-admin/admin.php?page=gutenberg-navigation.
  • You should see the nav menu appear and all the core/navigation-links should appear with the correct block variation (eg: Post Link, Page Link, Custom`...etc. There are a few known exceptions that don't work which - given that they have never worked - I will tackle in a follow up. These are:
    • Post Type Archive this will not work because we don't have a variation setup for this yet.
    • Post Type Categories (eg: anything you created under Portfolio Categories will show up with the block variation name being Category. This needs fixing.
  • Save your Navigation - this will resave all the items that are currently blocks in the Navigation Editor back to menu items in the database. This will expose any saving errors.
  • Go back to the old Menus page at http://localhost:8889/wp-admin/nav-menus.php.
  • Check the menu items have been correctly persisted and retained their original "types".

Screenshots

Menu -> Nav Editor -> Menu

Screen.Capture.on.2021-04-23.at.13-02-18.mov

Menu -> Nav Block

Screen.Capture.on.2021-04-23.at.13-05-53.mov

Types of changes

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code follows the accessibility standards.
  • I've tested my changes with keyboard and screen readers.
  • My code has proper inline documentation.
  • I've included developer documentation if appropriate.
  • I've updated all React Native files affected by any refactorings/renamings in this PR (please manually search all *.native.js files for terms that need renaming or removal).

@getdave getdave self-assigned this Apr 20, 2021
@github-actions
Copy link

github-actions bot commented Apr 20, 2021

Size Change: -185 kB (-12%) 👏

Total Size: 1.31 MB

Filename Size Change
build/a11y/index.js 1.12 kB -24 B (-2%)
build/annotations/index.js 2.93 kB -865 B (-23%) 🎉
build/api-fetch/index.js 2.42 kB -1 kB (-29%) 🎉
build/autop/index.js 2.28 kB -553 B (-20%) 🎉
build/blob/index.js 672 B +7 B (+1%)
build/block-directory/index.js 6.6 kB -2.01 kB (-23%) 🎉
build/block-directory/style-rtl.css 993 B -12 B (-1%)
build/block-directory/style.css 995 B -11 B (-1%)
build/block-editor/index.js 116 kB -15.6 kB (-12%) 👏
build/block-editor/style-rtl.css 13 kB -23 B (0%)
build/block-editor/style.css 13 kB -22 B (0%)
build/block-library/blocks/button/style-rtl.css 515 B +12 B (+2%)
build/block-library/blocks/button/style.css 515 B +12 B (+2%)
build/block-library/blocks/columns/style-rtl.css 422 B -14 B (-3%)
build/block-library/blocks/columns/style.css 422 B -13 B (-3%)
build/block-library/blocks/cover/editor-rtl.css 603 B -2 B (0%)
build/block-library/blocks/cover/editor.css 604 B -1 B (0%)
build/block-library/blocks/cover/style-rtl.css 1.22 kB -8 B (-1%)
build/block-library/blocks/cover/style.css 1.22 kB -7 B (-1%)
build/block-library/blocks/file/frontend.js 773 B +8 B (+1%)
build/block-library/blocks/freeform/editor-rtl.css 2.45 kB +4 B (0%)
build/block-library/blocks/freeform/editor.css 2.45 kB +4 B (0%)
build/block-library/blocks/gallery/style-rtl.css 1.06 kB -36 B (-3%)
build/block-library/blocks/gallery/style.css 1.05 kB -35 B (-3%)
build/block-library/blocks/legacy-widget/editor-rtl.css 557 B +159 B (+40%) 🚨
build/block-library/blocks/legacy-widget/editor.css 557 B +158 B (+40%) 🚨
build/block-library/blocks/media-text/editor-rtl.css 176 B -15 B (-8%)
build/block-library/blocks/media-text/editor.css 176 B -15 B (-8%)
build/block-library/blocks/media-text/style-rtl.css 492 B -43 B (-8%)
build/block-library/blocks/media-text/style.css 489 B -43 B (-8%)
build/block-library/blocks/navigation-link/editor-rtl.css 617 B +20 B (+3%)
build/block-library/blocks/navigation-link/editor.css 619 B +22 B (+4%)
build/block-library/blocks/navigation-link/style-rtl.css 94 B -1.08 kB (-92%) 🏆
build/block-library/blocks/navigation-link/style.css 94 B -1.08 kB (-92%) 🏆
build/block-library/blocks/navigation/editor-rtl.css 1.19 kB +3 B (0%)
build/block-library/blocks/navigation/editor.css 1.19 kB +3 B (0%)
build/block-library/blocks/navigation/style-rtl.css 1.26 kB +991 B (+364%) 🆘
build/block-library/blocks/navigation/style.css 1.26 kB +993 B (+366%) 🆘
build/block-library/blocks/table/style-rtl.css 485 B +83 B (+21%) 🚨
build/block-library/blocks/table/style.css 485 B +83 B (+21%) 🚨
build/block-library/blocks/template-part/editor-rtl.css 551 B -1 B (0%)
build/block-library/blocks/template-part/editor.css 550 B -1 B (0%)
build/block-library/blocks/video/editor-rtl.css 569 B +1 B (0%)
build/block-library/blocks/video/editor.css 570 B +1 B (0%)
build/block-library/blocks/video/style-rtl.css 169 B -4 B (-2%)
build/block-library/blocks/video/style.css 169 B -4 B (-2%)
build/block-library/editor-rtl.css 9.54 kB +126 B (+1%)
build/block-library/editor.css 9.53 kB +118 B (+1%)
build/block-library/index.js 142 kB -8.96 kB (-6%)
build/block-library/reset-rtl.css 506 B +4 B (+1%)
build/block-library/reset.css 507 B +4 B (+1%)
build/block-library/style-rtl.css 9.54 kB -17 B (0%)
build/block-library/style.css 9.54 kB -20 B (0%)
build/block-serialization-default-parser/index.js 1.3 kB -575 B (-31%) 🎉
build/blocks/index.js 47 kB -1.62 kB (-3%)
build/components/index.js 186 kB -101 kB (-35%) 🎉
build/components/style-rtl.css 16.2 kB -146 B (-1%)
build/components/style.css 16.2 kB -149 B (-1%)
build/compose/index.js 9.96 kB -1.62 kB (-14%) 👏
build/core-data/index.js 12 kB -5.16 kB (-30%) 🎉
build/customize-widgets/index.js 5.21 kB -3.06 kB (-37%) 🎉
build/data-controls/index.js 830 B -9 B (-1%)
build/data/index.js 7.22 kB -1.98 kB (-22%) 🎉
build/date/index.js 31.8 kB -19 B (0%)
build/deprecated/index.js 738 B -49 B (-6%)
build/dom-ready/index.js 576 B -1 B (0%)
build/dom/index.js 4.61 kB -917 B (-17%) 👏
build/edit-navigation/index.js 13.6 kB -3.52 kB (-21%) 🎉
build/edit-navigation/style-rtl.css 2.86 kB -4 B (0%)
build/edit-navigation/style.css 2.86 kB -4 B (0%)
build/edit-post/index.js 334 kB -5.5 kB (-2%)
build/edit-post/style-rtl.css 6.98 kB +21 B (0%)
build/edit-post/style.css 6.97 kB +20 B (0%)
build/edit-site/index.js 25.7 kB -3.25 kB (-11%) 👏
build/edit-site/style-rtl.css 4.91 kB +11 B (0%)
build/edit-site/style.css 4.9 kB +11 B (0%)
build/edit-widgets/index.js 12.5 kB -4.17 kB (-25%) 🎉
build/edit-widgets/style-rtl.css 2.98 kB +6 B (0%)
build/edit-widgets/style.css 2.98 kB +6 B (0%)
build/editor/index.js 60.4 kB -5.32 kB (-8%)
build/element/index.js 3.44 kB -1.19 kB (-26%) 🎉
build/escape-html/index.js 739 B +4 B (+1%)
build/format-library/index.js 5.68 kB -1.09 kB (-16%) 👏
build/hooks/index.js 1.76 kB -516 B (-23%) 🎉
build/html-entities/index.js 628 B +5 B (+1%)
build/i18n/index.js 3.73 kB -314 B (-8%)
build/is-shallow-equal/index.js 710 B +12 B (+2%)
build/keyboard-shortcuts/index.js 1.65 kB -890 B (-35%) 🎉
build/keycodes/index.js 1.43 kB -515 B (-26%) 🎉
build/list-reusable-blocks/index.js 2.06 kB -1.12 kB (-35%) 🎉
build/media-utils/index.js 3.08 kB -2.32 kB (-43%) 🎉
build/notices/index.js 1.07 kB -785 B (-42%) 🎉
build/nux/index.js 2.3 kB -1.12 kB (-33%) 🎉
build/nux/style-rtl.css 718 B -13 B (-2%)
build/nux/style.css 716 B -11 B (-2%)
build/plugins/index.js 2 kB -961 B (-32%) 🎉
build/primitives/index.js 1.03 kB -379 B (-27%) 🎉
build/priority-queue/index.js 791 B +1 B (0%)
build/react-i18n/index.js 924 B -529 B (-36%) 🎉
build/redux-routine/index.js 2.82 kB -13 B (0%)
build/reusable-blocks/index.js 2.56 kB -1.26 kB (-33%) 🎉
build/rich-text/index.js 11.8 kB -1.74 kB (-13%) 👏
build/server-side-render/index.js 1.64 kB -963 B (-37%) 🎉
build/shortcode/index.js 1.68 kB -14 B (-1%)
build/token-list/index.js 848 B -421 B (-33%) 🎉
build/url/index.js 1.95 kB -1.06 kB (-35%) 🎉
build/viewport/index.js 1.28 kB -572 B (-31%) 🎉
build/warning/index.js 1.13 kB -4 B (0%)
build/wordcount/index.js 1.24 kB +14 B (+1%)
ℹ️ View Unchanged
Filename Size Change
build/block-library/blocks/archives/editor-rtl.css 61 B 0 B
build/block-library/blocks/archives/editor.css 60 B 0 B
build/block-library/blocks/audio/editor-rtl.css 58 B 0 B
build/block-library/blocks/audio/editor.css 58 B 0 B
build/block-library/blocks/audio/style-rtl.css 112 B 0 B
build/block-library/blocks/audio/style.css 112 B 0 B
build/block-library/blocks/block/editor-rtl.css 161 B 0 B
build/block-library/blocks/block/editor.css 161 B 0 B
build/block-library/blocks/button/editor-rtl.css 475 B 0 B
build/block-library/blocks/button/editor.css 474 B 0 B
build/block-library/blocks/buttons/editor-rtl.css 315 B 0 B
build/block-library/blocks/buttons/editor.css 315 B 0 B
build/block-library/blocks/buttons/style-rtl.css 368 B 0 B
build/block-library/blocks/buttons/style.css 368 B 0 B
build/block-library/blocks/calendar/style-rtl.css 208 B 0 B
build/block-library/blocks/calendar/style.css 208 B 0 B
build/block-library/blocks/categories/editor-rtl.css 84 B 0 B
build/block-library/blocks/categories/editor.css 83 B 0 B
build/block-library/blocks/categories/style-rtl.css 79 B 0 B
build/block-library/blocks/categories/style.css 79 B 0 B
build/block-library/blocks/code/style-rtl.css 90 B 0 B
build/block-library/blocks/code/style.css 90 B 0 B
build/block-library/blocks/columns/editor-rtl.css 190 B 0 B
build/block-library/blocks/columns/editor.css 190 B 0 B
build/block-library/blocks/embed/editor-rtl.css 486 B 0 B
build/block-library/blocks/embed/editor.css 486 B 0 B
build/block-library/blocks/embed/style-rtl.css 401 B 0 B
build/block-library/blocks/embed/style.css 400 B 0 B
build/block-library/blocks/file/editor-rtl.css 301 B 0 B
build/block-library/blocks/file/editor.css 300 B 0 B
build/block-library/blocks/file/style-rtl.css 255 B 0 B
build/block-library/blocks/file/style.css 255 B 0 B
build/block-library/blocks/gallery/editor-rtl.css 704 B 0 B
build/block-library/blocks/gallery/editor.css 705 B 0 B
build/block-library/blocks/group/editor-rtl.css 160 B 0 B
build/block-library/blocks/group/editor.css 160 B 0 B
build/block-library/blocks/group/style-rtl.css 57 B 0 B
build/block-library/blocks/group/style.css 57 B 0 B
build/block-library/blocks/heading/editor-rtl.css 129 B 0 B
build/block-library/blocks/heading/editor.css 129 B 0 B
build/block-library/blocks/heading/style-rtl.css 76 B 0 B
build/block-library/blocks/heading/style.css 76 B 0 B
build/block-library/blocks/html/editor-rtl.css 281 B 0 B
build/block-library/blocks/html/editor.css 281 B 0 B
build/block-library/blocks/image/editor-rtl.css 717 B 0 B
build/block-library/blocks/image/editor.css 716 B 0 B
build/block-library/blocks/image/style-rtl.css 476 B 0 B
build/block-library/blocks/image/style.css 478 B 0 B
build/block-library/blocks/latest-comments/style-rtl.css 281 B 0 B
build/block-library/blocks/latest-comments/style.css 282 B 0 B
build/block-library/blocks/latest-posts/editor-rtl.css 137 B 0 B
build/block-library/blocks/latest-posts/editor.css 137 B 0 B
build/block-library/blocks/latest-posts/style-rtl.css 523 B 0 B
build/block-library/blocks/latest-posts/style.css 522 B 0 B
build/block-library/blocks/list/style-rtl.css 63 B 0 B
build/block-library/blocks/list/style.css 63 B 0 B
build/block-library/blocks/more/editor-rtl.css 434 B 0 B
build/block-library/blocks/more/editor.css 434 B 0 B
build/block-library/blocks/nextpage/editor-rtl.css 395 B 0 B
build/block-library/blocks/nextpage/editor.css 395 B 0 B
build/block-library/blocks/page-list/editor-rtl.css 239 B 0 B
build/block-library/blocks/page-list/editor.css 240 B 0 B
build/block-library/blocks/page-list/style-rtl.css 167 B 0 B
build/block-library/blocks/page-list/style.css 167 B 0 B
build/block-library/blocks/paragraph/editor-rtl.css 157 B 0 B
build/block-library/blocks/paragraph/editor.css 157 B 0 B
build/block-library/blocks/paragraph/style-rtl.css 247 B 0 B
build/block-library/blocks/paragraph/style.css 248 B 0 B
build/block-library/blocks/post-author/editor-rtl.css 209 B 0 B
build/block-library/blocks/post-author/editor.css 209 B 0 B
build/block-library/blocks/post-author/style-rtl.css 183 B 0 B
build/block-library/blocks/post-author/style.css 184 B 0 B
build/block-library/blocks/post-comments-form/style-rtl.css 250 B 0 B
build/block-library/blocks/post-comments-form/style.css 250 B 0 B
build/block-library/blocks/post-content/editor-rtl.css 139 B 0 B
build/block-library/blocks/post-content/editor.css 139 B 0 B
build/block-library/blocks/post-excerpt/editor-rtl.css 73 B 0 B
build/block-library/blocks/post-excerpt/editor.css 73 B 0 B
build/block-library/blocks/post-excerpt/style-rtl.css 69 B 0 B
build/block-library/blocks/post-excerpt/style.css 69 B 0 B
build/block-library/blocks/post-featured-image/editor-rtl.css 338 B 0 B
build/block-library/blocks/post-featured-image/editor.css 338 B 0 B
build/block-library/blocks/post-featured-image/style-rtl.css 100 B 0 B
build/block-library/blocks/post-featured-image/style.css 100 B 0 B
build/block-library/blocks/post-title/style-rtl.css 60 B 0 B
build/block-library/blocks/post-title/style.css 60 B 0 B
build/block-library/blocks/preformatted/style-rtl.css 103 B 0 B
build/block-library/blocks/preformatted/style.css 103 B 0 B
build/block-library/blocks/pullquote/editor-rtl.css 183 B 0 B
build/block-library/blocks/pullquote/editor.css 183 B 0 B
build/block-library/blocks/pullquote/style-rtl.css 318 B 0 B
build/block-library/blocks/pullquote/style.css 318 B 0 B
build/block-library/blocks/query-loop/editor-rtl.css 83 B 0 B
build/block-library/blocks/query-loop/editor.css 82 B 0 B
build/block-library/blocks/query-loop/style-rtl.css 315 B 0 B
build/block-library/blocks/query-loop/style.css 317 B 0 B
build/block-library/blocks/query-pagination-numbers/editor-rtl.css 122 B 0 B
build/block-library/blocks/query-pagination-numbers/editor.css 121 B 0 B
build/block-library/blocks/query-pagination/editor-rtl.css 270 B 0 B
build/block-library/blocks/query-pagination/editor.css 262 B 0 B
build/block-library/blocks/query-pagination/style-rtl.css 168 B 0 B
build/block-library/blocks/query-pagination/style.css 168 B 0 B
build/block-library/blocks/query-title/editor-rtl.css 86 B 0 B
build/block-library/blocks/query-title/editor.css 86 B 0 B
build/block-library/blocks/query/editor-rtl.css 131 B 0 B
build/block-library/blocks/query/editor.css 132 B 0 B
build/block-library/blocks/quote/style-rtl.css 169 B 0 B
build/block-library/blocks/quote/style.css 169 B 0 B
build/block-library/blocks/rss/editor-rtl.css 201 B 0 B
build/block-library/blocks/rss/editor.css 202 B 0 B
build/block-library/blocks/rss/style-rtl.css 290 B 0 B
build/block-library/blocks/rss/style.css 290 B 0 B
build/block-library/blocks/search/editor-rtl.css 189 B 0 B
build/block-library/blocks/search/editor.css 189 B 0 B
build/block-library/blocks/search/style-rtl.css 359 B 0 B
build/block-library/blocks/search/style.css 362 B 0 B
build/block-library/blocks/separator/editor-rtl.css 99 B 0 B
build/block-library/blocks/separator/editor.css 99 B 0 B
build/block-library/blocks/separator/style-rtl.css 251 B 0 B
build/block-library/blocks/separator/style.css 251 B 0 B
build/block-library/blocks/shortcode/editor-rtl.css 512 B 0 B
build/block-library/blocks/shortcode/editor.css 512 B 0 B
build/block-library/blocks/site-logo/editor-rtl.css 440 B 0 B
build/block-library/blocks/site-logo/editor.css 441 B 0 B
build/block-library/blocks/site-logo/style-rtl.css 154 B 0 B
build/block-library/blocks/site-logo/style.css 154 B 0 B
build/block-library/blocks/social-link/editor-rtl.css 164 B 0 B
build/block-library/blocks/social-link/editor.css 165 B 0 B
build/block-library/blocks/social-links/editor-rtl.css 796 B 0 B
build/block-library/blocks/social-links/editor.css 795 B 0 B
build/block-library/blocks/social-links/style-rtl.css 1.32 kB 0 B
build/block-library/blocks/social-links/style.css 1.33 kB 0 B
build/block-library/blocks/spacer/editor-rtl.css 308 B 0 B
build/block-library/blocks/spacer/editor.css 308 B 0 B
build/block-library/blocks/spacer/style-rtl.css 48 B 0 B
build/block-library/blocks/spacer/style.css 48 B 0 B
build/block-library/blocks/table/editor-rtl.css 478 B 0 B
build/block-library/blocks/table/editor.css 478 B 0 B
build/block-library/blocks/tag-cloud/editor-rtl.css 118 B 0 B
build/block-library/blocks/tag-cloud/editor.css 118 B 0 B
build/block-library/blocks/tag-cloud/style-rtl.css 94 B 0 B
build/block-library/blocks/tag-cloud/style.css 94 B 0 B
build/block-library/blocks/term-description/editor-rtl.css 90 B 0 B
build/block-library/blocks/term-description/editor.css 90 B 0 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B 0 B
build/block-library/blocks/text-columns/editor.css 95 B 0 B
build/block-library/blocks/text-columns/style-rtl.css 166 B 0 B
build/block-library/blocks/text-columns/style.css 166 B 0 B
build/block-library/blocks/verse/style-rtl.css 87 B 0 B
build/block-library/blocks/verse/style.css 87 B 0 B
build/block-library/common-rtl.css 1.31 kB 0 B
build/block-library/common.css 1.31 kB 0 B
build/block-library/theme-rtl.css 692 B 0 B
build/block-library/theme.css 693 B 0 B
build/block-serialization-spec-parser/index.js 3.06 kB 0 B
build/customize-widgets/style-rtl.css 666 B 0 B
build/customize-widgets/style.css 667 B 0 B
build/edit-post/classic-rtl.css 454 B 0 B
build/edit-post/classic.css 454 B 0 B
build/editor/style-rtl.css 3.9 kB 0 B
build/editor/style.css 3.9 kB 0 B
build/format-library/style-rtl.css 637 B 0 B
build/format-library/style.css 639 B 0 B
build/list-reusable-blocks/style-rtl.css 629 B 0 B
build/list-reusable-blocks/style.css 628 B 0 B
build/reusable-blocks/style-rtl.css 225 B 0 B
build/reusable-blocks/style.css 225 B 0 B
build/widgets/index.js 1.61 kB 0 B

compressed-size-action

@getdave getdave requested a review from gwwar April 20, 2021 15:32
@getdave
Copy link
Contributor Author

getdave commented Apr 21, 2021

I've realised this is more complex than I thought.

Essentially we have x2 fields on the nav_menu_item coming from the database

  1. type - can either be: post_type, post_type_archive, taxonomy (otherwise it falls back to custom).
  2. object - refers to the specific object type eg: post, page.

We also have object_id which is a reference to the ID of the object. This is currently mapped to the block.attributes.id field.

On our core/navigation-link block we have:

  1. type - this PR updates it to map to the object field.
  2. kind - this sort of maps to the type field on the nav_menu_item but the format is different.

I think we need to update everything as follows:

  • Update type to map 1:1 from block to nav_menu_item object.
  • Add a new object attribute to the block.attirbutes that maps 1:1 with the object field on the nav_menu_item.
  • Update the variations so that the variation is matched against the object type which is the most specific identifier to the "type" of the item.

I'll dive into this again tomorrow.

@getdave
Copy link
Contributor Author

getdave commented Apr 21, 2021

@gwwar
Copy link
Contributor

gwwar commented Apr 21, 2021

On our core/navigation-link block we have:

Leaving a brain dump of the current values. I think all props are optional (we render placeholders in the editor). Some older data might be missing kind information.

label : This the text value of the link. May contain rich text formatting.
type : { 'post' | 'page' | 'category' | 'tag' } or $taxonomy->name or $post_type->name for a CPT. Note the exception for tag instead of post_tag.
description: Menu description if the theme supports it
rel: link rel, see https://developer.mozilla.org/en-US/docs/Web/HTML/Link_types
id: term id OR post id. Also an optional attribute.
opensInNewTab: sets link target="_blank"
url: link url is set even if we have enough information to generate this, for example having an id, type and kind value. This is probably open for iteration. (A custom link is simply a label+url set, but we can be more explicit in noting the custom type in kind.)
title: the title attribute set on a link
kind: { 'post-type' | 'taxonomy' } post-format is also passed around in the kind variable internally, but doesn't get serialized. We're likely missing post_type_archive support.

{
"apiVersion": 2,
"name": "core/navigation-link",
"category": "design",
"parent": [ "core/navigation" ],
"attributes": {
"label": {
"type": "string"
},
"type": {
"type": "string"
},
"description": {
"type": "string"
},
"rel": {
"type": "string"
},
"id": {
"type": "number"
},
"opensInNewTab": {
"type": "boolean",
"default": false
},
"url": {
"type": "string"
},
"title": {
"type": "string"
},
"kind": {
"type": "string"
}
},

@gwwar
Copy link
Contributor

gwwar commented Apr 21, 2021

I think we have some flexibility in the data formats, what might help drive this is adding unit test cases for our common scenarios. If it makes sense, I think we'll want three suites:

  • MenuData -> MenuData ( Are values retained when I save in the navigation editor? This is especially noticeable when going from customizer/old menu editor -> navigation editor )
  • MenuData-> NavigationLink (When I load a menu in the site/post editor using the navigation block).
  • NavigationLink -> MenuData (A user started from a named menu in the site/post editor, we then edit the menu in the navigation editor).

Each suite would likely cover cases like:

  • Custom Links
  • PostType/Taxonomy Links
  • Tag test for the hardcoded value
  • Drafts
  • Home Link (Might need to wait for this to be fully implemented/a bit further along).

@getdave getdave force-pushed the try/create-nav-link-variations-from-menu-data branch from bddea9f to 6e726cb Compare April 23, 2021 12:20
@getdave getdave marked this pull request as ready for review April 23, 2021 12:22
@getdave getdave changed the title Create correct nav link block variations from menu data type Standardise and fix parsing and serialization of blocks and nav menu items Apr 23, 2021
@getdave

This comment has been minimized.

@getdave
Copy link
Contributor Author

getdave commented Apr 30, 2021

A tag created in the current menu screen becomes a custom Link when loaded in the new nav screen

✅ Fixed

Screen.Capture.on.2021-04-30.at.13-20-29.mp4

Good catch. Another one which @gwwar also noticed. I've been through again and I was able to replicate. The issue is that the block variation is tag whereas WP Core uses post_tag when storing in the DB.

I've decided to avoid a block migration by simply doing the conversion on the fly when mapping blocks -> menu items (and vica versa). I've added x2 specific tests to provide coverage on these and documented the reasons behind the decision in code.

  • A label edited in the new nav screen isn't saved, loading up the current menu screen Custom Link labels are deleted and changes to other types aren't saved.

✅ Fixed

Screen.Capture.on.2021-04-30.at.13-21-52.mov

Got it! I think @gwwar picked this one up as well. I've just worked out the cause, fixed the issue and added some test coverage.

@getdave
Copy link
Contributor Author

getdave commented Apr 30, 2021

@gwwar @talldan I looked into the post-format issue. Looks like we have a bug in the REST API response which I can't fix in this PR.

Other than that I believe all the previous points have now been addressed, namely:

✅ Updated to use per block/menu item transforms rather than per property.
✅ Fix tag type serialization
✅ Fix link title serialization
✅ Fix open in new tab serialization

So the only issue left is Fix post-format serialization (currently 500s) which as I say above we can't address in this PR.

I'd say I'm ready for a final review 🤞 🙇

Copy link
Contributor

@gwwar gwwar left a comment

Choose a reason for hiding this comment

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

Nice work @getdave this is a huge improvement on our serialization and data handling in the navigation editor! ✨

I'm giving tentative approval. ✅ Please fix the opensInNewTab case before merge. No need for another look from me for that case if that's sorted.

I tested this by some manual smoke testing starting from various editors, and seeing if values were persisted starting from one editor or another.

Here's a quick example case:

serialize.mp4

packages/edit-navigation/src/store/utils.js Show resolved Hide resolved
packages/edit-navigation/src/store/utils.js Show resolved Hide resolved
packages/edit-navigation/src/store/utils.js Outdated Show resolved Hide resolved
@getdave getdave merged commit c5871c9 into trunk May 4, 2021
@getdave getdave deleted the try/create-nav-link-variations-from-menu-data branch May 4, 2021 09:51
@github-actions github-actions bot added this to the Gutenberg 10.6 milestone May 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Navigation Affects the Navigation Block
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Navigation Editor: Navigation links added to menu only preserve url and label attributes
5 participants