@riosst100/pwa-marketplace 1.8.1 → 1.8.2

package/src/overwrites/venia-ui/lib/components/RadioGroup/radio.module.css

@@ -1,70 +1,70 @@
-.root {
-    composes: gap-1 from global;
-    composes: grid from global;
-    composes: grid-flow-col from global;
-    composes: items-center from global;
-    composes: justify-items-center from global;
-    composes: leading-normal from global;
-    composes: m-0 from global;
-    composes: text-colorDefault from global;
-    grid-template-areas: 'input label';
-    grid-template-columns: min-content 1fr;
-}
-
-.input {
-    composes: appearance-none from global;
-    composes: bg-clip-content from global;
-    composes: bg-transparent from global;
-    composes: border-8 from global;
-    composes: border-solid from global;
-    composes: border-transparent from global;
-    composes: h-[1.5rem] from global;
-    composes: m-0 from global;
-    composes: rounded-full from global;
-    composes: w-[1.5rem] from global;
-    composes: z-foreground from global;
-    grid-area: input;
-
-    composes: active_outline-none from global;
-    /* composes: active_shadow-radioActive from global; */
-
-    composes: checked_bg-brand-dark from global;
-
-    composes: focus_outline-none from global;
-    /* composes: focus_shadow-radioFocus from global; */
-}
-
-.icon {
-    composes: h-[14px] from global;
-    composes: w-[14px] from global;
-    composes: z-surface from global;
-    grid-area: input;
-}
-
-/* TODO @TW: cannot compose */
-.icon svg {
-    /* composes: stroke-gray-600 from global; */
-    stroke: rgb(var(--venia-global-color-gray-600));
-    width: 14px;
-    height: 14px;
-}
-
-.label {
-    composes: justify-self-start from global;
-    composes: text-base from global;
-    grid-area: label;
-}
-
-/* TODO @TW: cannot compose */
-.input:checked + .icon svg {
-    /* composes: stroke-brand-base from global; */
-    stroke: rgb(var(--venia-brand-color-1-700));
-}
-
-.input_shimmer {
-    composes: h-[14px] from global;
-    composes: m-0 from global;
-    composes: rounded-full from global;
-    composes: w-[14px] from global;
-    composes: z-foreground from global;
-}
+.root {
+    composes: gap-1 from global;
+    composes: grid from global;
+    composes: grid-flow-col from global;
+    composes: items-center from global;
+    composes: justify-items-center from global;
+    composes: leading-normal from global;
+    composes: m-0 from global;
+    composes: text-colorDefault from global;
+    grid-template-areas: 'input label';
+    grid-template-columns: min-content 1fr;
+}
+
+.input {
+    composes: appearance-none from global;
+    composes: bg-clip-content from global;
+    composes: bg-transparent from global;
+    composes: border-8 from global;
+    composes: border-solid from global;
+    composes: border-transparent from global;
+    composes: h-[1.5rem] from global;
+    composes: m-0 from global;
+    composes: rounded-full from global;
+    composes: w-[1.5rem] from global;
+    composes: z-foreground from global;
+    grid-area: input;
+
+    composes: active_outline-none from global;
+    /* composes: active_shadow-radioActive from global; */
+
+    composes: checked_bg-brand-dark from global;
+
+    composes: focus_outline-none from global;
+    /* composes: focus_shadow-radioFocus from global; */
+}
+
+.icon {
+    composes: h-[14px] from global;
+    composes: w-[14px] from global;
+    composes: z-surface from global;
+    grid-area: input;
+}
+
+/* TODO @TW: cannot compose */
+.icon svg {
+    /* composes: stroke-gray-600 from global; */
+    stroke: rgb(var(--venia-global-color-gray-600));
+    width: 14px;
+    height: 14px;
+}
+
+.label {
+    composes: justify-self-start from global;
+    composes: text-base from global;
+    grid-area: label;
+}
+
+/* TODO @TW: cannot compose */
+.input:checked + .icon svg {
+    /* composes: stroke-brand-base from global; */
+    stroke: rgb(var(--venia-brand-color-1-700));
+}
+
+.input_shimmer {
+    composes: h-[14px] from global;
+    composes: m-0 from global;
+    composes: rounded-full from global;
+    composes: w-[14px] from global;
+    composes: z-foreground from global;
+}

package/src/talons/AttributesBlock/attributesBlock.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/CustomFilters/customFilters.gql.js

@@ -1,45 +1,45 @@
-import { gql } from '@apollo/client';
-
-export const GET_CUSTOM_FILTERS = gql`
-    query GetCustomFilters($filters: ProductAttributeFilterInput!) {
-        customSubFilters(filters: $filters) {
-            label
-            count
-            attribute_code
-            options {
-                label
-                value
-            }
-            position
-        }
-    }
-`;
-
-export const GET_FILTER_INPUTS = gql`
-    query GetFilterInputsForCategory {
-        __type(name: "ProductAttributeFilterInput") {
-            inputFields {
-                name
-                type {
-                    name
-                }
-            }
-        }
-    }
-`;
-
-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 {
-    getFilterInputsQuery: GET_FILTER_INPUTS,
-    getCustomFilters: GET_CUSTOM_FILTERS,
-    getStoreConfigQuery: GET_STORE_CONFIG_DATA
-};
+import { gql } from '@apollo/client';
+
+export const GET_CUSTOM_FILTERS = gql`
+    query GetCustomFilters($filters: ProductAttributeFilterInput!) {
+        customSubFilters(filters: $filters) {
+            label
+            count
+            attribute_code
+            options {
+                label
+                value
+            }
+            position
+        }
+    }
+`;
+
+export const GET_FILTER_INPUTS = gql`
+    query GetFilterInputsForCategory {
+        __type(name: "ProductAttributeFilterInput") {
+            inputFields {
+                name
+                type {
+                    name
+                }
+            }
+        }
+    }
+`;
+
+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 {
+    getFilterInputsQuery: GET_FILTER_INPUTS,
+    getCustomFilters: GET_CUSTOM_FILTERS,
+    getStoreConfigQuery: GET_STORE_CONFIG_DATA
+};

package/src/talons/CustomFilters/useCustomFilters.js

@@ -19,7 +19,7 @@ import {
 } from '@magento/peregrine/lib/talons/FilterModal/helpers';
 
 export const useCustomFilters = props => {
-    const { filters } = props;
+    const { filters, category } = props;
 
     const [isApplying, setIsApplying] = useState(false);
     const [filterState, filterApi] = useFilterState();
@@ -68,6 +68,8 @@ export const useCustomFilters = props => {
         return typeMap;
     }, [introspectionData]);
 
+    console.log(category)
+
     useEffect(() => {
 
         if (!filterTypeMap.size) {
@@ -94,7 +96,8 @@ export const useCustomFilters = props => {
     }, [
         runQuery,
         filterTypeMap,
-        search
+        search,
+        category
     ]);
 
     const customFiltersData = customFiltersLoading && !data ? null : (data ? data.customSubFilters : null);

package/src/talons/FilterTop/filterTop.gql.js

@@ -1,45 +1,45 @@
-import { gql } from '@apollo/client';
-
-export const GET_CUSTOM_FILTERS = gql`
-    query GetCustomFilters($categoryUrlKey: String!, $filters: ProductAttributeFilterInput!) {
-        customSubFilters(categoryUrlKey: $categoryUrlKey, filters: $filters) {
-            label
-            count
-            attribute_code
-            options {
-                label
-                value
-            }
-            position
-        }
-    }
-`;
-
-export const GET_FILTER_INPUTS = gql`
-    query GetFilterInputsForCategory {
-        __type(name: "ProductAttributeFilterInput") {
-            inputFields {
-                name
-                type {
-                    name
-                }
-            }
-        }
-    }
-`;
-
-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 {
-    getFilterInputsQuery: GET_FILTER_INPUTS,
-    getCustomFilters: GET_CUSTOM_FILTERS,
-    getStoreConfigQuery: GET_STORE_CONFIG_DATA
-};
+import { gql } from '@apollo/client';
+
+export const GET_CUSTOM_FILTERS = gql`
+    query GetCustomFilters($category: String!, $filters: ProductAttributeFilterInput!) {
+        customSubFilters(category: $category, filters: $filters) {
+            label
+            count
+            attribute_code
+            options {
+                label
+                value
+            }
+            position
+        }
+    }
+`;
+
+export const GET_FILTER_INPUTS = gql`
+    query GetFilterInputsForCategory {
+        __type(name: "ProductAttributeFilterInput") {
+            inputFields {
+                name
+                type {
+                    name
+                }
+            }
+        }
+    }
+`;
+
+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 {
+    getFilterInputsQuery: GET_FILTER_INPUTS,
+    getCustomFilters: GET_CUSTOM_FILTERS,
+    getStoreConfigQuery: GET_STORE_CONFIG_DATA
+};

package/src/talons/FilterTop/index.js

@@ -1 +1 @@
-export { useFilterTop } from './useFilterTop';
+export { useFilterTop } from './useFilterTop';

package/src/talons/FilterTop/useFilterTop.js

@@ -21,7 +21,7 @@ import DEFAULT_OPERATIONS from './filterTop.gql';
 const DRAWER_NAME = 'filter';
 
 export const useFilterTop = props => {
-    const { filters } = props;
+    const { filters, category } = props;
 
     const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
     const { getFilterInputsQuery, getCustomFilters } = operations;
@@ -42,7 +42,7 @@ export const useFilterTop = props => {
 
     const pathnameArr = pathname.split('/');
 
-    const categoryUrlKey = pathnameArr[pathnameArr.length - 1].replace('.html','');
+    // const categoryUrlKey = pathnameArr[pathnameArr.length - 1].replace('.html','');
 
     const { data: introspectionData } = useQuery(getFilterInputsQuery);
 
@@ -77,13 +77,14 @@ export const useFilterTop = props => {
         runQuery({
             variables: {
                 filters: newFilters,
-                categoryUrlKey: categoryUrlKey
+                category: category?.url_path
             }
         });
     }, [
         runQuery,
         filterTypeMap,
-        search
+        search,
+        category
     ]);
 
     const attributeCodes = useMemo(

package/src/talons/Header/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
+};

package/src/talons/SellerReview/sellerReview.gql.js

@@ -1,53 +1,53 @@
-import { gql } from '@apollo/client';
-
-export const GET_SELLER_REVIEW_DATA = gql`
-    query getSellerReviewData($sellerUrl: String!, $filter: SellerRatingFilterInput, $pageSize: Int, $currentPage: Int, $sort: SellerRatingSortInput) {
-        sellerRatings(
-            seller_url: $sellerUrl
-            filter: $filter
-            pageSize: $pageSize
-            currentPage: $currentPage
-            sort: $sort
-        ) {
-            total_count
-            page_info {
-                total_pages
-                page_size
-                current_page
-            }
-            items {
-                rating_id
-                seller_id
-                customer_id
-                rate1
-                rate2
-                rate3
-                rate4
-                rate5
-                rating
-                email
-                title
-                status
-                detail
-                nickname
-                created_at
-                verified_buyer
-                is_recommended
-                is_hidden
-                answer
-                admin_note
-                like_about
-                not_like_about
-                guest_email
-                plus_review
-                minus_review
-                report_abuse
-                country
-            }
-        }
-    }
-`;
-
-export default {
-    getSellerReviewQuery: GET_SELLER_REVIEW_DATA
-};
+import { gql } from '@apollo/client';
+
+export const GET_SELLER_REVIEW_DATA = gql`
+    query getSellerReviewData($sellerUrl: String!, $filter: SellerRatingFilterInput, $pageSize: Int, $currentPage: Int, $sort: SellerRatingSortInput) {
+        sellerRatings(
+            seller_url: $sellerUrl
+            filter: $filter
+            pageSize: $pageSize
+            currentPage: $currentPage
+            sort: $sort
+        ) {
+            total_count
+            page_info {
+                total_pages
+                page_size
+                current_page
+            }
+            items {
+                rating_id
+                seller_id
+                customer_id
+                rate1
+                rate2
+                rate3
+                rate4
+                rate5
+                rating
+                email
+                title
+                status
+                detail
+                nickname
+                created_at
+                verified_buyer
+                is_recommended
+                is_hidden
+                answer
+                admin_note
+                like_about
+                not_like_about
+                guest_email
+                plus_review
+                minus_review
+                report_abuse
+                country
+            }
+        }
+    }
+`;
+
+export default {
+    getSellerReviewQuery: GET_SELLER_REVIEW_DATA
+};

package/src/talons/ShopByCategory/index.js

@@ -1 +1 @@
-export { useShopByCategory } from './useShopByCategory';
+export { useShopByCategory } from './useShopByCategory';