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

Add 'Clear customizations' button to template list page #36802

Merged
merged 3 commits into from
Nov 24, 2021
Merged

Add 'Clear customizations' button to template list page #36802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e65513
Add 'Clear customizations' button
noisysocks Nov 19, 2021
e9e7ede
Save entity after reverting it
noisysocks Nov 24, 2021
650d3f8
Correctly 'allowUndo' default
Mamaduka Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
74 changes: 48 additions & 26 deletions packages/edit-site/src/components/list/table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,56 @@ import { addQueryArgs } from '@wordpress/url';
*/
import { store as editSiteStore } from '../../store';
import isTemplateRemovable from '../../utils/is-template-removable';
import isTemplateRevertable from '../../utils/is-template-revertable';

function Actions( { template, onClose } ) {
const { removeTemplate } = useDispatch( editSiteStore );
function Actions( { template } ) {
const { removeTemplate, revertTemplate } = useDispatch( editSiteStore );
const { saveEditedEntityRecord } = useDispatch( coreStore );

const isRemovable = isTemplateRemovable( template );
const isRevertable = isTemplateRevertable( template );

if ( ! isRemovable && ! isRevertable ) {
return null;
}

async function revertAndSaveTemplate() {
await revertTemplate( template, { allowUndo: false } );
await saveEditedEntityRecord( 'postType', template.type, template.id );
}

return (
<MenuGroup>
<MenuItem
onClick={ () => {
removeTemplate( template );
onClose();
} }
>
{ __( 'Remove template' ) }
</MenuItem>
</MenuGroup>
<DropdownMenu
icon={ moreVertical }
label={ __( 'Actions' ) }
className="edit-site-list-table__actions"
>
{ ( { onClose } ) => (
<MenuGroup>
{ isRemovable && (
<MenuItem
onClick={ () => {
removeTemplate( template );
onClose();
} }
>
{ __( 'Remove template' ) }
</MenuItem>
) }
{ isRevertable && (
<MenuItem
info={ __( 'Restore template to theme default' ) }
onClick={ () => {
revertAndSaveTemplate();
onClose();
} }
>
{ __( 'Clear customizations' ) }
</MenuItem>
) }
</MenuGroup>
) }
</DropdownMenu>
);
}

Expand Down Expand Up @@ -126,20 +161,7 @@ export default function Table( { templateType } ) {
{ template.theme }
</td>
<td className="edit-site-list-table-column" role="cell">
{ isTemplateRemovable( template ) && (
<DropdownMenu
icon={ moreVertical }
label={ __( 'Actions' ) }
className="edit-site-list-table__actions"
>
{ ( { onClose } ) => (
<Actions
template={ template }
onClose={ onClose }
/>
) }
</DropdownMenu>
) }
<Actions template={ template } />
</td>
</tr>
) ) }
Expand Down
61 changes: 36 additions & 25 deletions packages/edit-site/src/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,12 @@ export function setIsListViewOpened( isOpen ) {
/**
* Reverts a template to its original theme-provided file.
*
* @param {Object} template The template to revert.
* @param {Object} template The template to revert.
* @param {Object} [options]
* @param {boolean} [options.allowUndo] Whether to allow the user to undo
* reverting the template. Default true.
*/
export function* revertTemplate( template ) {
export function* revertTemplate( template, { allowUndo = true } = {} ) {
if ( ! isTemplateRevertable( template ) ) {
yield controls.dispatch(
noticesStore,
Expand Down Expand Up @@ -428,32 +431,40 @@ export function* revertTemplate( template ) {
}
);

const undoRevert = async () => {
await dispatch( coreStore ).editEntityRecord(
'postType',
template.type,
edited.id,
if ( allowUndo ) {
const undoRevert = async () => {
await dispatch( coreStore ).editEntityRecord(
'postType',
template.type,
edited.id,
{
content: serializeBlocks,
blocks: edited.blocks,
source: 'custom',
}
);
};
yield controls.dispatch(
noticesStore,
'createSuccessNotice',
__( 'Template reverted.' ),
{
content: serializeBlocks,
blocks: edited.blocks,
source: 'custom',
type: 'snackbar',
actions: [
{
label: __( 'Undo' ),
onClick: undoRevert,
},
],
}
);
};
yield controls.dispatch(
noticesStore,
'createSuccessNotice',
__( 'Template reverted.' ),
{
type: 'snackbar',
actions: [
{
label: __( 'Undo' ),
onClick: undoRevert,
},
],
}
);
} else {
yield controls.dispatch(
noticesStore,
'createSuccessNotice',
__( 'Template reverted.' )
);
}
} catch ( error ) {
const errorMessage =
error.message && error.code !== 'unknown_error'
Expand Down