Merge branch 'trunk' into 11235/fix-white-space

woocommerce · Oct 18, 2023 · 2793b43 · 2793b43
2 parents f0dac9a + 0318adb
commit 2793b43
Show file tree

Hide file tree

Showing 18 changed files with 3 additions and 23 deletions.
diff --git a/assets/js/base/components/cart-checkout/totals/discount/index.tsx b/assets/js/base/components/cart-checkout/totals/discount/index.tsx
@@ -3,7 +3,7 @@
  */
 import { __, sprintf } from '@wordpress/i18n';
 import LoadingMask from '@woocommerce/base-components/loading-mask';
-import { RemovableChip } from '@woocommerce/base-components/chip';
+import { RemovableChip } from '@woocommerce/blocks-components';
 import { applyCheckoutFilter, TotalsItem } from '@woocommerce/blocks-checkout';
 import { getSetting } from '@woocommerce/settings';
 import {

diff --git a/assets/js/base/components/index.ts b/assets/js/base/components/index.ts
@@ -1,7 +1,6 @@
 export * from './block-error-boundary';
 export * from './button';
 export * from './cart-checkout';
-export * from './chip';
 export * from './combobox';
 export * from './country-input';
 export * from './drawer';

diff --git a/assets/js/blocks/active-filters/utils.tsx b/assets/js/blocks/active-filters/utils.tsx
@@ -3,7 +3,7 @@
  */
 import { __, sprintf } from '@wordpress/i18n';
 import { formatPrice } from '@woocommerce/price-format';
-import { RemovableChip } from '@woocommerce/base-components/chip';
+import { RemovableChip } from '@woocommerce/blocks-components';
 import Label from '@woocommerce/base-components/label';
 import { getQueryArgs, addQueryArgs, removeQueryArgs } from '@wordpress/url';
 import { changeUrl } from '@woocommerce/utils';

diff --git a/...migration-products-to-product-collection/migration-from-product-collection-to-products.ts b/...migration-products-to-product-collection/migration-from-product-collection-to-products.ts
@@ -35,7 +35,6 @@ const mapAttributes = ( attributes ) => {
 		woocommerceOnSale,
 		woocommerceHandPickedProducts,
 		taxQuery,
-		parents,
 		isProductCollectionBlock,
 		...restQuery
 	} = query;

diff --git a/...migration-products-to-product-collection/migration-from-products-to-product-collection.ts b/...migration-products-to-product-collection/migration-from-products-to-product-collection.ts
@@ -49,7 +49,6 @@ const mapAttributes = ( attributes: Record< string, unknown > ) => {
 			woocommerceOnSale: __woocommerceOnSale,
 			woocommerceHandPickedProducts: include,
 			taxQuery: {},
-			parents: [],
 			isProductCollectionBlock: true,
 			...restQuery,
 		},

diff --git a/assets/js/blocks/product-collection/constants.ts b/assets/js/blocks/product-collection/constants.ts
@@ -43,10 +43,8 @@ export const DEFAULT_QUERY: ProductCollectionQuery = {
 	author: '',
 	search: '',
 	exclude: [],
-	sticky: '',
 	inherit: null,
 	taxQuery: {},
-	parents: [],
 	isProductCollectionBlock: true,
 	woocommerceOnSale: false,
 	woocommerceStockStatus: getDefaultStockStatuses(),

diff --git a/assets/js/blocks/product-collection/types.ts b/assets/js/blocks/product-collection/types.ts
@@ -35,11 +35,9 @@ export interface ProductCollectionQuery {
 	order: TProductCollectionOrder;
 	orderBy: TProductCollectionOrderBy;
 	pages: number;
-	parents: number[];
 	perPage: number;
 	postType: string;
 	search: string;
-	sticky: string;
 	taxQuery: Record< string, number[] >;
 	woocommerceOnSale: boolean;
 	/**

diff --git a/assets/js/blocks/product-template/edit.tsx b/assets/js/blocks/product-template/edit.tsx
@@ -80,10 +80,8 @@ const ProductTemplateEdit = ( {
 			author,
 			search,
 			exclude,
-			sticky,
 			inherit,
 			taxQuery,
-			parents,
 			pages,
 			...restQueryArgs
 		},
@@ -165,15 +163,6 @@ const ProductTemplateEdit = ( {
 			if ( exclude?.length ) {
 				query.exclude = exclude;
 			}
-			if ( parents?.length ) {
-				query.parent = parents;
-			}
-			// If sticky is not set, it will return all products in the results.
-			// If sticky is set to `only`, it will limit the results to sticky products only.
-			// If it is anything else, it will exclude sticky products from results. For the record the value stored is `exclude`.
-			if ( sticky ) {
-				query.sticky = sticky === 'only';
-			}
 			// If `inherit` is truthy, adjust conditionally the query to create a better preview.
 			if ( inherit ) {
 				if ( templateCategory ) {
@@ -200,11 +189,9 @@ const ProductTemplateEdit = ( {
 			search,
 			postType,
 			exclude,
-			sticky,
 			inherit,
 			templateSlug,
 			taxQuery,
-			parents,
 			restQueryArgs,
 		]
 	);

diff --git a/assets/js/base/components/chip/chip.tsx → packages/components/chip/chip.tsx b/assets/js/base/components/chip/chip.tsx → packages/components/chip/chip.tsx
diff --git a/assets/js/base/components/chip/index.ts → packages/components/chip/index.ts b/assets/js/base/components/chip/index.ts → packages/components/chip/index.ts
diff --git a/...s/base/components/chip/removable-chip.tsx → packages/components/chip/removable-chip.tsx b/...s/base/components/chip/removable-chip.tsx → packages/components/chip/removable-chip.tsx
diff --git a/.../components/chip/stories/chip.stories.tsx → .../components/chip/stories/chip.stories.tsx b/.../components/chip/stories/chip.stories.tsx → .../components/chip/stories/chip.stories.tsx
diff --git a/...s/chip/stories/removable-chip.stories.tsx → ...s/chip/stories/removable-chip.stories.tsx b/...s/chip/stories/removable-chip.stories.tsx → ...s/chip/stories/removable-chip.stories.tsx
diff --git a/assets/js/base/components/chip/style.scss → packages/components/chip/style.scss b/assets/js/base/components/chip/style.scss → packages/components/chip/style.scss
diff --git a/...nts/chip/test/__snapshots__/index.js.snap → ...nts/chip/test/__snapshots__/index.js.snap b/...nts/chip/test/__snapshots__/index.js.snap → ...nts/chip/test/__snapshots__/index.js.snap
diff --git a/assets/js/base/components/chip/test/index.js → packages/components/chip/test/index.js b/assets/js/base/components/chip/test/index.js → packages/components/chip/test/index.js
diff --git a/packages/components/index.js b/packages/components/index.js
@@ -1 +1,2 @@
 export { default as CheckboxList } from './checkbox-list';
+export { Chip, RemovableChip } from './chip';
diff --git a/src/BlockTypes/CollectionFilters.php b/src/BlockTypes/CollectionFilters.php
@@ -234,7 +234,6 @@ function( $key ) use ( $query, &$params ) {
 		$mapped_params = array(
 			'orderBy'                       => 'orderby',
 			'pages'                         => 'page',
-			'parents'                       => 'parent',
 			'perPage'                       => 'per_page',
 			'woocommerceStockStatus'        => 'stock_status',
 			'woocommerceOnSale'             => 'on_sale',
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export { default as CheckboxList } from './checkbox-list';
		export { Chip, RemovableChip } from './chip';