@riosst100/pwa-marketplace 1.2.5 → 1.2.7

package/src/talons/SellerAccountPage/useSellerAccountPage.js

@@ -1,174 +1,174 @@
-import { useCallback, useMemo, useState } from 'react';
-import { useMutation, useQuery } from '@apollo/client';
-import { useUserContext } from '@magento/peregrine/lib/context/user';
-import { useGoogleReCaptcha } from '@magento/peregrine/lib/hooks/useGoogleReCaptcha';
-import { useEventingContext } from '@magento/peregrine/lib/context/eventing';
-
-export const useSellerAccountPage = props => {
-    const {
-        mutations: {
-            setCustomerInformationMutation,
-            changeCustomerPasswordMutation
-        },
-        queries: { getCustomerInformationQuery }
-    } = props;
-
-    const [{ isSignedIn }] = useUserContext();
-    const [shouldShowNewPassword, setShouldShowNewPassword] = useState(false);
-
-    const [isUpdateMode, setIsUpdateMode] = useState(false);
-
-    const [, { dispatch }] = useEventingContext();
-
-    // Use local state to determine whether to display errors or not.
-    // Could be replaced by a "reset mutation" function from apollo client.
-    // https://github.com/apollographql/apollo-feature-requests/issues/170
-    const [displayError, setDisplayError] = useState(false);
-
-    const { data: accountInformationData, error: loadDataError } = useQuery(
-        getCustomerInformationQuery,
-        {
-            skip: !isSignedIn,
-            fetchPolicy: 'cache-and-network',
-            nextFetchPolicy: 'cache-first'
-        }
-    );
-
-    const [
-        setCustomerInformation,
-        {
-            error: customerInformationUpdateError,
-            loading: isUpdatingCustomerInformation
-        }
-    ] = useMutation(setCustomerInformationMutation);
-
-    const [
-        changeCustomerPassword,
-        {
-            error: customerPasswordChangeError,
-            loading: isChangingCustomerPassword
-        }
-    ] = useMutation(changeCustomerPasswordMutation);
-
-    const {
-        generateReCaptchaData,
-        recaptchaLoading,
-        recaptchaWidgetProps
-    } = useGoogleReCaptcha({
-        currentForm: 'CUSTOMER_EDIT',
-        formAction: 'editCustomer'
-    });
-
-    const initialValues = useMemo(() => {
-        if (accountInformationData) {
-            return { customer: accountInformationData.customer };
-        }
-    }, [accountInformationData]);
-
-    const handleChangePassword = useCallback(() => {
-        setShouldShowNewPassword(true);
-    }, [setShouldShowNewPassword]);
-
-    const handleCancel = useCallback(() => {
-        setIsUpdateMode(false);
-        setShouldShowNewPassword(false);
-    }, [setIsUpdateMode]);
-
-    const showUpdateMode = useCallback(() => {
-        setIsUpdateMode(true);
-
-        // If there were errors from removing/updating info, hide them
-        // when we open the modal.
-        setDisplayError(false);
-    }, [setIsUpdateMode]);
-
-    const handleSubmit = useCallback(
-        async ({ email, firstname, lastname, password, newPassword }) => {
-            try {
-                email = email.trim();
-                firstname = firstname.trim();
-                lastname = lastname.trim();
-                password = password.trim();
-                newPassword = newPassword ? newPassword.trim() : newPassword;
-
-                if (
-                    initialValues.customer.email !== email ||
-                    initialValues.customer.firstname !== firstname ||
-                    initialValues.customer.lastname !== lastname
-                ) {
-                    await setCustomerInformation({
-                        variables: {
-                            customerInput: {
-                                email,
-                                firstname,
-                                lastname,
-                                // You must send password because it is required
-                                // when changing email.
-                                password
-                            }
-                        }
-                    });
-                }
-                if (password && newPassword) {
-                    const recaptchaDataForChangeCustomerPassword = await generateReCaptchaData();
-                    await changeCustomerPassword({
-                        variables: {
-                            currentPassword: password,
-                            newPassword: newPassword
-                        },
-                        ...recaptchaDataForChangeCustomerPassword
-                    });
-                }
-
-                dispatch({
-                    type: 'USER_ACCOUNT_UPDATE',
-                    payload: {
-                        email,
-                        firstName: firstname,
-                        lastName: lastname
-                    }
-                });
-
-                // After submission, close the form if there were no errors.
-                handleCancel(false);
-            } catch {
-                // Make sure any errors from the mutation are displayed.
-                setDisplayError(true);
-
-                // we have an onError link that logs errors, and FormError
-                // already renders this error, so just return to avoid
-                // triggering the success callback
-                return;
-            }
-        },
-        [
-            initialValues,
-            handleCancel,
-            setCustomerInformation,
-            generateReCaptchaData,
-            changeCustomerPassword,
-            dispatch
-        ]
-    );
-
-    const errors = displayError
-        ? [customerInformationUpdateError, customerPasswordChangeError]
-        : [];
-
-    return {
-        handleCancel,
-        formErrors: errors,
-        handleSubmit,
-        handleChangePassword,
-        initialValues,
-        isDisabled:
-            isUpdatingCustomerInformation ||
-            isChangingCustomerPassword ||
-            recaptchaLoading,
-        isUpdateMode,
-        loadDataError,
-        shouldShowNewPassword,
-        showUpdateMode,
-        recaptchaWidgetProps
-    };
-};
+import { useCallback, useMemo, useState } from 'react';
+import { useMutation, useQuery } from '@apollo/client';
+import { useUserContext } from '@magento/peregrine/lib/context/user';
+import { useGoogleReCaptcha } from '@magento/peregrine/lib/hooks/useGoogleReCaptcha';
+import { useEventingContext } from '@magento/peregrine/lib/context/eventing';
+
+export const useSellerAccountPage = props => {
+    const {
+        mutations: {
+            setCustomerInformationMutation,
+            changeCustomerPasswordMutation
+        },
+        queries: { getCustomerInformationQuery }
+    } = props;
+
+    const [{ isSignedIn }] = useUserContext();
+    const [shouldShowNewPassword, setShouldShowNewPassword] = useState(false);
+
+    const [isUpdateMode, setIsUpdateMode] = useState(false);
+
+    const [, { dispatch }] = useEventingContext();
+
+    // Use local state to determine whether to display errors or not.
+    // Could be replaced by a "reset mutation" function from apollo client.
+    // https://github.com/apollographql/apollo-feature-requests/issues/170
+    const [displayError, setDisplayError] = useState(false);
+
+    const { data: accountInformationData, error: loadDataError } = useQuery(
+        getCustomerInformationQuery,
+        {
+            skip: !isSignedIn,
+            fetchPolicy: 'cache-and-network',
+            nextFetchPolicy: 'cache-first'
+        }
+    );
+
+    const [
+        setCustomerInformation,
+        {
+            error: customerInformationUpdateError,
+            loading: isUpdatingCustomerInformation
+        }
+    ] = useMutation(setCustomerInformationMutation);
+
+    const [
+        changeCustomerPassword,
+        {
+            error: customerPasswordChangeError,
+            loading: isChangingCustomerPassword
+        }
+    ] = useMutation(changeCustomerPasswordMutation);
+
+    const {
+        generateReCaptchaData,
+        recaptchaLoading,
+        recaptchaWidgetProps
+    } = useGoogleReCaptcha({
+        currentForm: 'CUSTOMER_EDIT',
+        formAction: 'editCustomer'
+    });
+
+    const initialValues = useMemo(() => {
+        if (accountInformationData) {
+            return { customer: accountInformationData.customer };
+        }
+    }, [accountInformationData]);
+
+    const handleChangePassword = useCallback(() => {
+        setShouldShowNewPassword(true);
+    }, [setShouldShowNewPassword]);
+
+    const handleCancel = useCallback(() => {
+        setIsUpdateMode(false);
+        setShouldShowNewPassword(false);
+    }, [setIsUpdateMode]);
+
+    const showUpdateMode = useCallback(() => {
+        setIsUpdateMode(true);
+
+        // If there were errors from removing/updating info, hide them
+        // when we open the modal.
+        setDisplayError(false);
+    }, [setIsUpdateMode]);
+
+    const handleSubmit = useCallback(
+        async ({ email, firstname, lastname, password, newPassword }) => {
+            try {
+                email = email.trim();
+                firstname = firstname.trim();
+                lastname = lastname.trim();
+                password = password.trim();
+                newPassword = newPassword ? newPassword.trim() : newPassword;
+
+                if (
+                    initialValues.customer.email !== email ||
+                    initialValues.customer.firstname !== firstname ||
+                    initialValues.customer.lastname !== lastname
+                ) {
+                    await setCustomerInformation({
+                        variables: {
+                            customerInput: {
+                                email,
+                                firstname,
+                                lastname,
+                                // You must send password because it is required
+                                // when changing email.
+                                password
+                            }
+                        }
+                    });
+                }
+                if (password && newPassword) {
+                    const recaptchaDataForChangeCustomerPassword = await generateReCaptchaData();
+                    await changeCustomerPassword({
+                        variables: {
+                            currentPassword: password,
+                            newPassword: newPassword
+                        },
+                        ...recaptchaDataForChangeCustomerPassword
+                    });
+                }
+
+                dispatch({
+                    type: 'USER_ACCOUNT_UPDATE',
+                    payload: {
+                        email,
+                        firstName: firstname,
+                        lastName: lastname
+                    }
+                });
+
+                // After submission, close the form if there were no errors.
+                handleCancel(false);
+            } catch {
+                // Make sure any errors from the mutation are displayed.
+                setDisplayError(true);
+
+                // we have an onError link that logs errors, and FormError
+                // already renders this error, so just return to avoid
+                // triggering the success callback
+                return;
+            }
+        },
+        [
+            initialValues,
+            handleCancel,
+            setCustomerInformation,
+            generateReCaptchaData,
+            changeCustomerPassword,
+            dispatch
+        ]
+    );
+
+    const errors = displayError
+        ? [customerInformationUpdateError, customerPasswordChangeError]
+        : [];
+
+    return {
+        handleCancel,
+        formErrors: errors,
+        handleSubmit,
+        handleChangePassword,
+        initialValues,
+        isDisabled:
+            isUpdatingCustomerInformation ||
+            isChangingCustomerPassword ||
+            recaptchaLoading,
+        isUpdateMode,
+        loadDataError,
+        shouldShowNewPassword,
+        showUpdateMode,
+        recaptchaWidgetProps
+    };
+};

package/src/talons/SellerCountry/useSellerCountry.js

@@ -1,25 +1,25 @@
-import { useQuery } from '@apollo/client';
-
-export const useSellerCountry = props => {
-    const {
-        queries: { getSellerCountriesQuery }
-    } = props;
-
-    const { data, error, loading } = useQuery(getSellerCountriesQuery);
-
-    let formattedCountriesData = [{ label: 'Loading Countries...', value: '' }];
-    if (!loading && !error) {
-        const { sellerCountries } = data;
-        formattedCountriesData = sellerCountries.map(country => ({
-            // If a country is missing the full english name just show the abbreviation.
-            label: country.full_name_english || country.two_letter_abbreviation,
-            value: country.two_letter_abbreviation
-        }));
-        formattedCountriesData.sort((a, b) => (a.label < b.label ? -1 : 1));
-    }
-
-    return {
-        countries: formattedCountriesData,
-        loading
-    };
-};
+import { useQuery } from '@apollo/client';
+
+export const useSellerCountry = props => {
+    const {
+        queries: { getSellerCountriesQuery }
+    } = props;
+
+    const { data, error, loading } = useQuery(getSellerCountriesQuery);
+
+    let formattedCountriesData = [{ label: 'Loading Countries...', value: '' }];
+    if (!loading && !error) {
+        const { sellerCountries } = data;
+        formattedCountriesData = sellerCountries.map(country => ({
+            // If a country is missing the full english name just show the abbreviation.
+            label: country.full_name_english || country.two_letter_abbreviation,
+            value: country.two_letter_abbreviation
+        }));
+        formattedCountriesData.sort((a, b) => (a.label < b.label ? -1 : 1));
+    }
+
+    return {
+        countries: formattedCountriesData,
+        loading
+    };
+};

package/src/talons/WebsiteByIp/getWebsiteByIp.gql.js

@@ -1,14 +1,14 @@
-import gql from 'graphql-tag';
-
-export const GET_WEBSITE_BY_IP = gql`
-    query getWebsiteByUserIp (
-        $ip_address: String
-    ) {
-        getWebsiteByUserIp(ip_address: $ip_address) {
-            store_code
-            website_code
-            website_name
-            is_suggested
-        }
-    }
+import gql from 'graphql-tag';
+
+export const GET_WEBSITE_BY_IP = gql`
+    query getWebsiteByUserIp (
+        $ip_address: String
+    ) {
+        getWebsiteByUserIp(ip_address: $ip_address) {
+            store_code
+            website_code
+            website_name
+            is_suggested
+        }
+    }
 `;

package/src/talons/WebsiteByIp/useWebsiteByIp.js

@@ -1,34 +1,34 @@
-import { useState, useMemo, useEffect } from 'react';
-import axios from 'axios';
-
-export const useWebsiteByIp = websiteCodeInUrl => {
-    const [websiteByUserIpData, setWebsiteByUserIpData] = useState(null);
-
-    useEffect(() => {
-        if (!websiteCodeInUrl) {
-            const fetchData = async () => {
-                axios.get('https://extreme-ip-lookup.com/json/?key=NqwiAPsYZXoA3jwsnP7B').then((response) => {
-                    let data = response.data;
-                    if (data) {
-                        setWebsiteByUserIpData(data)
-                    }
-                }).catch((error) => {
-                });
-            };
-        
-            fetchData();
-        }
-    }, [websiteCodeInUrl]);
-
-    const getWebsiteByUserIp = useMemo(() => {
-        if (websiteByUserIpData) {
-            return websiteByUserIpData;
-        } else {
-            return null;
-        }
-    }, [websiteByUserIpData]);
-
-    return {
-        getWebsiteByUserIp
-    };
-};
+import { useState, useMemo, useEffect } from 'react';
+import axios from 'axios';
+
+export const useWebsiteByIp = websiteCodeInUrl => {
+    const [websiteByUserIpData, setWebsiteByUserIpData] = useState(null);
+
+    useEffect(() => {
+        if (!websiteCodeInUrl) {
+            const fetchData = async () => {
+                axios.get('https://extreme-ip-lookup.com/json/?key=NqwiAPsYZXoA3jwsnP7B').then((response) => {
+                    let data = response.data;
+                    if (data) {
+                        setWebsiteByUserIpData(data)
+                    }
+                }).catch((error) => {
+                });
+            };
+        
+            fetchData();
+        }
+    }, [websiteCodeInUrl]);
+
+    const getWebsiteByUserIp = useMemo(() => {
+        if (websiteByUserIpData) {
+            return websiteByUserIpData;
+        } else {
+            return null;
+        }
+    }, [websiteByUserIpData]);
+
+    return {
+        getWebsiteByUserIp
+    };
+};