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.

Sign up for GitHub

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

TemplatePanel: Fixed a problem that when a new template is created, the template is not displayed in the select box. #32744

Merged
merged 11 commits into from
Jun 22, 2021
Merged

TemplatePanel: Fixed a problem that when a new template is created, the template is not displayed in the select box. #32744

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
77bfa8a
Use getEntityRecords to get the template. Then, merge it with the ava…
torounit Jun 16, 2021
c0253f1
Fixed the problem that currentTemplate is not updated when it is a bl…
torounit Jun 16, 2021
8177644
merge template dictionary, outside useSelect.
torounit Jun 18, 2021
c1e4b04
useMemo
torounit Jun 18, 2021
0d7d50f
fix eslint problem
torounit Jun 18, 2021
62c6f7e
Check that the selectedTemplate is included in the templates.
torounit Jun 18, 2021
ccf8459
Fix e2e-test: Create a custom template before editing the template.
torounit Jun 20, 2021
e792d23
Click to open the panel only when it is closed.
torounit Jun 20, 2021
67cfa05
If the template is "", the edit link is also displayed.
torounit Jun 21, 2021
bb7c55c
getEditedPostTemplate: If currentTemplate is "", skip searching for w…
torounit Jun 21, 2021
a2d3822
revert change to template === null -> !! template
torounit Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions packages/edit-post/src/components/sidebar/template/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* External dependencies
*/
import { partial, isEmpty, map } from 'lodash';
import { partial, isEmpty, map, fromPairs } from 'lodash';

/**
* WordPress dependencies
Expand Down Expand Up @@ -43,18 +43,32 @@ export function TemplatePanel() {
getEditorSettings,
getCurrentPostType,
} = select( editorStore );
const { getPostType } = select( coreStore );
const { getPostType, getEntityRecords } = select( coreStore );
const _isViewable =
getPostType( getCurrentPostType() )?.viewable ?? false;
const _supportsTemplateMode =
select( editorStore ).getEditorSettings().supportsTemplateMode &&
_isViewable;

const templates = getEntityRecords( 'postType', 'wp_template', {
per_page: -1,
} );

const newAvailableTemplates = fromPairs(
( templates || [] ).map( ( { slug, title } ) => [
slug,
title.rendered,
] )
);

return {
isEnabled: isEditorPanelEnabled( PANEL_NAME ),
isOpened: isEditorPanelOpened( PANEL_NAME ),
selectedTemplate: getEditedPostAttribute( 'template' ),
availableTemplates: getEditorSettings().availableTemplates,
availableTemplates: {
youknowriad marked this conversation as resolved.
Show resolved Hide resolved
...getEditorSettings().availableTemplates,
youknowriad marked this conversation as resolved.
Show resolved Hide resolved
...newAvailableTemplates,
},
template: _supportsTemplateMode && getEditedPostTemplate(),
isViewable: _isViewable,
supportsTemplateMode: _supportsTemplateMode,
Expand All @@ -75,6 +89,7 @@ export function TemplatePanel() {
const onTogglePanel = partial( toggleEditorPanelOpened, PANEL_NAME );

let panelTitle = __( 'Template' );

if ( !! template ) {
panelTitle = sprintf(
/* translators: %s: template title */
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-post/src/store/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ export const getEditedPostTemplate = createRegistrySelector(
const currentTemplate = select( editorStore ).getEditedPostAttribute(
'template'
);
if ( currentTemplate ) {
if ( currentTemplate !== null ) {
const templateWithSameSlug = select( coreStore )
.getEntityRecords( 'postType', 'wp_template' )
?.find( ( template ) => template.slug === currentTemplate );
Expand Down