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

Partially uplift #9251 to 10.0.x #9654

Merged
merged 1 commit into from
May 30, 2023
Merged

Conversation

Aljullu
Copy link
Contributor

@Aljullu Aljullu commented May 30, 2023

Uplifts part of #9251 in order to fix the conflict between the Mini-Cart block, Page Optimize and Product Bundles.

Fixes #9653 (with #9649).

Testing

User Facing Testing

  1. Enable a block theme.
  2. Add the Mini-Cart block to the header of your store.
  3. Go to Appearance > Editor > Template Parts > Mini-Cart.
  4. Modify the text and background colors of Mini Cart View Cart Button and Mini Cart Proceed to Checkout Button. Try with colors from the palette and with custom colors.
  5. Save the template part and reload the page. Verify the colors persisted.
  6. Go to the frontend, open the Mini-Cart drawer and verify the colors are applied correctly there too.

Additional steps (same as #9649):

  1. Make sure you have WC core 7.7.1.
  2. Enable a block theme.
  3. Add the Mini-Cart block to the header of your store.
  4. Go to the frontend and open the Mini-Cart drawer. Verify it opens.
  5. Install the Page Optimize and Product Bundles plugins (no need to change anything in their configuration).
  6. Go to a page in the frontend that doesn't have any blocks besides the Mini-Cart you added to the header.
  7. Open the Mini-Cart drawer and verify it opens without JS errors.
  • Do not include in the Testing Notes

WooCommerce Visibility

  • WooCommerce Core
  • Feature plugin
  • Experimental

@woocommercebot woocommercebot requested review from a team and roykho and removed request for a team May 30, 2023 18:50
@Aljullu Aljullu self-assigned this May 30, 2023
@Aljullu Aljullu added status: needs review type: bug The issue/PR concerns a confirmed bug. skip-changelog PRs that you don't want to appear in the changelog. block: mini-cart Issues related to the Mini-Cart block. labels May 30, 2023
@Aljullu Aljullu added this to the 10.0.6 milestone May 30, 2023
@github-actions
Copy link
Contributor

github-actions bot commented May 30, 2023

The release ZIP for this PR is accessible via:

https://wcblocks.wpcomstaging.com/wp-content/uploads/woocommerce-gutenberg-products-block-9654.zip

Script Dependencies Report

The compare-assets action has detected some changed script dependencies between this branch and trunk. Please review and confirm the following are correct before merging.

Script Handle Added Removed
wc-blocks.js wp-block-editor, wp-components, wp-core-data, wp-data, wp-edit-site, wp-plugins 🎉
active-filters.js lodash ⚠️
all-products.js wp-style-engine 🎉
all-reviews.js lodash ⚠️
cart.js wp-style-engine 🎉
featured-category.js lodash wp-style-engine
featured-product.js lodash wp-style-engine
handpicked-products.js lodash ⚠️
legacy-template.js wp-core-data, wp-notices 🎉
mini-cart-contents.js wp-components 🎉
price-filter.js lodash ⚠️
product-best-sellers.js lodash ⚠️
product-category.js lodash ⚠️
product-new.js lodash ⚠️
product-on-sale.js lodash ⚠️
product-query.js lodash ⚠️
product-tag.js lodash ⚠️
product-top-rated.js lodash ⚠️
products-by-attribute.js lodash ⚠️
reviews-by-category.js lodash ⚠️
reviews-by-product.js lodash ⚠️
single-product.js wp-style-engine 🎉

This comment was automatically generated by the ./github/compare-assets action.

TypeScript Errors Report

  • Files with errors: 451
  • Total errors: 2213

⚠️ ⚠️ This PR introduces new TS errors on 19 files:

assets/js/atomic/blocks/product-elements/button/block.tsx

assets/js/atomic/blocks/product-elements/button/supports.ts

assets/js/base/components/drawer/index.tsx

assets/js/base/hooks/use-border-props.ts

assets/js/base/hooks/use-color-props.ts

assets/js/base/hooks/use-spacing-props.ts

assets/js/blocks/featured-items/with-featured-item.tsx

assets/js/blocks/mini-cart/edit.tsx

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/color-utils.ts

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-footer-block/block.tsx

assets/js/blocks/product-new/block.js

assets/js/blocks/product-new/index.js

assets/js/blocks/product-search/block.js

assets/js/blocks/product-search/edit.js

assets/js/blocks/product-top-rated/block.js

assets/js/blocks/product-top-rated/index.js

assets/js/data/cart/reducers.ts

assets/js/data/utils/has-in-state.js

assets/js/data/utils/update-state.js

comments-aggregator

@github-actions
Copy link
Contributor

github-actions bot commented May 30, 2023

Size Change: +2.3 kB (0%)

Total Size: 1.11 MB

Filename Size Change
build/active-filters-frontend.js 7.98 kB -1 B (0%)
build/active-filters-wrapper-frontend.js 5.97 kB +3 B (0%)
build/all-products-frontend.js 11.8 kB +1 B (0%)
build/attribute-filter-frontend.js 22.5 kB +1 B (0%)
build/attribute-filter-wrapper-frontend.js 7.1 kB +1 B (0%)
build/cart-blocks/cart-accepted-payment-methods-frontend.js 1.38 kB +3 B (0%)
build/cart-blocks/cart-cross-sells-products-frontend.js 9.75 kB +1 B (0%)
build/cart-blocks/cart-express-payment--checkout-blocks/express-payment-frontend.js 5.16 kB -2 B (0%)
build/cart-blocks/cart-express-payment-frontend.js 721 B +3 B (0%)
build/cart-blocks/cart-line-items--mini-cart-contents-block/products-table-frontend.js 5.4 kB +1 B (0%)
build/cart-blocks/cart-line-items-frontend.js 1.06 kB -4 B (0%)
build/cart-blocks/cart-order-summary-frontend.js 1.27 kB -2 B (0%)
build/cart-blocks/cart-totals-frontend.js 307 B -1 B (0%)
build/cart-blocks/empty-cart-frontend.js 345 B +1 B (0%)
build/cart-blocks/order-summary-coupon-form-frontend.js 1.62 kB +2 B (0%)
build/cart-blocks/order-summary-discount-frontend.js 2.12 kB -1 B (0%)
build/cart-blocks/order-summary-fee-frontend.js 273 B +1 B (0%)
build/cart-blocks/order-summary-heading-frontend.js 456 B +1 B (0%)
build/cart-blocks/order-summary-shipping-frontend.js 11.8 kB +1 B (0%)
build/cart-blocks/order-summary-taxes-frontend.js 432 B +1 B (0%)
build/cart-frontend.js 29.3 kB +2 B (0%)
build/checkout-blocks/actions-frontend.js 1.84 kB -3 B (0%)
build/checkout-blocks/billing-address-frontend.js 4.19 kB +6 B (0%)
build/checkout-blocks/contact-information-frontend.js 2.05 kB +2 B (0%)
build/checkout-blocks/express-payment-frontend.js 1.14 kB +1 B (0%)
build/checkout-blocks/order-summary-coupon-form-frontend.js 1.78 kB -1 B (0%)
build/checkout-blocks/order-summary-frontend.js 1.27 kB -1 B (0%)
build/checkout-blocks/order-summary-shipping-frontend.js 11.8 kB +1 B (0%)
build/checkout-blocks/payment-frontend.js 8.27 kB -4 B (0%)
build/checkout-blocks/pickup-options-frontend.js 4.14 kB +4 B (0%)
build/checkout-blocks/shipping-address-frontend.js 4.14 kB +3 B (0%)
build/checkout-blocks/shipping-methods-frontend.js 5.84 kB +5 B (0%)
build/checkout-blocks/totals-frontend.js 310 B -1 B (0%)
build/checkout-frontend.js 30.9 kB -7 B (0%)
build/filter-wrapper-frontend.js 14 kB -4 B (0%)
build/mini-cart-component-frontend.js 28.3 kB +14 B (0%)
build/mini-cart-contents-block/cart-button-frontend.js 1.58 kB +759 B (+93%) 🆘
build/mini-cart-contents-block/checkout-button-frontend.js 1.58 kB +758 B (+92%) 🆘
build/mini-cart-contents-block/footer-frontend.js 3.91 kB +732 B (+23%) 🚨
build/mini-cart-contents-block/shopping-button-frontend.js 706 B +1 B (0%)
build/price-filter-frontend.js 13.9 kB +1 B (0%)
build/product-add-to-cart-frontend.js 6.42 kB -3 B (0%)
build/product-button-frontend.js 1.91 kB -1 B (0%)
build/product-image-frontend.js 1.78 kB +1 B (0%)
build/product-price-frontend.js 2.12 kB +4 B (0%)
build/product-rating-frontend.js 1.33 kB -3 B (0%)
build/product-sale-badge-frontend.js 977 B +2 B (0%)
build/product-sku-frontend.js 1 kB +2 B (0%)
build/product-stock-indicator-frontend.js 1.01 kB +3 B (0%)
build/product-summary-frontend.js 1.29 kB +1 B (0%)
build/product-title-frontend.js 1.37 kB +2 B (0%)
build/rating-filter-frontend.js 20.8 kB +4 B (0%)
build/rating-filter-wrapper-frontend.js 5.59 kB +4 B (0%)
build/reviews-frontend.js 7.1 kB -1 B (0%)
build/vendors--cart-blocks/cart-cross-sells-products--cart-blocks/order-summary-shipping--checkout-blocks--18f9376a-frontend.js 19.4 kB +5 B (0%)
build/vendors--cart-blocks/cart-cross-sells-products--product-add-to-cart-frontend.js 7.25 kB +3 B (0%)
build/vendors--cart-blocks/order-summary-shipping--checkout-blocks/order-summary-shipping--checkout-block--24d3fc0c-frontend.js 8.24 kB -2 B (0%)
build/vendors--checkout-blocks/billing-address--checkout-blocks/shipping-address-frontend.js 5.44 kB +1 B (0%)
build/vendors--checkout-blocks/shipping-method-frontend.js 12 kB -1 B (0%)
ℹ️ View Unchanged
Filename Size
build/active-filters.js 7.48 kB
build/all-products.js 38.3 kB
build/all-reviews.js 7.65 kB
build/attribute-filter.js 13.2 kB
build/blocks-checkout.js 35.1 kB
build/breadcrumbs.js 2.05 kB
build/cart-blocks/cart-cross-sells-frontend.js 253 B
build/cart-blocks/cart-items-frontend.js 301 B
build/cart-blocks/filled-cart-frontend.js 655 B
build/cart-blocks/order-summary-subtotal-frontend.js 273 B
build/cart-blocks/proceed-to-checkout-frontend.js 1.33 kB
build/cart.js 48.6 kB
build/catalog-sorting.js 1.7 kB
build/checkout-blocks/fields-frontend.js 331 B
build/checkout-blocks/order-note-frontend.js 1.14 kB
build/checkout-blocks/order-summary-cart-items-frontend.js 3.71 kB
build/checkout-blocks/order-summary-discount-frontend.js 2.29 kB
build/checkout-blocks/order-summary-fee-frontend.js 275 B
build/checkout-blocks/order-summary-subtotal-frontend.js 273 B
build/checkout-blocks/order-summary-taxes-frontend.js 431 B
build/checkout-blocks/shipping-method-frontend.js 2.64 kB
build/checkout-blocks/terms-frontend.js 1.56 kB
build/checkout.js 46.3 kB
build/customer-account.js 3.17 kB
build/featured-category.js 14.3 kB
build/featured-product.js 14.5 kB
build/filter-wrapper.js 2.4 kB
build/general-style-rtl.css 1.31 kB
build/general-style.css 1.31 kB
build/handpicked-products.js 7.92 kB
build/legacy-template.js 5.56 kB
build/mini-cart-contents-block/empty-cart-frontend.js 360 B
build/mini-cart-contents-block/filled-cart-frontend.js 268 B
build/mini-cart-contents-block/items-frontend.js 237 B
build/mini-cart-contents-block/products-table-frontend.js 589 B
build/mini-cart-contents-block/title-frontend.js 368 B
build/mini-cart-contents.js 17.4 kB
build/mini-cart-frontend.js 2.02 kB
build/mini-cart.js 4.49 kB
build/price-filter-wrapper-frontend.js 7.04 kB
build/price-filter.js 8.46 kB
build/price-format.js 1.19 kB
build/product-add-to-cart--product-button--product-image--product-price--product-rating--product-sale-bad--49d3ecb2.js 253 B
build/product-add-to-cart--product-button--product-image--product-rating--product-title.js 151 B
build/product-add-to-cart.js 8.8 kB
build/product-best-sellers.js 8.26 kB
build/product-button--product-image--product-price--product-rating--product-sale-badge--product-sku--prod--5bce0384.js 464 B
build/product-button--product-image--product-price--product-rating--product-sale-badge--product-sku--product-title.js 262 B
build/product-button.js 4.17 kB
build/product-categories.js 2.36 kB
build/product-category.js 9.25 kB
build/product-image.js 4.28 kB
build/product-new.js 8.26 kB
build/product-on-sale.js 8.59 kB
build/product-price.js 1.67 kB
build/product-query.js 11.2 kB
build/product-rating.js 921 B
build/product-results-count.js 1.66 kB
build/product-sale-badge.js 800 B
build/product-search.js 2.63 kB
build/product-sku.js 577 B
build/product-stock-indicator.js 646 B
build/product-summary.js 919 B
build/product-tag.js 8.75 kB
build/product-title.js 3.73 kB
build/product-top-rated.js 8.49 kB
build/products-by-attribute.js 9.59 kB
build/rating-filter.js 6.99 kB
build/reviews-by-category.js 11.9 kB
build/reviews-by-product.js 13 kB
build/single-product.js 10.9 kB
build/stock-filter-frontend.js 21.1 kB
build/stock-filter-wrapper-frontend.js 5.83 kB
build/stock-filter.js 7.7 kB
build/store-notices.js 1.69 kB
build/vendors--attribute-filter-wrapper--cart-blocks/cart-cross-sells-products--cart-blocks/order-summary--82e4ed06-frontend.js 6.82 kB
build/vendors--attribute-filter-wrapper--rating-filter-wrapper--stock-filter-wrapper-frontend.js 7.7 kB
build/vendors--cart-blocks/cart-cross-sells-products--cart-blocks/cart-line-items--cart-blocks/cart-order--3c5fe802-frontend.js 5.26 kB
build/vendors--cart-blocks/cart-line-items--checkout-blocks/order-summary-cart-items--mini-cart-contents---233ab542-frontend.js 3.14 kB
build/wc-blocks-data.js 21.8 kB
build/wc-blocks-editor-style-rtl.css 5.83 kB
build/wc-blocks-editor-style.css 5.83 kB
build/wc-blocks-google-analytics.js 1.56 kB
build/wc-blocks-middleware.js 933 B
build/wc-blocks-registry.js 3.15 kB
build/wc-blocks-shared-context.js 1.52 kB
build/wc-blocks-shared-hocs.js 1.73 kB
build/wc-blocks-style-rtl.css 27.6 kB
build/wc-blocks-style.css 27.6 kB
build/wc-blocks-vendors-style-rtl.css 1.96 kB
build/wc-blocks-vendors-style.css 1.96 kB
build/wc-blocks-vendors.js 63.8 kB
build/wc-blocks.js 2.63 kB
build/wc-payment-method-bacs.js 816 B
build/wc-payment-method-cheque.js 811 B
build/wc-payment-method-cod.js 909 B
build/wc-payment-method-paypal.js 837 B
build/wc-settings.js 2.6 kB
build/wc-shipping-method-pickup-location.js 29.9 kB
build/woo-directives-runtime.js 2.73 kB
build/woo-directives-vendors.js 7.91 kB

compressed-size-action

@Aljullu Aljullu force-pushed the fix/partially-uplift-9251 branch from afc38df to 81ef7b5 Compare May 30, 2023 18:59
@Aljullu Aljullu force-pushed the fix/partially-uplift-9251 branch from 81ef7b5 to 24e477a Compare May 30, 2023 19:01
@danieldudzic danieldudzic self-requested a review May 30, 2023 19:11
Copy link
Contributor

@danieldudzic danieldudzic left a comment

Choose a reason for hiding this comment

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

Followed all testing steps and verified that the PR addresses all mentioned issues.

@Aljullu
Copy link
Contributor Author

Aljullu commented May 30, 2023

There are some PHP unit tests failing, but they are failing in release/10.0.0 as well and seem unrelated to this PR.

@Aljullu Aljullu merged commit 2cbbef7 into release/10.0.6 May 30, 2023
@Aljullu Aljullu deleted the fix/partially-uplift-9251 branch May 30, 2023 19:15
Aljullu added a commit that referenced this pull request May 30, 2023
* Empty commit for release pull request

* Empty commit for release pull request

* Add 10.0.6 changelog

* Update versions to 10.0.6

* Fix Mini-Cart block check to see whether a script has already been enqueued (#9649)

* Add 10.0.6 testing steps

* Partially uplift #9251 to 10.0.x (#9654)

* Update testing ZIP

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Albert Juhé Lluveras <[email protected]>
Aljullu added a commit that referenced this pull request May 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
block: mini-cart Issues related to the Mini-Cart block. skip-changelog PRs that you don't want to appear in the changelog. type: bug The issue/PR concerns a confirmed bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants