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

Jump to bottom

Fix visibility of the template Welcome Guide in the Site Editor #64789

Merged
merged 6 commits into from
Sep 3, 2024
Merged

Fix visibility of the template Welcome Guide in the Site Editor #64789

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e82e202
Require previous entity record for display
stokesman Aug 24, 2024
6c4bc26
Show template edit notice only if welcome guide isn’t active
stokesman Aug 24, 2024
6a2bb80
Hack around flash of presence
stokesman Aug 26, 2024
bf73c4e
Use a simpler hack around flash of presence
stokesman Sep 2, 2024
d23d85c
Use edited entity record hook for post type condition
stokesman Sep 2, 2024
29bfbc0
Read record type only if edited entity hook says it’s loaded
stokesman Sep 3, 2024
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
30 changes: 12 additions & 18 deletions packages/edit-site/src/components/welcome-guide/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,23 @@ import { store as editorStore } from '@wordpress/editor';
/**
* Internal dependencies
*/
import { store as editSiteStore } from '../../store';
import useEditedEntityRecord from '../use-edited-entity-record';

export default function WelcomeGuideTemplate() {
const { toggle } = useDispatch( preferencesStore );

const isVisible = useSelect( ( select ) => {
const isTemplateActive = !! select( preferencesStore ).get(
'core/edit-site',
'welcomeGuideTemplate'
);
const isEditorActive = !! select( preferencesStore ).get(
'core/edit-site',
'welcomeGuide'
);
const { isPage } = select( editSiteStore );
const { getCurrentPostType } = select( editorStore );
return (
isTemplateActive &&
! isEditorActive &&
isPage() &&
getCurrentPostType() === 'wp_template'
);
const edited = useEditedEntityRecord();
const isPostTypeTemplate = edited.record.type === 'wp_template';
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
const isPostTypeTemplate = edited.record.type === 'wp_template';
const isPostTypeTemplate = edited.record?.type === 'wp_template';

edited.record can be false on the first load.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Aw, good catch. Yet in this case the optional chaining operator isn’t truly suited. Still, I’m not against trying to make this more explicit. I decided to leverage the isLoaded property in the return value 29bfbc0. Once that becomes true then record won’t be false.

const { isActive, hasPreviousEntity } = useSelect( ( select ) => {
const { getEditorSettings } = select( editorStore );
const { get } = select( preferencesStore );
return {
isActive: get( 'core/edit-site', 'welcomeGuideTemplate' ),
hasPreviousEntity:
!! getEditorSettings().onNavigateToPreviousEntityRecord,
};
}, [] );
ramonjd marked this conversation as resolved.
Show resolved Hide resolved
const isVisible = isActive && isPostTypeTemplate && hasPreviousEntity;

if ( ! isVisible ) {
return null;
Expand Down
24 changes: 15 additions & 9 deletions packages/editor/src/components/post-template/block-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { __ } from '@wordpress/i18n';
import { useEntityRecord, store as coreStore } from '@wordpress/core-data';
import { check } from '@wordpress/icons';
import { store as noticesStore } from '@wordpress/notices';
import { store as preferencesStore } from '@wordpress/preferences';

/**
* Internal dependencies
Expand Down Expand Up @@ -43,6 +44,8 @@ export default function BlockThemeControl( { id } ) {
};
}, [] );

const { get: getPreference } = useSelect( preferencesStore );

const { editedRecord: template, hasResolved } = useEntityRecord(
'postType',
'wp_template',
Expand Down Expand Up @@ -75,6 +78,17 @@ export default function BlockThemeControl( { id } ) {
},
]
: undefined;

const mayShowTemplateEditNotice = () => {
if ( ! getPreference( 'core/edit-site', 'welcomeGuideTemplate' ) ) {
createSuccessNotice(
__(
'Editing template. Changes made here affect all posts and pages that use the template.'
),
{ type: 'snackbar', actions: notificationAction }
);
}
};
return (
<DropdownMenu
popoverProps={ POPOVER_PROPS }
Expand All @@ -99,15 +113,7 @@ export default function BlockThemeControl( { id } ) {
postType: 'wp_template',
} );
onClose();
createSuccessNotice(
__(
'Editing template. Changes made here affect all posts and pages that use the template.'
),
{
type: 'snackbar',
actions: notificationAction,
}
);
mayShowTemplateEditNotice();
} }
>
{ __( 'Edit template' ) }
Expand Down
Loading