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

Make Navigation fallback selector private #51413

Merged
merged 8 commits into from
Jun 29, 2023

Conversation

getdave
Copy link
Contributor

@getdave getdave commented Jun 12, 2023

What?

Makes the selector added for Navigation fallbacks private.

Closes #50372

Why?

Because we're not 100% confident on the API yet.

How?

  1. Move to private selectors
  2. Implement the locking and unlocking apis in the core-data package
  3. Update the data package to map private selectors to their resolvers
  4. Register the new locked navigation fallback selector

Testing Instructions

  • all tests should pass
  • the navigation block fallback mechanism should work
  • the site editor navigation sidebar fallback mechanism should work
  • the getNavigationFallbackId should not accessible without unlocking the core store

@getdave getdave added [Type] Code Quality Issues or PRs that relate to code quality [Block] Navigation Affects the Navigation Block labels Jun 12, 2023
@getdave getdave requested a review from draganescu June 12, 2023 10:58
@getdave getdave self-assigned this Jun 12, 2023
@getdave
Copy link
Contributor Author

getdave commented Jun 12, 2023

@draganescu I started on this but I'm not sure how to get the unlock API so it's available in the Navigation block code where the selector is accessed. Core Data doesn't seem to have this setup enabled yet.

@draganescu
Copy link
Contributor

Yes it looks like the private selectors are private in the sense they're not exported, not in the sense we use the locking API. Is it difficult to implement lock/unloc in this PR as well? Can I help?

@getdave
Copy link
Contributor Author

getdave commented Jun 14, 2023

Yeh I guess I'm not sure how to go about implementing the lock/unlock stuff for Core Data. Other modules have it. Any help much appreciated.

@draganescu draganescu assigned draganescu and unassigned getdave Jun 26, 2023
@draganescu draganescu force-pushed the update/make-nav-fallback-selectors-private branch from b0c9c8a to ddaa659 Compare June 26, 2023 15:01
@github-actions
Copy link

github-actions bot commented Jun 26, 2023

Size Change: -15.5 kB (-1%)

Total Size: 1.44 MB

Filename Size Change
build/block-editor/content-rtl.css 4.25 kB +26 B (+1%)
build/block-editor/content.css 4.24 kB +25 B (+1%)
build/block-editor/index.min.js 209 kB +434 B (0%)
build/block-library/blocks/file/interactivity.min.js 0 B -395 B (removed) 🏆
build/block-library/blocks/file/view.min.js 312 B -63 B (-17%) 👏
build/block-library/blocks/image/interactivity.min.js 0 B -1.52 kB (removed) 🏆
build/block-library/blocks/navigation/interactivity.min.js 0 B -978 B (removed) 🏆
build/block-library/blocks/navigation/view-modal.min.js 0 B -2.78 kB (removed) 🏆
build/block-library/blocks/navigation/view.min.js 906 B +468 B (+107%) 🆘
build/block-library/index.min.js 201 kB +38 B (0%)
build/block-library/interactivity/runtime.min.js 0 B -2.69 kB (removed) 🏆
build/block-library/interactivity/vendors.min.js 0 B -8.2 kB (removed) 🏆
build/blocks/index.min.js 50.9 kB +25 B (0%)
build/core-commands/index.min.js 2.26 kB -2 B (0%)
build/core-data/index.min.js 16.1 kB +20 B (0%)
build/data/index.min.js 8.27 kB +3 B (0%)
build/edit-site/index.min.js 84.4 kB +119 B (0%)
build/edit-site/style-rtl.css 12.5 kB -1 B (0%)
build/edit-site/style.css 12.5 kB -2 B (0%)
build/editor/index.min.js 45.4 kB -64 B (0%)
build/editor/style-rtl.css 3.58 kB -4 B (0%)
build/editor/style.css 3.58 kB -4 B (0%)
build/reusable-blocks/index.min.js 2.38 kB -5 B (0%)
build/style-engine/index.min.js 1.83 kB +17 B (+1%)
ℹ️ View Unchanged
Filename Size
build/a11y/index.min.js 955 B
build/annotations/index.min.js 2.69 kB
build/api-fetch/index.min.js 2.28 kB
build/autop/index.min.js 2.1 kB
build/blob/index.min.js 451 B
build/block-directory/index.min.js 6.99 kB
build/block-directory/style-rtl.css 1.02 kB
build/block-directory/style.css 1.02 kB
build/block-editor/default-editor-styles-rtl.css 381 B
build/block-editor/default-editor-styles.css 381 B
build/block-editor/style-rtl.css 14.7 kB
build/block-editor/style.css 14.7 kB
build/block-library/blocks/archives/editor-rtl.css 61 B
build/block-library/blocks/archives/editor.css 60 B
build/block-library/blocks/archives/style-rtl.css 90 B
build/block-library/blocks/archives/style.css 90 B
build/block-library/blocks/audio/editor-rtl.css 150 B
build/block-library/blocks/audio/editor.css 150 B
build/block-library/blocks/audio/style-rtl.css 122 B
build/block-library/blocks/audio/style.css 122 B
build/block-library/blocks/audio/theme-rtl.css 126 B
build/block-library/blocks/audio/theme.css 126 B
build/block-library/blocks/avatar/editor-rtl.css 116 B
build/block-library/blocks/avatar/editor.css 116 B
build/block-library/blocks/avatar/style-rtl.css 104 B
build/block-library/blocks/avatar/style.css 104 B
build/block-library/blocks/block/editor-rtl.css 305 B
build/block-library/blocks/block/editor.css 305 B
build/block-library/blocks/button/editor-rtl.css 584 B
build/block-library/blocks/button/editor.css 582 B
build/block-library/blocks/button/style-rtl.css 624 B
build/block-library/blocks/button/style.css 623 B
build/block-library/blocks/buttons/editor-rtl.css 337 B
build/block-library/blocks/buttons/editor.css 337 B
build/block-library/blocks/buttons/style-rtl.css 332 B
build/block-library/blocks/buttons/style.css 332 B
build/block-library/blocks/calendar/style-rtl.css 239 B
build/block-library/blocks/calendar/style.css 239 B
build/block-library/blocks/categories/editor-rtl.css 113 B
build/block-library/blocks/categories/editor.css 112 B
build/block-library/blocks/categories/style-rtl.css 124 B
build/block-library/blocks/categories/style.css 124 B
build/block-library/blocks/code/editor-rtl.css 53 B
build/block-library/blocks/code/editor.css 53 B
build/block-library/blocks/code/style-rtl.css 121 B
build/block-library/blocks/code/style.css 121 B
build/block-library/blocks/code/theme-rtl.css 124 B
build/block-library/blocks/code/theme.css 124 B
build/block-library/blocks/columns/editor-rtl.css 108 B
build/block-library/blocks/columns/editor.css 108 B
build/block-library/blocks/columns/style-rtl.css 409 B
build/block-library/blocks/columns/style.css 409 B
build/block-library/blocks/comment-author-avatar/editor-rtl.css 125 B
build/block-library/blocks/comment-author-avatar/editor.css 125 B
build/block-library/blocks/comment-content/style-rtl.css 92 B
build/block-library/blocks/comment-content/style.css 92 B
build/block-library/blocks/comment-template/style-rtl.css 199 B
build/block-library/blocks/comment-template/style.css 198 B
build/block-library/blocks/comments-pagination-numbers/editor-rtl.css 123 B
build/block-library/blocks/comments-pagination-numbers/editor.css 121 B
build/block-library/blocks/comments-pagination/editor-rtl.css 222 B
build/block-library/blocks/comments-pagination/editor.css 209 B
build/block-library/blocks/comments-pagination/style-rtl.css 235 B
build/block-library/blocks/comments-pagination/style.css 231 B
build/block-library/blocks/comments-title/editor-rtl.css 75 B
build/block-library/blocks/comments-title/editor.css 75 B
build/block-library/blocks/comments/editor-rtl.css 840 B
build/block-library/blocks/comments/editor.css 839 B
build/block-library/blocks/comments/style-rtl.css 637 B
build/block-library/blocks/comments/style.css 636 B
build/block-library/blocks/cover/editor-rtl.css 647 B
build/block-library/blocks/cover/editor.css 650 B
build/block-library/blocks/cover/style-rtl.css 1.61 kB
build/block-library/blocks/cover/style.css 1.6 kB
build/block-library/blocks/details/editor-rtl.css 65 B
build/block-library/blocks/details/editor.css 65 B
build/block-library/blocks/details/style-rtl.css 159 B
build/block-library/blocks/details/style.css 159 B
build/block-library/blocks/embed/editor-rtl.css 293 B
build/block-library/blocks/embed/editor.css 293 B
build/block-library/blocks/embed/style-rtl.css 410 B
build/block-library/blocks/embed/style.css 410 B
build/block-library/blocks/embed/theme-rtl.css 126 B
build/block-library/blocks/embed/theme.css 126 B
build/block-library/blocks/file/editor-rtl.css 316 B
build/block-library/blocks/file/editor.css 316 B
build/block-library/blocks/file/style-rtl.css 269 B
build/block-library/blocks/file/style.css 270 B
build/block-library/blocks/footnotes/style-rtl.css 183 B
build/block-library/blocks/footnotes/style.css 182 B
build/block-library/blocks/freeform/editor-rtl.css 2.58 kB
build/block-library/blocks/freeform/editor.css 2.58 kB
build/block-library/blocks/gallery/editor-rtl.css 947 B
build/block-library/blocks/gallery/editor.css 952 B
build/block-library/blocks/gallery/style-rtl.css 1.53 kB
build/block-library/blocks/gallery/style.css 1.53 kB
build/block-library/blocks/gallery/theme-rtl.css 108 B
build/block-library/blocks/gallery/theme.css 108 B
build/block-library/blocks/group/editor-rtl.css 654 B
build/block-library/blocks/group/editor.css 654 B
build/block-library/blocks/group/style-rtl.css 57 B
build/block-library/blocks/group/style.css 57 B
build/block-library/blocks/group/theme-rtl.css 78 B
build/block-library/blocks/group/theme.css 78 B
build/block-library/blocks/heading/style-rtl.css 76 B
build/block-library/blocks/heading/style.css 76 B
build/block-library/blocks/html/editor-rtl.css 336 B
build/block-library/blocks/html/editor.css 337 B
build/block-library/blocks/image/editor-rtl.css 834 B
build/block-library/blocks/image/editor.css 833 B
build/block-library/blocks/image/style-rtl.css 1.34 kB
build/block-library/blocks/image/style.css 1.35 kB
build/block-library/blocks/image/theme-rtl.css 126 B
build/block-library/blocks/image/theme.css 126 B
build/block-library/blocks/image/view-interactivity.min.js 1.45 kB
build/block-library/blocks/latest-comments/style-rtl.css 357 B
build/block-library/blocks/latest-comments/style.css 357 B
build/block-library/blocks/latest-posts/editor-rtl.css 213 B
build/block-library/blocks/latest-posts/editor.css 212 B
build/block-library/blocks/latest-posts/style-rtl.css 478 B
build/block-library/blocks/latest-posts/style.css 478 B
build/block-library/blocks/list/style-rtl.css 88 B
build/block-library/blocks/list/style.css 88 B
build/block-library/blocks/media-text/editor-rtl.css 266 B
build/block-library/blocks/media-text/editor.css 263 B
build/block-library/blocks/media-text/style-rtl.css 507 B
build/block-library/blocks/media-text/style.css 505 B
build/block-library/blocks/more/editor-rtl.css 431 B
build/block-library/blocks/more/editor.css 431 B
build/block-library/blocks/navigation-link/editor-rtl.css 712 B
build/block-library/blocks/navigation-link/editor.css 711 B
build/block-library/blocks/navigation-link/style-rtl.css 115 B
build/block-library/blocks/navigation-link/style.css 115 B
build/block-library/blocks/navigation-submenu/editor-rtl.css 296 B
build/block-library/blocks/navigation-submenu/editor.css 295 B
build/block-library/blocks/navigation/editor-rtl.css 2.26 kB
build/block-library/blocks/navigation/editor.css 2.26 kB
build/block-library/blocks/navigation/style-rtl.css 2.21 kB
build/block-library/blocks/navigation/style.css 2.2 kB
build/block-library/blocks/nextpage/editor-rtl.css 395 B
build/block-library/blocks/nextpage/editor.css 395 B
build/block-library/blocks/page-list/editor-rtl.css 401 B
build/block-library/blocks/page-list/editor.css 401 B
build/block-library/blocks/page-list/style-rtl.css 175 B
build/block-library/blocks/page-list/style.css 175 B
build/block-library/blocks/paragraph/editor-rtl.css 174 B
build/block-library/blocks/paragraph/editor.css 174 B
build/block-library/blocks/paragraph/style-rtl.css 279 B
build/block-library/blocks/paragraph/style.css 281 B
build/block-library/blocks/post-author/style-rtl.css 175 B
build/block-library/blocks/post-author/style.css 176 B
build/block-library/blocks/post-comments-form/editor-rtl.css 96 B
build/block-library/blocks/post-comments-form/editor.css 96 B
build/block-library/blocks/post-comments-form/style-rtl.css 508 B
build/block-library/blocks/post-comments-form/style.css 508 B
build/block-library/blocks/post-date/style-rtl.css 61 B
build/block-library/blocks/post-date/style.css 61 B
build/block-library/blocks/post-excerpt/editor-rtl.css 71 B
build/block-library/blocks/post-excerpt/editor.css 71 B
build/block-library/blocks/post-excerpt/style-rtl.css 141 B
build/block-library/blocks/post-excerpt/style.css 141 B
build/block-library/blocks/post-featured-image/editor-rtl.css 588 B
build/block-library/blocks/post-featured-image/editor.css 586 B
build/block-library/blocks/post-featured-image/style-rtl.css 319 B
build/block-library/blocks/post-featured-image/style.css 319 B
build/block-library/blocks/post-navigation-link/style-rtl.css 153 B
build/block-library/blocks/post-navigation-link/style.css 153 B
build/block-library/blocks/post-template/editor-rtl.css 99 B
build/block-library/blocks/post-template/editor.css 98 B
build/block-library/blocks/post-template/style-rtl.css 314 B
build/block-library/blocks/post-template/style.css 314 B
build/block-library/blocks/post-terms/style-rtl.css 96 B
build/block-library/blocks/post-terms/style.css 96 B
build/block-library/blocks/post-time-to-read/style-rtl.css 69 B
build/block-library/blocks/post-time-to-read/style.css 69 B
build/block-library/blocks/post-title/style-rtl.css 100 B
build/block-library/blocks/post-title/style.css 100 B
build/block-library/blocks/preformatted/style-rtl.css 103 B
build/block-library/blocks/preformatted/style.css 103 B
build/block-library/blocks/pullquote/editor-rtl.css 135 B
build/block-library/blocks/pullquote/editor.css 135 B
build/block-library/blocks/pullquote/style-rtl.css 335 B
build/block-library/blocks/pullquote/style.css 335 B
build/block-library/blocks/pullquote/theme-rtl.css 167 B
build/block-library/blocks/pullquote/theme.css 167 B
build/block-library/blocks/query-pagination-numbers/editor-rtl.css 122 B
build/block-library/blocks/query-pagination-numbers/editor.css 121 B
build/block-library/blocks/query-pagination/editor-rtl.css 221 B
build/block-library/blocks/query-pagination/editor.css 211 B
build/block-library/blocks/query-pagination/style-rtl.css 288 B
build/block-library/blocks/query-pagination/style.css 284 B
build/block-library/blocks/query-title/style-rtl.css 63 B
build/block-library/blocks/query-title/style.css 63 B
build/block-library/blocks/query/editor-rtl.css 450 B
build/block-library/blocks/query/editor.css 449 B
build/block-library/blocks/quote/style-rtl.css 222 B
build/block-library/blocks/quote/style.css 222 B
build/block-library/blocks/quote/theme-rtl.css 223 B
build/block-library/blocks/quote/theme.css 226 B
build/block-library/blocks/read-more/style-rtl.css 132 B
build/block-library/blocks/read-more/style.css 132 B
build/block-library/blocks/rss/editor-rtl.css 149 B
build/block-library/blocks/rss/editor.css 149 B
build/block-library/blocks/rss/style-rtl.css 289 B
build/block-library/blocks/rss/style.css 288 B
build/block-library/blocks/search/editor-rtl.css 178 B
build/block-library/blocks/search/editor.css 178 B
build/block-library/blocks/search/style-rtl.css 587 B
build/block-library/blocks/search/style.css 584 B
build/block-library/blocks/search/theme-rtl.css 114 B
build/block-library/blocks/search/theme.css 114 B
build/block-library/blocks/search/view.min.js 531 B
build/block-library/blocks/separator/editor-rtl.css 146 B
build/block-library/blocks/separator/editor.css 146 B
build/block-library/blocks/separator/style-rtl.css 234 B
build/block-library/blocks/separator/style.css 234 B
build/block-library/blocks/separator/theme-rtl.css 194 B
build/block-library/blocks/separator/theme.css 194 B
build/block-library/blocks/shortcode/editor-rtl.css 323 B
build/block-library/blocks/shortcode/editor.css 323 B
build/block-library/blocks/site-logo/editor-rtl.css 754 B
build/block-library/blocks/site-logo/editor.css 754 B
build/block-library/blocks/site-logo/style-rtl.css 203 B
build/block-library/blocks/site-logo/style.css 203 B
build/block-library/blocks/site-tagline/editor-rtl.css 86 B
build/block-library/blocks/site-tagline/editor.css 86 B
build/block-library/blocks/site-title/editor-rtl.css 116 B
build/block-library/blocks/site-title/editor.css 116 B
build/block-library/blocks/site-title/style-rtl.css 57 B
build/block-library/blocks/site-title/style.css 57 B
build/block-library/blocks/social-link/editor-rtl.css 184 B
build/block-library/blocks/social-link/editor.css 184 B
build/block-library/blocks/social-links/editor-rtl.css 674 B
build/block-library/blocks/social-links/editor.css 673 B
build/block-library/blocks/social-links/style-rtl.css 1.43 kB
build/block-library/blocks/social-links/style.css 1.42 kB
build/block-library/blocks/spacer/editor-rtl.css 348 B
build/block-library/blocks/spacer/editor.css 348 B
build/block-library/blocks/spacer/style-rtl.css 48 B
build/block-library/blocks/spacer/style.css 48 B
build/block-library/blocks/table/editor-rtl.css 433 B
build/block-library/blocks/table/editor.css 433 B
build/block-library/blocks/table/style-rtl.css 645 B
build/block-library/blocks/table/style.css 644 B
build/block-library/blocks/table/theme-rtl.css 146 B
build/block-library/blocks/table/theme.css 146 B
build/block-library/blocks/tag-cloud/style-rtl.css 251 B
build/block-library/blocks/tag-cloud/style.css 253 B
build/block-library/blocks/template-part/editor-rtl.css 403 B
build/block-library/blocks/template-part/editor.css 403 B
build/block-library/blocks/template-part/theme-rtl.css 101 B
build/block-library/blocks/template-part/theme.css 101 B
build/block-library/blocks/term-description/style-rtl.css 111 B
build/block-library/blocks/term-description/style.css 111 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B
build/block-library/blocks/text-columns/editor.css 95 B
build/block-library/blocks/text-columns/style-rtl.css 166 B
build/block-library/blocks/text-columns/style.css 166 B
build/block-library/blocks/verse/style-rtl.css 99 B
build/block-library/blocks/verse/style.css 99 B
build/block-library/blocks/video/editor-rtl.css 552 B
build/block-library/blocks/video/editor.css 555 B
build/block-library/blocks/video/style-rtl.css 174 B
build/block-library/blocks/video/style.css 174 B
build/block-library/blocks/video/theme-rtl.css 126 B
build/block-library/blocks/video/theme.css 126 B
build/block-library/classic-rtl.css 179 B
build/block-library/classic.css 179 B
build/block-library/common-rtl.css 1.1 kB
build/block-library/common.css 1.1 kB
build/block-library/editor-elements-rtl.css 75 B
build/block-library/editor-elements.css 75 B
build/block-library/editor-rtl.css 12.1 kB
build/block-library/editor.css 12.1 kB
build/block-library/elements-rtl.css 54 B
build/block-library/elements.css 54 B
build/block-library/reset-rtl.css 478 B
build/block-library/reset.css 478 B
build/block-library/style-rtl.css 13.6 kB
build/block-library/style.css 13.6 kB
build/block-library/theme-rtl.css 686 B
build/block-library/theme.css 691 B
build/block-serialization-default-parser/index.min.js 1.12 kB
build/block-serialization-spec-parser/index.min.js 2.87 kB
build/commands/index.min.js 14.9 kB
build/commands/style-rtl.css 827 B
build/commands/style.css 827 B
build/components/index.min.js 240 kB
build/components/style-rtl.css 11.8 kB
build/components/style.css 11.8 kB
build/compose/index.min.js 12 kB
build/customize-widgets/index.min.js 12 kB
build/customize-widgets/style-rtl.css 1.46 kB
build/customize-widgets/style.css 1.45 kB
build/data-controls/index.min.js 640 B
build/date/index.min.js 40.4 kB
build/deprecated/index.min.js 451 B
build/dom-ready/index.min.js 324 B
build/dom/index.min.js 4.63 kB
build/edit-post/classic-rtl.css 544 B
build/edit-post/classic.css 545 B
build/edit-post/index.min.js 35.2 kB
build/edit-post/style-rtl.css 7.58 kB
build/edit-post/style.css 7.57 kB
build/edit-widgets/index.min.js 16.9 kB
build/edit-widgets/style-rtl.css 4.53 kB
build/edit-widgets/style.css 4.53 kB
build/element/index.min.js 4.8 kB
build/escape-html/index.min.js 537 B
build/format-library/index.min.js 7.62 kB
build/format-library/style-rtl.css 554 B
build/format-library/style.css 553 B
build/hooks/index.min.js 1.55 kB
build/html-entities/index.min.js 448 B
build/i18n/index.min.js 3.58 kB
build/interactivity/index.min.js 10 kB
build/is-shallow-equal/index.min.js 527 B
build/keyboard-shortcuts/index.min.js 1.64 kB
build/keycodes/index.min.js 1.84 kB
build/list-reusable-blocks/index.min.js 2.13 kB
build/list-reusable-blocks/style-rtl.css 836 B
build/list-reusable-blocks/style.css 836 B
build/media-utils/index.min.js 2.9 kB
build/notices/index.min.js 948 B
build/plugins/index.min.js 1.77 kB
build/preferences-persistence/index.min.js 1.84 kB
build/preferences/index.min.js 1.24 kB
build/primitives/index.min.js 943 B
build/priority-queue/index.min.js 1.52 kB
build/private-apis/index.min.js 943 B
build/react-i18n/index.min.js 615 B
build/react-refresh-entry/index.min.js 8.44 kB
build/react-refresh-runtime/index.min.js 7.31 kB
build/redux-routine/index.min.js 2.7 kB
build/reusable-blocks/style-rtl.css 243 B
build/reusable-blocks/style.css 243 B
build/rich-text/index.min.js 10.9 kB
build/router/index.min.js 1.77 kB
build/server-side-render/index.min.js 1.94 kB
build/shortcode/index.min.js 1.39 kB
build/token-list/index.min.js 582 B
build/url/index.min.js 3.57 kB
build/vendors/inert-polyfill.min.js 2.48 kB
build/vendors/react-dom.min.js 41.8 kB
build/vendors/react.min.js 4.02 kB
build/viewport/index.min.js 958 B
build/warning/index.min.js 268 B
build/widgets/index.min.js 7.16 kB
build/widgets/style-rtl.css 1.15 kB
build/widgets/style.css 1.16 kB
build/wordcount/index.min.js 1.02 kB

compressed-size-action

@draganescu draganescu force-pushed the update/make-nav-fallback-selectors-private branch from ddaa659 to ace42c3 Compare June 27, 2023 12:51
@draganescu
Copy link
Contributor

draganescu commented Jun 27, 2023

The problem here is that it looks like locked selectors do not call their resolvers.

@getdave
Copy link
Contributor Author

getdave commented Jun 27, 2023

The problem here is that it looks like locked selectors do not call thir resolvers.

Ah that's not great. Do you have a code path for that problem?

@draganescu draganescu force-pushed the update/make-nav-fallback-selectors-private branch from bf6c954 to 00844b5 Compare June 27, 2023 18:09
@draganescu draganescu marked this pull request as ready for review June 27, 2023 18:10
@draganescu draganescu requested review from jsnajdr and dmsnell and removed request for juanmaguitar June 27, 2023 18:10
@draganescu
Copy link
Contributor

@getdave the data package in the createReduxStore function missed a mapping of the private selectors to resolvers - see 00844b5

@tellthemachines
Copy link
Contributor

Hey peeps, does this need to go into WP 6.3?

resolvers,
store,
resolversCache
);
Copy link
Member

Choose a reason for hiding this comment

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

great fix, and thanks for following up on this @draganescu

Copy link
Member

Choose a reason for hiding this comment

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

Yes, this is probably the first time we're creating a private selector with a resolver 👍 However, this fix won't work when you register a private selector after a store got instantiated:

const store = createReduxStore( name, { ..., resolvers: { foo } );
register( store ); // instance is created and resolvers bound
unlock( store ).registerPrivateSelectors( { foo } );

Here you supplied a resolver for foo, registered a private selector foo, but they won't be bound together. You'd have to move the register call after the private registration.

That's why the private selectors are bound lazily. I'll try to do a more perfect fix in a separate PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

I specifically moved the registration after to get this effect 🤷🏻

Copy link
Member

Choose a reason for hiding this comment

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

Yes, you had to move the registration, but you shouldn't have to, that's the bug 🙂

I think this PR is mergeable with the simple resolver fix. The correct solution turns out the be a rather big PR -- although it doesn't change a lot of code, it involves a lot of refactoring.

@getdave
Copy link
Contributor Author

getdave commented Jun 28, 2023

Testing now

Copy link
Contributor Author

@getdave getdave left a comment

Choose a reason for hiding this comment

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

I found (and fixed) a bug with one usage in the Browse Mode sidebar that wasn't unlocked. Other than that this tests well.

@tellthemachines This needs to land in 6.3 🙏

@scruffian I cannot approve this cos I raised the PR so can you ✅ ?

Copy link
Contributor

@scruffian scruffian left a comment

Choose a reason for hiding this comment

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

This breaks the navigation section of Site View, if you have no navigation menus.

@github-actions
Copy link

Flaky tests detected in 06ad9ce.
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.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/5400496691
📝 Reported issues:

@draganescu
Copy link
Contributor

It seems the update in the data package causes a caching problem for locked selectors and their resolvers are always called

The getNavigationFallbackId selector and resolver couple behaves like this:

This Branch

selector 
resolver 
selector 
resolver 
selector 
selector 
resolver 


Trunk

selector 
resolver 
selector 
selector 
selector 

@jsnajdr
Copy link
Member

jsnajdr commented Jun 28, 2023

caching problem for locked selectors and their resolvers are always called

I think it's because for private selectors, bindSelector and mapSelectorsWithResolvers are called in wrong order. Normally, we would call bindSelector first, which binds the selector to store state, and then wrap the bound selector with mapSelectorsWithResolvers. But this PR does it in the opposite order. The args array is then wrong, it also contains the state parameter. Caching the results, where the cache is keyed by the args, then doesn't work.

We could merge #52036 to unblock this. I'm not happy with the PR, but it works.

@draganescu
Copy link
Contributor

@jsnajdr can we just fix the problem here as step 1? You say in #52036 that you'd like to merge that in multiple PRs - this can be the 1st - as long as we can only fix this problem? Just trying my luck here really :D

@jsnajdr
Copy link
Member

jsnajdr commented Jun 28, 2023

can we just fix the problem here as step 1?

I can try to do a minimalistic solution right here in this PR. #52036 is bigger than I originally expected especially because I wanted to add a good unit test, and that requires a working unlock( resolveSelect( store ) ).privateSelector, and implementing that required many additional changes.

@tellthemachines tellthemachines added the Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Jun 29, 2023
@jsnajdr
Copy link
Member

jsnajdr commented Jun 29, 2023

Pushed a fix for the private selectors with resolvers. I also had to remove core-data's duplicate lock/unlock registration to make the unit tests pass.

Copy link
Contributor

@scruffian scruffian left a comment

Choose a reason for hiding this comment

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

This is now working well for me.

@scruffian scruffian merged commit c355d54 into trunk Jun 29, 2023
@scruffian scruffian deleted the update/make-nav-fallback-selectors-private branch June 29, 2023 14:23
@github-actions github-actions bot added this to the Gutenberg 16.2 milestone Jun 29, 2023
tellthemachines pushed a commit that referenced this pull request Jul 3, 2023
* Move selector to become private

* adds basic lock functionality

* remove useless lock-unlock file

* map private selectors to resolvers

* Unlock the other usage

* only create one fallback per session

* Fix core-data duplicate private opt-in

* Data: bind resolvers to selectors individually, support private selectors

---------

Co-authored-by: Andrei Draganescu <[email protected]>
Co-authored-by: scruffian <[email protected]>
Co-authored-by: Jarda Snajdr <[email protected]>
@tellthemachines
Copy link
Contributor

I just cherry-picked this PR to the update/wp6-3-beta3 branch to get it included in the next release: 7b8db97

@tellthemachines tellthemachines removed the Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Jul 3, 2023
tellthemachines added a commit that referenced this pull request Jul 3, 2023
* Footnotes: inscrease selector specificity for anchor (#52179)

* Patterns: Include template parts for custom areas in Uncategorized category (#52159)

* Fix custom patterns console error (#51947)

* Fix error with react list key with new custom patterns list in inserter

* Update placeholder key

* Add comment to explain the different keys

* Patterns: Fix missing custom patterns in patterns explorer (#51889)

* Add custom patterns to pattern explorer

* show custom patterns in the patterns explorer dialog

* remove changes from 51877

* Fix up use of async lists

* remove a bit of code duplication by adding a new hook

* add 51877 fix back to make testing easier

* Just assign the key value in one place

* Refactor the custom patterns to use the usePatternsState hook

* Fix use of async list

* Translate strings and remove unneeded fields from pattern object

* Try integrating unsynced patterns directly into pattern selectors (#51955)

* Include reusable blocks with an undefined sync status in inserter items

* Update docs

* Remove change to hover dependencies

---------

Co-authored-by: Daniel Richards <[email protected]>

* i18n: Add context to the word "Filters" (#52198)

* Update home template icon (#52075)

* Centralise all permissions lookup in Link UI and enable (#52166)

* BlockRemovalWarningModal: Fix incorrect '_n' usage (#52164)

* Fix fetching Nav fallback ID flushing Navigation entity cache (#52069)

* Only flush the `getEntityRecords` cache if the fallback isn’t already in state

* Save the edited entity record to a const and then invert it to determine whether we should invalidate the recordds

---------

Co-authored-by: scruffian <[email protected]>

* Block Editor: Unify texts for Create pattern modal (#52151)

* Fix history back after entering edit mode from Patterns (#52112)

* Add template part icons to the library grid items (#51963)

* Patterns: Fix sidebar tab label (#51953)

* Patterns: Fix setting of sync status for fully synced patterns (#51952)

* Library: Reinstate manage all template parts page (#51961)

* Command Palette: fix incorrect path and snackbar message when template part is deleted (#52034)

* Command Center: Fix incorrect navigation when deleting template part

* removeTemplate: consider title type

* Drop-indicator: remove white border. (#52122)

* Make Navigation fallback selector private (#51413)

* Move selector to become private

* adds basic lock functionality

* remove useless lock-unlock file

* map private selectors to resolvers

* Unlock the other usage

* only create one fallback per session

* Fix core-data duplicate private opt-in

* Data: bind resolvers to selectors individually, support private selectors

---------

Co-authored-by: Andrei Draganescu <[email protected]>
Co-authored-by: scruffian <[email protected]>
Co-authored-by: Jarda Snajdr <[email protected]>

* Focus Mode: Use the symbol icon if a pattern is being edited (#52031)

* Footnotes: register meta field for pages (#52024)

* Fix unintentional toggling on of distraction free (#52090)

* replace toggle with set preference - because I don't read code properly it seems

* remove notification

* Revert "Updating social link attributes (#51997)" (#52019)

This reverts commit c711e2a.

* Update home template name (#52048)

* Removes unused call (#51988)

* Remove ability for user to toggle sync status after pattern creation (#51998)

* Fix disable DFM when opening styles command (#52165)

* Update custom patterns label to 'My patterns' (#51949)

* rename custom patterns to my patterns

* Add my patterns label to inserter and show at the top

---------

Co-authored-by: Daniel Richards <[email protected]>

* Library: Add sync status to pattern details screen (#51954)

* Patterns: Rename Library to Patterns (#52102)

* [Library] Add lock icon for theme patterns (#51990)

* Add lock icon for theme patterns

* Change to class names

* Add aria-description

* Change wording

* Patterns: Use "detached" copy consistently (#51993)

* Editor initrial appender: Zero out margins in constrained layouts. (#52026)

* Update pattern creation modal in library (#51946)

* Fix missing snackbars in Library (#52021)

* Make the entire preview clickable in order to enter "edit" mode in focus mode (#51973)

* Page Content Focus: Add welcome guides (#52014)

* Page Content Focus: Add welcome guides

* Don't show when editor guide is active

* Just use regular accent/theme color in all guides

* slight copy change page guide

* Update components changelog

* Disable new guides in E2E tests

* Use s.w.org videos

---------

Co-authored-by: Saxon Fletcher <[email protected]>

---------

Co-authored-by: Ella <[email protected]>
Co-authored-by: Aaron Robertshaw <[email protected]>
Co-authored-by: Glen Davies <[email protected]>
Co-authored-by: Daniel Richards <[email protected]>
Co-authored-by: Aki Hamano <[email protected]>
Co-authored-by: James Koster <[email protected]>
Co-authored-by: Dave Smith <[email protected]>
Co-authored-by: George Mamadashvili <[email protected]>
Co-authored-by: scruffian <[email protected]>
Co-authored-by: Kai Hao <[email protected]>
Co-authored-by: Carolina Nymark <[email protected]>
Co-authored-by: Joen A <[email protected]>
Co-authored-by: Andrei Draganescu <[email protected]>
Co-authored-by: Jarda Snajdr <[email protected]>
Co-authored-by: Andrei Draganescu <[email protected]>
Co-authored-by: Ramon <[email protected]>
Co-authored-by: Nik Tsekouras <[email protected]>
Co-authored-by: Saxon Fletcher <[email protected]>
Co-authored-by: Rich Tabor <[email protected]>
Co-authored-by: Robert Anderson <[email protected]>
sethrubenstein pushed a commit to pewresearch/gutenberg that referenced this pull request Jul 13, 2023
* Move selector to become private

* adds basic lock functionality

* remove useless lock-unlock file

* map private selectors to resolvers

* Unlock the other usage

* only create one fallback per session

* Fix core-data duplicate private opt-in

* Data: bind resolvers to selectors individually, support private selectors

---------

Co-authored-by: Andrei Draganescu <[email protected]>
Co-authored-by: scruffian <[email protected]>
Co-authored-by: Jarda Snajdr <[email protected]>
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 [Type] Code Quality Issues or PRs that relate to code quality
Projects
Development

Successfully merging this pull request may close these issues.

Make Navigation specific Core Data selectors Private
6 participants