@jetshop/core 5.17.0-minor.21477356 → 6.0.0
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/ChannelHandler/PreserveRedirectRouteQuery.gql +4 -4
- package/ChannelHandler/redirectUtils.d.ts +2 -2
- package/ChannelHandler/redirectUtils.js +5 -3
- package/ChannelHandler/redirectUtils.js.map +1 -1
- package/ChannelHandler/redirectUtils.test.js +5 -5
- package/ChannelHandler/redirectUtilsGroupedChannels.test.js +5 -5
- package/analytics/Analytics.d.ts +3 -3
- package/analytics/Analytics.js.map +1 -1
- package/analytics/AnalyticsProvider.d.ts +2 -2
- package/analytics/trackerRegistry.d.ts +2 -2
- package/analytics/utils/script.d.ts +1 -1
- package/analytics/webVitals.js +5 -5
- package/analytics/webVitals.js.map +1 -1
- 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 +13 -8
- package/boot/apollo.js.map +1 -1
- package/boot/client/startClient.js +18 -5
- package/boot/client/startClient.js.map +1 -1
- package/boot/server/IntervalQuery.d.ts +2 -2
- 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/breakpointMiddleware.d.ts +1 -1
- package/boot/server/createApolloServer.d.ts +4 -3
- 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/PersistedClient.d.ts +3 -3
- 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 +4 -4
- package/cart/AddToCartFormik.js +2 -2
- package/cart/AddToCartFormik.js.map +1 -1
- package/cart/useAddToCart.d.ts +4 -4
- package/components/Auth/CustomerUpdateForm.d.ts +1 -1
- package/components/Auth/ForgotPasswordProvider.d.ts +6 -8
- package/components/Auth/ForgotPasswordProvider.js +18 -18
- package/components/Auth/ForgotPasswordProvider.js.map +1 -1
- package/components/Auth/ResetPasswordProvider.d.ts +6 -4
- 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/SSNLookupContainer.d.ts +1 -1
- package/components/Auth/SignupFormContainer.d.ts +3 -6
- package/components/Auth/SignupFormContainer.js.map +1 -1
- package/components/Auth/UpdatePasswordForm.d.ts +1 -1
- package/components/Auth/UpdatePasswordForm.js +6 -6
- package/components/Auth/UpdatePasswordForm.js.map +1 -1
- package/components/Auth/formatSignupInput.d.ts +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 +3 -3
- 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/ProductRoute.js.map +1 -1
- package/components/DynamicRoute/RouteResolver.d.ts +3 -3
- package/components/DynamicRoute/RouteResolver.js +2 -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 +5 -5
- package/components/DynamicRoute/index.js +47 -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/Fonts/CustomFont.d.ts +1 -1
- package/components/Fonts/injectFont.d.ts +2 -2
- package/components/Fonts/injectFont.js +2 -2
- package/components/Fonts/injectFont.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 +3 -3
- 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/Notifications/notificationMachine.d.ts +1 -1
- package/components/Notifications/notificationsMachine.d.ts +3 -3
- package/components/Notifications/useNotification.d.ts +1 -1
- package/components/OpenGraph/OpenGraphGeneralPageData.d.ts +1 -1
- package/components/Pagination/PaginationProvider.d.ts +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/SortOrder/SortOrderContext.d.ts +1 -1
- package/components/StructuredData/StructuredBreadcrumbData.d.ts +2 -2
- package/data/cache.d.ts +1 -1
- package/data/cache.js +62 -12
- package/data/cache.js.map +1 -1
- package/data/fragments/ProductListsFragments.gql +8 -8
- package/errorReporting.shared.d.ts +1 -1
- package/global.d.ts +80 -2
- package/helpers/getErrorDetail.d.ts +1 -1
- package/helpers/getErrorDetail.js +2 -2
- package/helpers/getErrorDetail.js.map +1 -1
- package/helpers/getHeaders.d.ts +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 +2 -2
- 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 +11 -11
- package/hooks/ProductList/list-transforms.js +1 -1
- package/hooks/ProductList/list-transforms.js.map +1 -1
- package/hooks/ProductList/product-list-reducer.d.ts +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 +4 -4
- 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.d.ts +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/usePreconnectLinks.d.ts +1 -1
- package/hooks/usePreconnectLinks.js +1 -1
- package/hooks/usePreconnectLinks.js.map +1 -1
- package/hooks/useProductVariants/useProductVariants.d.ts +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/hooks/useThunkReducer.d.ts +1 -1
- package/integrations/sluggishSchemaExtension.js +1 -1
- package/integrations/sluggishSchemaExtension.js.map +1 -1
- package/package.json +24 -42
- 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/resolvers/index.d.ts +1 -1
- package/server/graphql.js +6 -7
- package/server/graphql.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/integrations/addwishSchemaExtension.d.ts +0 -35
- package/integrations/addwishSchemaExtension.js +0 -141
- package/integrations/addwishSchemaExtension.js.map +0 -1
- package/integrations/nostoSchemaExtension.d.ts +0 -5
- package/integrations/nostoSchemaExtension.js +0 -77
- package/integrations/nostoSchemaExtension.js.map +0 -1
@@ -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
|
-
|
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>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { Customer, CustomerAddress, CustomerField, CustomerUpdateBillingAddressInput, CustomerUpdateDeliveryAddressInput, CustomerUpdateInput, CustomerUpdatePreferenceInput, Query, PrivateCustomer, BusinessCustomer, CountrySettings } from '@jetshop/core/types';
|
2
2
|
import { DocumentNode } from 'graphql';
|
3
|
-
|
3
|
+
type CustomerUpdateAddressInput = CustomerUpdateBillingAddressInput | CustomerUpdateDeliveryAddressInput;
|
4
4
|
export declare function customerAddressToCustomerUpdateAddressInput({ address, isDeleteId, countryCode }: {
|
5
5
|
address: CustomerAddress;
|
6
6
|
isDeleteId?: boolean;
|
@@ -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":"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"}
|
@@ -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;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AuthProvider.js","sourceRoot":"","sources":["AuthProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"AuthProvider.js","sourceRoot":"","sources":["AuthProvider.tsx"],"names":[],"mappings":"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"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { MockedProvider } from '@apollo/
|
1
|
+
import { MockedProvider } from '@apollo/client/testing';
|
2
2
|
import React from 'react';
|
3
3
|
import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
|
4
4
|
import { createSelectedChannel } from '../../ChannelHandler/channelUtils';
|
@@ -6,5 +6,5 @@ export interface ChannelProviderProps {
|
|
6
6
|
children?: React.ReactNode;
|
7
7
|
config: BootOptions;
|
8
8
|
}
|
9
|
-
declare const ChannelProvider: ({ channelHandler, children, config }: ChannelProviderProps) => JSX.Element;
|
9
|
+
declare const ChannelProvider: ({ channelHandler, children, config }: ChannelProviderProps) => React.JSX.Element;
|
10
10
|
export default ChannelProvider;
|
@@ -1,5 +1,5 @@
|
|
1
1
|
declare function useCountrySettings({ countrySettingsQuery }?: {
|
2
|
-
countrySettingsQuery: import("
|
2
|
+
countrySettingsQuery: import("@apollo/client").DocumentNode;
|
3
3
|
}): {
|
4
4
|
selectedCountrySettings: import("../../types").CountrySettings;
|
5
5
|
countrySettings: import("../../types").CountrySettings[];
|
@@ -1,6 +1,6 @@
|
|
1
|
+
import { useQuery } from '@apollo/client';
|
1
2
|
import { useContext } from 'react';
|
2
3
|
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
3
|
-
import { useQuery } from 'react-apollo';
|
4
4
|
import defaultCountrySettingsQuery from './CountrySettingsQuery.gql';
|
5
5
|
function useCountrySettings({ countrySettingsQuery } = {
|
6
6
|
countrySettingsQuery: defaultCountrySettingsQuery
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useCountrySettings.js","sourceRoot":"","sources":["useCountrySettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"useCountrySettings.js","sourceRoot":"","sources":["useCountrySettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,2BAA2B,MAAM,4BAA4B,CAAC;AAGrE,SAAS,kBAAkB,CACzB,EAAE,oBAAoB,EAAE,GAAG;IACzB,oBAAoB,EAAE,2BAA2B;CAClD;;IAED,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,QAAQ,CAAuB,oBAAoB,EAAE;QAClE,SAAS,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE;KACjD,CAAC,CAAC;IACH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAEjC,MAAM,uBAAuB,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,CAAC,eAAe,CAAC,IAAI,CAC1E,CAAC,cAAc,EAAE,EAAE;QACjB,OAAO,cAAc,CAAC,WAAW,KAAK,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC;IACrE,CAAC,CACF,CAAC;IACF,OAAO;QACL,uBAAuB;QACvB,eAAe,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,CAAC,eAAe;QACxD,OAAO;KACR,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
@@ -1,19 +1,19 @@
|
|
1
1
|
query ActiveFilters {
|
2
2
|
activeFilters @client @export {
|
3
|
-
listFilters @export {
|
3
|
+
listFilters @client @export {
|
4
4
|
id
|
5
5
|
values
|
6
6
|
}
|
7
|
-
rangeFilters @export {
|
7
|
+
rangeFilters @client @export {
|
8
8
|
id
|
9
9
|
min
|
10
10
|
max
|
11
11
|
}
|
12
|
-
booleanFilters @export {
|
12
|
+
booleanFilters @client @export {
|
13
13
|
id
|
14
14
|
value
|
15
15
|
}
|
16
|
-
multiListFilters @export {
|
16
|
+
multiListFilters @client @export {
|
17
17
|
id
|
18
18
|
values
|
19
19
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { Category } from '@jetshop/core/types';
|
2
|
-
import { ComponentType } from 'react';
|
3
|
-
import { QueryResult } from '
|
2
|
+
import React, { ComponentType } from 'react';
|
3
|
+
import { QueryResult } from '@apollo/client';
|
4
4
|
export interface CategoryProps {
|
5
5
|
result: QueryResult;
|
6
6
|
category: Category;
|
@@ -9,5 +9,5 @@ export interface CategoryRouteProps {
|
|
9
9
|
component: ComponentType<CategoryProps>;
|
10
10
|
result: QueryResult;
|
11
11
|
}
|
12
|
-
declare const CategoryRoute: (props: CategoryRouteProps) => JSX.Element;
|
12
|
+
declare const CategoryRoute: (props: CategoryRouteProps) => React.JSX.Element;
|
13
13
|
export default CategoryRoute;
|
@@ -11,16 +11,18 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
11
11
|
};
|
12
12
|
import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
|
13
13
|
import React, { useEffect } from 'react';
|
14
|
-
import { useApolloClient } from '
|
14
|
+
import { useApolloClient } from '@apollo/client';
|
15
15
|
import { useHistory } from 'react-router';
|
16
16
|
import { getActiveFiltersFromSearch } from '../../resolvers/filters/filterParams';
|
17
17
|
import { StructuredCategoryData } from '../StructuredData';
|
18
|
+
import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
|
18
19
|
function useFiltersOnHistoryPop() {
|
19
20
|
const client = useApolloClient();
|
20
21
|
useEffect(() => {
|
21
22
|
function getSearchFilters() {
|
22
23
|
// Write the active filters from search
|
23
|
-
client.
|
24
|
+
client.writeQuery({
|
25
|
+
query: ActiveFiltersQuery,
|
24
26
|
data: {
|
25
27
|
activeFilters: getActiveFiltersFromSearch(window.location.search)
|
26
28
|
}
|
@@ -33,7 +35,8 @@ function useFiltersOnHistoryPop() {
|
|
33
35
|
const CategoryRoute = (props) => {
|
34
36
|
var _a, _b, _c;
|
35
37
|
const { component: CategoryPage } = props, rest = __rest(props, ["component"]);
|
36
|
-
const category = ((_b = (_a = props.result.data) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) ||
|
38
|
+
const category = ((_b = (_a = (props.result.data || props.result.previousData)) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) ||
|
39
|
+
((_c = (props.result.data || props.result.previousData)) === null || _c === void 0 ? void 0 : _c.category);
|
37
40
|
const { structuredData } = useShopConfig();
|
38
41
|
const disableDefaultCategoryData = structuredData
|
39
42
|
? !!structuredData.disableDefaultCategoryData
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CategoryRoute.js","sourceRoot":"","sources":["CategoryRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAe,eAAe,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"CategoryRoute.js","sourceRoot":"","sources":["CategoryRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAe,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAU9F,SAAS,sBAAsB;IAC7B,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,SAAS,CAAC,GAAG,EAAE;QACb,SAAS,gBAAgB;YACvB,uCAAuC;YACvC,MAAM,CAAC,UAAU,CAAC;gBAChB,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE;oBACJ,aAAa,EAAE,0BAA0B,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;iBAClE;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEtD,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACxE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACf,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,KAAyB,EAAE,EAAE;;IAClD,MAAM,EAAE,SAAS,EAAE,YAAY,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA5C,aAAoC,CAAQ,CAAC;IAEnD,MAAM,QAAQ,GACZ,CAAA,MAAA,MAAA,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,0CAAE,KAAK,0CAAE,MAAM;SAC/D,MAAA,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,0CAAE,QAAQ,CAAA,CAAC;IAE7D,MAAM,EAAE,cAAc,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3C,MAAM,0BAA0B,GAAG,cAAc;QAC/C,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,0BAA0B;QAC7C,CAAC,CAAC,KAAK,CAAC;IAEV,MAAM,OAAO,GAAG,UAAU,EAAiB,CAAC;IAC5C,sBAAsB,EAAE,CAAC;IACzB,SAAS,CAAC,GAAG,EAAE;;QACb,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,MAAM,IAAG,CAAC,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,CAAC,KAAK,0CAAE,IAAI,CAAA,EAAE;YAC9D,OAAO,CAAC,OAAO,CACb,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,kBAErB,IAAI,EAAE,QAAQ,CAAC,IAAI,IAChB,OAAO,CAAC,QAAQ,CAAC,KAAK,EAE5B,CAAC;SACH;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAExB,OAAO,CACL;QACG,QAAQ,IAAI,CACX,0CACG,CAAC,0BAA0B,IAAI,CAC9B,oBAAC,sBAAsB,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAC/C,CACA,CACJ;QACD,oBAAC,YAAY,oBAAK,IAAI,IAAE,QAAQ,EAAE,QAAQ,IAAI,CAC7C,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
@@ -0,0 +1,18 @@
|
|
1
|
+
import * as React from 'react';
|
2
|
+
export interface BoundaryErrorState {
|
3
|
+
error?: Error;
|
4
|
+
info?: React.ErrorInfo;
|
5
|
+
}
|
6
|
+
export interface BoundaryErrorProps {
|
7
|
+
component?: React.FC<BoundaryErrorState>;
|
8
|
+
extraInfo?: any;
|
9
|
+
children: React.ReactNode;
|
10
|
+
}
|
11
|
+
export declare const DefaultError: ({ error, info }: BoundaryErrorState) => React.JSX.Element;
|
12
|
+
declare class ErrorBoundary extends React.Component<BoundaryErrorProps, BoundaryErrorState> {
|
13
|
+
state: BoundaryErrorState;
|
14
|
+
static defaultProps: Partial<BoundaryErrorProps>;
|
15
|
+
componentDidCatch(error: Error, info: React.ErrorInfo): void;
|
16
|
+
render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode>;
|
17
|
+
}
|
18
|
+
export default ErrorBoundary;
|
@@ -0,0 +1,61 @@
|
|
1
|
+
import * as React from 'react';
|
2
|
+
import report from '@jetshop/core/errorReporting';
|
3
|
+
export const DefaultError = ({ error, info }) => (React.createElement("section", { style: {
|
4
|
+
width: '57ch',
|
5
|
+
maxWidth: '100%',
|
6
|
+
margin: '4rem auto',
|
7
|
+
padding: '1rem'
|
8
|
+
} },
|
9
|
+
React.createElement("h1", { style: {
|
10
|
+
fontSize: '1.5rem',
|
11
|
+
marginBottom: '2rem'
|
12
|
+
} }, "Something went wrong!"),
|
13
|
+
React.createElement("p", null, "Sorry! Our developers have been notified."),
|
14
|
+
React.createElement("div", null,
|
15
|
+
React.createElement("a", { href: "/", style: {
|
16
|
+
display: 'inline-block',
|
17
|
+
margin: '1rem 0 3rem 0',
|
18
|
+
borderRadius: '3px',
|
19
|
+
padding: '0.5rem',
|
20
|
+
textDecoration: 'none',
|
21
|
+
fontWeight: 600,
|
22
|
+
background: '#e2e2e2',
|
23
|
+
border: '1px solid #c3c3c3',
|
24
|
+
color: '#000'
|
25
|
+
} }, "Go back to the start page")),
|
26
|
+
process.env.NODE_ENV !== 'production' && (React.createElement("div", null,
|
27
|
+
error && React.createElement("p", null,
|
28
|
+
"Error: ",
|
29
|
+
error.message),
|
30
|
+
info && (React.createElement("pre", { style: {
|
31
|
+
fontSize: '0.875rem',
|
32
|
+
lineHeight: 1.5,
|
33
|
+
color: '#585858'
|
34
|
+
} }, info.componentStack))))));
|
35
|
+
class ErrorBoundary extends React.Component {
|
36
|
+
constructor() {
|
37
|
+
super(...arguments);
|
38
|
+
this.state = {
|
39
|
+
error: undefined,
|
40
|
+
info: undefined
|
41
|
+
};
|
42
|
+
}
|
43
|
+
componentDidCatch(error, info) {
|
44
|
+
const { extraInfo = {} } = this.props;
|
45
|
+
// Report to Sentry
|
46
|
+
report(error, Object.assign(Object.assign({}, extraInfo), { reactInfo: info }));
|
47
|
+
this.setState({ error, info });
|
48
|
+
}
|
49
|
+
render() {
|
50
|
+
const Comp = this.props.component;
|
51
|
+
if (!this.state.error) {
|
52
|
+
return this.props.children;
|
53
|
+
}
|
54
|
+
return React.createElement(Comp, Object.assign({}, this.state));
|
55
|
+
}
|
56
|
+
}
|
57
|
+
ErrorBoundary.defaultProps = {
|
58
|
+
component: DefaultError
|
59
|
+
};
|
60
|
+
export default ErrorBoundary;
|
61
|
+
//# sourceMappingURL=GenericError.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"GenericError.js","sourceRoot":"","sources":["GenericError.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAalD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAsB,EAAE,EAAE,CAAC,CACnE,iCACE,KAAK,EAAE;QACL,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,MAAM;QAChB,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,MAAM;KAChB;IAED,4BACE,KAAK,EAAE;YACL,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,MAAM;SACrB,4BAGE;IACL,2EAAgD;IAChD;QACE,2BACE,IAAI,EAAC,GAAG,EACR,KAAK,EAAE;gBACL,OAAO,EAAE,cAAc;gBACvB,MAAM,EAAE,eAAe;gBACvB,YAAY,EAAE,KAAK;gBACnB,OAAO,EAAE,QAAQ;gBACjB,cAAc,EAAE,MAAM;gBACtB,UAAU,EAAE,GAAG;gBACf,UAAU,EAAE,SAAS;gBACrB,MAAM,EAAE,mBAAmB;gBAC3B,KAAK,EAAE,MAAM;aACd,gCAGC,CACA;IACL,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,CACxC;QACG,KAAK,IAAI;;YAAW,KAAK,CAAC,OAAO,CAAK;QACtC,IAAI,IAAI,CACP,6BACE,KAAK,EAAE;gBACL,QAAQ,EAAE,UAAU;gBACpB,UAAU,EAAE,GAAG;gBACf,KAAK,EAAE,SAAS;aACjB,IAEA,IAAI,CAAC,cAAc,CAChB,CACP,CACG,CACP,CACO,CACX,CAAC;AAEF,MAAM,aAAc,SAAQ,KAAK,CAAC,SAGjC;IAHD;;QAIE,UAAK,GAAuB;YAC1B,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,SAAS;SAChB,CAAC;IAsBJ,CAAC;IAhBC,iBAAiB,CAAC,KAAY,EAAE,IAAqB;QACnD,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,mBAAmB;QACnB,MAAM,CAAC,KAAK,kCAAO,SAAS,KAAE,SAAS,EAAE,IAAI,IAAG,CAAC;QACjD,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,MAAM;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAyC,CAAC;QAElE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC5B;QAED,OAAO,oBAAC,IAAI,oBAAK,IAAI,CAAC,KAAK,EAAI,CAAC;IAClC,CAAC;;AAnBM,0BAAY,GAAgC;IACjD,SAAS,EAAE,YAAY;CACxB,CAAC;AAoBJ,eAAe,aAAa,CAAC"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import qs from 'qs';
|
2
2
|
import React, { useContext } from 'react';
|
3
|
-
import { Query } from 'react
|
3
|
+
import { Query } from '@apollo/client/react/components';
|
4
4
|
import SortOrderContainer from '../SortOrder/SortOrderContainer';
|
5
5
|
import CategoryRoute from './CategoryRoute';
|
6
6
|
import ProductRoute from './ProductRoute';
|