This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
Show classic template in the inserter only for specific templates #6539
Conversation
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
|
Size Change: +351 B (0%) Total Size: 875 kB
ℹ️ View Unchanged
|
gigitux
added
focus: template
rubikuserbot
requested review from
a team and
dinhtungdu
and removed request for
a team
gigitux
force-pushed
the
fix/5193-classic-template-only-for-specific-template
branch
from
cdb943b to
c4953d4
Compare
dinhtungdu
reviewed
Jun 25, 2022
There was a problem hiding this comment.
@gigitux This is working as expected for built-in templates from the plugin but not for templates from the theme. I tested overriding the Product Catalog template in theme and got this issue:
dinhtungdu
reviewed
Jun 25, 2022
…ocks into fix/5193-classic-template-only-for-specific-template
Thanks for the review and for testing! Great catch! 💪 I addressed the bug, the problem was the hardcoded slug. Now, it should be okay! |
dinhtungdu
reviewed
Jun 28, 2022
There was a problem hiding this comment.
@gigitux thanks for the update! I can confirm this PR is working with overridden templates from themes. I left some minor comments, can you please check?
|
|
||
| if ( isExperimentalBuild() ) { | ||
| subscribe( () => { | ||
| const previousValue = currentTemplateId; |
There was a problem hiding this comment.
Should we change this to previousTemplateId for consistency?
| html: false, | ||
| multiple: false, | ||
| reusable: false, | ||
| inserter: true, |
There was a problem hiding this comment.
This should be feature gated, otherwise, the block will be always available in the inserter when the block phase is less than 3.
| } | ||
|
|
||
| if ( | ||
| getBlockType( BLOCK_SLUG ) === undefined && |
There was a problem hiding this comment.
should we use the block variable here?
|
Thanks for the review, @dinhtungdu. With 1ac90a3 I addressed feedback. I reply to you about your question. Maybe are you thinking about a PHP approach? |
dinhtungdu
reviewed
Jun 28, 2022
| * See https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues/5861 for more context | ||
| */ | ||
| registerClassicTemplateBlock( { | ||
| template: parsedTemplate ?? 'WooCommerce Classic Template', |
There was a problem hiding this comment.
Because of the condition in line 219, Isn't the parsedTemplate variable always truly at this point?
By the way, 'WooCommerce Classic Template' isn't the correct value for the template variable, it should be the template ID.
dinhtungdu
approved these changes
Jun 29, 2022
dinhtungdu
reviewed
Jun 29, 2022
Comment on lines
27
to
38
| import { BLOCK_SLUG, TEMPLATES } from './constants'; | ||
|
|
||
| interface Props { | ||
| attributes: { | ||
| template: string; | ||
| align: string; | ||
| }; | ||
| setAttributes: ( attributes: Record< string, string > ) => void; | ||
| clientId: string; | ||
| } | ||
|
|
||
| const Edit = ( { clientId, attributes }: Props ) => { | ||
| const Edit = ( { clientId, attributes, setAttributes }: Props ) => { |
There was a problem hiding this comment.
This is optional but we can use the BlockEditProp type here, for example:
woocommerce-blocks/assets/js/blocks/price-filter/edit.tsx
Lines 31 to 34 in f2ece16
Comment on lines
174
to
176
| edit: ( { attributes, clientId, setAttributes } ) => { | ||
| const newTemplate = template ?? ( attributes.template as string ); | ||
|
|
There was a problem hiding this comment.
Specifying the type here can save a type casting call.
Suggested change
| edit: ( { attributes, clientId, setAttributes } ) => { | |
| const newTemplate = template ?? ( attributes.template as string ); | |
| edit: ( { attributes, clientId, setAttributes }: Props ) => { | |
| const newTemplate = template ?? attributes.template; | |
Thanks for the multiple reviews! 💪 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5193
Fixes #6110
With this PR the
Classic Template Blockwill be visible in the inserter. But, the block will be visible in the inserter only for the templates:Testing
User Facing Testing
Check out this branch
Classic Template Blockis visible in the inserter only for the templates specificated above.WooCommerce Visibility
Changelog