Merge remote-tracking branch 'origin/develop' into PWA-3430

Author: glo82145

packages/peregrine/lib/talons/RootComponents/Category/__tests__/__snapshots__/useCategoryContent.spec.js.snap

@@ -4,7 +4,9 @@ exports[`useCategoryContent tests handles no data prop 1`] = `
 Object {
   "availableSortMethods": null,
   "categoryDescription": "Jewelry category",
+  "categoryDisplayMode": undefined,
   "categoryName": "Jewelry",
+  "cmsBlockContent": undefined,
   "filterOptions": undefined,
   "filters": null,
   "items": Array [
@@ -33,7 +35,9 @@ Object {
     },
   ],
   "categoryDescription": "Jewelry category",
+  "categoryDisplayMode": undefined,
   "categoryName": "Jewelry",
+  "cmsBlockContent": undefined,
   "filterOptions": undefined,
   "filters": Array [
     Object {

packages/peregrine/lib/talons/RootComponents/Category/categoryContent.gql.js

@@ -1,7 +1,9 @@
 import { gql } from '@apollo/client';
 
 export const GET_PRODUCT_FILTERS_BY_CATEGORY = gql`
-    query getProductFiltersByCategory($filters: ProductAttributeFilterInput!) {
+    query getProductFiltersByCategories(
+        $filters: ProductAttributeFilterInput!
+    ) {
         products(filter: $filters) {
             aggregations {
                 label
@@ -27,13 +29,17 @@ export const GET_CATEGORY_CONTENT = gql`
                 description
                 url_key
                 url_path
+                display_mode
+                cms_block {
+                    content
+                }
             }
         }
     }
 `;
 
 export const GET_CATEGORY_AVAILABLE_SORT_METHODS = gql`
-    query getCategoryAvailableSortMethods(
+    query getCategoriesAvailableSortMethods(
         $categoryIdFilter: FilterEqualTypeInput!
     ) {
         products(filter: { category_uid: $categoryIdFilter }) {

packages/peregrine/lib/talons/RootComponents/Category/useCategoryContent.js

@@ -196,6 +196,14 @@ export const useCategoryContent = props => {
     const availableSortMethods = sortData
         ? sortData.products.sort_fields.options
         : null;
+    const categoryDisplayMode =
+        categoryData && categoryData.categories.items.length
+            ? categoryData.categories.items[0].display_mode
+            : null;
+    const cmsBlockContent =
+        categoryData && categoryData.categories.items.length
+            ? categoryData.categories.items[0].cms_block?.content
+            : null;
 
     useEffect(() => {
         if (!categoryLoading && categoryData?.categories.items.length > 0) {
@@ -220,6 +228,8 @@ export const useCategoryContent = props => {
         setFilterOptions,
         items,
         totalCount,
-        totalPagesFromData
+        totalPagesFromData,
+        categoryDisplayMode,
+        cmsBlockContent
     };
 };

packages/peregrine/lib/talons/WishlistPage/useWishlistItem.js

@@ -81,28 +81,39 @@ export const useWishlistItem = props => {
             selectedConfigurableOptions.length &&
             selectedConfigurableOptions.length === configurableOptions.length
         ) {
-            const selectedOptionsArray = selectedConfigurableOptions.map(
-                selectedOption => {
-                    // TODO: Use configurable_product_option_uid for ConfigurableWishlistItem when available in 2.4.5
+            const selectedOptionsArray = selectedConfigurableOptions
+                .map(selectedOption => {
                     const {
                         id: attributeId,
                         value_id: selectedValueId
                     } = selectedOption;
                     const configurableOption = configurableOptions.find(
                         option => option.attribute_id_v2 === attributeId
                     );
-                    const configurableOptionValue = configurableOption.values.find(
-                        optionValue =>
-                            optionValue.value_index === selectedValueId
-                    );
-
-                    return configurableOptionValue.uid;
-                }
-            );
+                    if (configurableOption) {
+                        const configurableOptionValue = configurableOption.values.find(
+                            optionValue =>
+                                optionValue.value_index === selectedValueId
+                        );
+
+                        if (
+                            configurableOptionValue &&
+                            configurableOptionValue.uid
+                        ) {
+                            return configurableOptionValue.uid;
+                        }
+                    }
+                    return null;
+                })
+                .filter(uid => uid !== null);
 
-            Object.assign(item, {
-                selected_options: selectedOptionsArray
-            });
+            if (selectedOptionsArray.length > 0) {
+                Object.assign(item, {
+                    selected_options: selectedOptionsArray
+                });
+            } else {
+                return null;
+            }
         }
 
         return item;

packages/venia-concept/webpack.config.js

@@ -3,6 +3,7 @@ const HTMLWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
 const fs = require('fs');
 const { promisify } = require('util');
+const path = require('path');
 
 const {
     getMediaURL,
@@ -72,6 +73,20 @@ module.exports = async env => {
         ({ store_code }) => store_code === process.env.STORE_VIEW_CODE
     );
 
+    /**
+     * Here we check the STORE_VIEW_CODE for multistore setup and generate
+     * the index.html content to have the store code in script url
+     * and placed the assets in storeview specific folder inside dist
+     */
+    if (process.env.USE_STORE_CODE_IN_URL && process.env.STORE_VIEW_CODE) {
+        const storeViewCode = process.env.STORE_VIEW_CODE;
+        config.output = {
+            ...config.output,
+            publicPath: `/${storeViewCode}/`,
+            path: path.resolve(__dirname, 'dist', storeViewCode)
+        };
+    }
+
     global.MAGENTO_MEDIA_BACKEND_URL = mediaUrl;
     global.LOCALE = storeConfigData.locale.replace('_', '-');
     global.AVAILABLE_STORE_VIEWS = availableStores;