@riosst100/pwa-marketplace 1.2.5 → 1.2.7

package/src/talons/Seller/seller.gql.js

@@ -1,204 +1,139 @@
-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
-            product_url_suffix
-        }
-    }
-`;
-
-export const GET_SELLER_DETAIL_QUERY = gql`
-    query getSellerDetailForSellerPage($urlKey: String!, $getOtherInfo: Boolean, $getProducts: Boolean) {
-        sellerByUrl(seller_url: $urlKey, get_other_info: $getOtherInfo, get_products: $getProducts) {
-            seller_id
-            contact_number
-            shop_title
-            company
-            term_and_conditions
-            website_url
-            ship_to
-            ship_to_country
-            seller_rates {
-                total_count
-                page_info {
-                    current_page
-                    page_size
-                    total_pages
-                }
-                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
-                }
-            }
-            products {
-                total_count
-                page_info {
-                    current_page
-                    page_size
-                    total_pages
-                }
-                items {
-                    name
-                    sku
-                }
-            }
-            operating_hours {
-                day
-                status
-                time {
-                    opening_time
-                    closing_time
-                }
-            }
-            store_locators {
-                name
-                country
-                region
-                address_line_1
-                address_line_2
-                city
-                postcode
-                operating_hours {
-                    day
-                    status
-                    time {
-                        opening_time
-                        closing_time
-                    }
-                }
-            }
-            description
-            country
-            image
-            thumbnail
-            city
-            region
-            group
-            group_id
-            url
-            email
-            name
-            sale
-            creation_time
-            page_layout
-            status
-            position
-            twitter_id
-            facebook_id
-            gplus_id
-            youtube_id
-            vimeo_id
-            instagram_id
-            pinterest_id
-            linkedin_id
-            tw_active
-            fb_active
-            gplus_active
-            vimeo_active
-            instagram_active
-            pinterest_active
-            linkedin_active
-            banner_pic
-            shop_url
-            url_key
-            logo_pic
-            verify_status
-            product_count
-            telephone
-            creation_time
-            update_time
-            country_id
-            total_sold
-            operating_time
-            order_processing_time
-            shipping_partners
-            offers
-            benefits
-            product_shipping_info
-            prepare_time
-            response_ratio
-            response_time
-            store_id
-            seller_rates {
-                total_count
-                page_info {
-                    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
-                }
-            }
-            products {
-                total_count
-                page_info {
-                    page_size
-                    current_page
-                }
-                items {
-                    id
-                    name
-                }
-            }
-        }
-    }
-`;
-
-export default {
-    getStoreConfigData: GET_STORE_CONFIG_DATA,
-    getSellerDetailQuery: GET_SELLER_DETAIL_QUERY
-};
+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
+            product_url_suffix
+        }
+    }
+`;
+
+export const GET_SELLER_DETAIL_QUERY = gql`
+    query getSellerDetailForSellerPage($urlKey: String!) {
+        sellerByUrl(seller_url: $urlKey) {
+            seller_id
+            contact_number
+            shop_title
+            company
+            term_and_conditions
+            website_url
+            ship_to
+            ship_to_country
+            operating_hours {
+                day
+                time {
+                    opening_time
+                    closing_time
+                }
+            }
+            description
+            address
+            country
+            image
+            thumbnail
+            city
+            region
+            group
+            group_id
+            url
+            customer_id
+            email
+            name
+            sale
+            commission_id
+            page_layout
+            status
+            position
+            twitter_id
+            facebook_id
+            gplus_id
+            youtube_id
+            vimeo_id
+            instagram_id
+            pinterest_id
+            linkedin_id
+            tw_active
+            fb_active
+            gplus_active
+            vimeo_active
+            instagram_active
+            pinterest_active
+            linkedin_active
+            banner_pic
+            shop_url
+            url_key
+            logo_pic
+            verify_status
+            product_count
+            telephone
+            creation_time
+            update_time
+            country_id
+            total_sold
+            operating_time
+            order_processing_time
+            shipping_partners
+            offers
+            benefits
+            product_shipping_info
+            prepare_time
+            response_ratio
+            response_time
+            store_id
+            seller_rates {
+                total_count
+                page_info {
+                    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
+                }
+            }
+            products {
+                total_count
+                page_info {
+                    page_size
+                    current_page
+                }
+                items {
+                    id
+                    name
+                }
+            }
+        }
+    }
+`;
+
+export default {
+    getStoreConfigData: GET_STORE_CONFIG_DATA,
+    getSellerDetailQuery: GET_SELLER_DETAIL_QUERY
+};

package/src/talons/Seller/useSeller.js

@@ -1,71 +1,66 @@
-import { useQuery } from '@apollo/client';
-import { useEffect, useMemo } from 'react';
-import { useLocation } from 'react-router-dom';
-import { useAppContext } from '@magento/peregrine/lib/context/app';
-
-import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
-import DEFAULT_OPERATIONS from './seller.gql';
-
-export const useSeller = props => {
-    const { mapSeller } = props;
-
-    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
-    const { getStoreConfigData, getSellerDetailQuery } = operations;
-    const { pathname } = useLocation();
-    const [
-        ,
-        {
-            actions: { setPageLoading }
-        }
-    ] = useAppContext();
-
-    const { data: storeConfigData } = useQuery(getStoreConfigData, {
-        fetchPolicy: 'cache-and-network',
-        nextFetchPolicy: 'cache-first'
-    });
-
-    const slug = pathname.split('/').pop();
-    const productUrlSuffix = storeConfigData?.storeConfig?.product_url_suffix;
-    const urlKey = productUrlSuffix ? slug.replace(productUrlSuffix, '') : slug;
-
-    const getOtherInfo = true;
-    const getProducts = true;
-
-    const { error, loading, data } = useQuery(getSellerDetailQuery, {
-        fetchPolicy: 'cache-and-network',
-        nextFetchPolicy: 'cache-first',
-        skip: !storeConfigData,
-        variables: {
-            urlKey,
-            getOtherInfo,
-            getProducts
-        }
-    });
-
-    const isBackgroundLoading = !!data && loading;
-
-    const seller = useMemo(() => {
-        if (!data) {
-            return null;
-        }
-        
-        const seller = data.sellerByUrl;
-
-        if (!seller) {
-            return null;
-        }
-
-        return mapSeller(seller);
-    }, [data, mapSeller, urlKey]);
-
-    // Update the page indicator if the GraphQL query is in flight.
-    useEffect(() => {
-        setPageLoading(isBackgroundLoading);
-    }, [isBackgroundLoading, setPageLoading]);
-
-    return {
-        error,
-        loading,
-        seller
-    };
-};
+import { useQuery } from '@apollo/client';
+import { useEffect, useMemo } from 'react';
+import { useLocation } from 'react-router-dom';
+import { useAppContext } from '@magento/peregrine/lib/context/app';
+
+import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
+import DEFAULT_OPERATIONS from './seller.gql';
+
+export const useSeller = props => {
+    const { mapSeller } = props;
+
+    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
+    const { getStoreConfigData, getSellerDetailQuery } = operations;
+    const { pathname } = useLocation();
+    const [
+        ,
+        {
+            actions: { setPageLoading }
+        }
+    ] = useAppContext();
+
+    const { data: storeConfigData } = useQuery(getStoreConfigData, {
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first'
+    });
+
+    const slug = pathname.split('/').pop();
+    const productUrlSuffix = storeConfigData?.storeConfig?.product_url_suffix;
+    const urlKey = productUrlSuffix ? slug.replace(productUrlSuffix, '') : slug;
+
+    const { error, loading, data } = useQuery(getSellerDetailQuery, {
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first',
+        skip: !storeConfigData,
+        variables: {
+            urlKey
+        }
+    });
+
+    const isBackgroundLoading = !!data && loading;
+
+    const seller = useMemo(() => {
+        if (!data) {
+            return null;
+        }
+        
+        const seller = data.sellerByUrl;
+
+        if (!seller) {
+            return null;
+        }
+
+        return mapSeller(seller);
+    }, [data, mapSeller, urlKey]);
+
+    // Update the page indicator if the GraphQL query is in flight.
+    useEffect(() => {
+        setPageLoading(isBackgroundLoading);
+    }, [isBackgroundLoading, setPageLoading]);
+
+    return {
+        error,
+        loading,
+        seller
+    };
+};