This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 221
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Turn current page into the default Cart/Checkout page (#6867)
* Add default page notice * show notice all inner blocks * support flow when page isnt saved * switch from where we get the current post id * update lock * fix types * update logic to support cart as well * fix package.json * update design and move away from wc.data * restore notice * handle older versions of WooCommerce * fix package lock * fix typo
- Loading branch information
Showing
8 changed files
with
235 additions
and
99 deletions.
There are no files selected for viewing
11 changes: 0 additions & 11 deletions
11
assets/js/blocks/cart-checkout-shared/default-notice/editor.scss
This file was deleted.
Oops, something went wrong.
58 changes: 0 additions & 58 deletions
58
assets/js/blocks/cart-checkout-shared/default-notice/index.tsx
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import { __, sprintf } from '@wordpress/i18n'; | ||
| import { store as editorStore } from '@wordpress/editor'; | ||
| import triggerFetch from '@wordpress/api-fetch'; | ||
| import { store as coreStore } from '@wordpress/core-data'; | ||
| import { Notice, Button } from '@wordpress/components'; | ||
| import { useSelect, useDispatch } from '@wordpress/data'; | ||
| import { CHECKOUT_PAGE_ID, CART_PAGE_ID } from '@woocommerce/block-settings'; | ||
| import { | ||
| useCallback, | ||
| useState, | ||
| createInterpolateElement, | ||
| } from '@wordpress/element'; | ||
| import { getAdminLink } from '@woocommerce/settings'; | ||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import './editor.scss'; | ||
|
|
||
| export function DefaultNotice( { block }: { block: string } ) { | ||
| // To avoid having the same logic twice, we're going to handle both pages here. | ||
| const ORIGINAL_PAGE_ID = | ||
| block === 'checkout' ? CHECKOUT_PAGE_ID : CART_PAGE_ID; | ||
| const settingName = | ||
| block === 'checkout' | ||
| ? 'woocommerce_checkout_page_id' | ||
| : 'woocommerce_cart_page_id'; | ||
|
|
||
| const noticeContent = | ||
| block === 'checkout' | ||
| ? __( | ||
| 'If you would like to use this block as your default checkout, update your page settings', | ||
| 'woo-gutenberg-products-block' | ||
| ) | ||
| : __( | ||
| 'If you would like to use this block as your default cart, update your page settings', | ||
| 'woo-gutenberg-products-block' | ||
| ); | ||
|
|
||
| // Everything below works the same for Cart/Checkout | ||
| const { saveEntityRecord } = useDispatch( coreStore ); | ||
| const { editPost, savePost } = useDispatch( editorStore ); | ||
| const { slug, isLoadingPage, postPublished, currentPostId } = useSelect( | ||
| ( select ) => { | ||
| const { getEntityRecord, isResolving } = select( coreStore ); | ||
| const { isCurrentPostPublished, getCurrentPostId } = | ||
| select( editorStore ); | ||
| return { | ||
| slug: | ||
| getEntityRecord( 'postType', 'page', ORIGINAL_PAGE_ID ) | ||
| ?.slug || block, | ||
| isLoadingPage: isResolving( 'getEntityRecord', [ | ||
| 'postType', | ||
| 'page', | ||
| ORIGINAL_PAGE_ID, | ||
| ] ), | ||
| postPublished: isCurrentPostPublished(), | ||
| currentPostId: getCurrentPostId(), | ||
| }; | ||
| }, | ||
| [] | ||
| ); | ||
| const [ settingStatus, setStatus ] = useState( 'pristine' ); | ||
| const updatePage = useCallback( () => { | ||
| setStatus( 'updating' ); | ||
| Promise.resolve() | ||
| .then( () => | ||
| triggerFetch( { | ||
| path: `/wc/v3/settings/advanced/${ settingName }`, | ||
| method: 'GET', | ||
| } ) | ||
| ) | ||
| .catch( ( error ) => { | ||
| if ( error.code === 'rest_setting_setting_invalid' ) { | ||
| setStatus( 'error' ); | ||
| } | ||
| } ) | ||
| .then( () => { | ||
| if ( ! postPublished ) { | ||
| editPost( { status: 'publish' } ); | ||
| return savePost(); | ||
| } | ||
| } ) | ||
| .then( () => | ||
| // Make this page ID the default cart/checkout. | ||
| triggerFetch( { | ||
| path: `/wc/v3/settings/advanced/${ settingName }`, | ||
| method: 'POST', | ||
| data: { | ||
| value: currentPostId.toString(), | ||
| }, | ||
| } ) | ||
| ) | ||
| // Append `-2` to the original link so we can use it here. | ||
| .then( () => { | ||
| if ( ORIGINAL_PAGE_ID !== 0 ) { | ||
| return saveEntityRecord( 'postType', 'page', { | ||
| id: ORIGINAL_PAGE_ID, | ||
| slug: `${ slug }-2`, | ||
| } ); | ||
| } | ||
| } ) | ||
| // Use the original link for this page. | ||
| .then( () => editPost( { slug } ) ) | ||
| // Save page. | ||
| .then( () => savePost() ) | ||
| .then( () => setStatus( 'updated' ) ); | ||
| }, [ | ||
| postPublished, | ||
| editPost, | ||
| savePost, | ||
| settingName, | ||
| currentPostId, | ||
| ORIGINAL_PAGE_ID, | ||
| saveEntityRecord, | ||
| slug, | ||
| ] ); | ||
| if ( currentPostId === ORIGINAL_PAGE_ID || settingStatus === 'dismissed' ) { | ||
| return null; | ||
| } | ||
| return ( | ||
| <Notice | ||
| className="wc-default-page-notice" | ||
| status={ settingStatus === 'updated' ? 'success' : 'warning' } | ||
| onRemove={ () => setStatus( 'dismissed' ) } | ||
| spokenMessage={ | ||
| settingStatus === 'updated' | ||
| ? __( | ||
| 'Page settings updated', | ||
| 'woo-gutenberg-products-block' | ||
| ) | ||
| : noticeContent | ||
| } | ||
| > | ||
| { settingStatus === 'updated' ? ( | ||
| __( 'Page settings updated', 'woo-gutenberg-products-block' ) | ||
| ) : ( | ||
| <> | ||
| <p>{ noticeContent }</p> | ||
| <Button | ||
| onClick={ updatePage } | ||
| variant="secondary" | ||
| isBusy={ settingStatus === 'updating' } | ||
| disabled={ isLoadingPage } | ||
| isSmall={ true } | ||
| > | ||
| { __( | ||
| 'update your page settings', | ||
| 'woo-gutenberg-products-block' | ||
| ) } | ||
| </Button> | ||
| </> | ||
| ) } | ||
| </Notice> | ||
| ); | ||
| } | ||
|
|
||
| export function LegacyNotice( { block }: { block: string } ) { | ||
| return ( | ||
| <Notice | ||
| className="wc-blocks-legacy-page-notice" | ||
| isDismissible={ false } | ||
| status="warning" | ||
| > | ||
| { createInterpolateElement( | ||
| sprintf( | ||
| /* translators: %s is the block name. It will be cart or checkout. */ | ||
| __( | ||
| 'If you would like to use this block as your default %s you must update your <a>page settings in WooCommerce</a>.', | ||
| 'woo-gutenberg-products-block' | ||
| ), | ||
| block | ||
| ), | ||
| { | ||
| a: ( | ||
| // eslint-disable-next-line jsx-a11y/anchor-has-content | ||
| <a | ||
| href={ getAdminLink( | ||
| 'admin.php?page=wc-settings&tab=advanced' | ||
| ) } | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| /> | ||
| ), | ||
| } | ||
| ) } | ||
| </Notice> | ||
| ); | ||
| } |
22 changes: 13 additions & 9 deletions
22
assets/js/editor-components/sidebar-compatibility-notice/editor.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,17 @@ | ||
| .wc-blocks-sidebar-compatibility-notice { | ||
| border-top: 1px solid $gray-200; | ||
| } | ||
|
|
||
| .wc-blocks-sidebar-compatibility-notice__notice.components-notice.is-dismissible { | ||
| .wc-blocks-sidebar-compatibility-notice.is-dismissible { | ||
| margin: 0; | ||
| padding: $gap; | ||
| padding-right: $gap-small; | ||
|
|
||
| padding-right: 16px; | ||
| .components-notice__dismiss { | ||
| min-width: 24px; | ||
| } | ||
| .components-notice__content { | ||
| margin-right: 0; | ||
| margin: 4px 0; | ||
| } | ||
| svg { | ||
| width: 16px; | ||
| height: 16px; | ||
| } | ||
| &.is-hidden { | ||
| display: none; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters