@riosst100/pwa-marketplace 1.8.1 → 1.8.2

package/src/talons/ShopByCategory/shopByCategory.gql.js

@@ -1,38 +1,38 @@
-import { gql } from '@apollo/client';
-
-export const GET_STORE_CONFIG_DATA = gql`
-    query GetStoreConfigForBreadcrumbs {
-        # eslint-disable-next-line @graphql-eslint/require-id-when-available
-        storeConfig {
-            store_code
-            category_url_suffix
-        }
-    }
-`;
-
-export const GET_CATEGORY_LIST = gql`
-    query getCategoryData($id: String!) {
-        categories(filters: { category_uid: { eq: $id } }) {
-            items {
-                uid
-                name
-                url_path
-                parent {
-                    uid
-                    name
-                    url_path
-                }
-                children {
-                    uid
-                    name
-                    url_path
-                }
-            }
-        }
-    }
-`;
-
-export default {
-    getStoreConfigQuery: GET_STORE_CONFIG_DATA,
-    getCategoryQuery: GET_CATEGORY_LIST
-};
+import { gql } from '@apollo/client';
+
+export const GET_STORE_CONFIG_DATA = gql`
+    query GetStoreConfigForBreadcrumbs {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        storeConfig {
+            store_code
+            category_url_suffix
+        }
+    }
+`;
+
+export const GET_CATEGORY_LIST = gql`
+    query getCategoryData($id: String!) {
+        categories(filters: { category_uid: { eq: $id } }) {
+            items {
+                uid
+                name
+                url_path
+                parent {
+                    uid
+                    name
+                    url_path
+                }
+                children {
+                    uid
+                    name
+                    url_path
+                }
+            }
+        }
+    }
+`;
+
+export default {
+    getStoreConfigQuery: GET_STORE_CONFIG_DATA,
+    getCategoryQuery: GET_CATEGORY_LIST
+};

package/src/talons/ShopByCategory/useShopByCategory.js

@@ -1,69 +1,69 @@
-import { useMemo } from 'react';
-import { useQuery } from '@apollo/client';
-
-import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
-
-import DEFAULT_OPERATIONS from './shopByCategory.gql';
-
-const getPath = (path, suffix) => {
-    if (path) {
-        return `/${path}${suffix || ''}`;
-    }
-
-    // If there is no path this is just a dead link.
-    return '#';
-};
-
-export const useShopByCategory = props => {
-    const { children, parent } = props;
-
-    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
-    const { getStoreConfigQuery } = operations;
-
-    const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
-        fetchPolicy: 'cache-and-network' 
-    });
-
-    const categoryUrlSuffix = useMemo(() => {
-        if (storeConfigData) {
-            return storeConfigData.storeConfig.category_url_suffix;
-        }
-    }, [storeConfigData]);
-
-    const childrenNormalizedData = useMemo(() => {
-        if (children) {
-            return (
-                children.length &&
-                children
-                    .map(category => ({
-                        text: category.name,
-                        path: getPath(
-                            category.url_path,
-                            categoryUrlSuffix
-                        )
-                    }))
-            );
-        }
-    }, [categoryUrlSuffix, children]);
-
-    const parentNormalizedData = useMemo(() => {
-        if (parent) {
-            return (
-                parent.length &&
-                parent
-                    .map(category => ({
-                        text: category.name,
-                        path: getPath(
-                            category.url_path,
-                            categoryUrlSuffix
-                        )
-                    }))
-            );
-        }
-    }, [categoryUrlSuffix, parent]);
-
-    return {
-        childrenNormalizedData: childrenNormalizedData || [],
-        parentNormalizedData: parentNormalizedData || []
-    };
-};
+import { useMemo } from 'react';
+import { useQuery } from '@apollo/client';
+
+import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
+
+import DEFAULT_OPERATIONS from './shopByCategory.gql';
+
+const getPath = (path, suffix) => {
+    if (path) {
+        return `/${path}${suffix || ''}`;
+    }
+
+    // If there is no path this is just a dead link.
+    return '#';
+};
+
+export const useShopByCategory = props => {
+    const { children, parent } = props;
+
+    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
+    const { getStoreConfigQuery } = operations;
+
+    const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
+        fetchPolicy: 'cache-and-network' 
+    });
+
+    const categoryUrlSuffix = useMemo(() => {
+        if (storeConfigData) {
+            return storeConfigData.storeConfig.category_url_suffix;
+        }
+    }, [storeConfigData]);
+
+    const childrenNormalizedData = useMemo(() => {
+        if (children) {
+            return (
+                children.length &&
+                children
+                    .map(category => ({
+                        text: category.name,
+                        path: getPath(
+                            category.url_path,
+                            categoryUrlSuffix
+                        )
+                    }))
+            );
+        }
+    }, [categoryUrlSuffix, children]);
+
+    const parentNormalizedData = useMemo(() => {
+        if (parent) {
+            return (
+                parent.length &&
+                parent
+                    .map(category => ({
+                        text: category.name,
+                        path: getPath(
+                            category.url_path,
+                            categoryUrlSuffix
+                        )
+                    }))
+            );
+        }
+    }, [categoryUrlSuffix, parent]);
+
+    return {
+        childrenNormalizedData: childrenNormalizedData || [],
+        parentNormalizedData: parentNormalizedData || []
+    };
+};

package/src/talons/SubCategory/subCategory.gql.js

@@ -1,15 +1,15 @@
-import { gql } from '@apollo/client';
-
-export const GET_STORE_CONFIG_DATA = gql`
-    query GetStoreConfigForBreadcrumbs {
-        # eslint-disable-next-line @graphql-eslint/require-id-when-available
-        storeConfig {
-            store_code
-            category_url_suffix
-        }
-    }
-`;
-
-export default {
-    getStoreConfigQuery: GET_STORE_CONFIG_DATA
-};
+import { gql } from '@apollo/client';
+
+export const GET_STORE_CONFIG_DATA = gql`
+    query GetStoreConfigForBreadcrumbs {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        storeConfig {
+            store_code
+            category_url_suffix
+        }
+    }
+`;
+
+export default {
+    getStoreConfigQuery: GET_STORE_CONFIG_DATA
+};

package/src/talons/SubCategory/useSubCategory.js

@@ -33,10 +33,10 @@ export const useSubCategory = props => {
     const normalizedData = useMemo(() => {
         if (children) {
             return (
-                children.length &&
+                children && children.length &&
                 children
-                    .map(category => ({
-                        text: category?.name || '',
+                    .map((category, index) => ({
+                        text: category && typeof category.name != "undefined" ? category.name : '',
                         path: getPath(
                             category.url_path,
                             categoryUrlSuffix

package/src/talons/WebsiteSwitcher/websiteSwitcher.gql.js

@@ -1,45 +1,45 @@
-import { gql } from '@apollo/client';
-
-export const GET_STORE_CONFIG_DATA = gql`
-    query getStoreConfigData {
-        # eslint-disable-next-line @graphql-eslint/require-id-when-available
-        storeConfig {
-            store_code
-            store_name
-            store_group_name
-            website_name
-        }
-    }
-`;
-
-export const GET_ROUTE_DATA = gql`
-    query getRouteData($url: String!) {
-        route(url: $url) {
-            relative_url
-        }
-    }
-`;
-
-export const GET_AVAILABLE_WEBSITES_DATA = gql`
-    query availableStoresByUserIp {
-        # eslint-disable-next-line @graphql-eslint/require-id-when-available
-        availableStoresByUserIp {
-            default_display_currency_code
-            locale
-            secure_base_media_url
-            store_code
-            store_group_code
-            store_group_name
-            store_name
-            store_sort_order
-            website_name
-            website_code
-        }
-    }
-`;
-
-export default {
-    getStoreConfigData: GET_STORE_CONFIG_DATA,
-    getRouteData: GET_ROUTE_DATA,
-    getAvailableWebsitesData: GET_AVAILABLE_WEBSITES_DATA
-};
+import { gql } from '@apollo/client';
+
+export const GET_STORE_CONFIG_DATA = gql`
+    query getStoreConfigData {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        storeConfig {
+            store_code
+            store_name
+            store_group_name
+            website_name
+        }
+    }
+`;
+
+export const GET_ROUTE_DATA = gql`
+    query getRouteData($url: String!) {
+        route(url: $url) {
+            relative_url
+        }
+    }
+`;
+
+export const GET_AVAILABLE_WEBSITES_DATA = gql`
+    query availableStoresByUserIp {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        availableStoresByUserIp {
+            default_display_currency_code
+            locale
+            secure_base_media_url
+            store_code
+            store_group_code
+            store_group_name
+            store_name
+            store_sort_order
+            website_name
+            website_code
+        }
+    }
+`;
+
+export default {
+    getStoreConfigData: GET_STORE_CONFIG_DATA,
+    getRouteData: GET_ROUTE_DATA,
+    getAvailableWebsitesData: GET_AVAILABLE_WEBSITES_DATA
+};