Product Collection: Make attributes available in rest_product_query hook (#44150)
* Make attributes available in rest_product_query hook
This commit introduces the 'includeInQueryContext' attribute to the 'woocommerce/product-collection' block and updates the 'woocommerce/product-template' block to consume this new attribute.
Key Changes:
1. `woocommerce/product-collection` Block:
- A new attribute 'includeInQueryContext' is added in `block.json`. This attribute is designed to hold a list of attribute names relevant for the query context.
- The 'includeInQueryContext' attribute is included in the `providesContext` field to ensure its availability to child blocks.
- In `constants.ts`, default values for 'includeInQueryContext' are defined, specifying 'collection' and 'id' as initial attributes.
- The `types.ts` file is updated with a comment explaining the purpose of 'includeInQueryContext'.
2. `woocommerce/product-template` Block:
- Modified `block.json` to utilize the 'includeInQueryContext' context provided by the parent `woocommerce/product-collection` block.
- The `edit.tsx` file is updated to handle the new context. It uses a newly added utility function `useProductCollectionBlockAttributes` from `utils.tsx` to access parent block attributes.
- The `utils.tsx` file is introduced, containing the `useProductCollectionBlockAttributes` hook. This hook is responsible for finding the parent 'woocommerce/product-collection' block and returning its attributes.
- Within `edit.tsx`, logic is added to create a query context object based on the attributes specified in 'includeInQueryContext', enhancing the block's ability to dynamically adapt to changes.
* Remove commented code
* Rename query context attribute and optimize parent block detection
This commit introduces two significant changes aimed at improving code readability and efficiency.
1. **Renaming of Query Context Attribute:**
- The attribute `includeInQueryContext` has been renamed to `queryContextIncludes` across various files, including block JSON configurations and TypeScript definitions. This change makes the attribute's purpose more intuitive, indicating it specifies which attributes to include in the query context.
2. **Optimized Parent Block Detection:**
- Replaced the use of `getBlockParents` with `getBlockParentsByBlockName` in utility functions to find the closest Product Collection block. This optimization allows for a more direct and efficient way to identify the relevant parent block by specifying the block name, reducing unnecessary iterations and improving code performance.
* Streamline query context construction in product template
Key Changes:
- **Introduction of `useProductCollectionQueryContext` Hook:** This new hook takes the `clientId` and `queryContextIncludes` as inputs and returns a query context object. It encapsulates the logic for fetching parent product collection block attributes and constructing the query context accordingly. This abstraction simplifies the edit component's logic, focusing on the essentials and improving code readability.
- **Optimization of Parent Block Detection:** The hook uses `getBlockParentsByBlockName` to accurately and efficiently find the closest parent `Product Collection` block, minimizing the overhead previously associated with traversing the block hierarchy.
* Always include `collection` and `id` in query context
* Minor refactor
* Enhance query context handling for more maintainable code
- Introduced `DEFAULT_QUERY_CONTEXT_ATTRIBUTES` in `edit.tsx` to maintain a clear list of default query context attributes.
- Modified `ProductTemplateEdit` to automatically include these default attributes in `queryContextIncludes`, ensuring they are always part of the query context without manual initialization.
- Simplified `useProductCollectionQueryContext` in `utils.tsx` by removing static initialization of 'collection' and 'id', relying instead on the dynamic addition of necessary attributes from `queryContextIncludes`.
This refactor enhances the maintainability and clarity of the code, ensuring a solid foundation for future enhancements and features.
* Add E2E tests for Product Collection query context
- Added a new test suite 'Query Context in Editor' to validate the correctness of query context parameters when the Product Collection block is used. This suite ensures that:
- For the 'Product Catalog', only the ID is sent in the query context, confirming that collection-specific parameters are excluded when not relevant.
- For collections such as 'On Sale', the collection name is correctly passed in the query context, validating that the block dynamically adjusts query parameters based on its settings.
- Introduced a new utility method `setupAndFetchQueryContextURL` in `product-collection.page.ts`. This method automates the setup of a post with the Product Collection block and fetches the URL with query context parameters, facilitating the validation of query context handling.
* Add changefile(s) from automation for the following project(s): woocommerce-blocks
* Fix edge case when `queryContextIncludes` is not defined
- Initializing `queryContextIncludes` with a default empty array directly in the destructuring assignment of the component's props. This approach ensures that `queryContextIncludes` is always an array, simplifying downstream logic.
- Creating a new constant `queryContextIncludesWithDefaults` to hold the combination of `queryContextIncludes` and `DEFAULT_QUERY_CONTEXT_ATTRIBUTES`. This step avoids directly mutating the `queryContextIncludes` prop, aligning with best practices for functional purity and making the code easier to understand and debug.
- Updating the `useProductCollectionQueryContext` hook call to use `queryContextIncludesWithDefaults`. This ensures that the default query context attributes are consistently included without altering the original prop.
These adjustments not only enhance the code's maintainability but also ensure more predictable behavior by avoiding side effects related to parameter mutation.
---------
Co-authored-by: github-actions <github-actions@github.com>
2024-02-12 08:45:24 +00:00
|
|
|
/**
|
|
|
|
* External dependencies
|
|
|
|
*/
|
2024-02-12 19:59:40 +00:00
|
|
|
import { resolveSelect, useSelect } from '@wordpress/data';
|
|
|
|
import { useState, useEffect, useMemo } from '@wordpress/element';
|
|
|
|
import { store as coreStore } from '@wordpress/core-data';
|
|
|
|
import { store as blockEditorStore } from '@wordpress/block-editor';
|
|
|
|
|
2024-04-05 13:54:56 +00:00
|
|
|
export const enum LocationType {
|
|
|
|
Product = 'product',
|
|
|
|
Archive = 'archive',
|
|
|
|
Cart = 'cart',
|
|
|
|
Order = 'order',
|
|
|
|
Site = 'site',
|
|
|
|
}
|
2024-02-12 19:59:40 +00:00
|
|
|
type Context< T > = T & {
|
|
|
|
templateSlug?: string;
|
|
|
|
postId?: number;
|
|
|
|
};
|
|
|
|
type SetEntityId = (
|
|
|
|
kind: 'postType' | 'taxonomy',
|
|
|
|
name: 'product' | 'product_cat' | 'product_tag',
|
|
|
|
slug: string,
|
|
|
|
stateSetter: ( entityId: number | null ) => void
|
|
|
|
) => void;
|
|
|
|
|
|
|
|
const templateSlugs = {
|
|
|
|
singleProduct: 'single-product',
|
|
|
|
productCategory: 'taxonomy-product_cat',
|
|
|
|
productTag: 'taxonomy-product_tag',
|
|
|
|
productAttribute: 'taxonomy-product_attribute',
|
|
|
|
orderConfirmation: 'order-confirmation',
|
|
|
|
cart: 'page-cart',
|
|
|
|
checkout: 'page-checkout',
|
|
|
|
};
|
|
|
|
|
|
|
|
const getIdFromResponse = ( resp?: Record< 'id', number >[] ): number | null =>
|
|
|
|
resp && resp.length && resp[ 0 ]?.id ? resp[ 0 ].id : null;
|
|
|
|
|
|
|
|
const setEntityId: SetEntityId = async ( kind, name, slug, stateSetter ) => {
|
|
|
|
const response = ( await resolveSelect( coreStore ).getEntityRecords(
|
|
|
|
kind,
|
|
|
|
name,
|
|
|
|
{
|
|
|
|
_fields: [ 'id' ],
|
|
|
|
slug,
|
|
|
|
}
|
|
|
|
) ) as Record< 'id', number >[];
|
|
|
|
const entityId = getIdFromResponse( response );
|
|
|
|
stateSetter( entityId );
|
|
|
|
};
|
|
|
|
|
|
|
|
const prepareGetEntitySlug =
|
|
|
|
( templateSlug: string ) =>
|
|
|
|
( entitySlug: string ): string =>
|
|
|
|
templateSlug.replace( `${ entitySlug }-`, '' );
|
|
|
|
const prepareIsInSpecificTemplate =
|
|
|
|
( templateSlug: string ) =>
|
|
|
|
( entitySlug: string ): boolean =>
|
|
|
|
templateSlug.includes( entitySlug ) && templateSlug !== entitySlug;
|
|
|
|
const prepareIsInGenericTemplate =
|
|
|
|
( templateSlug: string ) =>
|
|
|
|
( entitySlug: string ): boolean =>
|
|
|
|
templateSlug === entitySlug;
|
|
|
|
|
Product Collection: Implement Preview Mode (#46369)
* POC: Preview Mode using HOC
* Add explanation as comments
POC: Implement preview mode for Product Collection block in editor
- Added extensive commentary to clarify the mechanism and usage of the `handlePreviewState` function
- Implemented an internal state within `ProductCollectionContent` to manage preview status and messages, serving as a foundational example of how preview mode can enrich block functionality.
- Showcased the application of `handlePreviewState` by incorporating it as a prop in `BlockEdit`, illustrating the potential for extending the block's capabilities for dynamic and interactive previews.
This POC demonstrates a flexible approach to managing preview states within the editor, paving the way for further development and integration based on feedback and use-case analysis.
* Refactor preview state handling and collection registration
This commit introduces a centralized approach for registering product collection variations and managing their preview states. It abstracts the registration logic into a dedicated function and enhances the flexibility of preview state handling across different collection types.
* Rename file
* Minor improvements
* Don't pass previewState to handlePreviewState
I don't see any good use of it in handlePreviewState. Also, We will be going to call handlePreviewState only once
therefore, it will always have the same value as the initial value of the previewState. If in future, we decide to run it
multiple times then we can pass the previewState as an argument to handlePreviewState.
* Add comment
* Use JS closure to inject handlePreviewState
This commit introduces a refined approach for injecting the `handlePreviewState` function into product collection blocks, utilizing JavaScript closures to streamline the process. This method replaces the previous global registry mechanism, offering a more direct and efficient way to manage preview states.
Advantages of This Approach:
- Utilizing JavaScript closures for injecting `handlePreviewState` simplifies the overall architecture by directly modifying block edit components without relying on an external registry. This method enhances code clarity and reduces the cognitive load for developers.
- The conditional application of `withHandlePreviewState` ensures that the preview state handling logic is only added to blocks that require it, optimizing performance and maintainability.
* Refactor preview state management into custom hook
This commit enhances the organization and readability of the product collection content component by abstracting the preview state management into a custom hook named `usePreviewState`. This change streamlines the component's structure and aligns with React best practices for managing state and side effects.
Key Changes:
- Introduced `usePreviewState`, a custom hook responsible for initializing and managing the preview state (`isPreview` and `previewMessage`) of the product collection block. This hook encapsulates the state logic and its side effects, including the conditional invocation of `handlePreviewState`.
- Modified `ProductCollectionContent` to utilize `usePreviewState` for handling its preview state. This adjustment makes the component cleaner and focuses it more on presentation and behavior rather than state management details.
* Replace useEffect with useLayoutEffect
* Add cleanup function in handlePreviewState function
Based on [this discussion](https://github.com/woocommerce/woocommerce/pull/45703#discussion_r1535323883), I added a cleanup function support for handlePreviewState. `handlePreviewState` can return a function which will be called on cleanup in `useLayoutEffect` hook.
* Fetching random products in Preview mode
* Allow collection to set initial preview state
* Pass location & all attributes to handlePreviewState function
* Handling collection specific query for preview mode
- Consolidated `handlePreviewState` and `initialPreviewState` into a single `preview` prop in `register-product-collection.tsx` and `product-collection-content.tsx` to streamline prop passing and improve the component interface.
- Updated the `queryContextIncludes` in `constants.ts` to include 'previewState'
- Enhanced the `ProductCollection` PHP class to handle preview-specific queries more effectively, introducing a new method `get_preview_query_args` that adjusts query parameters based on the collection being previewed, thereby improving the relevance and accuracy of products displayed in preview mode.
* Always set initialPreviewState on load
* Refine preview state handling
- Renamed `HandlePreviewStateArgs` to `SetPreviewStateArgs` in `featured.tsx` to better reflect its purpose, which is now more focused on setting rather than handling states. The implementation details within `featured.tsx` have also been refined to include async operations and cleanup functions, demonstrating a more sophisticated approach to managing state.
Overall, these updates make the preview state logic more understandable and maintainable.
* Rename "initialState" to "initialPreviewState"
* Fix: Correct merging of newPreviewState into previewState attribute
This commit addresses an issue in the product-collection-content.tsx where the newPreviewState was not properly merged into the existing previewState attribute. Previously, the spread operator was incorrectly applied, leading to potential loss of existing state attributes. By changing the order of operations and correctly spreading the existing attributes before merging the newPreviewState, we ensure that all state attributes are preserved and updated correctly.
* Initial refactor POC code to productionize it
* Move `useSetPreviewState` to Utils
* Implement preview mode for Generic archive templates
Implemented a new useLayoutEffect in `utils.tsx` to dynamically set a preview message in the editor for product collection blocks located in generic archive templates (like Products by Category, Products by Tag, or Products by Attribute).
* Remove preview mode from Featured and On sale collection
* Remove preview query modfication for On Sale collection
* Add changefile(s) from automation for the following project(s): woocommerce-blocks, woocommerce
* Fix: hide/show preview label based on value of "inherit"
If user change the toggle "Sync with current query", then it should reflect for the preview label as well.
- If the toggle is on, then the preview label should be shown.
- If the toggle is off, then the preview label should be hidden.
* Minor improvements
* Add changefile(s) from automation for the following project(s): woocommerce-blocks, woocommerce
* Add changefile(s) from automation for the following project(s): woocommerce-blocks, woocommerce
* Refactor: Simplify SetPreviewState type definition in types.ts
This commit refines the SetPreviewState type definition by eliminating the previously used intermediate interface, SetPreviewStateArgs. The change streamlines the type definition directly within the SetPreviewState type, enhancing readability and reducing redundancy.
* Update import syntax for ElementType in register-product-collection.tsx
This commit updates the import statement for `ElementType` from `@wordpress/element` to use the more modern and concise `import type` syntax. This change does not affect functionality but aligns with TypeScript best practices for importing types, ensuring that type imports are distinguished from regular imports. This helps in clarity and in optimizing the build process by explicitly indicating that `ElementType` is used solely for type checking and not included in the JavaScript runtime.
* Refactor: Update TypeScript usage in Product Collection
This commit introduces several TypeScript refinements across product-collection components:
1. **DEFAULT_ATTRIBUTES** in `constants.ts` now uses `Pick` to explicitly define its shape, ensuring only relevant attributes are included and typed accurately.
2. **ProductCollectionAdvancedInspectorControls** and **ToolbarControls** in the `edit` subdirectory now use `Omit` to exclude the 'preview' property from props, clarifying the intended prop usage and improving type safety.
These changes collectively tighten the type definitions and improve the codebase's adherence to best practices in TypeScript.
* Refactor: Update dependencies of useSetPreviewState hook in utils.tsx
This change enhances the stability and predictability of the hook's behavior, ensuring it updates its internal state accurately when its dependencies change, thus aligning with best practices in React development.
* Refactor preview button CSS and conditional rendering
1. **CSS Refactoring:** Moved the positioning styles of the `.wc-block-product-collection__preview-button` from inline styles in the JSX to the `editor.scss` file. This separation of concerns improves maintainability and readability, aligning the styling responsibilities solely within the CSS file.
2. **Conditional Rendering Logic:** Updated the rendering condition for the preview button. Now, it not only checks if `isPreview` is true but also if the block is currently selected (`props.isSelected`). This prevents the preview button from appearing when the block is not actively selected, reducing visual clutter and enhancing the user experience in the editor.
* Enhance: Update preview button visibility logic in ProductCollectionContent
This commit enhances the visibility logic of the preview button in the `ProductCollectionContent` component:
1. **Added `isSelectedOrInnerBlockSelected`:** Introduced a new `useSelect` hook to determine if the current block or any of its inner blocks are selected. This ensures that the preview button is visible when either the product collection block or any of its inner blocks are selected.
2. **Updated Conditional Rendering:** Adjusted the conditional rendering of the preview button to use the new `isSelectedOrInnerBlockSelected` value, providing a more intuitive user experience by ensuring the preview button remains visible when any relevant block is selected.
* use __private prefix with attribute name
* Add E2E tests for Preview Mode
1. **Template-Specific Tests:** Each template (tag, category, attribute) undergoes a test to ensure the preview button behaves as expected when replacing products with product collections in these contexts.
2. **Visibility Checks:** The tests verify that the preview button is visible when the block or its inner blocks are selected and hidden when the block is not selected. This helps confirm the correct implementation of the preview button visibility logic across different use cases.
3. **Interaction with Inner Blocks:** Additional checks are included to ensure the preview button's visibility toggles appropriately when interacting with inner blocks, reinforcing the dynamic nature of block selection and its effect on UI elements within the editor.
* Add setPreviewState to dependencies
* Add data-test-id to Preview button and update e2e locator
Modifications:
- Added `data-test-id="product-collection-preview-button"` to the Preview button in `product-collection-content.tsx`.
- Updated the corresponding e2e test locator in `product-collection.block_theme.side_effects.spec.ts` to use the new `data-test-id` instead of the class name.
By using `data-test-id`, we ensure that the e2e tests are not affected by changes in the styling or restructuring of the DOM that might alter CSS classes but do not affect functionality.
* Enhance: Localize preview message in useSetPreviewState hook
* Don't show shadow & outline on focus
* Make preview button font same as Admin
* Fix SCSS lint errors
* Add missing await keyword
---------
Co-authored-by: github-actions <github-actions@github.com>
2024-05-15 07:48:43 +00:00
|
|
|
export type WooCommerceBlockLocation = ReturnType<
|
|
|
|
typeof createLocationObject
|
|
|
|
>;
|
|
|
|
|
|
|
|
const createLocationObject = (
|
|
|
|
type: LocationType,
|
|
|
|
sourceData: Record< string, unknown > = {}
|
|
|
|
) => ( {
|
2024-02-12 19:59:40 +00:00
|
|
|
type,
|
|
|
|
sourceData,
|
|
|
|
} );
|
|
|
|
|
|
|
|
type ContextProperties = {
|
|
|
|
templateSlug: string;
|
|
|
|
postId?: string;
|
|
|
|
};
|
|
|
|
|
|
|
|
export const useGetLocation = < T, >(
|
|
|
|
context: Context< T & ContextProperties >,
|
|
|
|
clientId: string
|
|
|
|
) => {
|
|
|
|
const templateSlug = context.templateSlug || '';
|
|
|
|
const postId = context.postId || null;
|
|
|
|
|
|
|
|
const getEntitySlug = prepareGetEntitySlug( templateSlug );
|
|
|
|
const isInSpecificTemplate = prepareIsInSpecificTemplate( templateSlug );
|
|
|
|
|
|
|
|
// Detect Specific Templates
|
|
|
|
const isInSpecificProductTemplate = isInSpecificTemplate(
|
|
|
|
templateSlugs.singleProduct
|
|
|
|
);
|
|
|
|
const isInSpecificCategoryTemplate = isInSpecificTemplate(
|
|
|
|
templateSlugs.productCategory
|
|
|
|
);
|
|
|
|
const isInSpecificTagTemplate = isInSpecificTemplate(
|
|
|
|
templateSlugs.productTag
|
|
|
|
);
|
|
|
|
|
|
|
|
const [ productId, setProductId ] = useState< number | null >( null );
|
|
|
|
const [ categoryId, setCategoryId ] = useState< number | null >( null );
|
|
|
|
const [ tagId, setTagId ] = useState< number | null >( null );
|
|
|
|
|
|
|
|
useEffect( () => {
|
|
|
|
if ( isInSpecificProductTemplate ) {
|
|
|
|
const slug = getEntitySlug( templateSlugs.singleProduct );
|
|
|
|
setEntityId( 'postType', 'product', slug, setProductId );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( isInSpecificCategoryTemplate ) {
|
|
|
|
const slug = getEntitySlug( templateSlugs.productCategory );
|
|
|
|
setEntityId( 'taxonomy', 'product_cat', slug, setCategoryId );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( isInSpecificTagTemplate ) {
|
|
|
|
const slug = getEntitySlug( templateSlugs.productTag );
|
|
|
|
setEntityId( 'taxonomy', 'product_tag', slug, setTagId );
|
|
|
|
}
|
|
|
|
}, [
|
|
|
|
isInSpecificProductTemplate,
|
|
|
|
isInSpecificCategoryTemplate,
|
|
|
|
isInSpecificTagTemplate,
|
|
|
|
getEntitySlug,
|
|
|
|
] );
|
|
|
|
|
2024-04-02 07:05:17 +00:00
|
|
|
const { isInSingleProductBlock, isInSomeCartCheckoutBlock } = useSelect(
|
|
|
|
( select ) => {
|
|
|
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
|
|
// @ts-ignore No types for this selector exist yet
|
|
|
|
const { getBlockParentsByBlockName } = select( blockEditorStore );
|
|
|
|
const isInBlocks = ( parentBlockNames: string[] ) =>
|
|
|
|
getBlockParentsByBlockName( clientId, parentBlockNames )
|
|
|
|
.length > 0;
|
|
|
|
|
|
|
|
return {
|
|
|
|
isInSingleProductBlock: isInBlocks( [
|
|
|
|
'woocommerce/single-product',
|
|
|
|
] ),
|
|
|
|
isInSomeCartCheckoutBlock: isInBlocks( [
|
|
|
|
'woocommerce/cart',
|
|
|
|
'woocommerce/checkout',
|
|
|
|
'woocommerce/mini-cart-contents',
|
|
|
|
] ),
|
|
|
|
};
|
|
|
|
},
|
2024-02-12 19:59:40 +00:00
|
|
|
[ clientId ]
|
|
|
|
);
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 1.1: BLOCK LEVEL: SPECIFIC PRODUCT
|
2024-02-12 19:59:40 +00:00
|
|
|
* Single Product block - take product ID from context
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ( isInSingleProductBlock ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Product, {
|
|
|
|
productId: postId,
|
|
|
|
} );
|
2024-02-12 19:59:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 1.2: BLOCK LEVEL: GENERIC CART
|
|
|
|
* Cart, Checkout or Mini Cart blocks - block scope is more important than template
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ( isInSomeCartCheckoutBlock ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Cart );
|
2024-04-02 07:05:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Case 2.1: TEMPLATES: SPECIFIC PRODUCT
|
2024-02-12 19:59:40 +00:00
|
|
|
* Specific Single Product template - take product ID from taxononmy
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ( isInSpecificProductTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Product, { productId } );
|
2024-02-12 19:59:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
const isInGenericTemplate = prepareIsInGenericTemplate( templateSlug );
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 2.2: TEMPLATES: GENERIC PRODUCT
|
2024-02-12 19:59:40 +00:00
|
|
|
* Generic Single Product template
|
|
|
|
*/
|
|
|
|
|
|
|
|
const isInSingleProductTemplate = isInGenericTemplate(
|
|
|
|
templateSlugs.singleProduct
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( isInSingleProductTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Product, {
|
|
|
|
productId: null,
|
|
|
|
} );
|
2024-02-12 19:59:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 2.3: TEMPLATES: SPECIFIC TAXONOMY
|
2024-02-12 19:59:40 +00:00
|
|
|
* Specific Category template - take category ID from
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ( isInSpecificCategoryTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Archive, {
|
2024-02-12 19:59:40 +00:00
|
|
|
taxonomy: 'product_cat',
|
|
|
|
termId: categoryId,
|
|
|
|
} );
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 2.4: TEMPLATES: SPECIFIC TAXONOMY
|
2024-02-12 19:59:40 +00:00
|
|
|
* Specific Tag template
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ( isInSpecificTagTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Archive, {
|
2024-02-12 19:59:40 +00:00
|
|
|
taxonomy: 'product_tag',
|
|
|
|
termId: tagId,
|
|
|
|
} );
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 2.5: TEMPLATES: GENERIC TAXONOMY
|
2024-02-12 19:59:40 +00:00
|
|
|
* Generic Taxonomy template
|
|
|
|
*/
|
|
|
|
|
|
|
|
const isInProductsByCategoryTemplate = isInGenericTemplate(
|
|
|
|
templateSlugs.productCategory
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( isInProductsByCategoryTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Archive, {
|
2024-02-12 19:59:40 +00:00
|
|
|
taxonomy: 'product_cat',
|
|
|
|
termId: null,
|
|
|
|
} );
|
|
|
|
}
|
|
|
|
|
|
|
|
const isInProductsByTagTemplate = isInGenericTemplate(
|
|
|
|
templateSlugs.productTag
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( isInProductsByTagTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Archive, {
|
2024-02-12 19:59:40 +00:00
|
|
|
taxonomy: 'product_tag',
|
|
|
|
termId: null,
|
|
|
|
} );
|
|
|
|
}
|
|
|
|
|
|
|
|
const isInProductsByAttributeTemplate = isInGenericTemplate(
|
|
|
|
templateSlugs.productAttribute
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( isInProductsByAttributeTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Archive, {
|
2024-02-12 19:59:40 +00:00
|
|
|
taxonomy: null,
|
|
|
|
termId: null,
|
|
|
|
} );
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 2.6: TEMPLATES: GENERIC CART
|
|
|
|
* Cart/Checkout templates
|
2024-02-12 19:59:40 +00:00
|
|
|
*/
|
|
|
|
|
2024-04-02 07:05:17 +00:00
|
|
|
const isInCartCheckoutTemplate =
|
2024-02-12 19:59:40 +00:00
|
|
|
templateSlug === templateSlugs.cart ||
|
2024-04-02 07:05:17 +00:00
|
|
|
templateSlug === templateSlugs.checkout;
|
2024-02-12 19:59:40 +00:00
|
|
|
|
2024-04-02 07:05:17 +00:00
|
|
|
if ( isInCartCheckoutTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Cart );
|
2024-02-12 19:59:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 2.7: TEMPLATES: GENERIC ORDER
|
2024-02-12 19:59:40 +00:00
|
|
|
* Order Confirmation template
|
|
|
|
*/
|
|
|
|
|
|
|
|
const isInOrderTemplate = isInGenericTemplate(
|
|
|
|
templateSlugs.orderConfirmation
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( isInOrderTemplate ) {
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Order );
|
2024-02-12 19:59:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-04-02 07:05:17 +00:00
|
|
|
* Case 3: GENERIC
|
2024-02-12 19:59:40 +00:00
|
|
|
* All other cases
|
|
|
|
*/
|
|
|
|
|
2024-04-05 13:54:56 +00:00
|
|
|
return createLocationObject( LocationType.Site );
|
2024-02-12 19:59:40 +00:00
|
|
|
};
|
Product Collection: Make attributes available in rest_product_query hook (#44150)
* Make attributes available in rest_product_query hook
This commit introduces the 'includeInQueryContext' attribute to the 'woocommerce/product-collection' block and updates the 'woocommerce/product-template' block to consume this new attribute.
Key Changes:
1. `woocommerce/product-collection` Block:
- A new attribute 'includeInQueryContext' is added in `block.json`. This attribute is designed to hold a list of attribute names relevant for the query context.
- The 'includeInQueryContext' attribute is included in the `providesContext` field to ensure its availability to child blocks.
- In `constants.ts`, default values for 'includeInQueryContext' are defined, specifying 'collection' and 'id' as initial attributes.
- The `types.ts` file is updated with a comment explaining the purpose of 'includeInQueryContext'.
2. `woocommerce/product-template` Block:
- Modified `block.json` to utilize the 'includeInQueryContext' context provided by the parent `woocommerce/product-collection` block.
- The `edit.tsx` file is updated to handle the new context. It uses a newly added utility function `useProductCollectionBlockAttributes` from `utils.tsx` to access parent block attributes.
- The `utils.tsx` file is introduced, containing the `useProductCollectionBlockAttributes` hook. This hook is responsible for finding the parent 'woocommerce/product-collection' block and returning its attributes.
- Within `edit.tsx`, logic is added to create a query context object based on the attributes specified in 'includeInQueryContext', enhancing the block's ability to dynamically adapt to changes.
* Remove commented code
* Rename query context attribute and optimize parent block detection
This commit introduces two significant changes aimed at improving code readability and efficiency.
1. **Renaming of Query Context Attribute:**
- The attribute `includeInQueryContext` has been renamed to `queryContextIncludes` across various files, including block JSON configurations and TypeScript definitions. This change makes the attribute's purpose more intuitive, indicating it specifies which attributes to include in the query context.
2. **Optimized Parent Block Detection:**
- Replaced the use of `getBlockParents` with `getBlockParentsByBlockName` in utility functions to find the closest Product Collection block. This optimization allows for a more direct and efficient way to identify the relevant parent block by specifying the block name, reducing unnecessary iterations and improving code performance.
* Streamline query context construction in product template
Key Changes:
- **Introduction of `useProductCollectionQueryContext` Hook:** This new hook takes the `clientId` and `queryContextIncludes` as inputs and returns a query context object. It encapsulates the logic for fetching parent product collection block attributes and constructing the query context accordingly. This abstraction simplifies the edit component's logic, focusing on the essentials and improving code readability.
- **Optimization of Parent Block Detection:** The hook uses `getBlockParentsByBlockName` to accurately and efficiently find the closest parent `Product Collection` block, minimizing the overhead previously associated with traversing the block hierarchy.
* Always include `collection` and `id` in query context
* Minor refactor
* Enhance query context handling for more maintainable code
- Introduced `DEFAULT_QUERY_CONTEXT_ATTRIBUTES` in `edit.tsx` to maintain a clear list of default query context attributes.
- Modified `ProductTemplateEdit` to automatically include these default attributes in `queryContextIncludes`, ensuring they are always part of the query context without manual initialization.
- Simplified `useProductCollectionQueryContext` in `utils.tsx` by removing static initialization of 'collection' and 'id', relying instead on the dynamic addition of necessary attributes from `queryContextIncludes`.
This refactor enhances the maintainability and clarity of the code, ensuring a solid foundation for future enhancements and features.
* Add E2E tests for Product Collection query context
- Added a new test suite 'Query Context in Editor' to validate the correctness of query context parameters when the Product Collection block is used. This suite ensures that:
- For the 'Product Catalog', only the ID is sent in the query context, confirming that collection-specific parameters are excluded when not relevant.
- For collections such as 'On Sale', the collection name is correctly passed in the query context, validating that the block dynamically adjusts query parameters based on its settings.
- Introduced a new utility method `setupAndFetchQueryContextURL` in `product-collection.page.ts`. This method automates the setup of a post with the Product Collection block and fetches the URL with query context parameters, facilitating the validation of query context handling.
* Add changefile(s) from automation for the following project(s): woocommerce-blocks
* Fix edge case when `queryContextIncludes` is not defined
- Initializing `queryContextIncludes` with a default empty array directly in the destructuring assignment of the component's props. This approach ensures that `queryContextIncludes` is always an array, simplifying downstream logic.
- Creating a new constant `queryContextIncludesWithDefaults` to hold the combination of `queryContextIncludes` and `DEFAULT_QUERY_CONTEXT_ATTRIBUTES`. This step avoids directly mutating the `queryContextIncludes` prop, aligning with best practices for functional purity and making the code easier to understand and debug.
- Updating the `useProductCollectionQueryContext` hook call to use `queryContextIncludesWithDefaults`. This ensures that the default query context attributes are consistently included without altering the original prop.
These adjustments not only enhance the code's maintainability but also ensure more predictable behavior by avoiding side effects related to parameter mutation.
---------
Co-authored-by: github-actions <github-actions@github.com>
2024-02-12 08:45:24 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* In Product Collection block, queryContextIncludes attribute contains
|
|
|
|
* list of attribute names that should be included in the query context.
|
|
|
|
*
|
|
|
|
* This hook returns the query context object based on the attribute names
|
|
|
|
* provided in the queryContextIncludes array.
|
|
|
|
*
|
|
|
|
* Example:
|
|
|
|
* {
|
|
|
|
* clientID = 'd2c7e34f-70d6-417c-b582-f554a3a575f3',
|
|
|
|
* queryContextIncludes = [ 'collection' ]
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* The hook will return the following query context object:
|
|
|
|
* {
|
|
|
|
* collection: 'woocommerce/product-collection/featured'
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* @param args Arguments for the hook.
|
|
|
|
* @param args.clientId Client ID of the inner block.
|
|
|
|
* @param args.queryContextIncludes Array of attribute names to be included in the query context.
|
|
|
|
*
|
|
|
|
* @return Query context object.
|
|
|
|
*/
|
|
|
|
export const useProductCollectionQueryContext = ( {
|
|
|
|
clientId,
|
|
|
|
queryContextIncludes,
|
|
|
|
}: {
|
|
|
|
clientId: string;
|
|
|
|
queryContextIncludes: string[];
|
|
|
|
} ) => {
|
|
|
|
const productCollectionBlockAttributes = useSelect(
|
|
|
|
( select ) => {
|
|
|
|
const { getBlockParentsByBlockName, getBlockAttributes } =
|
|
|
|
select( 'core/block-editor' );
|
|
|
|
|
|
|
|
const parentBlocksClientIds = getBlockParentsByBlockName(
|
|
|
|
clientId,
|
|
|
|
'woocommerce/product-collection',
|
|
|
|
true
|
|
|
|
);
|
|
|
|
|
|
|
|
if ( parentBlocksClientIds?.length ) {
|
|
|
|
const closestParentClientId = parentBlocksClientIds[ 0 ];
|
|
|
|
return getBlockAttributes( closestParentClientId );
|
|
|
|
}
|
|
|
|
|
|
|
|
return null;
|
|
|
|
},
|
|
|
|
[ clientId ]
|
|
|
|
);
|
|
|
|
|
|
|
|
return useMemo( () => {
|
|
|
|
// If the product collection block is not found, return null.
|
|
|
|
if ( ! productCollectionBlockAttributes ) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
const queryContext: {
|
|
|
|
[ key: string ]: unknown;
|
|
|
|
} = {};
|
|
|
|
|
|
|
|
if ( queryContextIncludes?.length ) {
|
|
|
|
queryContextIncludes.forEach( ( attribute: string ) => {
|
|
|
|
if ( productCollectionBlockAttributes?.[ attribute ] ) {
|
|
|
|
queryContext[ attribute ] =
|
|
|
|
productCollectionBlockAttributes[ attribute ];
|
|
|
|
}
|
|
|
|
} );
|
|
|
|
}
|
|
|
|
|
|
|
|
return queryContext;
|
|
|
|
}, [ queryContextIncludes, productCollectionBlockAttributes ] );
|
|
|
|
};
|
2024-07-29 12:21:44 +00:00
|
|
|
|
|
|
|
export const parseTemplateSlug = ( rawTemplateSlug = '' ) => {
|
|
|
|
const categoryPrefix = 'category-';
|
|
|
|
const productCategoryPrefix = 'taxonomy-product_cat-';
|
|
|
|
const productTagPrefix = 'taxonomy-product_tag-';
|
|
|
|
|
|
|
|
if ( rawTemplateSlug.startsWith( categoryPrefix ) ) {
|
|
|
|
return {
|
|
|
|
taxonomy: 'category',
|
|
|
|
slug: rawTemplateSlug.replace( categoryPrefix, '' ),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( rawTemplateSlug.startsWith( productCategoryPrefix ) ) {
|
|
|
|
return {
|
|
|
|
taxonomy: 'product_cat',
|
|
|
|
slug: rawTemplateSlug.replace( productCategoryPrefix, '' ),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( rawTemplateSlug.startsWith( productTagPrefix ) ) {
|
|
|
|
return {
|
|
|
|
taxonomy: 'product_tag',
|
|
|
|
slug: rawTemplateSlug.replace( productTagPrefix, '' ),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
return { taxonomy: '', slug: '' };
|
|
|
|
};
|