Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Fix reverting WC templates #5342

Merged
merged 1 commit into from
Dec 9, 2021
Merged

Fix reverting WC templates #5342

merged 1 commit into from
Dec 9, 2021

Conversation

Aljullu
Copy link
Contributor

@Aljullu Aljullu commented Dec 8, 2021

Fixes #5272.

We were hooking into the get_block_template() function, but when reverting a template, the function that is called is get_block_file_template(). In fact, get_block_template internally calls get_block_file_template, so moving our hooks into the latter would fix the issue and it shouldn't introduce any regressions. This PR implements that.

Manual Testing

  1. With WC 6.0 or later, Gutenberg and a block theme installed, go to Appearance > Editor.
  2. Go to the Templates page and edit one of the WooCommerce templates (ie: Single Product Page).
  3. In the frontend, verify the changes you just saved are applied.
  4. Go back to the Templates page and press on Clear Customizations of the template you just edited.
  5. Verify there is no error and the changes have been reverted in the frontend.
  6. Repeat the steps above with WP 5.9 beta without Gutenberg enabled.

User Facing Testing

These are steps for user testing (where "user" is someone interacting with this change that is not editing any code).

  • Same as above, or
  • See steps below.

Changelog

Fix error when reverting WooCommerce templates.

@Aljullu Aljullu self-assigned this Dec 8, 2021
@rubikuserbot rubikuserbot requested review from a team and tjcafferkey and removed request for a team December 8, 2021 17:22
@Aljullu Aljullu added focus: FSE Work related to prepare WooCommerce for FSE. status: needs review type: bug The issue/PR concerns a confirmed bug. labels Dec 8, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Dec 8, 2021

Size Change: 0 B

Total Size: 840 kB

ℹ️ View Unchanged
Filename Size
build/active-filters-frontend.js 6.21 kB
build/active-filters.js 7.06 kB
build/all-products-frontend.js 18.6 kB
build/all-products.js 34.4 kB
build/all-reviews.js 8.35 kB
build/atomic-block-components/add-to-cart--atomic-block-components/button--atomic-block-components/image---a7e2bb9b.js 2.76 kB
build/atomic-block-components/add-to-cart--atomic-block-components/button.js 1.48 kB
build/atomic-block-components/add-to-cart-frontend.js 6.88 kB
build/atomic-block-components/add-to-cart.js 6.42 kB
build/atomic-block-components/button-frontend.js 1.48 kB
build/atomic-block-components/button.js 848 B
build/atomic-block-components/category-list-frontend.js 458 B
build/atomic-block-components/category-list.js 458 B
build/atomic-block-components/image-frontend.js 1.37 kB
build/atomic-block-components/image.js 1.05 kB
build/atomic-block-components/price-frontend.js 1.74 kB
build/atomic-block-components/price.js 1.69 kB
build/atomic-block-components/rating-frontend.js 553 B
build/atomic-block-components/rating.js 553 B
build/atomic-block-components/sale-badge-frontend.js 626 B
build/atomic-block-components/sale-badge.js 622 B
build/atomic-block-components/sku-frontend.js 386 B
build/atomic-block-components/sku.js 385 B
build/atomic-block-components/stock-indicator-frontend.js 585 B
build/atomic-block-components/stock-indicator.js 586 B
build/atomic-block-components/summary-frontend.js 875 B
build/atomic-block-components/summary.js 872 B
build/atomic-block-components/tag-list-frontend.js 459 B
build/atomic-block-components/tag-list.js 458 B
build/atomic-block-components/title-frontend.js 1.11 kB
build/atomic-block-components/title.js 1.1 kB
build/attribute-filter-frontend.js 16.6 kB
build/attribute-filter.js 12.7 kB
build/blocks-checkout.js 17.6 kB
build/cart-blocks/accepted-payment-methods-frontend.js 1.14 kB
build/cart-blocks/checkout-button-frontend.js 1.14 kB
build/cart-blocks/empty-cart-frontend.js 345 B
build/cart-blocks/express-payment-frontend.js 4.87 kB
build/cart-blocks/filled-cart-frontend.js 767 B
build/cart-blocks/items-frontend.js 297 B
build/cart-blocks/line-items-frontend.js 5.14 kB
build/cart-blocks/order-summary-frontend.js 8.96 kB
build/cart-blocks/totals-frontend.js 320 B
build/cart-frontend.js 45.5 kB
build/cart.js 44 kB
build/checkout-blocks/actions-frontend.js 1.45 kB
build/checkout-blocks/billing-address--checkout-blocks/shipping-address-frontend.js 4.25 kB
build/checkout-blocks/billing-address-frontend.js 887 B
build/checkout-blocks/contact-information-frontend.js 2.94 kB
build/checkout-blocks/express-payment-frontend.js 5.17 kB
build/checkout-blocks/fields-frontend.js 343 B
build/checkout-blocks/order-note-frontend.js 1.13 kB
build/checkout-blocks/order-summary-frontend.js 11.4 kB
build/checkout-blocks/payment-frontend.js 7.48 kB
build/checkout-blocks/shipping-address-frontend.js 973 B
build/checkout-blocks/shipping-methods-frontend.js 4.81 kB
build/checkout-blocks/terms-frontend.js 1.22 kB
build/checkout-blocks/totals-frontend.js 323 B
build/checkout-frontend.js 47.5 kB
build/checkout.js 47 kB
build/featured-category.js 8.55 kB
build/featured-product.js 9.9 kB
build/handpicked-products.js 7.33 kB
build/legacy-template.js 2.05 kB
build/mini-cart-component-frontend.js 37.6 kB
build/mini-cart-contents.js 3.46 kB
build/mini-cart-frontend.js 1.76 kB
build/mini-cart.js 6.66 kB
build/price-filter-frontend.js 12.4 kB
build/price-filter.js 8.61 kB
build/price-format.js 1.18 kB
build/product-best-sellers.js 7.51 kB
build/product-categories.js 3.47 kB
build/product-category.js 8.36 kB
build/product-new.js 7.67 kB
build/product-on-sale.js 8.05 kB
build/product-search.js 2.47 kB
build/product-tag.js 7.77 kB
build/product-top-rated.js 7.63 kB
build/products-by-attribute.js 8.49 kB
build/reviews-by-category.js 11.9 kB
build/reviews-by-product.js 12.9 kB
build/reviews-frontend.js 7.23 kB
build/single-product-frontend.js 22 kB
build/single-product.js 10.4 kB
build/stock-filter-frontend.js 6.8 kB
build/stock-filter.js 6.83 kB
build/vendors--atomic-block-components/add-to-cart--cart-blocks/order-summary--checkout-blocks/billing-ad--c5eb4dcd-frontend.js 18.9 kB
build/vendors--atomic-block-components/add-to-cart-frontend.js 6.81 kB
build/vendors--atomic-block-components/price--cart-blocks/line-items--cart-blocks/order-summary--checkout--8a3571de-frontend.js 5.71 kB
build/vendors--cart-blocks/line-items--checkout-blocks/order-summary-frontend.js 3.14 kB
build/vendors--cart-blocks/order-summary--checkout-blocks/billing-address--checkout-blocks/order-summary---eb4d2cec-frontend.js 4.74 kB
build/wc-blocks-data.js 8.84 kB
build/wc-blocks-editor-style-rtl.css 4.27 kB
build/wc-blocks-editor-style.css 4.28 kB
build/wc-blocks-google-analytics.js 1.56 kB
build/wc-blocks-middleware.js 949 B
build/wc-blocks-registry.js 2.7 kB
build/wc-blocks-shared-context.js 1.51 kB
build/wc-blocks-shared-hocs.js 1.14 kB
build/wc-blocks-style-rtl.css 21.1 kB
build/wc-blocks-style.css 21.1 kB
build/wc-blocks-vendors-style-rtl.css 1.28 kB
build/wc-blocks-vendors-style.css 1.28 kB
build/wc-blocks-vendors.js 65.4 kB
build/wc-blocks.js 2.96 kB
build/wc-payment-method-bacs.js 820 B
build/wc-payment-method-cheque.js 816 B
build/wc-payment-method-cod.js 912 B
build/wc-payment-method-paypal.js 838 B
build/wc-payment-method-stripe.js 11.1 kB
build/wc-settings.js 2.6 kB

compressed-size-action

Copy link
Contributor

@tjcafferkey tjcafferkey left a comment

Choose a reason for hiding this comment

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

Nice! This works as expected. Thanks for fixing!

@github-actions github-actions bot added this to the 6.6.0 milestone Dec 9, 2021
@Aljullu Aljullu merged commit 6bd2228 into trunk Dec 9, 2021
@Aljullu Aljullu deleted the fix/5272-wc-templates-revert branch December 9, 2021 09:35
@Aljullu Aljullu modified the milestones: 6.6.0, 6.5.1 Dec 9, 2021
jonny-bull pushed a commit to jonny-bull/woocommerce-gutenberg-products-block that referenced this pull request Dec 14, 2021
jonny-bull pushed a commit to jonny-bull/woocommerce-gutenberg-products-block that referenced this pull request Dec 16, 2021
tjcafferkey pushed a commit that referenced this pull request Dec 22, 2021
tjcafferkey added a commit that referenced this pull request Dec 22, 2021
* Empty commit for release pull request

* Fix saving WooCommerce templates in WP 5.9 beta 3 (#5408)

* fix not found template for the template editor (#5425)

* Check for woocommerce as the theme before rendering with a more user friendly plugin name (#5420)

* Make it so WooCommerce template names are not editable (#5385)

* Make it so WooCommerce template names is not editable

* Remove source='plugin' from templates

* Load required scripts in LegacyTemplate.php render method (#5346)

* Fix reverting WC templates (#5342)

* Update block theme conditionals in BlockTemplateController (#5335)

* Check if the current theme has a product-archive block template in the absence of a product taxonomy block template. (#5380)

* Add archive-product template into block template hieachy

* Add archive-product condition to product tag block template render method

* Move taxonomy hierarchy filter to WC core

* Undo template amends

* Duplicate the themes archive-product template if it has one for taxonomy block templates

* Review feedback

* Use TextDomain instead of Name

* use correct if/else syntax

* Remove unncessary boolean syntax

* Update readme.txt for 6.5.1 changelog

* Testing notes for 6.5.1

* Bumping version strings to new version.

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Albert Juhé Lluveras <[email protected]>
Co-authored-by: Luigi Teschio <[email protected]>
Co-authored-by: Tom Cafferkey <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
focus: FSE Work related to prepare WooCommerce for FSE. type: bug The issue/PR concerns a confirmed bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WooCommerce templates: it's not possible to revert them
2 participants