Skip to content

Full Site Editing: Add Support for Templates Default and Custom Titles and Descriptions (PHP Side)#27036

Merged
Copons merged 3 commits into
masterfrom
update/default-template-types
Nov 19, 2020
Merged

Full Site Editing: Add Support for Templates Default and Custom Titles and Descriptions (PHP Side)#27036
Copons merged 3 commits into
masterfrom
update/default-template-types

Conversation

@Copons
Copy link
Copy Markdown
Contributor

@Copons Copons commented Nov 17, 2020

Description

This PR was originally part of #26636.

  • Added support for excerpts to the wp_template CPT, used to store the template description.
  • Created a list of default template types definitions in PHP containing titles and descriptions for all the "generic" templates.
  • The list is filterable with the new default_template_types filter, already used to temporarily remove the embed definition which it's currently not supported.
  • The list is available in JS via Redux through the new getDefaultTemplateTypes(), getDefaultTemplateType(), and getTemplateInfo() selectors of core/edit-site.
  • Templates imported from files will automatically obtain the title and excerpt from the default definitions, if possible.

How has this been tested?

See #27038

Types of changes

New feature (non-breaking change which adds functionality)

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code follows the accessibility standards.
  • 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.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 17, 2020

Size Change: 0 B

Total Size: 1.19 MB

ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.14 kB 0 B
build/annotations/index.js 3.8 kB 0 B
build/api-fetch/index.js 3.42 kB 0 B
build/autop/index.js 2.84 kB 0 B
build/blob/index.js 664 B 0 B
build/block-directory/index.js 8.72 kB 0 B
build/block-directory/style-rtl.css 943 B 0 B
build/block-directory/style.css 942 B 0 B
build/block-editor/index.js 133 kB 0 B
build/block-editor/style-rtl.css 11.3 kB 0 B
build/block-editor/style.css 11.3 kB 0 B
build/block-library/editor-rtl.css 9.03 kB 0 B
build/block-library/editor.css 9.03 kB 0 B
build/block-library/index.js 147 kB 0 B
build/block-library/style-rtl.css 8.1 kB 0 B
build/block-library/style.css 8.1 kB 0 B
build/block-library/theme-rtl.css 792 B 0 B
build/block-library/theme.css 793 B 0 B
build/block-serialization-default-parser/index.js 1.87 kB 0 B
build/block-serialization-spec-parser/index.js 3.06 kB 0 B
build/blocks/index.js 48 kB 0 B
build/components/index.js 171 kB 0 B
build/components/style-rtl.css 15.3 kB 0 B
build/components/style.css 15.3 kB 0 B
build/compose/index.js 9.95 kB 0 B
build/core-data/index.js 14.8 kB 0 B
build/data-controls/index.js 827 B 0 B
build/data/index.js 8.8 kB 0 B
build/date/index.js 11.2 kB 0 B
build/deprecated/index.js 768 B 0 B
build/dom-ready/index.js 571 B 0 B
build/dom/index.js 4.92 kB 0 B
build/edit-navigation/index.js 11.2 kB 0 B
build/edit-navigation/style-rtl.css 881 B 0 B
build/edit-navigation/style.css 885 B 0 B
build/edit-post/index.js 306 kB 0 B
build/edit-post/style-rtl.css 6.45 kB 0 B
build/edit-post/style.css 6.44 kB 0 B
build/edit-site/index.js 23.3 kB 0 B
build/edit-site/style-rtl.css 3.85 kB 0 B
build/edit-site/style.css 3.85 kB 0 B
build/edit-widgets/index.js 26.4 kB 0 B
build/edit-widgets/style-rtl.css 3.13 kB 0 B
build/edit-widgets/style.css 3.13 kB 0 B
build/editor/editor-styles-rtl.css 476 B 0 B
build/editor/editor-styles.css 478 B 0 B
build/editor/index.js 42.7 kB 0 B
build/editor/style-rtl.css 3.85 kB 0 B
build/editor/style.css 3.85 kB 0 B
build/element/index.js 4.62 kB 0 B
build/escape-html/index.js 735 B 0 B
build/format-library/index.js 6.86 kB 0 B
build/format-library/style-rtl.css 547 B 0 B
build/format-library/style.css 548 B 0 B
build/hooks/index.js 2.16 kB 0 B
build/html-entities/index.js 623 B 0 B
build/i18n/index.js 3.57 kB 0 B
build/is-shallow-equal/index.js 698 B 0 B
build/keyboard-shortcuts/index.js 2.54 kB 0 B
build/keycodes/index.js 1.94 kB 0 B
build/list-reusable-blocks/index.js 3.1 kB 0 B
build/list-reusable-blocks/style-rtl.css 476 B 0 B
build/list-reusable-blocks/style.css 476 B 0 B
build/media-utils/index.js 5.32 kB 0 B
build/notices/index.js 1.81 kB 0 B
build/nux/index.js 3.42 kB 0 B
build/nux/style-rtl.css 671 B 0 B
build/nux/style.css 668 B 0 B
build/plugins/index.js 2.56 kB 0 B
build/primitives/index.js 1.43 kB 0 B
build/priority-queue/index.js 790 B 0 B
build/redux-routine/index.js 2.84 kB 0 B
build/reusable-blocks/index.js 3.06 kB 0 B
build/rich-text/index.js 13.3 kB 0 B
build/server-side-render/index.js 2.77 kB 0 B
build/shortcode/index.js 1.69 kB 0 B
build/token-list/index.js 1.27 kB 0 B
build/url/index.js 4.05 kB 0 B
build/viewport/index.js 1.86 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.22 kB 0 B

compressed-size-action

@Copons Copons self-assigned this Nov 17, 2020
@Copons Copons changed the title Add PHP side of the default template type definitions Full Site Editing: Add Support for Templates Default and Custom Titles and Descriptions (PHP Side) Nov 17, 2020
@Copons Copons marked this pull request as ready for review November 17, 2020 13:21
@gziolo
Copy link
Copy Markdown
Member

gziolo commented Nov 17, 2020

It looks like there is one merge issue to resolve now, but overall it all looks good. Thank you for breaking up #26636 into smaller PRs 😍, I didn't feel confident to accept the previous PR but those changes seem to be a nice improvement. You might still want to validate with someone more familiar with FSE 😅

@Copons Copons force-pushed the update/default-template-types branch from 4fbac9c to 8c907a6 Compare November 17, 2020 17:59
Copy link
Copy Markdown
Member

@noahtallen noahtallen left a comment

Choose a reason for hiding this comment

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

Not quite sure what's happening, but the descriptions aren't rendering correctly:

Screen Shot 2020-11-17 at 12 26 11 PM

Screen Shot 2020-11-17 at 12 26 17 PM

Comment thread lib/template-loader.php Outdated
Comment thread lib/templates.php Outdated
@Copons
Copy link
Copy Markdown
Contributor Author

Copons commented Nov 18, 2020

Not quite sure what's happening, but the descriptions aren't rendering correctly:

@noahtallen in the JS counterpart to this PR (#27038) I've updated the description selector from: excerpt.rendered to excerpt.raw.
I think generally excerpts don't accept HTML (and more so in this case where their usage is "internal", not exposed to the site users), so there should be no need to grab the rendered version and dangerously use it.

@Copons Copons force-pushed the update/default-template-types branch from 8c907a6 to 7eef161 Compare November 18, 2020 10:48
@gziolo
Copy link
Copy Markdown
Member

gziolo commented Nov 18, 2020

There are some e2e test failures in specs covering reusable blocks. Is there any chance it's related to this PR?

@Copons
Copy link
Copy Markdown
Contributor Author

Copons commented Nov 18, 2020

There are some e2e test failures in specs covering reusable blocks. Is there any chance it's related to this PR?

@gziolo I've tried running them a few times, always receiving different fails.

First time there was something going on with the Embed block. This PR shouldn't affect any blocks, but it does remove the embed template type from the default types (it's not used, and even manually removed at some point — removal that I've left in the code, in the off chance a third party adds it by filtering the list).
Regardless, a second run cleared those fails, and replaced them with others related to the Inserter, which I'm pretty confident cannot be caused by this PR, as it's PHP-only.

@gziolo
Copy link
Copy Markdown
Member

gziolo commented Nov 19, 2020

Regardless, a second run cleared those fails, and replaced them with others related to the Inserter, which I'm pretty confident cannot be caused by this PR, as it's PHP-only.

Yes, no idea where it's coming from 🙁

@Copons Copons force-pushed the update/default-template-types branch from 7eef161 to 61eae5b Compare November 19, 2020 10:49
@Copons Copons requested a review from noahtallen November 19, 2020 11:28
Copy link
Copy Markdown
Member

@david-szabo97 david-szabo97 left a comment

Choose a reason for hiding this comment

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

  • Cleaned auto-drafts
  • New auto-drafts are created with the correct title and description
  • Opened site editor
  • Correct template loaded
  • Templates title and description match

👍 ✅

@Copons Copons merged commit cfb3696 into master Nov 19, 2020
@Copons Copons deleted the update/default-template-types branch November 19, 2020 15:01
@github-actions github-actions Bot added this to the Gutenberg 9.5 milestone Nov 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants