@jetshop/core 5.10.0 → 5.11.0
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/ChannelHandler.d.ts +9 -13
- package/ChannelHandler/ChannelHandler.js +16 -63
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/ChannelHandler/channelUtils.d.ts +13 -0
- package/ChannelHandler/channelUtils.js +26 -15
- package/ChannelHandler/channelUtils.js.map +1 -1
- package/ChannelHandler/redirectUtils.d.ts +3 -0
- package/ChannelHandler/redirectUtils.js +48 -0
- package/ChannelHandler/redirectUtils.js.map +1 -0
- package/ChannelHandler/redirectUtils.test.js +8 -0
- package/analytics/AnalyticsProvider.js +1 -1
- package/analytics/AnalyticsProvider.js.map +1 -1
- package/boot/SharedTree.js +1 -1
- package/boot/SharedTree.js.map +1 -1
- package/boot/apollo.d.ts +5 -3
- package/boot/apollo.js +9 -13
- package/boot/apollo.js.map +1 -1
- package/boot/client/startClient.js +5 -10
- package/boot/client/startClient.js.map +1 -1
- package/boot/server/createRenderer.js +8 -7
- package/boot/server/createRenderer.js.map +1 -1
- package/boot/server/index.js +2 -2
- package/boot/server/index.js.map +1 -1
- package/boot/server/persistedQueries/__tests__/getPersistedQueriesForRequest.test.js +53 -39
- package/boot/server/persistedQueries/getPersistedQueriesForRequest.js +2 -2
- package/boot/server/persistedQueries/getPersistedQueriesForRequest.js.map +1 -1
- package/components/Auth/CustomerUpdateForm.js +7 -7
- package/components/Auth/CustomerUpdateForm.js.map +1 -1
- package/components/ChannelContext/ChannelProvider.d.ts +1 -3
- package/components/ChannelContext/ChannelProvider.js +6 -13
- package/components/ChannelContext/ChannelProvider.js.map +1 -1
- package/components/ChannelContext/ChannelProvider.test.js +110 -0
- package/components/Mutation/cartMutationUtils.js +7 -6
- package/components/Mutation/cartMutationUtils.js.map +1 -1
- package/components/Query/CartProvider.js +31 -21
- package/components/Query/CartProvider.js.map +1 -1
- package/components/StructuredData/StructuredBreadcrumbData.js +4 -3
- package/components/StructuredData/StructuredBreadcrumbData.js.map +1 -1
- package/hooks/ProductList/ProductListContext.js +37 -14
- package/hooks/ProductList/ProductListContext.js.map +1 -1
- package/hooks/ProductList/action-creators.d.ts +20 -7
- package/hooks/ProductList/action-creators.js +125 -31
- package/hooks/ProductList/action-creators.js.map +1 -1
- package/hooks/ProductList/index.d.ts +34 -8
- package/hooks/ProductList/index.js +19 -0
- package/hooks/ProductList/index.js.map +1 -1
- package/hooks/ProductList/list-transforms.d.ts +2 -2
- package/hooks/ProductList/list-transforms.js +22 -22
- package/hooks/ProductList/list-transforms.js.map +1 -1
- package/hooks/ProductList/list-transforms.test.js +103 -100
- package/hooks/ProductList/product-list-reducer.d.ts +37 -14
- package/hooks/ProductList/product-list-reducer.js +106 -43
- package/hooks/ProductList/product-list-reducer.js.map +1 -1
- package/hooks/ProductList/product-list-reducer.test.js +144 -82
- package/hooks/ProductList/useProductList.d.ts +2 -2
- package/hooks/ProductList/useProductList.js +12 -5
- package/hooks/ProductList/useProductList.js.map +1 -1
- package/hooks/ProductList/useProductListItems.d.ts +1 -1
- package/hooks/ProductList/useProductListItems.js +8 -6
- package/hooks/ProductList/useProductListItems.js.map +1 -1
- package/package.json +1 -1
- package/resolvers/index.d.ts +3 -0
- package/resolvers/index.js +3 -0
- package/resolvers/index.js.map +1 -1
- package/sentry/client.js +1 -1
- package/sentry/client.js.map +1 -1
- package/time.d.ts +1 -0
- package/time.js +6 -0
- package/time.js.map +1 -0
package/boot/apollo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apollo.js","sourceRoot":"","sources":["apollo.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"apollo.js","sourceRoot":"","sources":["apollo.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,18 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
// Intl
|
|
11
10
|
import { setupIntl } from '@jetshop/intl/config';
|
|
12
11
|
import * as Sentry from '../../sentry/client';
|
|
13
12
|
import React from 'react';
|
|
14
|
-
// Cookies
|
|
15
13
|
import { Cookies } from 'react-cookie';
|
|
16
|
-
// React DOM
|
|
17
14
|
import { hydrate as renderToDOM } from 'react-dom';
|
|
18
|
-
// Metadata
|
|
19
|
-
// Loadable Component
|
|
20
15
|
import { loadableReady } from '@loadable/component';
|
|
21
|
-
// React Router DOM
|
|
22
16
|
import { BrowserRouter } from 'react-router-dom';
|
|
23
17
|
import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
|
|
24
18
|
import { getSelectedAndRecommendedChannel } from '../../ChannelHandler/channelUtils';
|
|
@@ -33,6 +27,7 @@ import SharedTree from '../SharedTree';
|
|
|
33
27
|
import createIntlOptions from '../utils/createIntOptions';
|
|
34
28
|
import { setUID } from '../utils/uid';
|
|
35
29
|
import { webVitals } from '../../analytics/webVitals';
|
|
30
|
+
import { primaryRouteForPathFetcher } from '../../../core/ChannelHandler/redirectUtils';
|
|
36
31
|
// Instantiate this here, since we need to read cookies outside of React.
|
|
37
32
|
const cookies = new Cookies();
|
|
38
33
|
function getInitialCacheData() {
|
|
@@ -62,18 +57,18 @@ const startClient = (tree, config) => {
|
|
|
62
57
|
Sentry.init(config.sentry.clientDSN);
|
|
63
58
|
}
|
|
64
59
|
const { apolloConfig } = config;
|
|
65
|
-
const channelHandler = new ChannelHandler();
|
|
66
60
|
const authHandler = new AuthHandler({
|
|
67
61
|
cookies
|
|
68
62
|
});
|
|
69
63
|
const previewHandler = new PreviewHandler();
|
|
70
|
-
|
|
64
|
+
const channelHandler = new ChannelHandler();
|
|
71
65
|
const { client } = createClient({
|
|
72
66
|
apolloConfig,
|
|
73
|
-
channelHandler,
|
|
74
67
|
authHandler,
|
|
75
|
-
previewHandler
|
|
68
|
+
previewHandler,
|
|
69
|
+
channelHandler
|
|
76
70
|
});
|
|
71
|
+
channelHandler.setGetPrimaryRoutePath(primaryRouteForPathFetcher(client));
|
|
77
72
|
const initialCacheData = getInitialCacheData();
|
|
78
73
|
// Initialise cache with active filters from the search params
|
|
79
74
|
client.cache.writeData(initialCacheData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startClient.js","sourceRoot":"","sources":["startClient.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO
|
|
1
|
+
{"version":3,"file":"startClient.js","sourceRoot":"","sources":["startClient.tsx"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ import { getPersistedQueriesForRequest } from './persistedQueries/getPersistedQu
|
|
|
29
29
|
import _merge from 'lodash.merge';
|
|
30
30
|
import { salesSourceMiddleware } from './salesSource';
|
|
31
31
|
import { getPreloadLinkHeaderString } from './getPreloadAssets';
|
|
32
|
+
import { primaryRouteForPathFetcher } from '../../../core/ChannelHandler/redirectUtils';
|
|
32
33
|
const injectDataIntoSlots = (template, data) => Object.keys(data).reduce((output, key) => key !== 'htmlAttributes'
|
|
33
34
|
? output.replace(`<slot name="${key}"/>`, data[key])
|
|
34
35
|
: output.replace('<html lang="en">', `<html ${data[key]}>`), template);
|
|
@@ -124,27 +125,27 @@ const createRenderer = (template, tree, options) => {
|
|
|
124
125
|
acceptedLanguages,
|
|
125
126
|
disableGeoRedirect
|
|
126
127
|
});
|
|
128
|
+
const authHandler = new AuthHandler({
|
|
129
|
+
cookies
|
|
130
|
+
});
|
|
131
|
+
const previewHandler = new PreviewHandler();
|
|
127
132
|
const channelHandler = new ChannelHandler({
|
|
128
133
|
selectedChannel,
|
|
129
134
|
recommendedChannel,
|
|
130
135
|
channels
|
|
131
136
|
});
|
|
132
|
-
const authHandler = new AuthHandler({
|
|
133
|
-
cookies
|
|
134
|
-
});
|
|
135
|
-
const previewHandler = new PreviewHandler();
|
|
136
137
|
const createClientOpts = {
|
|
137
138
|
apolloConfig,
|
|
138
139
|
schema,
|
|
139
|
-
channelHandler,
|
|
140
140
|
authHandler,
|
|
141
141
|
previewHandler,
|
|
142
|
-
req
|
|
142
|
+
req,
|
|
143
|
+
channelHandler
|
|
143
144
|
};
|
|
144
145
|
const { client } = createClient(createClientOpts);
|
|
146
|
+
channelHandler.setGetPrimaryRoutePath(primaryRouteForPathFetcher(client));
|
|
145
147
|
if (redirect && !isBot(req.header('user-agent'))) {
|
|
146
148
|
const redirectUrl = yield channelHandler.getRedirectUrl({
|
|
147
|
-
client,
|
|
148
149
|
url: fullUrl,
|
|
149
150
|
newChannel: channelHandler.recommendedChannel,
|
|
150
151
|
preserveRedirect: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createRenderer.js","sourceRoot":"","sources":["createRenderer.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAIhD,OAAO,KAAuB,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,iBAAiB,MAAM,2BAA2B,CAAC;AAE1D,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,6BAA6B,EAAE,MAAM,kDAAkD,CAAC;AACjG,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAiB,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"createRenderer.js","sourceRoot":"","sources":["createRenderer.tsx"],"names":[],"mappings":"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"}
|
package/boot/server/index.js
CHANGED
|
@@ -53,7 +53,7 @@ function validateBootOptions(opts) {
|
|
|
53
53
|
}
|
|
54
54
|
if (errors.length > 0) {
|
|
55
55
|
throw new Error(`Boot options invalid, check your "shop.config.js". Errors:\n${errors
|
|
56
|
-
.map(str => `- ${str}`)
|
|
56
|
+
.map((str) => `- ${str}`)
|
|
57
57
|
.join('\n')}`);
|
|
58
58
|
}
|
|
59
59
|
return addMissingConfig(opts);
|
|
@@ -113,6 +113,6 @@ export const createApp = (Component, userConfig) => __awaiter(void 0, void 0, vo
|
|
|
113
113
|
app.use(asyncErrorHandler(renderer));
|
|
114
114
|
return app;
|
|
115
115
|
});
|
|
116
|
-
const boot = () => throwErrorInDev(true, `Update your server.js to use the named import 'createApp' instead of 'boot', see https://docs.dev.jetshop.se/
|
|
116
|
+
const boot = () => throwErrorInDev(true, `Update your server.js to use the named import 'createApp' instead of 'boot', see https://docs.dev.jetshop.se/migrating/3-and-below#change-server-entry-point`);
|
|
117
117
|
export default boot;
|
|
118
118
|
//# sourceMappingURL=index.js.map
|
package/boot/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,qCAAqC,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,8EAA8E;AAC9E,iGAAiG;AACjG,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,kBAAkB,MAAM,oCAAoC,CAAC;AAEpE,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,kBAAkB,MAAM,kCAAkC,CAAC;AAClE,gJAAgJ;AAChJ,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACpC,IAAI,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,GAAG,QAAQ,CAAC;AAEtE,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,GAAG,aAAa,CAAC;AACpD,MAAM,iBAAiB,GAAG,KAAK,CAAC,cAAc,GAAG,sBAAsB,CAAC;AAMxE,SAAS,mBAAmB,CAAC,IAAiB;;IAC5C,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAI,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,0CAAE,UAAU,CAAC,MAAM,EAAE;QAC3C,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE;YACnE,MAAM,CAAC,IAAI,CACT,mNAAmN,CACpN,CAAC;SACH;KACF;IAED,IACE,IAAI,CAAC,gBAAgB;QACrB,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;QAChC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAChC;QACA,MAAM,CAAC,IAAI,CACT,qBAAqB,IAAI,CAAC,gBAAgB,CAAC,MAAM,4GAA4G,CAC9J,CAAC;KACH;IAED,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS;YAC1B,MAAM,CAAC,IAAI,CACT,kEAAkE,CACnE,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY;YAC7B,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;QAC3E,IACE,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc;YAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;YAEvC,MAAM,CAAC,IAAI,CACT,yGAAyG,CAC1G,CAAC;KACL;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,+DAA+D,MAAM;aAClE,GAAG,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { getPersistedQueriesForRequest } from '../getPersistedQueriesForRequest'
|
|
|
2
2
|
import aQuery from './mockQuery.gql';
|
|
3
3
|
import nock from 'nock';
|
|
4
4
|
import { ApolloError } from 'apollo-client';
|
|
5
|
+
import { ChannelHandler } from '../../../../ChannelHandler/ChannelHandler';
|
|
5
6
|
|
|
6
7
|
beforeAll(() => {
|
|
7
8
|
jest.useFakeTimers();
|
|
@@ -25,24 +26,13 @@ const apolloConfig = {
|
|
|
25
26
|
persistedQueries: [{ query: aQuery }]
|
|
26
27
|
};
|
|
27
28
|
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
currency: { name: 'Dollarydoos' }
|
|
36
|
-
}
|
|
37
|
-
},
|
|
38
|
-
authHandler: {
|
|
39
|
-
getAuthHeaders: () => {},
|
|
40
|
-
loadAuthToken: () => {},
|
|
41
|
-
authToken: ''
|
|
42
|
-
},
|
|
43
|
-
previewHandler: {
|
|
44
|
-
getPreviewHeaders: () => {},
|
|
45
|
-
preview: false
|
|
29
|
+
const defaultChannel = {
|
|
30
|
+
id: 1,
|
|
31
|
+
language: { name: 'English' },
|
|
32
|
+
currency: { name: 'Dollarydoos' },
|
|
33
|
+
country: {
|
|
34
|
+
id: 1234,
|
|
35
|
+
code: 'UK'
|
|
46
36
|
}
|
|
47
37
|
};
|
|
48
38
|
|
|
@@ -50,20 +40,43 @@ function mockResponse(resp, { statusCode = 200, errors } = {}) {
|
|
|
50
40
|
const data = {
|
|
51
41
|
errors,
|
|
52
42
|
data: resp && {
|
|
53
|
-
[resp.name]: resp.values.map(val =>
|
|
43
|
+
[resp.name]: resp.values.map((val) =>
|
|
54
44
|
Object.assign({ __typename: resp.name }, val)
|
|
55
45
|
)
|
|
56
46
|
}
|
|
57
47
|
};
|
|
58
48
|
|
|
59
49
|
const res = jest.fn(() => data);
|
|
60
|
-
nock('http://localhost')
|
|
61
|
-
.post('/graphql')
|
|
62
|
-
.reply(statusCode, res);
|
|
50
|
+
nock('http://localhost').post('/graphql').reply(statusCode, res);
|
|
63
51
|
return res;
|
|
64
52
|
}
|
|
65
53
|
|
|
66
54
|
describe('getPersistedQueriesForRequest', () => {
|
|
55
|
+
let opts;
|
|
56
|
+
|
|
57
|
+
beforeEach(() => {
|
|
58
|
+
const channelHandler = new ChannelHandler({
|
|
59
|
+
selectedChannel: defaultChannel
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
opts = {
|
|
63
|
+
apolloConfig,
|
|
64
|
+
channelHandler,
|
|
65
|
+
authHandler: {
|
|
66
|
+
getAuthHeaders: () => {},
|
|
67
|
+
loadAuthToken: () => {},
|
|
68
|
+
authToken: ''
|
|
69
|
+
},
|
|
70
|
+
previewHandler: {
|
|
71
|
+
getPreviewHeaders: () => {},
|
|
72
|
+
preview: false
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
});
|
|
76
|
+
afterEach(() => {
|
|
77
|
+
opts = {};
|
|
78
|
+
});
|
|
79
|
+
|
|
67
80
|
test('creates an object keyed by the channel', async () => {
|
|
68
81
|
const clients = {};
|
|
69
82
|
|
|
@@ -72,17 +85,20 @@ describe('getPersistedQueriesForRequest', () => {
|
|
|
72
85
|
values: [{ id: 1, name: 'Roger' }]
|
|
73
86
|
});
|
|
74
87
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
language: { name: 'Deutsch' },
|
|
83
|
-
currency: { name: 'Deutschmarks' }
|
|
84
|
-
}
|
|
88
|
+
const newChannel = {
|
|
89
|
+
id: 2,
|
|
90
|
+
language: { name: 'Deutsch' },
|
|
91
|
+
currency: { name: 'Deutschmarks' },
|
|
92
|
+
country: {
|
|
93
|
+
id: 1923,
|
|
94
|
+
code: 'DE'
|
|
85
95
|
}
|
|
96
|
+
};
|
|
97
|
+
|
|
98
|
+
// First request comes in at channel 2…
|
|
99
|
+
opts.channelHandler.setSelectedChannel(newChannel);
|
|
100
|
+
getPersistedQueriesForRequest(clients, {
|
|
101
|
+
...opts
|
|
86
102
|
});
|
|
87
103
|
|
|
88
104
|
// It's added to the clients object
|
|
@@ -97,7 +113,8 @@ describe('getPersistedQueriesForRequest', () => {
|
|
|
97
113
|
});
|
|
98
114
|
|
|
99
115
|
// Another request comes in on channel 1…
|
|
100
|
-
|
|
116
|
+
opts.channelHandler.setSelectedChannel(defaultChannel);
|
|
117
|
+
getPersistedQueriesForRequest(clients, opts);
|
|
101
118
|
|
|
102
119
|
// Now both are kept in memory
|
|
103
120
|
expect(Object.keys(clients).length).toBe(2);
|
|
@@ -117,10 +134,10 @@ describe('getPersistedQueriesForRequest', () => {
|
|
|
117
134
|
});
|
|
118
135
|
|
|
119
136
|
// A request comes in on channel 1…
|
|
120
|
-
|
|
137
|
+
getPersistedQueriesForRequest(clients, opts);
|
|
121
138
|
|
|
122
139
|
// And then another!
|
|
123
|
-
|
|
140
|
+
getPersistedQueriesForRequest(clients, opts);
|
|
124
141
|
|
|
125
142
|
// Only one entry in the cache tho
|
|
126
143
|
const keys = Object.keys(clients);
|
|
@@ -142,10 +159,7 @@ describe('getPersistedQueriesForRequest', () => {
|
|
|
142
159
|
// A request comes in on channel 1…
|
|
143
160
|
|
|
144
161
|
try {
|
|
145
|
-
|
|
146
|
-
clients,
|
|
147
|
-
opts
|
|
148
|
-
).extractCache();
|
|
162
|
+
await getPersistedQueriesForRequest(clients, opts).extractCache();
|
|
149
163
|
} catch (err) {
|
|
150
164
|
expect(err).toBeInstanceOf(ApolloError);
|
|
151
165
|
expect(err.message).toBe(`GraphQL error: Something went wrong`);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PersistedClient } from './PersistedClient';
|
|
2
2
|
export function getPersistedQueriesForRequest(persistedQueryClients, opts) {
|
|
3
|
-
const { apolloConfig,
|
|
3
|
+
const { apolloConfig, authHandler, previewHandler, channelHandler } = opts;
|
|
4
4
|
const queriesToPersist = apolloConfig.persistedQueries || [];
|
|
5
5
|
// When auth is enabled or we are in a preview route, we don't want to cache
|
|
6
6
|
if (!!(authHandler === null || authHandler === void 0 ? void 0 : authHandler.authToken) || (previewHandler === null || previewHandler === void 0 ? void 0 : previewHandler.preview))
|
|
@@ -9,7 +9,7 @@ export function getPersistedQueriesForRequest(persistedQueryClients, opts) {
|
|
|
9
9
|
if (queriesToPersist.length === 0)
|
|
10
10
|
return null;
|
|
11
11
|
let client;
|
|
12
|
-
const channel = channelHandler.
|
|
12
|
+
const channel = channelHandler.getSelectedChannel();
|
|
13
13
|
if (channel.requiresAuth)
|
|
14
14
|
return null;
|
|
15
15
|
// Create a key unique to this selected channel, lang, currency
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPersistedQueriesForRequest.js","sourceRoot":"","sources":["getPersistedQueriesForRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,UAAU,6BAA6B,CAC3C,qBAA0B,EAC1B,IAAsB;IAEtB,MAAM,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"getPersistedQueriesForRequest.js","sourceRoot":"","sources":["getPersistedQueriesForRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,UAAU,6BAA6B,CAC3C,qBAA0B,EAC1B,IAAsB;IAEtB,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAE3E,MAAM,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,IAAI,EAAE,CAAC;IAE7D,4EAA4E;IAC5E,IAAI,CAAC,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,SAAS,CAAA,KAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,CAAA;QAAE,OAAO,IAAI,CAAC;IAErE,4EAA4E;IAC5E,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAE/C,IAAI,MAAuB,CAAC;IAE5B,MAAM,OAAO,GAAG,cAAc,CAAC,kBAAkB,EAAE,CAAC;IAEpD,IAAI,OAAO,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAEtC,+DAA+D;IAC/D,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAE9E,MAAM,OAAO,GAAG,cAAc,CAAC,iBAAiB,EAAE,CAAC;IAEnD,IAAI,GAAG,IAAI,qBAAqB,EAAE;QAChC,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;KACrC;SAAM;QACL,MAAM,SAAS,GAAG,IAAI,eAAe,iCAAM,IAAI,KAAE,OAAO,IAAG,CAAC;QAE5D,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;KACjD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -7,7 +7,7 @@ import React, { useContext, useMemo } from 'react';
|
|
|
7
7
|
import { getAddressInputFieldName, getCustomerUpdateInput, useCustomerQuery, useCustomerUpdateMutation } from './useCustomer';
|
|
8
8
|
export function getBillingAddressFieldsToRender(fields) {
|
|
9
9
|
return fields
|
|
10
|
-
.map(field => {
|
|
10
|
+
.map((field) => {
|
|
11
11
|
const name = `billingAddress.${getAddressInputFieldName(field.name)}`;
|
|
12
12
|
if (name === `billingAddress.countryCode`) {
|
|
13
13
|
// omit changing `countryCode` for now
|
|
@@ -26,7 +26,7 @@ export function getBillingAddressFieldsToRender(fields) {
|
|
|
26
26
|
}
|
|
27
27
|
export function getDeliveryAddressFieldsToRender(fields, index) {
|
|
28
28
|
return fields
|
|
29
|
-
.map(field => {
|
|
29
|
+
.map((field) => {
|
|
30
30
|
const name = `deliveryAddresses[${index}].${getAddressInputFieldName(field.name)}`;
|
|
31
31
|
if (name === `deliveryAddresses[${index}].countryCode`) {
|
|
32
32
|
// omit changing `countryCode` for now
|
|
@@ -52,7 +52,7 @@ export const CustomerUpdateFormProvider = ({ render, onSubmit, onSubmitSuccess,
|
|
|
52
52
|
const { billingAddressFields, deliveryAddressFields, pidField } = useMemo(() => formFieldsFromSettings(countrySettings, isBusinessCustomer), [countrySettings, isBusinessCustomer]);
|
|
53
53
|
const billingAddressFieldsToRender = useMemo(() => getBillingAddressFieldsToRender(billingAddressFields), [billingAddressFields]);
|
|
54
54
|
const deliveryAddressIndex = customer &&
|
|
55
|
-
customer.deliveryAddresses.findIndex(a => a.id === deliveryAddressId);
|
|
55
|
+
customer.deliveryAddresses.findIndex((a) => a.id === deliveryAddressId);
|
|
56
56
|
const deliveryAddressFieldsToRender = useMemo(() => deliveryAddressIndex > -1
|
|
57
57
|
? getDeliveryAddressFieldsToRender(deliveryAddressFields, deliveryAddressIndex)
|
|
58
58
|
: [], [deliveryAddressFields, deliveryAddressIndex]);
|
|
@@ -80,12 +80,12 @@ export const CustomerUpdateFormProvider = ({ render, onSubmit, onSubmitSuccess,
|
|
|
80
80
|
const customerUpdateMutation = useCustomerUpdateMutation({
|
|
81
81
|
customerQuery: customerProfileQuery
|
|
82
82
|
});
|
|
83
|
-
return loading ? null : (React.createElement(Formik, { initialValues: initialValues, validate: values => {
|
|
83
|
+
return loading ? null : (React.createElement(Formik, { initialValues: initialValues, validate: (values) => {
|
|
84
84
|
const errors = {};
|
|
85
85
|
const pidFieldName = pidField.name;
|
|
86
86
|
if (pidFieldName in values &&
|
|
87
87
|
pidField.required &&
|
|
88
|
-
values[pidFieldName].trim().length === 0) {
|
|
88
|
+
(values[pidFieldName] || '').trim().length === 0) {
|
|
89
89
|
errors[pidFieldName] = t('This field is required');
|
|
90
90
|
}
|
|
91
91
|
const billingAddress = billingAddressValidator(values.billingAddress);
|
|
@@ -109,14 +109,14 @@ export const CustomerUpdateFormProvider = ({ render, onSubmit, onSubmitSuccess,
|
|
|
109
109
|
actions.resetForm();
|
|
110
110
|
onSubmitSuccess && onSubmitSuccess();
|
|
111
111
|
})
|
|
112
|
-
.catch(err => {
|
|
112
|
+
.catch((err) => {
|
|
113
113
|
logError(true, err);
|
|
114
114
|
actions.setSubmitting(false);
|
|
115
115
|
actions.setStatus({
|
|
116
116
|
globalError: t('Something went wrong saving information. Try again?')
|
|
117
117
|
});
|
|
118
118
|
});
|
|
119
|
-
}, render: props => (React.createElement(Form, null, render(Object.assign(Object.assign({}, props), { billingAddressFields: billingAddressFieldsToRender, deliveryAddressFields: deliveryAddressFieldsToRender, pidField,
|
|
119
|
+
}, render: (props) => (React.createElement(Form, null, render(Object.assign(Object.assign({}, props), { billingAddressFields: billingAddressFieldsToRender, deliveryAddressFields: deliveryAddressFieldsToRender, pidField,
|
|
120
120
|
setCountryCode, countries: selectedChannel.countries })))) }));
|
|
121
121
|
};
|
|
122
122
|
//# sourceMappingURL=CustomerUpdateForm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomerUpdateForm.js","sourceRoot":"","sources":["CustomerUpdateForm.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,YAAY,EACb,MAAM,sDAAsD,CAAC;AAC9D,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AAEtD,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAA6B,MAAM,QAAQ,CAAC;AAEjE,OAAO,KAAK,EAAE,EAAa,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE9D,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,eAAe,CAAC;AAyBvB,MAAM,UAAU,+BAA+B,CAC7C,MAA+B;IAE/B,OAAO,MAAM;SACV,GAAG,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"CustomerUpdateForm.js","sourceRoot":"","sources":["CustomerUpdateForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import ApolloClient from 'apollo-client';
|
|
3
2
|
import { BootOptions } from '../ConfigProvider';
|
|
4
3
|
import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
|
|
5
4
|
export interface ChannelProviderProps {
|
|
6
|
-
client: ApolloClient<any>;
|
|
7
5
|
channelHandler: ChannelHandler;
|
|
8
6
|
children?: React.ReactNode;
|
|
9
7
|
config: BootOptions;
|
|
10
8
|
}
|
|
11
|
-
declare const ChannelProvider: ({
|
|
9
|
+
declare const ChannelProvider: ({ channelHandler, children, config }: ChannelProviderProps) => JSX.Element;
|
|
12
10
|
export default ChannelProvider;
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import React, { useMemo } from 'react';
|
|
2
2
|
import ChannelContext from './ChannelContext';
|
|
3
|
-
const ChannelProvider = ({
|
|
3
|
+
const ChannelProvider = ({ channelHandler, children, config }) => {
|
|
4
4
|
const { channels, selectedChannel, recommendedChannel } = channelHandler;
|
|
5
5
|
const value = useMemo(() => {
|
|
6
6
|
const updateChannelSingleDomain = (newChannel) => {
|
|
7
|
-
channelHandler.updateChannel({ config,
|
|
7
|
+
channelHandler.updateChannel({ config, newChannel });
|
|
8
8
|
};
|
|
9
9
|
const channelsById = {};
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
channels &&
|
|
11
|
+
channels.forEach((channel) => {
|
|
12
12
|
channelsById[channel.id] = channel;
|
|
13
13
|
});
|
|
14
14
|
return {
|
|
@@ -17,16 +17,9 @@ const ChannelProvider = ({ client, channelHandler, children, config }) => {
|
|
|
17
17
|
channels,
|
|
18
18
|
selectedChannel,
|
|
19
19
|
channelsById,
|
|
20
|
-
basename: channelHandler.getChannelBasename()
|
|
20
|
+
basename: channelHandler.getChannelBasename() // TODO This isn't used anywhere?
|
|
21
21
|
};
|
|
22
|
-
}, [
|
|
23
|
-
channelHandler,
|
|
24
|
-
channels,
|
|
25
|
-
client,
|
|
26
|
-
config,
|
|
27
|
-
recommendedChannel,
|
|
28
|
-
selectedChannel
|
|
29
|
-
]);
|
|
22
|
+
}, [channelHandler, channels, config, recommendedChannel, selectedChannel]);
|
|
30
23
|
return (React.createElement(ChannelContext.Provider, { value: value }, children));
|
|
31
24
|
};
|
|
32
25
|
export default ChannelProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChannelProvider.js","sourceRoot":"","sources":["ChannelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,cAAmC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"ChannelProvider.js","sourceRoot":"","sources":["ChannelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,cAAmC,MAAM,kBAAkB,CAAC;AAWnE,MAAM,eAAe,GAAG,CAAC,EACvB,cAAc,EACd,QAAQ,EACR,MAAM,EACe,EAAE,EAAE;IACzB,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,cAAc,CAAC;IACzE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,MAAM,yBAAyB,GAAG,CAAC,UAA2B,EAAE,EAAE;YAChE,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,MAAM,YAAY,GAA+B,EAAE,CAAC;QAEpD,QAAQ;YACN,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC;YACrC,CAAC,CAAC,CAAC;QAEL,OAAO;YACL,kBAAkB;YAClB,aAAa,EAAE,yBAAyB;YACxC,QAAQ;YACR,eAAe;YACf,YAAY;YACZ,QAAQ,EAAE,cAAc,CAAC,kBAAkB,EAAE,CAAC,iCAAiC;SAChF,CAAC;IACJ,CAAC,EAAE,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,kBAAkB,EAAE,eAAe,CAAC,CAAC,CAAC;IAE5E,OAAO,CACL,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IAAG,QAAQ,CAA2B,CAC5E,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,eAAe,CAAC"}
|