@jetshop/core 5.17.0-alpha.094a1dcb → 5.17.0-alpha.09f10c62
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/redirectUtils.d.ts +1 -1
- package/ChannelHandler/redirectUtils.test.js +5 -5
- package/ChannelHandler/redirectUtilsGroupedChannels.test.js +5 -5
- package/boot/NetworkStatusNotifier.d.ts +2 -0
- package/boot/NetworkStatusNotifier.js +4 -0
- package/boot/NetworkStatusNotifier.js.map +1 -0
- package/boot/SharedTree.d.ts +1 -1
- package/boot/SharedTree.js +1 -1
- package/boot/SharedTree.js.map +1 -1
- package/boot/apollo.d.ts +1 -2
- package/boot/apollo.js +14 -9
- package/boot/apollo.js.map +1 -1
- package/boot/client/startClient.js +14 -5
- package/boot/client/startClient.js.map +1 -1
- package/boot/server/IntervalQuery.d.ts +1 -1
- package/boot/server/IntervalQuery.js +2 -2
- package/boot/server/IntervalQuery.js.map +1 -1
- package/boot/server/IntervalQuery.test.js +9 -13
- package/boot/server/PersistedApolloClient.test.js +8 -7
- package/boot/server/createApolloServer.d.ts +2 -1
- package/boot/server/createApolloServer.js +5 -5
- package/boot/server/createApolloServer.js.map +1 -1
- package/boot/server/createRenderer.js +4 -2
- package/boot/server/createRenderer.js.map +1 -1
- package/boot/server/entrypoint.js +7 -4
- package/boot/server/entrypoint.js.map +1 -1
- package/boot/server/persistedQueries/__tests__/getPersistedQueriesForRequest.test.js +1 -1
- package/boot/utils/queryLoggingMiddleware.d.ts +1 -1
- package/boot/utils/queryLoggingMiddleware.js +2 -2
- package/boot/utils/queryLoggingMiddleware.js.map +1 -1
- package/cart/AddToCartFormik.d.ts +2 -2
- package/cart/AddToCartFormik.js +2 -2
- package/cart/AddToCartFormik.js.map +1 -1
- package/cart/useAddToCart.d.ts +1 -1
- package/components/Auth/ForgotPasswordProvider.d.ts +4 -6
- package/components/Auth/ForgotPasswordProvider.js +18 -18
- package/components/Auth/ForgotPasswordProvider.js.map +1 -1
- package/components/Auth/ResetPasswordProvider.d.ts +5 -3
- package/components/Auth/ResetPasswordProvider.js +1 -1
- package/components/Auth/ResetPasswordProvider.js.map +1 -1
- package/components/Auth/SSN.js +4 -4
- package/components/Auth/SSN.js.map +1 -1
- package/components/Auth/SignupFormContainer.d.ts +2 -5
- package/components/Auth/SignupFormContainer.js.map +1 -1
- package/components/Auth/UpdatePasswordForm.js +6 -6
- package/components/Auth/UpdatePasswordForm.js.map +1 -1
- package/components/Auth/signup-context.d.ts +2 -2
- package/components/Auth/signup-context.js +2 -3
- package/components/Auth/signup-context.js.map +1 -1
- package/components/Auth/signupSubmit.js +4 -4
- package/components/Auth/signupSubmit.js.map +1 -1
- package/components/Auth/useAddressFields.js +3 -3
- package/components/Auth/useAddressFields.js.map +1 -1
- package/components/Auth/useAddressFields.test.js +10 -8
- package/components/Auth/useCustomer.d.ts +2 -2
- package/components/Auth/useCustomer.js +1 -1
- package/components/Auth/useCustomer.js.map +1 -1
- package/components/AuthContext/AuthProvider.js +2 -2
- package/components/AuthContext/AuthProvider.js.map +1 -1
- package/components/AuthContext/AuthProvider.test.js +1 -1
- package/components/AuthContext/LogOut.d.ts +2 -2
- package/components/ChannelContext/ChannelProvider.d.ts +1 -1
- package/components/ChannelContext/useCountrySettings.d.ts +1 -1
- package/components/ChannelContext/useCountrySettings.js +1 -1
- package/components/ChannelContext/useCountrySettings.js.map +1 -1
- package/components/DynamicRoute/ActiveFiltersQuery.gql +4 -4
- package/components/DynamicRoute/CategoryRoute.d.ts +3 -3
- package/components/DynamicRoute/CategoryRoute.js +6 -3
- package/components/DynamicRoute/CategoryRoute.js.map +1 -1
- package/components/DynamicRoute/ContentRoute.d.ts +1 -1
- package/components/DynamicRoute/GenericError.d.ts +18 -0
- package/components/DynamicRoute/GenericError.js +61 -0
- package/components/DynamicRoute/GenericError.js.map +1 -0
- package/components/DynamicRoute/PreviewRoute.d.ts +1 -1
- package/components/DynamicRoute/PreviewRoute.js +1 -1
- package/components/DynamicRoute/PreviewRoute.js.map +1 -1
- package/components/DynamicRoute/ProductByArticlenumber.d.ts +2 -2
- package/components/DynamicRoute/ProductByArticlenumber.js +2 -2
- package/components/DynamicRoute/ProductByArticlenumber.js.map +1 -1
- package/components/DynamicRoute/ProductRoute.d.ts +3 -3
- package/components/DynamicRoute/RouteResolver.d.ts +2 -2
- package/components/DynamicRoute/RouteResolver.js +1 -1
- package/components/DynamicRoute/RouteResolver.js.map +1 -1
- package/components/DynamicRoute/Status.d.ts +4 -3
- package/components/DynamicRoute/Status.js.map +1 -1
- package/components/DynamicRoute/index.d.ts +4 -4
- package/components/DynamicRoute/index.js +48 -42
- package/components/DynamicRoute/index.js.map +1 -1
- package/components/Filters/utils/replaceInSearch.d.ts +1 -1
- package/components/Filters/utils/replaceInSearch.js.map +1 -1
- package/components/Mutation/AddToCartFormik.d.ts +1 -1
- package/components/Mutation/AddToCartFormik.js +2 -2
- package/components/Mutation/AddToCartFormik.js.map +1 -1
- package/components/Mutation/DecrementQuantity.d.ts +2 -2
- package/components/Mutation/DecrementQuantity.js +1 -1
- package/components/Mutation/DecrementQuantity.js.map +1 -1
- package/components/Mutation/IncrementQuantity.d.ts +2 -2
- package/components/Mutation/IncrementQuantity.js +1 -1
- package/components/Mutation/IncrementQuantity.js.map +1 -1
- package/components/Mutation/RemoveFromCart.d.ts +2 -2
- package/components/Mutation/RemoveFromCart.js +1 -1
- package/components/Mutation/RemoveFromCart.js.map +1 -1
- package/components/Mutation/SetQuantity.d.ts +2 -2
- package/components/Mutation/SetQuantity.js +1 -1
- package/components/Mutation/SetQuantity.js.map +1 -1
- package/components/Mutation/SubscribeToNewsletter.d.ts +1 -1
- package/components/Mutation/SubscribeToNewsletter.js +1 -1
- package/components/Mutation/SubscribeToNewsletter.js.map +1 -1
- package/components/Mutation/SubscribeToStockNotifications.d.ts +1 -1
- package/components/Mutation/SubscribeToStockNotifications.js +6 -2
- package/components/Mutation/SubscribeToStockNotifications.js.map +1 -1
- package/components/Mutation/cartMutationUtils.d.ts +1 -2
- package/components/Mutation/cartMutationUtils.js.map +1 -1
- package/components/Mutation/useDecrementQuantity.d.ts +1 -1
- package/components/Mutation/useDecrementQuantity.js +1 -1
- package/components/Mutation/useDecrementQuantity.js.map +1 -1
- package/components/Mutation/useIncrementQuantity.d.ts +1 -1
- package/components/Mutation/useIncrementQuantity.js +1 -1
- package/components/Mutation/useIncrementQuantity.js.map +1 -1
- package/components/Mutation/useRemoveFromCart.d.ts +1 -1
- package/components/Mutation/useRemoveFromCart.js +1 -1
- package/components/Mutation/useRemoveFromCart.js.map +1 -1
- package/components/Mutation/useSetQuantity.d.ts +1 -1
- package/components/Mutation/useSetQuantity.js +1 -1
- package/components/Mutation/useSetQuantity.js.map +1 -1
- package/components/Notifications/Notifications.d.ts +3 -3
- package/components/Notifications/Notifications.js +2 -3
- package/components/Notifications/Notifications.js.map +1 -1
- package/components/ProductConfigurationProvider/ProductConfigurationProvider.js +6 -6
- package/components/ProductConfigurationProvider/ProductConfigurationProvider.js.map +1 -1
- package/components/Query/CartProvider.d.ts +1 -1
- package/components/Query/CartProvider.js +1 -1
- package/components/Query/CartProvider.js.map +1 -1
- package/components/SortOrder/SortOrderContainer.d.ts +1 -1
- package/components/StructuredData/StructuredBreadcrumbData.d.ts +2 -2
- package/data/cache.d.ts +1 -1
- package/data/cache.js +69 -12
- package/data/cache.js.map +1 -1
- package/data/fragments/StockStatusFragment.gql +0 -1
- package/global.d.ts +55 -1
- package/helpers/getErrorDetail.d.ts +1 -1
- package/helpers/getErrorDetail.js +2 -2
- package/helpers/getErrorDetail.js.map +1 -1
- package/hooks/Filters/useBooleanFilter.d.ts +1 -1
- package/hooks/Filters/useBooleanFilter.js +1 -2
- package/hooks/Filters/useBooleanFilter.js.map +1 -1
- package/hooks/Filters/useFilters.d.ts +1 -1
- package/hooks/Filters/useFilters.js +1 -2
- package/hooks/Filters/useFilters.js.map +1 -1
- package/hooks/Filters/useListFilter.d.ts +2 -2
- package/hooks/Filters/useListFilter.js +1 -2
- package/hooks/Filters/useListFilter.js.map +1 -1
- package/hooks/Filters/useMultiFilter.d.ts +3 -3
- package/hooks/Filters/useMultiFilter.js +1 -2
- package/hooks/Filters/useMultiFilter.js.map +1 -1
- package/hooks/Filters/useRangeFilter.d.ts +2 -2
- package/hooks/Filters/useRangeFilter.js +1 -2
- package/hooks/Filters/useRangeFilter.js.map +1 -1
- package/hooks/Filters/useSortOrder.d.ts +6 -1
- package/hooks/Filters/useSortOrder.js +4 -3
- package/hooks/Filters/useSortOrder.js.map +1 -1
- package/hooks/PackageProducts/usePackageProductItem.d.ts +1 -1
- package/hooks/PackageProducts/usePackageProductItem.js +1 -1
- package/hooks/PackageProducts/usePackageProductItem.js.map +1 -1
- package/hooks/PackageProducts/usePackageProducts.js +17 -17
- package/hooks/PackageProducts/usePackageProducts.js.map +1 -1
- package/hooks/PackageProducts/usePackageProducts.test.js +1 -1
- package/hooks/ProductList/ProductListContext.js +1 -1
- package/hooks/ProductList/ProductListContext.js.map +1 -1
- package/hooks/ProductList/action-creators.d.ts +1 -1
- package/hooks/ProductList/index.d.ts +1 -1
- package/hooks/ProductList/list-transforms.js +1 -1
- package/hooks/ProductList/list-transforms.js.map +1 -1
- package/hooks/ProductList/product-list-reducer.js +1 -1
- package/hooks/ProductList/product-list-reducer.js.map +1 -1
- package/hooks/ProductList/useProductList.js +1 -1
- package/hooks/ProductList/useProductList.js.map +1 -1
- package/hooks/ProductList/useProductListItems.js +1 -1
- package/hooks/ProductList/useProductListItems.js.map +1 -1
- package/hooks/Subscriptions/useNewsletterSubscription.js +3 -3
- package/hooks/Subscriptions/useNewsletterSubscription.js.map +1 -1
- package/hooks/Subscriptions/useStockNotifications.d.ts +1 -1
- package/hooks/Subscriptions/useStockNotifications.js +3 -3
- package/hooks/Subscriptions/useStockNotifications.js.map +1 -1
- package/hooks/Subscriptions/useStoreSubscriptions.d.ts +1 -1
- package/hooks/Subscriptions/useStoreSubscriptions.js +3 -6
- package/hooks/Subscriptions/useStoreSubscriptions.js.map +1 -1
- package/hooks/Subscriptions/useStoresubscriptions.test.js +5 -7
- package/hooks/useAddMultipleToCart.d.ts +1 -1
- package/hooks/useAddMultipleToCart.js +1 -1
- package/hooks/useAddMultipleToCart.js.map +1 -1
- package/hooks/useAddMultipleToCart.test.js +1 -1
- package/hooks/useCustomerOrders.test.js +7 -5
- package/hooks/useCustomerOrdersQuery.d.ts +2 -2
- package/hooks/useCustomerOrdersQuery.js +1 -1
- package/hooks/useCustomerOrdersQuery.js.map +1 -1
- package/hooks/useDeleteAccountMutation.js +3 -3
- package/hooks/useDeleteAccountMutation.js.map +1 -1
- package/hooks/useInfinitePagination.d.ts +1 -1
- package/hooks/useInfinitePagination.js +4 -1
- package/hooks/useInfinitePagination.js.map +1 -1
- package/hooks/useLoginMutation.d.ts +3 -3
- package/hooks/useLoginMutation.js +2 -2
- package/hooks/useLoginMutation.js.map +1 -1
- package/hooks/useLoginRedirect.js +2 -2
- package/hooks/useLoginRedirect.js.map +1 -1
- package/hooks/useOrderDetailQuery.d.ts +3 -3
- package/hooks/useOrderDetailQuery.js +1 -1
- package/hooks/useOrderDetailQuery.js.map +1 -1
- package/hooks/useRoutePreload.js +1 -1
- package/hooks/useRoutePreload.js.map +1 -1
- package/hooks/useStockStatus.d.ts +8 -0
- package/hooks/useStockStatus.js +26 -0
- package/hooks/useStockStatus.js.map +1 -0
- package/integrations/addwishSchemaExtension.js +3 -3
- package/integrations/addwishSchemaExtension.js.map +1 -1
- package/integrations/nostoSchemaExtension.js +2 -2
- package/integrations/nostoSchemaExtension.js.map +1 -1
- package/integrations/sluggishSchemaExtension.js +1 -1
- package/integrations/sluggishSchemaExtension.js.map +1 -1
- package/package.json +13 -29
- package/polyfills.js +0 -2
- package/polyfills.js.map +1 -1
- package/resolvers/filters/boolFilter.js +24 -27
- package/resolvers/filters/boolFilter.js.map +1 -1
- package/resolvers/filters/filterParams.js +8 -8
- package/resolvers/filters/filterParams.js.map +1 -1
- package/resolvers/filters/filters.js +5 -5
- package/resolvers/filters/filters.js.map +1 -1
- package/resolvers/filters/index.d.ts +0 -4
- package/resolvers/filters/listFilter.js +24 -29
- package/resolvers/filters/listFilter.js.map +1 -1
- package/resolvers/filters/listFilterItem.js +31 -36
- package/resolvers/filters/listFilterItem.js.map +1 -1
- package/resolvers/filters/multiListFilter.js +41 -42
- package/resolvers/filters/multiListFilter.js.map +1 -1
- package/resolvers/filters/multiListFilterList.js +1 -1
- package/resolvers/filters/multiListFilterList.js.map +1 -1
- package/resolvers/filters/rangeFilter.js +27 -43
- package/resolvers/filters/rangeFilter.js.map +1 -1
- package/test-utils/ProviderPyramid.js +1 -1
- package/types.d.ts +1820 -1955
- package/components/Fonts/GoogleFont.d.ts +0 -10
- package/components/Fonts/GoogleFont.js +0 -35
- package/components/Fonts/GoogleFont.js.map +0 -1
- package/components/Fonts/TypekitFont.d.ts +0 -16
- package/components/Fonts/TypekitFont.js +0 -25
- package/components/Fonts/TypekitFont.js.map +0 -1
package/cart/AddToCartFormik.js
CHANGED
@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
10
10
|
import React from 'react';
|
11
11
|
import { useAddToCart } from './useAddToCart';
|
12
12
|
import { FormikProvider } from 'formik';
|
13
|
-
import { useApolloClient, useMutation } from '@apollo/
|
13
|
+
import { useApolloClient, useMutation } from '@apollo/client';
|
14
14
|
import { addToCartError, addToCartSuccess, useTrackProductAdd } from '../components/Mutation/AddToCart/addToCartUtils';
|
15
|
-
import
|
15
|
+
import uniqueId from '@jetshop/core/helpers/uniqueId';
|
16
16
|
import { getAddToCartOptimisticResponse } from '../components/Mutation/cartMutationUtils';
|
17
17
|
import { useCartId } from '../components/Cart/CartIdContext';
|
18
18
|
export function AddToCartFormik({ product, variant, commentValidators = {}, getMissingOptions, initialValues,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AddToCartFormik.js","sourceRoot":"","sources":["AddToCartFormik.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAmB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAe,MAAM,QAAQ,CAAC;AAWrD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"AddToCartFormik.js","sourceRoot":"","sources":["AddToCartFormik.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAmB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAe,MAAM,QAAQ,CAAC;AAWrD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AA6C7D,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,OAAO,EACP,iBAAiB,GAAG,EAAE,EACtB,iBAAiB,EACjB,aAAa;AACb,wBAAwB;AACxB,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACT,YAAY;AACZ,4CAA4C;AAC5C,QAAQ,EACa;IACrB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,MAAM,CAAC,iBAAiB,CAAC,GAAG,WAAW,CAGrC,YAAY,EAAE;QACd,WAAW,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC;KAC3D,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAC1C,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE3D,SAAe,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,EAAmB;;YAC1D,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC;YAE9B,MAAM,eAAe,GAAG;gBACtB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,iBAAiB,EAAE,OAAO;gBAC1B,UAAU;aACX,CAAC;YAEF,IAAI,eAAe,EAAE;gBACnB,eAAe,CAAC,eAAe,CAAC,CAAC;aAClC;YAED,OAAO,iBAAiB,CAAC;gBACvB,SAAS,EAAE;oBACT,KAAK;iBACN;gBACD,kBAAkB,EAAE;oBAClB,SAAS,EAAE;wBACT,IAAI,EAAE,8BAA8B,CAClC,UAAU,CAAC,OAAO,EAClB,KAAK,CAAC,QAAQ,EACd,MAAM,EACN,MAAM,EACN,SAAS,CACV;wBACD,UAAU,EAAE,cAAc;qBAC3B;iBACF;aACF,CAAC;iBACC,IAAI,CACH,gBAAgB,CAAC;gBACf,kBAAkB;gBAClB,eAAe;gBACf,MAAM;gBACN,SAAS;aACV,CAAC,CACH;iBACA,KAAK,CACJ,cAAc,CAAC;gBACb,gBAAgB;gBAChB,eAAe;aAChB,CAAC,CACH,CAAC;QACN,CAAC;KAAA;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC;QAC5B,OAAO;QACP,OAAO;QACP,iBAAiB;QACjB,iBAAiB;QACjB,aAAa;QACb,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,oBAAC,cAAc,IAAC,KAAK,EAAE,IAAI,IAAG,QAAQ,CAAC,IAAI,CAAC,CAAkB,CAAC;AACxE,CAAC;AAED,eAAe,eAAe,CAAC"}
|
package/cart/useAddToCart.d.ts
CHANGED
@@ -70,7 +70,7 @@ export declare function useAddToCart({ product, variant, submit, commentValidato
|
|
70
70
|
dirty: boolean;
|
71
71
|
unregisterField: (name: string) => void;
|
72
72
|
registerField: (name: string, { validate }: any) => void;
|
73
|
-
getFieldProps: (nameOrOptions: any) => import("formik").FieldInputProps<any>;
|
73
|
+
getFieldProps: (nameOrOptions: string | import("formik").FieldConfig<any>) => import("formik").FieldInputProps<any>;
|
74
74
|
getFieldMeta: (name: string) => import("formik").FieldMetaProps<any>;
|
75
75
|
getFieldHelpers: (name: string) => import("formik").FieldHelperProps<any>;
|
76
76
|
validateOnBlur: boolean;
|
@@ -3,11 +3,8 @@ import { FormikProps } from 'formik';
|
|
3
3
|
import React from 'react';
|
4
4
|
type ForgotPasswordFormik = FormikProps<MutationRequestPasswordResetArgs>;
|
5
5
|
interface ForgotPasswordProps {
|
6
|
-
children
|
7
|
-
formik: ForgotPasswordFormik;
|
8
|
-
}): React.ReactChild;
|
6
|
+
children: any;
|
9
7
|
}
|
10
|
-
export declare function ForgotPasswordProvider(props: ForgotPasswordProps): JSX.Element;
|
11
8
|
export declare const ForgotPasswordContext: React.Context<{
|
12
9
|
formik: ForgotPasswordFormik;
|
13
10
|
}>;
|
@@ -29,7 +26,7 @@ export declare function useForgotPasswordData(): {
|
|
29
26
|
setSubmitting: (isSubmitting: boolean) => void;
|
30
27
|
setTouched: (touched: import("formik").FormikTouched<MutationRequestPasswordResetArgs>, shouldValidate?: boolean) => void;
|
31
28
|
setValues: (values: React.SetStateAction<MutationRequestPasswordResetArgs>, shouldValidate?: boolean) => void;
|
32
|
-
setFieldValue: (field: string, value: any, shouldValidate?: boolean) => void
|
29
|
+
setFieldValue: (field: string, value: any, shouldValidate?: boolean) => Promise<void | import("formik").FormikErrors<MutationRequestPasswordResetArgs>>;
|
33
30
|
setFieldError: (field: string, message: string) => void;
|
34
31
|
setFieldTouched: (field: string, isTouched?: boolean, shouldValidate?: boolean) => void;
|
35
32
|
validateForm: (values?: any) => Promise<import("formik").FormikErrors<MutationRequestPasswordResetArgs>>;
|
@@ -47,7 +44,7 @@ export declare function useForgotPasswordData(): {
|
|
47
44
|
(e: React.ChangeEvent<any>): void;
|
48
45
|
<T_1 = string | React.ChangeEvent<any>>(field: T_1): T_1 extends React.ChangeEvent<any> ? void : (e: string | React.ChangeEvent<any>) => void;
|
49
46
|
};
|
50
|
-
getFieldProps: <Value = any>(props:
|
47
|
+
getFieldProps: <Value = any>(props: string | import("formik").FieldConfig<Value>) => import("formik").FieldInputProps<Value>;
|
51
48
|
getFieldMeta: <Value_1>(name: string) => import("formik").FieldMetaProps<Value_1>;
|
52
49
|
getFieldHelpers: <Value_2 = any>(name: string) => import("formik").FieldHelperProps<Value_2>;
|
53
50
|
dirty: boolean;
|
@@ -68,4 +65,5 @@ export declare function useForgotPasswordData(): {
|
|
68
65
|
required: boolean;
|
69
66
|
};
|
70
67
|
};
|
68
|
+
export declare function ForgotPasswordProvider(props: ForgotPasswordProps): React.JSX.Element;
|
71
69
|
export {};
|
@@ -2,9 +2,24 @@ import { resetRequest } from '@jetshop/core/data/mutations/accountMutations.gql'
|
|
2
2
|
import t from '@jetshop/intl';
|
3
3
|
import { Form, Formik } from 'formik';
|
4
4
|
import React from 'react';
|
5
|
-
import { useMutation } from '@apollo/
|
5
|
+
import { useMutation } from '@apollo/client';
|
6
|
+
export const ForgotPasswordContext = React.createContext(undefined);
|
7
|
+
export function useForgotPasswordData() {
|
8
|
+
var _a, _b;
|
9
|
+
const { formik } = React.useContext(ForgotPasswordContext);
|
10
|
+
const submitted = (_a = formik === null || formik === void 0 ? void 0 : formik.status) === null || _a === void 0 ? void 0 : _a.success;
|
11
|
+
const globalError = (_b = formik === null || formik === void 0 ? void 0 : formik.status) === null || _b === void 0 ? void 0 : _b.globalError;
|
12
|
+
const emailInputProps = {
|
13
|
+
type: 'email',
|
14
|
+
name: 'email',
|
15
|
+
required: true
|
16
|
+
};
|
17
|
+
return Object.assign({ submitted,
|
18
|
+
globalError,
|
19
|
+
emailInputProps }, formik);
|
20
|
+
}
|
6
21
|
function validate(values) {
|
7
|
-
|
22
|
+
const errors = {};
|
8
23
|
if (!values.email) {
|
9
24
|
errors['email'] = t('This field is required');
|
10
25
|
}
|
@@ -15,7 +30,7 @@ function validate(values) {
|
|
15
30
|
}
|
16
31
|
function handleMutationError(actions) {
|
17
32
|
actions.setStatus({
|
18
|
-
globalError: t('Something went wrong. Please check your input, or try again later.')
|
33
|
+
globalError: t('Something went wrong. Please check your input, or try again later.')
|
19
34
|
});
|
20
35
|
actions.setSubmitting(false);
|
21
36
|
}
|
@@ -39,19 +54,4 @@ export function ForgotPasswordProvider(props) {
|
|
39
54
|
} }, (formik) => (React.createElement(Form, null,
|
40
55
|
React.createElement(ForgotPasswordContext.Provider, Object.assign({ value: { formik } }, props))))));
|
41
56
|
}
|
42
|
-
export const ForgotPasswordContext = React.createContext(undefined);
|
43
|
-
export function useForgotPasswordData() {
|
44
|
-
var _a, _b;
|
45
|
-
const { formik } = React.useContext(ForgotPasswordContext);
|
46
|
-
const submitted = (_a = formik === null || formik === void 0 ? void 0 : formik.status) === null || _a === void 0 ? void 0 : _a.success;
|
47
|
-
const globalError = (_b = formik === null || formik === void 0 ? void 0 : formik.status) === null || _b === void 0 ? void 0 : _b.globalError;
|
48
|
-
const emailInputProps = {
|
49
|
-
type: 'email',
|
50
|
-
name: 'email',
|
51
|
-
required: true,
|
52
|
-
};
|
53
|
-
return Object.assign({ submitted,
|
54
|
-
globalError,
|
55
|
-
emailInputProps }, formik);
|
56
|
-
}
|
57
57
|
//# sourceMappingURL=ForgotPasswordProvider.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ForgotPasswordProvider.js","sourceRoot":"","sources":["ForgotPasswordProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mDAAmD,CAAC;AAKjF,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAA8B,MAAM,QAAQ,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;
|
1
|
+
{"version":3,"file":"ForgotPasswordProvider.js","sourceRoot":"","sources":["ForgotPasswordProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mDAAmD,CAAC;AAKjF,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAA8B,MAAM,QAAQ,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAQ7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC,aAAa,CAErD,SAAS,CAAC,CAAC;AAEd,MAAM,UAAU,qBAAqB;;IACnC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAE3D,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,OAAO,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,WAAW,CAAC;IAEhD,MAAM,eAAe,GAAG;QACtB,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,uBACE,SAAS;QACT,WAAW;QACX,eAAe,IACZ,MAAM,EACT;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,MAAyB;IACzC,MAAM,MAAM,GAAuB,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;QACjB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,wBAAwB,CAAC,CAAC;KAC/C;IAED,IAAI,CAAC,2CAA2C,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACnE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,uBAAuB,CAAC,CAAC;KAC9C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAyC;IACpE,OAAO,CAAC,SAAS,CAAC;QAChB,WAAW,EAAE,CAAC,CACZ,oEAAoE,CACrE;KACF,CAAC,CAAC;IACH,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAA0B;IAC/D,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAEzB,YAAY,CAAC,CAAC;IAEjB,OAAO,CACL,oBAAC,MAAM,IACL,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAC5B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAC5B,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAE5B,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;iBAC3C,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,IAAI,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE;oBAC1C,OAAO,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;oBACrC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;iBAC9B;qBAAM;oBACL,mBAAmB,CAAC,OAAO,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;QACP,CAAC,IAEA,CAAC,MAAM,EAAE,EAAE,CAAC,CACX,oBAAC,IAAI;QACH,oBAAC,qBAAqB,CAAC,QAAQ,kBAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAM,KAAK,EAAI,CAC3D,CACR,CACM,CACV,CAAC;AACJ,CAAC"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
export declare const ResetPasswordProvider: React.ComponentClass<Pick<
|
2
|
+
export declare const ResetPasswordProvider: React.ComponentClass<Pick<any, string | number | symbol>, any> & import("react-router").WithRouterStatics<(props: any) => React.JSX.Element>;
|
3
3
|
export declare function useResetPasswordForm(): {
|
4
4
|
passwordInputProps: {
|
5
5
|
required: boolean;
|
@@ -38,7 +38,9 @@ export declare function useResetPasswordForm(): {
|
|
38
38
|
setValues: (values: React.SetStateAction<{
|
39
39
|
newPassword: string;
|
40
40
|
}>, shouldValidate?: boolean) => void;
|
41
|
-
setFieldValue: (field: string, value: any, shouldValidate?: boolean) => void
|
41
|
+
setFieldValue: (field: string, value: any, shouldValidate?: boolean) => Promise<void | import("formik").FormikErrors<{
|
42
|
+
newPassword: string;
|
43
|
+
}>>;
|
42
44
|
setFieldError: (field: string, message: string) => void;
|
43
45
|
setFieldTouched: (field: string, isTouched?: boolean, shouldValidate?: boolean) => void;
|
44
46
|
validateForm: (values?: any) => Promise<import("formik").FormikErrors<{
|
@@ -66,7 +68,7 @@ export declare function useResetPasswordForm(): {
|
|
66
68
|
(e: React.ChangeEvent<any>): void;
|
67
69
|
<T_1 = string | React.ChangeEvent<any>>(field: T_1): T_1 extends React.ChangeEvent<any> ? void : (e: string | React.ChangeEvent<any>) => void;
|
68
70
|
};
|
69
|
-
getFieldProps: <Value = any>(props:
|
71
|
+
getFieldProps: <Value = any>(props: string | import("formik").FieldConfig<Value>) => import("formik").FieldInputProps<Value>;
|
70
72
|
getFieldMeta: <Value_1>(name: string) => import("formik").FieldMetaProps<Value_1>;
|
71
73
|
getFieldHelpers: <Value_2 = any>(name: string) => import("formik").FieldHelperProps<Value_2>;
|
72
74
|
dirty: boolean;
|
@@ -2,7 +2,7 @@ import { resetPassword } from '@jetshop/core/data/mutations/accountMutations.gql
|
|
2
2
|
import t from '@jetshop/intl';
|
3
3
|
import { Form, Formik } from 'formik';
|
4
4
|
import React, { useContext } from 'react';
|
5
|
-
import { useMutation } from '@apollo/
|
5
|
+
import { useMutation } from '@apollo/client';
|
6
6
|
import { Redirect, withRouter } from 'react-router';
|
7
7
|
import getErrorDetail from '../../helpers/getErrorDetail';
|
8
8
|
import throwErrorInDev from '../../helpers/throwErrorInDev';
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ResetPasswordProvider.js","sourceRoot":"","sources":["ResetPasswordProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAClF,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AACnD,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"ResetPasswordProvider.js","sourceRoot":"","sources":["ResetPasswordProvider.tsx"],"names":[],"mappings":"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"}
|
package/components/Auth/SSN.js
CHANGED
@@ -2,12 +2,12 @@ import getErrorDetail from '@jetshop/core/helpers/getErrorDetail';
|
|
2
2
|
import t from '@jetshop/intl';
|
3
3
|
import { Formik } from 'formik';
|
4
4
|
import React, { useContext } from 'react';
|
5
|
-
import { ApolloConsumer } from '
|
5
|
+
import { ApolloConsumer } from '@apollo/client';
|
6
6
|
import { LookupDispatch } from './SSNLookupContainer';
|
7
7
|
import PersonLookupQuery from '@jetshop/core/data/queries/PersonLookupQuery.gql';
|
8
8
|
const SSNField = function SSNField(props) {
|
9
9
|
const dispatch = useContext(LookupDispatch);
|
10
|
-
return (React.createElement(ApolloConsumer, null, client => {
|
10
|
+
return (React.createElement(ApolloConsumer, null, (client) => {
|
11
11
|
return (React.createElement(Formik, { onSubmit: (values, formik) => {
|
12
12
|
client
|
13
13
|
.query({
|
@@ -20,7 +20,7 @@ const SSNField = function SSNField(props) {
|
|
20
20
|
formik.setSubmitting(false);
|
21
21
|
props.onSuccess();
|
22
22
|
dispatch({ type: 'set', payload: resp.data.personLookup });
|
23
|
-
}, error => {
|
23
|
+
}, (error) => {
|
24
24
|
const errorMessage = getErrorDetail(error).codes[0].includes('PersonLookupFailed')
|
25
25
|
? t('Person lookup failed.')
|
26
26
|
: t('Something went wrong, please try again!');
|
@@ -28,7 +28,7 @@ const SSNField = function SSNField(props) {
|
|
28
28
|
dispatch({ type: 'reset' });
|
29
29
|
formik.setErrors({ ssn: errorMessage });
|
30
30
|
});
|
31
|
-
}, initialValues: { ssn: '' } }, formik => props.children({ formik })));
|
31
|
+
}, initialValues: { ssn: '' } }, (formik) => props.children({ formik })));
|
32
32
|
}));
|
33
33
|
};
|
34
34
|
export default SSNField;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SSN.js","sourceRoot":"","sources":["SSN.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,sCAAsC,CAAC;AAClE,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"SSN.js","sourceRoot":"","sources":["SSN.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,sCAAsC,CAAC;AAClE,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AAOjF,MAAM,QAAQ,GAA4B,SAAS,QAAQ,CAAC,KAAK;IAC/D,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAE5C,OAAO,CACL,oBAAC,cAAc,QACZ,CAAC,MAAM,EAAE,EAAE;QACV,OAAO,CACL,oBAAC,MAAM,IACL,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBAC3B,MAAM;qBACH,KAAK,CAAC;oBACL,KAAK,EAAE,iBAAiB;oBACxB,SAAS,EAAE;wBACT,GAAG,EAAE,MAAM,CAAC,GAAG;qBAChB;iBACF,CAAC;qBACD,IAAI,CACH,CAAC,IAAuD,EAAE,EAAE;oBAC1D,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;oBAC5B,KAAK,CAAC,SAAS,EAAE,CAAC;oBAClB,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC7D,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;oBACR,MAAM,YAAY,GAAG,cAAc,CACjC,KAAK,CACN,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC;wBACvC,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;wBAC5B,CAAC,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC;oBAEjD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;oBAC5B,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC5B,MAAM,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;gBAC1C,CAAC,CACF,CAAC;YACN,CAAC,EACD,aAAa,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAEzB,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAChC,CACV,CAAC;IACJ,CAAC,CACc,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
@@ -1,19 +1,16 @@
|
|
1
1
|
import { SignUpInput, MaskedProperty } from '@jetshop/core/types';
|
2
|
-
import { FormikProps } from 'formik';
|
3
2
|
import React from 'react';
|
4
3
|
import { SignUpFormInput } from './formatSignupInput';
|
5
4
|
type LookupData = {
|
6
5
|
[key: string]: MaskedProperty;
|
7
6
|
};
|
8
7
|
interface SignupFormProps {
|
9
|
-
children
|
10
|
-
formik: FormikProps<SignUpInput>;
|
11
|
-
}): React.ReactChild;
|
8
|
+
children: any;
|
12
9
|
lookupData: LookupData;
|
13
10
|
additionalFormatter?: (values: SignUpFormInput) => SignUpInput;
|
14
11
|
additionalInitialValues?: Partial<SignUpFormInput>;
|
15
12
|
}
|
16
13
|
declare function SignupFormProvider({ LoadingComponent, ...props }: SignupFormProps & {
|
17
14
|
LoadingComponent?: JSX.Element;
|
18
|
-
}): JSX.Element;
|
15
|
+
}): React.JSX.Element;
|
19
16
|
export default SignupFormProvider;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SignupFormContainer.js","sourceRoot":"","sources":["SignupFormContainer.tsx"],"names":[],"mappings":";;;;;;;;;;;AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"SignupFormContainer.js","sourceRoot":"","sources":["SignupFormContainer.tsx"],"names":[],"mappings":"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"}
|
@@ -3,7 +3,7 @@ import logError from '@jetshop/core/helpers/logError';
|
|
3
3
|
import t from '@jetshop/intl';
|
4
4
|
import { Form, Formik } from 'formik';
|
5
5
|
import React from 'react';
|
6
|
-
import { useMutation } from '@apollo/
|
6
|
+
import { useMutation } from '@apollo/client';
|
7
7
|
import { createValidatorForFields } from './formFieldsFromSettings';
|
8
8
|
import { useCustomerQuery } from './useCustomer';
|
9
9
|
import GetCustomerCountryCode from '@jetshop/core/data/queries/GetCustomerCountryCode.gql';
|
@@ -35,14 +35,14 @@ export const UpdatePasswordProvider = ({ render, onSubmitSuccess }) => {
|
|
35
35
|
query: GetCustomerCountryCode
|
36
36
|
});
|
37
37
|
const passwordField = countrySettings &&
|
38
|
-
countrySettings.privateCustomerFields.find(field => field.name === 'password');
|
38
|
+
countrySettings.privateCustomerFields.find((field) => field.name === 'password');
|
39
39
|
// Combine validation from the API with our own validation
|
40
40
|
const validator = createValidatorForFields([
|
41
41
|
passwordField,
|
42
42
|
{ id: 'oldPassword', name: 'oldPassword', required: true },
|
43
43
|
{ id: 'newPasswordRepeat', name: 'newPasswordRepeat', required: true }
|
44
44
|
], {
|
45
|
-
getFieldName: name => {
|
45
|
+
getFieldName: (name) => {
|
46
46
|
if (name === 'password') {
|
47
47
|
return 'newPassword';
|
48
48
|
}
|
@@ -68,14 +68,14 @@ export const UpdatePasswordProvider = ({ render, onSubmitSuccess }) => {
|
|
68
68
|
typeof onSubmitSuccess === 'function' && onSubmitSuccess();
|
69
69
|
actions.setStatus({ success: true });
|
70
70
|
})
|
71
|
-
.catch(err => {
|
71
|
+
.catch((err) => {
|
72
72
|
logError(true, err);
|
73
73
|
actions.setSubmitting(false);
|
74
74
|
actions.setStatus({
|
75
75
|
globalError: t('Something went wrong updating password. Is your old password correct?')
|
76
76
|
});
|
77
77
|
});
|
78
|
-
}, render: props => {
|
78
|
+
}, render: (props) => {
|
79
79
|
var _a, _b;
|
80
80
|
return (React.createElement(Form, null, render(Object.assign(Object.assign({}, props), { inputProps, submitted: (_a = props === null || props === void 0 ? void 0 : props.status) === null || _a === void 0 ? void 0 : _a.success, globalError: (_b = props === null || props === void 0 ? void 0 : props.status) === null || _b === void 0 ? void 0 : _b.globalError }))));
|
81
81
|
} }));
|
@@ -87,7 +87,7 @@ export function useUpdatePasswordMutation() {
|
|
87
87
|
.then(() => mutate({
|
88
88
|
variables
|
89
89
|
}))
|
90
|
-
.then(res => {
|
90
|
+
.then((res) => {
|
91
91
|
if (!res.data.updatePassword.success) {
|
92
92
|
// This should never happen as mutation itself fails
|
93
93
|
throw new Error('Something went wrong');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"UpdatePasswordForm.js","sourceRoot":"","sources":["UpdatePasswordForm.tsx"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,MAAM,iDAAiD,CAAC;AACrF,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AAEtD,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AACnD,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"UpdatePasswordForm.js","sourceRoot":"","sources":["UpdatePasswordForm.tsx"],"names":[],"mappings":"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"}
|
@@ -6,7 +6,7 @@ export interface EnhancedCustomerField extends CustomerField {
|
|
6
6
|
label: string;
|
7
7
|
placeholder?: string;
|
8
8
|
}
|
9
|
-
type
|
9
|
+
type ISignupContext = {
|
10
10
|
isUserTypeBusiness: boolean;
|
11
11
|
billingAddressFields: EnhancedCustomerField[];
|
12
12
|
loginFields: EnhancedCustomerField[];
|
@@ -27,7 +27,7 @@ export declare const SignupContext: React.Context<{
|
|
27
27
|
loading: boolean;
|
28
28
|
}>;
|
29
29
|
declare const SignupProvider: React.FC<{
|
30
|
-
value?:
|
30
|
+
value?: ISignupContext;
|
31
31
|
LoadingComponent?: JSX.Element;
|
32
32
|
}>;
|
33
33
|
export declare const SignupFormikContext: React.Context<{
|
@@ -30,7 +30,7 @@ const SignupProvider = function SignupContextProvider(_a) {
|
|
30
30
|
const [country, setCountry] = React.useState(selectedChannel.country);
|
31
31
|
const { countrySettings, loading } = useCountrySettings();
|
32
32
|
const selectedCountrySettings = countrySettings &&
|
33
|
-
countrySettings.find(c => c.countryCode === country.code);
|
33
|
+
countrySettings.find((c) => c.countryCode === country.code);
|
34
34
|
// Get all the billing address fields from the country settings
|
35
35
|
const { allFields, billingAddressFields, loginFields } = !loading
|
36
36
|
? formFieldsFromSettings(selectedCountrySettings, isUserTypeBusiness)
|
@@ -63,8 +63,7 @@ const SignupProvider = function SignupContextProvider(_a) {
|
|
63
63
|
if (loading) {
|
64
64
|
return LoadingComponent || null;
|
65
65
|
}
|
66
|
-
|
67
|
-
return React.createElement(SignupContext.Provider, Object.assign({ value: value }, props));
|
66
|
+
return React.createElement(SignupContext.Provider, Object.assign({ value: value }, props));
|
68
67
|
};
|
69
68
|
// Holds formik state
|
70
69
|
export const SignupFormikContext = React.createContext(undefined);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"signup-context.js","sourceRoot":"","sources":["signup-context.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AAC9F,OAAO,eAAe,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAqB1E,kCAAkC;AAClC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,
|
1
|
+
{"version":3,"file":"signup-context.js","sourceRoot":"","sources":["signup-context.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AAC9F,OAAO,eAAe,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAqB1E,kCAAkC;AAClC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAiB,SAAS,CAAC,CAAC;AAE5E,MAAM,cAAc,GAGf,SAAS,qBAAqB,CAAC,EAA8B;QAA9B,EAAE,gBAAgB,OAAY,EAAP,KAAK,cAA5B,oBAA8B,CAAF;IAC9D,mEAAmE;IACnE,8EAA8E;IAC9E,+BAA+B;IAC/B,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAE7D,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1E,eAAe,CACb,CAAC,eAAe,EAChB,4CAA4C,CAC7C,CAAC;IAEF,4EAA4E;IAC5E,0EAA0E;IAC1E,wBAAwB;IACxB,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACtE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC1D,MAAM,uBAAuB,GAC3B,eAAe;QACf,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D,+DAA+D;IAC/D,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,CAAC,OAAO;QAC/D,CAAC,CAAC,sBAAsB,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QACrE,CAAC,CAAC;YACE,SAAS,EAAE,IAAI;YACf,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;SAClB,CAAC;IAEN,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC/B,OAAO;YACL,oBAAoB;YACpB,WAAW;YACX,SAAS;YACT,eAAe,EAAE,OAAO;YACxB,SAAS,EAAE,eAAe,CAAC,SAAS;YACpC,UAAU;YACV,OAAO;YACP,kBAAkB;YAClB,qBAAqB;SACtB,CAAC;IACJ,CAAC,EAAE;QACD,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,OAAO;QACP,eAAe,CAAC,SAAS;QACzB,OAAO;QACP,kBAAkB;KACnB,CAAC,CAAC;IAEH,IAAI,OAAO,EAAE;QACX,OAAO,gBAAgB,IAAI,IAAI,CAAC;KACjC;IACD,OAAO,oBAAC,aAAa,CAAC,QAAQ,kBAAC,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AAC7D,CAAC,CAAC;AAEF,qBAAqB;AACrB,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAEnD,SAAS,CAAC,CAAC;AAEd,eAAe,cAAc,CAAC"}
|
@@ -2,7 +2,7 @@ import { formatSignupInput } from '@jetshop/core/components/Auth/formatSignupInp
|
|
2
2
|
import useAuth from '@jetshop/core/components/AuthContext/useAuth';
|
3
3
|
import SignupMutation from '@jetshop/core/data/mutations/signup.gql';
|
4
4
|
import getErrorDetail from '@jetshop/core/helpers/getErrorDetail';
|
5
|
-
import { useApolloClient, useMutation } from '@apollo/
|
5
|
+
import { useApolloClient, useMutation } from '@apollo/client';
|
6
6
|
import { useContext } from 'react';
|
7
7
|
import { SignupContext } from './signup-context';
|
8
8
|
import { trackRegisterEvent } from '../../analytics/tracking';
|
@@ -23,7 +23,7 @@ export function useSignupSubmit() {
|
|
23
23
|
})
|
24
24
|
}
|
25
25
|
})
|
26
|
-
.then(resp => {
|
26
|
+
.then((resp) => {
|
27
27
|
// Submitting is done
|
28
28
|
actions.setSubmitting(false);
|
29
29
|
// Track user register in GTAG
|
@@ -33,7 +33,7 @@ export function useSignupSubmit() {
|
|
33
33
|
// Log the user in with the token from signup
|
34
34
|
logIn(resp.data.signUp.token.value);
|
35
35
|
});
|
36
|
-
}, error => {
|
36
|
+
}, (error) => {
|
37
37
|
const errorDetail = getErrorDetail(error);
|
38
38
|
const validationDetails = getvalidationDetails(errorDetail);
|
39
39
|
// Submitting is done
|
@@ -43,7 +43,7 @@ export function useSignupSubmit() {
|
|
43
43
|
isSignupError: true
|
44
44
|
});
|
45
45
|
})
|
46
|
-
.catch(err => {
|
46
|
+
.catch((err) => {
|
47
47
|
console.log(err);
|
48
48
|
actions.setSubmitting(false);
|
49
49
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"signupSubmit.js","sourceRoot":"","sources":["signupSubmit.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAElB,MAAM,iDAAiD,CAAC;AACzD,OAAO,OAAO,MAAM,8CAA8C,CAAC;AACnE,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,cAEN,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"signupSubmit.js","sourceRoot":"","sources":["signupSubmit.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAElB,MAAM,iDAAiD,CAAC;AACzD,OAAO,OAAO,MAAM,8CAA8C,CAAC;AACnE,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,cAEN,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,MAAM,UAAU,eAAe;IAC7B,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAG1B,cAAc,CAAC,CAAC;IAClB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC;IAC5B,MAAM,EAAE,kBAAkB,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,OAAO,SAAS,MAAM,CAAC,EACrB,MAAM,EACN,OAAO,EAIR;QACC,sCAAsC;QACtC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,CAAC;YACL,SAAS,EAAE;gBACT,KAAK,EAAE,iBAAiB,CAAC,MAAM,EAAE;oBAC/B,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBACrD,CAAC;aACH;SACF,CAAC;aACC,IAAI,CACH,CAAC,IAAI,EAAE,EAAE;YACP,qBAAqB;YACrB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC7B,8BAA8B;YAC9B,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAC5B,yBAAyB;YACzB,MAAM,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC5B,6CAA6C;gBAC7C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACL,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;YACR,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAE5D,qBAAqB;YACrB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE7B,OAAO,CAAC,SAAS,CAAC;gBAChB,iBAAiB;gBACjB,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;QACL,CAAC,CACF;aACA,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAwB;IACpD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5C,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACzB,CAAC"}
|
@@ -10,7 +10,7 @@ export default function useAddressFields() {
|
|
10
10
|
// Change the selected country by country code
|
11
11
|
// This will change the fields and validations based on that country's settings
|
12
12
|
const setCountryByCode = React.useCallback((countryCode) => {
|
13
|
-
const country = countries.find(c => c.code === countryCode);
|
13
|
+
const country = countries.find((c) => c.code === countryCode);
|
14
14
|
if (!country)
|
15
15
|
return;
|
16
16
|
setCountry(country);
|
@@ -18,8 +18,8 @@ export default function useAddressFields() {
|
|
18
18
|
// Filter out the country field from the billing address fields, as it is handled separately
|
19
19
|
// See: Countries.tsx
|
20
20
|
const fields = billingAddressFields
|
21
|
-
.filter(f => f.name !== 'country')
|
22
|
-
.map(field => {
|
21
|
+
.filter((f) => f.name !== 'country')
|
22
|
+
.map((field) => {
|
23
23
|
return Object.assign(Object.assign({}, field), { inputProps: {
|
24
24
|
key: field.id,
|
25
25
|
type: field.type,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useAddressFields.js","sourceRoot":"","sources":["useAddressFields.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,uCAAuC,CAAC;AACpE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,OAAO,UAAU,gBAAgB;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAEhD,2EAA2E;IAC3E,iCAAiC;IACjC,eAAe,CACb,OAAO,OAAO,KAAK,WAAW,EAC9B,qEAAqE,CACtE,CAAC;IAEF,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhE,8CAA8C;IAC9C,+EAA+E;IAC/E,MAAM,gBAAgB,GAAG,KAAK,CAAC,WAAW,CACxC,CAAC,WAAmB,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"useAddressFields.js","sourceRoot":"","sources":["useAddressFields.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,uCAAuC,CAAC;AACpE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,OAAO,UAAU,gBAAgB;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAEhD,2EAA2E;IAC3E,iCAAiC;IACjC,eAAe,CACb,OAAO,OAAO,KAAK,WAAW,EAC9B,qEAAqE,CACtE,CAAC;IAEF,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhE,8CAA8C;IAC9C,+EAA+E;IAC/E,MAAM,gBAAgB,GAAG,KAAK,CAAC,WAAW,CACxC,CAAC,WAAmB,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;QAE9D,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,UAAU,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,SAAS,EAAE,UAAU,CAAC,CACxB,CAAC;IAEF,4FAA4F;IAC5F,qBAAqB;IACrB,MAAM,MAAM,GAAG,oBAAoB;SAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;SACnC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,uCACK,KAAK,KACR,UAAU,EAAE;gBACV,GAAG,EAAE,KAAK,CAAC,EAAE;gBACb,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;aACzB,IACD;IACJ,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC;AACjD,CAAC"}
|
@@ -3,11 +3,13 @@ import { render, fireEvent, waitForElement } from '@testing-library/react';
|
|
3
3
|
import useAddressFields from './useAddressFields';
|
4
4
|
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
5
5
|
import SignupProvider from './signup-context';
|
6
|
-
import {
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
6
|
+
import {
|
7
|
+
ApolloClient,
|
8
|
+
ApolloProvider,
|
9
|
+
InMemoryCache,
|
10
|
+
gql
|
11
|
+
} from '@apollo/client';
|
12
|
+
import { MockLink } from '@apollo/client';
|
11
13
|
|
12
14
|
const fields = [
|
13
15
|
{
|
@@ -69,7 +71,7 @@ describe('useAddressFields', () => {
|
|
69
71
|
const testFields = await waitForElement(() => getAllByTestId('field'));
|
70
72
|
|
71
73
|
expect(testFields).toHaveLength(2);
|
72
|
-
testFields.map(field => expect(field.id).not.toBe('country'));
|
74
|
+
testFields.map((field) => expect(field.id).not.toBe('country'));
|
73
75
|
});
|
74
76
|
|
75
77
|
it('changes the form fields based on selected country', async () => {
|
@@ -270,7 +272,7 @@ function Wrapper() {
|
|
270
272
|
return (
|
271
273
|
<>
|
272
274
|
<div>
|
273
|
-
{fields.map(field => (
|
275
|
+
{fields.map((field) => (
|
274
276
|
<span data-testid="field" key={field.name}>
|
275
277
|
{field.name}
|
276
278
|
</span>
|
@@ -284,7 +286,7 @@ function Wrapper() {
|
|
284
286
|
Set country from form
|
285
287
|
</button>
|
286
288
|
|
287
|
-
{countries.map(country => (
|
289
|
+
{countries.map((country) => (
|
288
290
|
<span data-testid="country" key={country.id}>
|
289
291
|
{country.code}
|
290
292
|
</span>
|
@@ -77,13 +77,13 @@ export declare function useCustomerQuery({ query, deliveryAddressId }: {
|
|
77
77
|
query: DocumentNode;
|
78
78
|
deliveryAddressId?: number;
|
79
79
|
}): {
|
80
|
-
refetch: (variables?: import("
|
80
|
+
refetch: (variables?: Partial<import("@apollo/client").OperationVariables>) => Promise<import("@apollo/client").ApolloQueryResult<{
|
81
81
|
customer: Query['customer'] & {
|
82
82
|
__typename: 'BusinessCustomer' | 'PrivateCustomer';
|
83
83
|
};
|
84
84
|
}>>;
|
85
85
|
loading: boolean;
|
86
|
-
error: import("apollo
|
86
|
+
error: import("@apollo/client").ApolloError;
|
87
87
|
customer: Customer & {
|
88
88
|
__typename: 'BusinessCustomer' | 'PrivateCustomer';
|
89
89
|
};
|
@@ -13,7 +13,7 @@ import ChannelContext from '@jetshop/core/components/ChannelContext';
|
|
13
13
|
import UpdateCustomerMutation from '@jetshop/core/data/mutations/updateCustomer.gql';
|
14
14
|
import logError from '@jetshop/core/helpers/logError';
|
15
15
|
import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
|
16
|
-
import { useMutation, useQuery } from '@apollo/
|
16
|
+
import { useMutation, useQuery } from '@apollo/client';
|
17
17
|
import { translations } from './signup-field-translations';
|
18
18
|
import { useCountrySettings } from '../ChannelContext/useCountrySettings';
|
19
19
|
export function customerAddressToCustomerUpdateAddressInput({ address, isDeleteId = false, countryCode }) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useCustomer.js","sourceRoot":"","sources":["useCustomer.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,sBAAsB,MAAM,iDAAiD,CAAC;AACrF,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AAiBtD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"useCustomer.js","sourceRoot":"","sources":["useCustomer.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,sBAAsB,MAAM,iDAAiD,CAAC;AACrF,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AAiBtD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAK1E,MAAM,UAAU,2CAA2C,CAAC,EAC1D,OAAO,EACP,UAAU,GAAG,KAAK,EAClB,WAAW,EAKZ;IACC,MAAM,EAAE,OAAO,KAAe,OAAO,EAAjB,KAAK,UAAK,OAAO,EAA/B,WAAqB,CAAU,CAAC;IAEtC,OAAQ,KAAa,CAAC,UAAU,CAAC;IAEjC,wFAAwF;IACxF,+EAA+E;IAC/E,IAAI,UAAU,IAAI,KAAK,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC,EAAE,CAAC;IAE5C,uCACK,KAAK,KACR,WAAW,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,WAAW,IACrD;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,IAAY;IAEZ,IAAK,IAAY,KAAK,SAAS,EAAE;QAC/B,OAAO,aAAa,CAAC;KACtB;IAED,OAAO,IAAwC,CAAC;AAClD,CAAC;AACD,MAAM,UAAU,yBAAyB,CACvC,QAAkB,EAClB,WAAmB;IAEnB,OAAO,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAChD,2CAA2C,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CACtE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACrC,QAAQ,EACR,WAAW,EAMZ;IACC,OAAO,2CAA2C,CAAC;QACjD,OAAO,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,cAAc;QACjC,UAAU,EAAE,IAAI;QAChB,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,QAAkB;AAClB,oFAAoF;AACpF,OAAe;IAEf,MAAM,WAAW,GAAkC;QACjD,IAAI,EAAE;YACJ,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,YAAY;YACjD,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,aAAa;YACnD,UAAU,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU;YAC7C,OAAO;SACR;KACF,CAAC;IACF,IAAI,QAAQ,CAAC,KAAK,EAAE;QAClB,WAAW,CAAC,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;KACjD;IACD,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,WAAW,CAAC,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;KACtD;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,iBAAiB,CACxB,QAA4C;IAE5C,OAAO,QAAQ,CAAC,UAAU,KAAK,iBAAiB,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACrC,QAAQ,EACR,oBAAoB,EACpB,OAAO,EACP,WAAW,EAMZ;IACC,uCACK,CAAC,iBAAiB,CAAC,QAAQ,CAAC;QAC7B,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE;QACvB,CAAC,CAAC,EAAE,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB,EAAE,CAAC,KACxD,cAAc,EAAE,sBAAsB,CAAC;YACrC,QAAQ;YACR,oBAAoB;YACpB,WAAW;SACZ,CAAC,EACF,iBAAiB,EAAE,yBAAyB,CAAC,QAAQ,EAAE,WAAW,CAAC,EACnE,WAAW,EAAE,gCAAgC,CAAC,QAAQ,EAAE,OAAO,CAAC,IAChE;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,QAAyB;IAClE,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,EAAE,eAAe,EAAE,uBAAuB,EAAE,OAAO,EAAE,GACzD,kBAAkB,EAAE,CAAC;IACvB,MAAM,aAAa,GAAG,WAAW,CAC/B,SAAS,aAAa,CAAC,WAAmB;QACxC,MAAM,QAAQ,GACZ,eAAe;YACf,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC;QAE7D,OAAO,QAAQ,IAAI,IAAI,CAAC;IAC1B,CAAC,EACD,CAAC,eAAe,CAAC,CAClB,CAAC;IAEF,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,QAAQ,CACpE,QAAQ,IAAI,QAAQ,CAAC,cAAc,CAAC,OAAO;QACzC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;QACrD,CAAC,CAAC,uBAAuB,CAC5B,CAAC;IAEF,MAAM,cAAc,GAAG,WAAW,CAChC,CAAC,WAAmB,EAAE,EAAE;QACtB,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;QAE5C,QAAQ,CACN,CAAC,QAAQ,EACT,qDAAqD,WAAW,GAAG,CACpE,CAAC;QAEF,IAAI,QAAQ,EAAE;YACZ,0BAA0B,CAAC,QAAQ,CAAC,CAAC;SACtC;IACH,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE;YACpC,QAAQ,CACN,IAAI,EACJ,iDACE,QAAQ,CAAC,EACX,0BAA0B,eAAe,CAAC,SAAS;iBAChD,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;iBACnB,IAAI,CAAC,GAAG,CAAC,EAAE,CACf,CAAC;YACF,OAAO;SACR;QACD,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;IAE1D,OAAO;QACL,OAAO;QACP,eAAe,EAAE,uBAAuB;QACxC,cAAc;KACf,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,EACvC,QAAQ,EACR,eAAe,EACf,iBAAiB,EAOlB;IACC,MAAM,SAAS,GACb,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,MAAK,kBAAkB;QACzC,CAAC,CAAC,wBAAwB;QAC1B,CAAC,CAAC,uBAAuB,CAAC;IAE9B,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE;QACnC,IAAI,iBAAiB,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QAE/C,MAAM,oBAAoB,GACxB,eAAe;YACf,eAAe,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;QAC5E,MAAM,oBAAoB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,iBAAiB,CAClC,CAAC;QACF,MAAM,qBAAqB,GAAG,oBAAoB;YAChD,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACxC,uCACK,KAAK,KACR,KAAK,EACH,QAAQ,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAC9C,KAAK,CAAC,IAA6B,CACpC,EACH,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAC/B;YACJ,CAAC,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,qBAAqB,CAAC;IAC/B,CAAC,EAAE,CAAC,eAAe,EAAE,QAAQ,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC,CAAC;IAE9D,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EACjC,QAAQ,EACR,iBAAiB,EAMlB;IACC,MAAM,SAAS,GACb,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,MAAK,kBAAkB;QACzC,CAAC,CAAC,wBAAwB;QAC1B,CAAC,CAAC,uBAAuB,CAAC;IAE9B,MAAM,EACJ,eAAe,EACf,cAAc,EACd,OAAO,EAAE,8BAA8B,EACxC,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE;;QAClC,MAAM,mBAAmB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,SAAS,EAAE,IAAI,CAC3D,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,gBAAgB,CACxC,CAAC;QACF,MAAM,oBAAoB,GACxB,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;YACxC,uCACK,KAAK,KACR,KAAK,EACH,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,cAAc,0CAAG,KAAK,CAAC,IAA6B,CAAC,EACjE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAC/B;QACJ,CAAC,CAAC,mCAAI,EAAE,CAAC;QAEX,OAAO,oBAAoB,CAAC;IAC9B,CAAC,EAAE,CAAC,eAAe,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;IAE3C,MAAM,eAAe,GAAG,wBAAwB,CAAC;QAC/C,QAAQ;QACR,eAAe;QACf,iBAAiB;KAClB,CAAC,CAAC;IAEH,OAAO;QACL,eAAe;QACf,cAAc;QACd,cAAc;QACd,eAAe;QACf,8BAA8B;KAC/B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,EAC/B,KAAK,EACL,iBAAiB,EAIlB;;IACC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,QAAQ,CAI/C,KAAK,CAAC,CAAC;IAEV,MAAM,QAAQ,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,mCAAI,IAAI,CAAC;IAExC,MAAM,EACJ,eAAe,EACf,cAAc,EACd,cAAc,EACd,eAAe,EACf,8BAA8B,EAC/B,GAAG,kBAAkB,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAExD,OAAO;QACL,OAAO;QACP,OAAO,EAAE,OAAO,IAAI,8BAA8B;QAClD,KAAK;QACL,QAAQ;QACR,eAAe;QACf,cAAc;QACd,cAAc;QACd,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,EACxC,aAAa,EAGd;IACC,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAG1B,sBAAsB,CAAC,CAAC;IAC1B,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,gBAAgB,CAAC;QACpD,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC;IAEH,OAAO,SAAS,6BAA6B,CAAC,KAA0B;QACtE,OAAO,OAAO,CAAC,OAAO,EAAE;aACrB,IAAI,CAAC,GAAG,EAAE,CACT,MAAM,CAAC;YACL,SAAS,EAAE;gBACT,KAAK;aACN;SACF,CAAC,CACH;aACA,IAAI,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC;aAC7B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { useApolloClient } from '
|
1
|
+
import { useApolloClient } from '@apollo/client';
|
2
2
|
import React, { useContext, useEffect } from 'react';
|
3
3
|
import AuthContext from './AuthContext';
|
4
4
|
import { withCookies } from 'react-cookie';
|
@@ -7,7 +7,7 @@ import ChannelContext from '@jetshop/core/components/ChannelContext';
|
|
7
7
|
import { useShopConfig } from '../../hooks/useShopConfig';
|
8
8
|
import { trackUserEvent } from '../../analytics/tracking';
|
9
9
|
import { useTracker } from '../../analytics/Analytics';
|
10
|
-
import { useQuery } from '@apollo/
|
10
|
+
import { useQuery } from '@apollo/client';
|
11
11
|
import googleUserIdQuery from './googleUserIdQuery.gql';
|
12
12
|
const AuthProvider = function AuthProvider(props) {
|
13
13
|
var _a, _b;
|