@jetshop/core 5.14.0-alpha.49df897e → 5.14.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ChannelHandler/channelUtils.js +20 -81
- package/ChannelHandler/channelUtils.js.map +1 -1
- package/ChannelHandler/redirectUtils.test.js +16 -6
- package/ChannelHandler/redirectUtilsGroupedChannels.test.js +92 -40
- package/cart/useAddToCart.js +2 -1
- package/cart/useAddToCart.js.map +1 -1
- package/components/Auth/formFieldsFromSettings.js +1 -1
- package/components/Auth/formFieldsFromSettings.js.map +1 -1
- package/components/Auth/useCustomer.d.ts +50 -4
- package/components/Auth/useCustomer.js +39 -18
- package/components/Auth/useCustomer.js.map +1 -1
- package/components/Mutation/AddToCartFormik.js +6 -5
- package/components/Mutation/AddToCartFormik.js.map +1 -1
- package/data/fragments/CartCoreFragment.gql +1 -0
- package/global.d.ts +1 -0
- package/hooks/usePrice.d.ts +3 -1
- package/hooks/usePrice.js +2 -1
- package/hooks/usePrice.js.map +1 -1
- package/package.json +1 -1
- package/test-utils/variables.js +11 -0
|
@@ -7,7 +7,7 @@ export const getGroupedChannels = (availableChannels, { groupName }) => {
|
|
|
7
7
|
return undefined;
|
|
8
8
|
}
|
|
9
9
|
const selectedChannelGroup = availableChannels.filter((channel) => channel.groupName === currentChannel.groupName);
|
|
10
|
-
if (selectedChannelGroup) {
|
|
10
|
+
if (selectedChannelGroup.length > 0) {
|
|
11
11
|
return selectedChannelGroup;
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
@@ -191,68 +191,8 @@ function setGeoIpAndAcceptLanguageCookies({ cookies, geoipCountry, acceptLanguag
|
|
|
191
191
|
path: '/'
|
|
192
192
|
});
|
|
193
193
|
}
|
|
194
|
-
function getGroupedChannelsByUrl({ url, channels, singleDomainMode, cookies, geoipCountry }) {
|
|
195
|
-
const hasGroupedChannels = allChannelsGrouped(channels);
|
|
196
|
-
if (!hasGroupedChannels) {
|
|
197
|
-
return {
|
|
198
|
-
hasGroupedChannels,
|
|
199
|
-
groupByChannel: undefined
|
|
200
|
-
};
|
|
201
|
-
}
|
|
202
|
-
switch (true) {
|
|
203
|
-
case isInDev(url): {
|
|
204
|
-
if (singleDomainMode) {
|
|
205
|
-
const currentBaseUrl = getURLBasename(new URL(url));
|
|
206
|
-
// -> se, de, dk, es etcetc
|
|
207
|
-
return {
|
|
208
|
-
hasGroupedChannels,
|
|
209
|
-
groupByChannel: channels.find((channel) =>
|
|
210
|
-
// We always split channel.url to consider if trailing slashes are added in as BaseUrl
|
|
211
|
-
sanitizeURL(channel.url).split('/')[1] === currentBaseUrl)
|
|
212
|
-
};
|
|
213
|
-
}
|
|
214
|
-
else {
|
|
215
|
-
// Try to match with anything during development + non-singledomain,
|
|
216
|
-
// this is b/c we can't match dev urls with any baseurl.
|
|
217
|
-
// If one wan't to test it in dev one can use the ?channel=XX param.
|
|
218
|
-
const { activeChannel, chosenChannel } = getCurrentChannel({
|
|
219
|
-
url,
|
|
220
|
-
singleDomainMode,
|
|
221
|
-
channels,
|
|
222
|
-
cookies,
|
|
223
|
-
geoipCountry
|
|
224
|
-
});
|
|
225
|
-
return {
|
|
226
|
-
hasGroupedChannels,
|
|
227
|
-
// Active channel is given first priority. If it is null we are most likely in staging or development so chosenChannel or defaultChannel is used
|
|
228
|
-
groupByChannel: activeChannel || chosenChannel || getDefaultChannel(channels)
|
|
229
|
-
};
|
|
230
|
-
}
|
|
231
|
-
}
|
|
232
|
-
case singleDomainMode: {
|
|
233
|
-
const currentBaseUrl = sanitizeURL(url).split('/', 2);
|
|
234
|
-
// -> se, de, dk, es etcetc
|
|
235
|
-
return {
|
|
236
|
-
hasGroupedChannels,
|
|
237
|
-
groupByChannel: channels.find((channel) =>
|
|
238
|
-
// We always split channel.url to consider if trailing slashes are added in as BaseUrl
|
|
239
|
-
sanitizeURL(channel.url).split('/')[1] === currentBaseUrl[1]) || getDefaultChannel(channels)
|
|
240
|
-
};
|
|
241
|
-
}
|
|
242
|
-
default: {
|
|
243
|
-
const currentBaseUrl = sanitizeURL(url).split('/')[0];
|
|
244
|
-
// -> domain.com
|
|
245
|
-
return {
|
|
246
|
-
hasGroupedChannels,
|
|
247
|
-
groupByChannel: channels.find((channel) =>
|
|
248
|
-
// We always split channel.url to consider if trailing slashes are added in as BaseUrl
|
|
249
|
-
sanitizeURL(channel.url).split('/')[0] === currentBaseUrl)
|
|
250
|
-
};
|
|
251
|
-
}
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
194
|
// Is where we determine current channel to get return values in getSelectedAndRecommendedChannel
|
|
255
|
-
function getCurrentChannel({ url, singleDomainMode, channels, cookies
|
|
195
|
+
function getCurrentChannel({ url, singleDomainMode, channels, cookies }) {
|
|
256
196
|
const { activeChannel, activeChannels } = getChannelFromPathOrUrl({
|
|
257
197
|
url,
|
|
258
198
|
singleDomainMode,
|
|
@@ -262,42 +202,34 @@ function getCurrentChannel({ url, singleDomainMode, channels, cookies, geoipCoun
|
|
|
262
202
|
cookies,
|
|
263
203
|
channels
|
|
264
204
|
});
|
|
265
|
-
const channelFromGeoIp = findChannelByCountry(geoipCountry || cookies.get('geoipCountry'), channels);
|
|
266
205
|
// But have default channel as fallback,
|
|
267
206
|
const defaultChannel = getDefaultChannel(channels);
|
|
268
207
|
return {
|
|
269
208
|
activeChannel,
|
|
270
209
|
activeChannels,
|
|
271
210
|
chosenChannel,
|
|
272
|
-
channelFromGeoIp,
|
|
273
211
|
defaultChannel
|
|
274
212
|
};
|
|
275
213
|
}
|
|
276
214
|
export function getSelectedAndRecommendedChannel({ url, singleDomainMode, channels, cookies, geoipCountry, acceptedLanguages, disableGeoRedirect }) {
|
|
277
215
|
setCookiesFromQueryString({ cookies, url });
|
|
278
|
-
const {
|
|
216
|
+
const { defaultChannel, chosenChannel, activeChannel, activeChannels } = getCurrentChannel({
|
|
279
217
|
url,
|
|
280
|
-
channels,
|
|
281
218
|
singleDomainMode,
|
|
219
|
+
channels,
|
|
282
220
|
cookies,
|
|
283
221
|
geoipCountry
|
|
284
222
|
});
|
|
285
|
-
// If
|
|
223
|
+
// Active channel is given first priority. If it is null we are most likely in staging or development so chosenChannel or defaultChannel is used
|
|
224
|
+
// Definitions: Requested channel by url || Channel stored in cookies || Default channel
|
|
225
|
+
const pureChannel = activeChannel || chosenChannel || defaultChannel;
|
|
286
226
|
// NB: All channels must be grouped and groupName is nullable.
|
|
287
|
-
const availableChannels =
|
|
227
|
+
const availableChannels = allChannelsGrouped(channels)
|
|
288
228
|
? getGroupedChannels(channels, {
|
|
289
|
-
groupName:
|
|
229
|
+
groupName: pureChannel.groupName
|
|
290
230
|
})
|
|
291
231
|
: channels;
|
|
292
|
-
const
|
|
293
|
-
url,
|
|
294
|
-
singleDomainMode,
|
|
295
|
-
channels: availableChannels,
|
|
296
|
-
cookies,
|
|
297
|
-
geoipCountry
|
|
298
|
-
});
|
|
299
|
-
// Active channel is given first priority. If it is null we are most likely in staging or development so chosenChannel or defaultChannel is used
|
|
300
|
-
const pureChannel = activeChannel || chosenChannel || defaultChannel;
|
|
232
|
+
const channelFromGeoIp = findChannelByCountry(geoipCountry || cookies.get('geoipCountry'), availableChannels);
|
|
301
233
|
let redirect = false;
|
|
302
234
|
let pureRecommendedChannel;
|
|
303
235
|
// If a channel has been chosen we want to redirect to it
|
|
@@ -305,14 +237,21 @@ export function getSelectedAndRecommendedChannel({ url, singleDomainMode, channe
|
|
|
305
237
|
activeChannel &&
|
|
306
238
|
activeChannel.id !== chosenChannel.id &&
|
|
307
239
|
// We don't want to redirect if the URLs of the channels are the same (i.e. demostore)
|
|
308
|
-
chosenChannel.url !== activeChannel.url
|
|
240
|
+
chosenChannel.url !== activeChannel.url &&
|
|
241
|
+
// It is safe to redirect if the channel is part of the same group (null === null ie. channel not grouped)
|
|
242
|
+
(chosenChannel === null || chosenChannel === void 0 ? void 0 : chosenChannel.groupName) === (activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.groupName)) {
|
|
309
243
|
redirect = true;
|
|
310
244
|
pureRecommendedChannel = chosenChannel;
|
|
311
245
|
}
|
|
312
|
-
else if (channelFromGeoIp &&
|
|
246
|
+
else if (channelFromGeoIp &&
|
|
247
|
+
// Recommend channel if it not the same as the current channel
|
|
248
|
+
pureChannel.id !== channelFromGeoIp.id &&
|
|
249
|
+
// Or is available in channel group (null === null ie. channel not grouped)
|
|
250
|
+
(pureChannel === null || pureChannel === void 0 ? void 0 : pureChannel.groupName) === (channelFromGeoIp === null || channelFromGeoIp === void 0 ? void 0 : channelFromGeoIp.groupName)) {
|
|
313
251
|
pureRecommendedChannel = channelFromGeoIp;
|
|
252
|
+
// Allow redirect if there's no channel in cookies (chosenChannel)
|
|
314
253
|
redirect = !disableGeoRedirect && !chosenChannel;
|
|
315
|
-
//
|
|
254
|
+
// the following should happen when we can't find a matching channel from the url so we want to redirect such that the basename is included
|
|
316
255
|
}
|
|
317
256
|
else if (!activeChannel &&
|
|
318
257
|
singleDomainMode &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channelUtils.js","sourceRoot":"","sources":["channelUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"channelUtils.js","sourceRoot":"","sources":["channelUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,7 @@ import {
|
|
|
10
10
|
import ApolloClient from 'apollo-client';
|
|
11
11
|
import gql from 'graphql-tag';
|
|
12
12
|
import { ChannelHandler } from './ChannelHandler';
|
|
13
|
-
import {
|
|
14
|
-
channels,
|
|
15
|
-
singleDomainChannels,
|
|
16
|
-
groupedChannels,
|
|
17
|
-
groupedSingleDomainChannels
|
|
18
|
-
} from '../test-utils/variables';
|
|
13
|
+
import { channels, singleDomainChannels } from '../test-utils/variables';
|
|
19
14
|
import { Cookies } from 'react-cookie';
|
|
20
15
|
import { primaryRouteForPathFetcher } from './redirectUtils';
|
|
21
16
|
import PreserveRedirectRouteQuery from './PreserveRedirectRouteQuery.gql';
|
|
@@ -299,6 +294,7 @@ describe('Single domain mode', () => {
|
|
|
299
294
|
expect(redirect).toBeFalsy();
|
|
300
295
|
expect(recommendedChannel).toBeFalsy();
|
|
301
296
|
});
|
|
297
|
+
|
|
302
298
|
it('Will redirect when the url is at the wrong channel and the channel is default', () => {
|
|
303
299
|
const cookies = new Cookies();
|
|
304
300
|
const { recommendedChannel, redirect } = getSelectedAndRecommendedChannel({
|
|
@@ -310,6 +306,7 @@ describe('Single domain mode', () => {
|
|
|
310
306
|
expect(redirect).toBe(true);
|
|
311
307
|
expect(recommendedChannel.url).toBe(selectedChannelSingleDomain.url);
|
|
312
308
|
});
|
|
309
|
+
|
|
313
310
|
it('Will not redirect when the redirect is disabled', () => {
|
|
314
311
|
const cookies = new Cookies();
|
|
315
312
|
const { redirect } = getSelectedAndRecommendedChannel({
|
|
@@ -320,6 +317,7 @@ describe('Single domain mode', () => {
|
|
|
320
317
|
});
|
|
321
318
|
expect(redirect).toBe(false);
|
|
322
319
|
});
|
|
320
|
+
|
|
323
321
|
it('Will not when the url is at the right channel', () => {
|
|
324
322
|
const cookies = new Cookies();
|
|
325
323
|
const { redirect } = getSelectedAndRecommendedChannel({
|
|
@@ -330,6 +328,7 @@ describe('Single domain mode', () => {
|
|
|
330
328
|
});
|
|
331
329
|
expect(redirect).toBe(false);
|
|
332
330
|
});
|
|
331
|
+
|
|
333
332
|
it('Will redirect when the url is at the wrong channel', () => {
|
|
334
333
|
const cookies = new Cookies();
|
|
335
334
|
cookies.set('channel', singleDomainChannels[2].name);
|
|
@@ -342,6 +341,7 @@ describe('Single domain mode', () => {
|
|
|
342
341
|
expect(redirect).toBe(true);
|
|
343
342
|
expect(recommendedChannel.url).toBe('https://flight-m2.jetshop.se/uk');
|
|
344
343
|
});
|
|
344
|
+
|
|
345
345
|
it('Georedirect will respect single domain mode', () => {
|
|
346
346
|
const cookies = new Cookies();
|
|
347
347
|
const { redirect, recommendedChannel } = getSelectedAndRecommendedChannel({
|
|
@@ -354,6 +354,7 @@ describe('Single domain mode', () => {
|
|
|
354
354
|
expect(redirect).toBe(true);
|
|
355
355
|
expect(recommendedChannel.url).toBe('https://flight-m2.jetshop.se/uk');
|
|
356
356
|
});
|
|
357
|
+
|
|
357
358
|
it('Georedirect will respect single domain mode when there is a domain path', async () => {
|
|
358
359
|
const urlToPreserve = '/accessories/orchid-peach-bag';
|
|
359
360
|
const cookies = new Cookies();
|
|
@@ -373,6 +374,7 @@ describe('Single domain mode', () => {
|
|
|
373
374
|
getPrimaryRoutePath,
|
|
374
375
|
channels
|
|
375
376
|
});
|
|
377
|
+
|
|
376
378
|
const redirectUrl = channelHandler.getRedirectUrl({
|
|
377
379
|
client,
|
|
378
380
|
url: selectedChannelSingleDomain.url + urlToPreserve,
|
|
@@ -383,6 +385,7 @@ describe('Single domain mode', () => {
|
|
|
383
385
|
'https://flight-m2.jetshop.se/uk/accessories/bags/orchid-peach-bag-uk?culture=sv-SE&channelCountry=UK&channel=UK'
|
|
384
386
|
);
|
|
385
387
|
});
|
|
388
|
+
|
|
386
389
|
it('Redirect on single domain mode when the basename shows up in the url', async () => {
|
|
387
390
|
const urlToPreserve = '/accessories/int/orchid-peach-bag';
|
|
388
391
|
const cookies = new Cookies();
|
|
@@ -401,6 +404,7 @@ describe('Single domain mode', () => {
|
|
|
401
404
|
getPrimaryRoutePath,
|
|
402
405
|
channels
|
|
403
406
|
});
|
|
407
|
+
|
|
404
408
|
const redirectUrl = channelHandler.getRedirectUrl({
|
|
405
409
|
client,
|
|
406
410
|
url: channels[0].url + urlToPreserve,
|
|
@@ -411,6 +415,7 @@ describe('Single domain mode', () => {
|
|
|
411
415
|
`https://flight-m2.jetshop.se/uk${urlToPreserve}?culture=sv-SE&channelCountry=UK&channel=UK`
|
|
412
416
|
);
|
|
413
417
|
});
|
|
418
|
+
|
|
414
419
|
it('Redirect on single domain mode when there is a domain path but no basename', async () => {
|
|
415
420
|
const urlToPreserve = '/accessories/orchid-peach-bag';
|
|
416
421
|
const cookies = new Cookies();
|
|
@@ -429,6 +434,7 @@ describe('Single domain mode', () => {
|
|
|
429
434
|
getPrimaryRoutePath,
|
|
430
435
|
channels
|
|
431
436
|
});
|
|
437
|
+
|
|
432
438
|
const redirectUrl = channelHandler.getRedirectUrl({
|
|
433
439
|
client,
|
|
434
440
|
url: channels[0].url + urlToPreserve,
|
|
@@ -439,6 +445,7 @@ describe('Single domain mode', () => {
|
|
|
439
445
|
`https://flight.jetshop.se/int${urlToPreserve}?culture=en-GB&channelCountry=US&channel=INT`
|
|
440
446
|
);
|
|
441
447
|
});
|
|
448
|
+
|
|
442
449
|
it('Will set the appropriate language based on basename', async () => {
|
|
443
450
|
const cookies = new Cookies();
|
|
444
451
|
const { selectedChannel } = getSelectedAndRecommendedChannel({
|
|
@@ -448,6 +455,7 @@ describe('Single domain mode', () => {
|
|
|
448
455
|
});
|
|
449
456
|
expect(selectedChannel.language.culture).toBe('en-GB');
|
|
450
457
|
});
|
|
458
|
+
|
|
451
459
|
it('Will set the appropriate language based on basename in singledomain mode', async () => {
|
|
452
460
|
const cookies = new Cookies();
|
|
453
461
|
const { selectedChannel } = getSelectedAndRecommendedChannel({
|
|
@@ -458,6 +466,7 @@ describe('Single domain mode', () => {
|
|
|
458
466
|
});
|
|
459
467
|
expect(selectedChannel.language.culture).toBe('en-GB');
|
|
460
468
|
});
|
|
469
|
+
|
|
461
470
|
it('Will redirect to a new language basename based on cookies', async () => {
|
|
462
471
|
const cookies = new Cookies();
|
|
463
472
|
cookies.set('culture', 'en-GB');
|
|
@@ -484,6 +493,7 @@ describe('Single domain mode', () => {
|
|
|
484
493
|
'https://flight-m2.jetshop.se/en/?culture=en-GB&channelCountry=SE&channel=SE'
|
|
485
494
|
);
|
|
486
495
|
});
|
|
496
|
+
|
|
487
497
|
it('Will redirect to a new language basename based on cookies in single domain mode', async () => {
|
|
488
498
|
const cookies = new Cookies();
|
|
489
499
|
cookies.set('culture', 'en-GB');
|
|
@@ -176,15 +176,6 @@ const selectedChannelSingleDomain = createSelectedChannel(
|
|
|
176
176
|
singleDomainChannels[0]
|
|
177
177
|
);
|
|
178
178
|
|
|
179
|
-
describe('Channel grouping', () => {
|
|
180
|
-
beforeEach(() => {
|
|
181
|
-
// Workaround changes in universal-cookie
|
|
182
|
-
Object.defineProperty(document, 'cookie', {
|
|
183
|
-
value: null
|
|
184
|
-
});
|
|
185
|
-
});
|
|
186
|
-
});
|
|
187
|
-
|
|
188
179
|
describe('Grouped channels', () => {
|
|
189
180
|
beforeEach(() => {
|
|
190
181
|
// Workaround changes in universal-cookie
|
|
@@ -319,46 +310,107 @@ describe('Grouped channels', () => {
|
|
|
319
310
|
});
|
|
320
311
|
});
|
|
321
312
|
describe('Redirects', () => {
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
313
|
+
beforeEach(() => {
|
|
314
|
+
// Workaround changes in universal-cookie
|
|
315
|
+
Object.defineProperty(document, 'cookie', {
|
|
316
|
+
value: null
|
|
317
|
+
});
|
|
318
|
+
});
|
|
319
|
+
describe('Single domain', () => {
|
|
320
|
+
it('Will not georedirect to channel outside of current group', () => {
|
|
321
|
+
const cookies = new Cookies();
|
|
322
|
+
const requestedChannel = createSelectedChannel(singleDomainChannels[0]);
|
|
323
|
+
|
|
324
|
+
const {
|
|
325
|
+
redirect,
|
|
326
|
+
channels: availableChannel,
|
|
327
|
+
selectedChannel
|
|
328
|
+
} = getSelectedAndRecommendedChannel({
|
|
329
|
+
url: requestedChannel.url,
|
|
330
|
+
singleDomainMode: true,
|
|
331
|
+
disableGeoRedirect: false,
|
|
332
|
+
channels: singleDomainChannels,
|
|
333
|
+
cookies,
|
|
334
|
+
geoipCountry: 'UK'
|
|
335
|
+
});
|
|
326
336
|
|
|
327
|
-
|
|
337
|
+
expect(selectedChannel.name === requestedChannel.name).toBe(true);
|
|
338
|
+
expect(redirect).toBe(false);
|
|
328
339
|
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
340
|
+
availableChannel.forEach((channel) =>
|
|
341
|
+
expect(channel.groupName).toBe('Brand-1')
|
|
342
|
+
);
|
|
343
|
+
});
|
|
344
|
+
it('Will georedirect to channel within of current group', () => {
|
|
345
|
+
const cookies = new Cookies();
|
|
346
|
+
const requestedChannel = createSelectedChannel(singleDomainChannels[0]);
|
|
347
|
+
|
|
348
|
+
const {
|
|
349
|
+
redirect,
|
|
350
|
+
channels: availableChannel,
|
|
351
|
+
selectedChannel,
|
|
352
|
+
recommendedChannel
|
|
353
|
+
} = getSelectedAndRecommendedChannel({
|
|
354
|
+
url: requestedChannel.url,
|
|
355
|
+
singleDomainMode: true,
|
|
356
|
+
disableGeoRedirect: false,
|
|
357
|
+
channels: singleDomainChannels,
|
|
358
|
+
cookies,
|
|
359
|
+
geoipCountry: 'SE'
|
|
335
360
|
});
|
|
336
361
|
|
|
337
|
-
|
|
338
|
-
expect(
|
|
339
|
-
|
|
340
|
-
|
|
362
|
+
expect(selectedChannel.name).toBe('INT');
|
|
363
|
+
expect(redirect).toBe(true);
|
|
364
|
+
expect(recommendedChannel.name).toBe('SE');
|
|
365
|
+
|
|
366
|
+
availableChannel.forEach((channel) =>
|
|
367
|
+
expect(channel.groupName).toBe('Brand-1')
|
|
368
|
+
);
|
|
369
|
+
});
|
|
341
370
|
});
|
|
342
371
|
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
372
|
+
describe('Non-single domain', () => {
|
|
373
|
+
it('Wil not redirect to channel within group', () => {
|
|
374
|
+
const cookies = new Cookies();
|
|
375
|
+
const selectedChannel = createSelectedChannel(channels[2]);
|
|
376
|
+
cookies.set('channel', selectedChannel.name);
|
|
347
377
|
|
|
348
|
-
|
|
378
|
+
const requestedChannel = createSelectedChannel(channels[0]);
|
|
349
379
|
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
380
|
+
const { redirect, channels: availableChannel } =
|
|
381
|
+
getSelectedAndRecommendedChannel({
|
|
382
|
+
url: requestedChannel.url,
|
|
383
|
+
singleDomainMode: false,
|
|
384
|
+
channels,
|
|
385
|
+
cookies
|
|
386
|
+
});
|
|
357
387
|
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
388
|
+
availableChannel.forEach((channel) =>
|
|
389
|
+
expect(channel.groupName).toBe('Brand-1')
|
|
390
|
+
);
|
|
391
|
+
expect(redirect).toBe(false);
|
|
392
|
+
});
|
|
393
|
+
|
|
394
|
+
it('Can redirect to channel within group', () => {
|
|
395
|
+
const cookies = new Cookies();
|
|
396
|
+
const selectedChannel = createSelectedChannel(channels[1]);
|
|
397
|
+
cookies.set('channel', selectedChannel.name);
|
|
398
|
+
|
|
399
|
+
const requestedChannel = createSelectedChannel(channels[0]);
|
|
400
|
+
|
|
401
|
+
const { redirect, channels: availableChannel } =
|
|
402
|
+
getSelectedAndRecommendedChannel({
|
|
403
|
+
url: requestedChannel.url,
|
|
404
|
+
singleDomainMode: false,
|
|
405
|
+
channels,
|
|
406
|
+
cookies
|
|
407
|
+
});
|
|
408
|
+
|
|
409
|
+
availableChannel.forEach((channel) =>
|
|
410
|
+
expect(channel.groupName).toBe('Brand-1')
|
|
411
|
+
);
|
|
412
|
+
expect(redirect).toBe(true);
|
|
413
|
+
});
|
|
362
414
|
});
|
|
363
415
|
});
|
|
364
416
|
});
|
package/cart/useAddToCart.js
CHANGED
|
@@ -25,6 +25,7 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
Object.keys(values.comments).forEach((name) => {
|
|
28
|
+
var _a;
|
|
28
29
|
const validator = commentValidators[name];
|
|
29
30
|
if (validator) {
|
|
30
31
|
const error = validator({ value: values.comments[name] });
|
|
@@ -35,7 +36,7 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
|
35
36
|
errors.comments[name] = error;
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
|
-
if (product.customerComments.find((customerComment) => customerComment.name === name).required &&
|
|
39
|
+
if (((_a = product.customerComments.find((customerComment) => customerComment.name === name)) === null || _a === void 0 ? void 0 : _a.required) &&
|
|
39
40
|
values.comments[name].length === 0) {
|
|
40
41
|
if (typeof errors.comments === 'undefined') {
|
|
41
42
|
errors.comments = {};
|
package/cart/useAddToCart.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAddToCart.js","sourceRoot":"","sources":["useAddToCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,2BAA2B,MAAM,wEAAwE,CAAC;AACjH,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAQ3D,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AA+CjE,MAAM,WAAW,GAAG,CAAC,EACnB,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,OAAO,EACP,iBAAiB,EAOlB,EAAE,EAAE;;IACH,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,cAAc,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC;IACxE,MAAM,kBAAkB,GACtB,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,0CAAE,QAAQ,CAAA,IAAI,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,0CAAE,MAAM,CAAA,CAAC;IAE7D,MAAM,QAAQ,GAAG,CAAC,MAA6B,EAAE,EAAE;QACjD,MAAM,MAAM,GAA0B,EAAE,CAAC;QACzC,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QACD,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE;YACvB,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,+BAA+B,CAAC,CAAC;SACtD;QACD,IAAI,gBAAgB,IAAI,MAAM,CAAC,QAAQ,GAAG,gBAAgB,EAAE;YAC1D,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,kDAAkD,EAAE;gBACtE,gBAAgB;aACjB,CAAC,CAAC;SACJ;QACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"useAddToCart.js","sourceRoot":"","sources":["useAddToCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,2BAA2B,MAAM,wEAAwE,CAAC;AACjH,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAQ3D,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AA+CjE,MAAM,WAAW,GAAG,CAAC,EACnB,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,OAAO,EACP,iBAAiB,EAOlB,EAAE,EAAE;;IACH,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,cAAc,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC;IACxE,MAAM,kBAAkB,GACtB,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,0CAAE,QAAQ,CAAA,IAAI,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,0CAAE,MAAM,CAAA,CAAC;IAE7D,MAAM,QAAQ,GAAG,CAAC,MAA6B,EAAE,EAAE;QACjD,MAAM,MAAM,GAA0B,EAAE,CAAC;QACzC,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QACD,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE;YACvB,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,+BAA+B,CAAC,CAAC;SACtD;QACD,IAAI,gBAAgB,IAAI,MAAM,CAAC,QAAQ,GAAG,gBAAgB,EAAE;YAC1D,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,kDAAkD,EAAE;gBACtE,gBAAgB;aACjB,CAAC,CAAC;SACJ;QACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;;YAC5C,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,SAAS,EAAE;gBACb,MAAM,KAAK,GAAG,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC1D,IAAI,KAAK,EAAE;oBACT,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE;wBAC1C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;qBACtB;oBACD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;iBAC/B;aACF;YACD,IACE,CAAA,MAAA,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAC3B,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,KAAK,IAAI,CACnD,0CAAE,QAAQ;gBACX,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAClC;gBACA,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE;oBAC1C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;iBACtB;gBACD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,mCAAmC,EAAE;oBAC7D,mBAAmB,EAAE,IAAI;iBAC1B,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,EAAE;YAClB,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,WAAW,EAAE;gBACzC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;aACrB;YAED,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;YAE3C,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAChC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,0BAA0B,EAAE;oBAC1D,UAAU,EAAE,MAAM,CAAC,IAAI;iBACxB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,kBAAkB,EAAE;YAC1C,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,4BAA4B,CAAC,CAAC;SACnD;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,UAAU,YAAY,CAAC,EAC3B,OAAO,EACP,OAAO,EACP,MAAM,EACN,iBAAiB,GAAG,EAAE,EACtB,iBAAiB,EACjB,aAAa,EACI;;IACjB,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAEzE,MAAM,2BAA2B,GAAG,UAAU,CAAC,2BAA2B,CAAC,CAAC;IAC5E,MAAM,gBAAgB,GAAG,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,GAAG,CAAC;IAC1D,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAE/B,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEzD,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,IAAI,OAAO,CAAC,gBAAgB,EAAE;QAC5B,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAC9B,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAC3C,CAAC;KACH;IAED,MAAM,cAAc,GAAY,EAAE,CAAC;IACnC,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,OAAO,0CAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;QAC/B,iBAAiB;QACjB,aAAa;QACb,OAAO;QACP,OAAO;QACP,iBAAiB;KAClB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,SAAS,CAAC;QACvB,gBAAgB,EAAE,KAAK;QACvB,QAAQ;QACR,aAAa,kBACX,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,cAAc,IACpB,aAAa,CACjB;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACnB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC3D,IAAI;gBACJ,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;aAC7B,CAAC,CAAC,CAAC;YAEJ,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAExE,MAAM,CAAC;gBACL,KAAK,EAAE;oBACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,YAAY;oBACZ,QAAQ;oBACR,aAAa;oBACb,MAAM;oBACN,gBAAgB;iBACjB;gBACD,UAAU,kCACL,KAAK,KACR,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,OAAO;oBACP,OAAO,GACR;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,MAAM;KACb,CAAC;AACJ,CAAC"}
|
|
@@ -57,7 +57,7 @@ export function createValidatorForFields(fields, { getFieldName = (name) => name
|
|
|
57
57
|
return function validate(values) {
|
|
58
58
|
const errors = {};
|
|
59
59
|
fields.forEach((field) => {
|
|
60
|
-
if (field
|
|
60
|
+
if (field) {
|
|
61
61
|
const pattern = field.pattern && new RegExp(unescape(field.pattern));
|
|
62
62
|
const fieldName = getFieldName(field.name);
|
|
63
63
|
const value = getFieldValue(values, fieldName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formFieldsFromSettings.js","sourceRoot":"","sources":["formFieldsFromSettings.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"formFieldsFromSettings.js","sourceRoot":"","sources":["formFieldsFromSettings.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Customer, CustomerAddress, CustomerField, CustomerUpdateBillingAddressInput, CustomerUpdateDeliveryAddressInput, CustomerUpdateInput, CustomerUpdatePreferenceInput, Query, PrivateCustomer, BusinessCustomer } from '@jetshop/core/types';
|
|
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
|
declare type CustomerUpdateAddressInput = CustomerUpdateBillingAddressInput | CustomerUpdateDeliveryAddressInput;
|
|
4
4
|
export declare function customerAddressToCustomerUpdateAddressInput({ address, isDeleteId, countryCode }: {
|
|
@@ -10,7 +10,7 @@ export declare function getAddressInputFieldName(name: string): keyof CustomerUp
|
|
|
10
10
|
export declare function getDeliveryAddressesInput(customer: Customer, countryCode: string): CustomerUpdateDeliveryAddressInput[];
|
|
11
11
|
export declare function getBillingAddressInput({ customer, countryCode }: {
|
|
12
12
|
customer: Customer;
|
|
13
|
-
billingAddressFields
|
|
13
|
+
billingAddressFields?: CustomerField[];
|
|
14
14
|
countryCode: string;
|
|
15
15
|
}): CustomerUpdateBillingAddressInput;
|
|
16
16
|
export declare function getCustomerUpdatePreferenceInput(customer: Customer,
|
|
@@ -24,9 +24,55 @@ export declare function getCustomerUpdateInput({ customer, billingAddressFields,
|
|
|
24
24
|
}): CustomerUpdateInput;
|
|
25
25
|
export declare function useCustomerCountrySettings(customer: Customer | null): {
|
|
26
26
|
loading: boolean;
|
|
27
|
-
countrySettings:
|
|
27
|
+
countrySettings: CountrySettings;
|
|
28
28
|
setCountryCode: (countryCode: string) => void;
|
|
29
29
|
};
|
|
30
|
+
export declare function useDeliveryAddressFields({ customer, countrySettings, deliveryAddressId }: {
|
|
31
|
+
customer?: Query['customer'] & {
|
|
32
|
+
__typename?: 'BusinessCustomer' | 'PrivateCustomer';
|
|
33
|
+
};
|
|
34
|
+
countrySettings: CountrySettings;
|
|
35
|
+
deliveryAddressId?: number;
|
|
36
|
+
}): {
|
|
37
|
+
value: string | number | import("@jetshop/core/types").Country;
|
|
38
|
+
label: any;
|
|
39
|
+
__typename?: "CustomerField";
|
|
40
|
+
id: string;
|
|
41
|
+
required: boolean;
|
|
42
|
+
pattern?: string;
|
|
43
|
+
fields?: CustomerField[];
|
|
44
|
+
name: string;
|
|
45
|
+
}[];
|
|
46
|
+
export declare function useCustomerDetails({ customer, deliveryAddressId }: {
|
|
47
|
+
customer?: Query['customer'] & {
|
|
48
|
+
__typename?: 'BusinessCustomer' | 'PrivateCustomer';
|
|
49
|
+
};
|
|
50
|
+
deliveryAddressId?: number;
|
|
51
|
+
}): {
|
|
52
|
+
countrySettings: CountrySettings;
|
|
53
|
+
setCountryCode: (countryCode: string) => void;
|
|
54
|
+
billingAddress: {
|
|
55
|
+
value: string | number | import("@jetshop/core/types").Country;
|
|
56
|
+
label: any;
|
|
57
|
+
__typename?: "CustomerField";
|
|
58
|
+
id: string;
|
|
59
|
+
required: boolean;
|
|
60
|
+
pattern?: string;
|
|
61
|
+
fields?: CustomerField[];
|
|
62
|
+
name: string;
|
|
63
|
+
}[];
|
|
64
|
+
deliveryAddress: {
|
|
65
|
+
value: string | number | import("@jetshop/core/types").Country;
|
|
66
|
+
label: any;
|
|
67
|
+
__typename?: "CustomerField";
|
|
68
|
+
id: string;
|
|
69
|
+
required: boolean;
|
|
70
|
+
pattern?: string;
|
|
71
|
+
fields?: CustomerField[];
|
|
72
|
+
name: string;
|
|
73
|
+
}[];
|
|
74
|
+
customerCountrySettingsLoading: boolean;
|
|
75
|
+
};
|
|
30
76
|
export declare function useCustomerQuery({ query, deliveryAddressId }: {
|
|
31
77
|
query: DocumentNode;
|
|
32
78
|
deliveryAddressId?: number;
|
|
@@ -41,7 +87,7 @@ export declare function useCustomerQuery({ query, deliveryAddressId }: {
|
|
|
41
87
|
customer: Customer & {
|
|
42
88
|
__typename: 'BusinessCustomer' | 'PrivateCustomer';
|
|
43
89
|
};
|
|
44
|
-
countrySettings:
|
|
90
|
+
countrySettings: CountrySettings;
|
|
45
91
|
setCountryCode: (countryCode: string) => void;
|
|
46
92
|
billingAddress: {
|
|
47
93
|
value: string | number | import("@jetshop/core/types").Country;
|
|
@@ -32,7 +32,7 @@ export function getAddressInputFieldName(name) {
|
|
|
32
32
|
return name;
|
|
33
33
|
}
|
|
34
34
|
export function getDeliveryAddressesInput(customer, countryCode) {
|
|
35
|
-
return customer.deliveryAddresses.map(address => customerAddressToCustomerUpdateAddressInput({ address, countryCode }));
|
|
35
|
+
return customer.deliveryAddresses.map((address) => customerAddressToCustomerUpdateAddressInput({ address, countryCode }));
|
|
36
36
|
}
|
|
37
37
|
export function getBillingAddressInput({ customer, countryCode }) {
|
|
38
38
|
return customerAddressToCustomerUpdateAddressInput({
|
|
@@ -77,7 +77,7 @@ export function useCustomerCountrySettings(customer) {
|
|
|
77
77
|
const { countrySettings, selectedCountrySettings, loading } = useCountrySettings();
|
|
78
78
|
const byCountryCode = useCallback(function byCountryCode(countryCode) {
|
|
79
79
|
const settings = countrySettings &&
|
|
80
|
-
countrySettings.find(s => s.countryCode === countryCode);
|
|
80
|
+
countrySettings.find((s) => s.countryCode === countryCode);
|
|
81
81
|
return settings || null;
|
|
82
82
|
}, [countrySettings]);
|
|
83
83
|
const [customerCountrySettings, setCustomerCountrySettings] = useState(customer && customer.billingAddress.country
|
|
@@ -108,36 +108,57 @@ export function useCustomerCountrySettings(customer) {
|
|
|
108
108
|
setCountryCode
|
|
109
109
|
};
|
|
110
110
|
}
|
|
111
|
-
export function
|
|
112
|
-
var _a;
|
|
113
|
-
const { refetch, data, loading, error } = useQuery(query);
|
|
114
|
-
const customer = (_a = data === null || data === void 0 ? void 0 : data.customer) !== null && _a !== void 0 ? _a : null;
|
|
111
|
+
export function useDeliveryAddressFields({ customer, countrySettings, deliveryAddressId }) {
|
|
115
112
|
const fieldType = (customer === null || customer === void 0 ? void 0 : customer.__typename) === 'BusinessCustomer'
|
|
116
113
|
? 'businessCustomerFields'
|
|
117
114
|
: 'privateCustomerFields';
|
|
118
|
-
const { countrySettings, setCountryCode, loading: customerCountrySettingsLoading } = useCustomerCountrySettings(customer);
|
|
119
|
-
const billingAddress = useMemo(() => {
|
|
120
|
-
var _a;
|
|
121
|
-
const billingAddressField = countrySettings === null || countrySettings === void 0 ? void 0 : countrySettings[fieldType].find(({ name }) => name === 'billingAddress');
|
|
122
|
-
const billingAddressFields = (_a = billingAddressField === null || billingAddressField === void 0 ? void 0 : billingAddressField.fields.map(field => {
|
|
123
|
-
var _a;
|
|
124
|
-
return Object.assign(Object.assign({}, field), { value: (_a = customer === null || customer === void 0 ? void 0 : customer.billingAddress) === null || _a === void 0 ? void 0 : _a[field.name], label: translations[field.name] });
|
|
125
|
-
})) !== null && _a !== void 0 ? _a : [];
|
|
126
|
-
return billingAddressFields;
|
|
127
|
-
}, [countrySettings, customer, fieldType]);
|
|
128
115
|
const deliveryAddress = useMemo(() => {
|
|
129
116
|
if (deliveryAddressId === undefined)
|
|
130
117
|
return [];
|
|
131
118
|
const deliveryAddressField = countrySettings &&
|
|
132
119
|
countrySettings[fieldType].find(({ name }) => name === 'deliveryAddress');
|
|
133
|
-
const deliveryAddressIndex = customer.deliveryAddresses.findIndex(a => a.id === deliveryAddressId);
|
|
120
|
+
const deliveryAddressIndex = customer.deliveryAddresses.findIndex((a) => a.id === deliveryAddressId);
|
|
134
121
|
const deliveryAddressFields = deliveryAddressField
|
|
135
|
-
? deliveryAddressField.fields.map(field => {
|
|
122
|
+
? deliveryAddressField.fields.map((field) => {
|
|
136
123
|
return Object.assign(Object.assign({}, field), { value: customer.deliveryAddresses[deliveryAddressIndex][field.name], label: translations[field.name] });
|
|
137
124
|
})
|
|
138
125
|
: [];
|
|
139
126
|
return deliveryAddressFields;
|
|
140
127
|
}, [countrySettings, customer, deliveryAddressId, fieldType]);
|
|
128
|
+
return deliveryAddress;
|
|
129
|
+
}
|
|
130
|
+
export function useCustomerDetails({ customer, deliveryAddressId }) {
|
|
131
|
+
const fieldType = (customer === null || customer === void 0 ? void 0 : customer.__typename) === 'BusinessCustomer'
|
|
132
|
+
? 'businessCustomerFields'
|
|
133
|
+
: 'privateCustomerFields';
|
|
134
|
+
const { countrySettings, setCountryCode, loading: customerCountrySettingsLoading } = useCustomerCountrySettings(customer);
|
|
135
|
+
const billingAddress = useMemo(() => {
|
|
136
|
+
var _a;
|
|
137
|
+
const billingAddressField = countrySettings === null || countrySettings === void 0 ? void 0 : countrySettings[fieldType].find(({ name }) => name === 'billingAddress');
|
|
138
|
+
const billingAddressFields = (_a = billingAddressField === null || billingAddressField === void 0 ? void 0 : billingAddressField.fields.map((field) => {
|
|
139
|
+
var _a;
|
|
140
|
+
return Object.assign(Object.assign({}, field), { value: (_a = customer === null || customer === void 0 ? void 0 : customer.billingAddress) === null || _a === void 0 ? void 0 : _a[field.name], label: translations[field.name] });
|
|
141
|
+
})) !== null && _a !== void 0 ? _a : [];
|
|
142
|
+
return billingAddressFields;
|
|
143
|
+
}, [countrySettings, customer, fieldType]);
|
|
144
|
+
const deliveryAddress = useDeliveryAddressFields({
|
|
145
|
+
customer,
|
|
146
|
+
countrySettings,
|
|
147
|
+
deliveryAddressId
|
|
148
|
+
});
|
|
149
|
+
return {
|
|
150
|
+
countrySettings,
|
|
151
|
+
setCountryCode,
|
|
152
|
+
billingAddress,
|
|
153
|
+
deliveryAddress,
|
|
154
|
+
customerCountrySettingsLoading
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
export function useCustomerQuery({ query, deliveryAddressId }) {
|
|
158
|
+
var _a;
|
|
159
|
+
const { refetch, data, loading, error } = useQuery(query);
|
|
160
|
+
const customer = (_a = data === null || data === void 0 ? void 0 : data.customer) !== null && _a !== void 0 ? _a : null;
|
|
161
|
+
const { countrySettings, setCountryCode, billingAddress, deliveryAddress, customerCountrySettingsLoading } = useCustomerDetails({ customer, deliveryAddressId });
|
|
141
162
|
return {
|
|
142
163
|
refetch,
|
|
143
164
|
loading: loading || customerCountrySettingsLoading,
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"useCustomer.js","sourceRoot":"","sources":["useCustomer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -94,7 +94,8 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
|
94
94
|
maxOrderQuantity
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
|
-
Object.keys(values.comments).forEach(name => {
|
|
97
|
+
Object.keys(values.comments).forEach((name) => {
|
|
98
|
+
var _a;
|
|
98
99
|
const validator = commentValidators[name];
|
|
99
100
|
if (validator) {
|
|
100
101
|
const error = validator({ value: values.comments[name] });
|
|
@@ -105,7 +106,7 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
|
105
106
|
errors.comments[name] = error;
|
|
106
107
|
}
|
|
107
108
|
}
|
|
108
|
-
if (product.customerComments.find(customerComment => customerComment.name === name).required &&
|
|
109
|
+
if (((_a = product.customerComments.find((customerComment) => customerComment.name === name)) === null || _a === void 0 ? void 0 : _a.required) &&
|
|
109
110
|
values.comments[name].length === 0) {
|
|
110
111
|
if (typeof errors.comments === 'undefined') {
|
|
111
112
|
errors.comments = {};
|
|
@@ -120,7 +121,7 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
|
120
121
|
errors.options = {};
|
|
121
122
|
}
|
|
122
123
|
const missingOptions = getMissingOptions();
|
|
123
|
-
missingOptions.forEach(option => {
|
|
124
|
+
missingOptions.forEach((option) => {
|
|
124
125
|
errors.options[option.name] = t(`{optionName} is required`, {
|
|
125
126
|
optionName: option.name
|
|
126
127
|
});
|
|
@@ -145,7 +146,7 @@ const AddToCartFormik = (_a) => {
|
|
|
145
146
|
initialComments[name] = '';
|
|
146
147
|
});
|
|
147
148
|
const initialOptions = {};
|
|
148
|
-
product.variants.options.forEach(option => {
|
|
149
|
+
product.variants.options.forEach((option) => {
|
|
149
150
|
initialOptions[option.name] = '';
|
|
150
151
|
});
|
|
151
152
|
const combinedInitialValues = Object.assign({ quantity: 1, comments: initialComments, options: initialOptions }, initialValues);
|
|
@@ -166,7 +167,7 @@ const AddToCartFormik = (_a) => {
|
|
|
166
167
|
product,
|
|
167
168
|
variant
|
|
168
169
|
});
|
|
169
|
-
return (React.createElement(Formik, Object.assign({ validateOnChange: false, initialValues: combinedInitialValues, validate: validate, onSubmit: onSubmit, render: renderProps => children(renderProps) }, props)));
|
|
170
|
+
return (React.createElement(Formik, Object.assign({ validateOnChange: false, initialValues: combinedInitialValues, validate: validate, onSubmit: onSubmit, render: (renderProps) => children(renderProps) }, props)));
|
|
170
171
|
};
|
|
171
172
|
export default AddToCartFormik;
|
|
172
173
|
//# sourceMappingURL=AddToCartFormik.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddToCartFormik.js","sourceRoot":"","sources":["AddToCartFormik.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AddToCartFormik.js","sourceRoot":"","sources":["AddToCartFormik.tsx"],"names":[],"mappings":"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"}
|
package/global.d.ts
CHANGED
package/hooks/usePrice.d.ts
CHANGED
|
@@ -11,8 +11,10 @@ export interface UsePrice {
|
|
|
11
11
|
formatter?(price: number, currencyCode?: string, culture?: string): string;
|
|
12
12
|
/** Override the channel settings for includeVat */
|
|
13
13
|
includeVat?: boolean;
|
|
14
|
+
hidePrice?: boolean;
|
|
14
15
|
}
|
|
15
|
-
export declare function usePrice({ currencyOverride, price, previousPrice, includeVat, formatter: defaultFormatter }: UsePrice): {
|
|
16
|
+
export declare function usePrice({ currencyOverride, price, previousPrice, includeVat, formatter: defaultFormatter, hidePrice }: UsePrice): {
|
|
17
|
+
hidePrice: boolean;
|
|
16
18
|
hasDiscount: boolean;
|
|
17
19
|
includesVat: boolean;
|
|
18
20
|
currencyLocale: {
|
package/hooks/usePrice.js
CHANGED
|
@@ -3,7 +3,7 @@ import { useContext } from 'react';
|
|
|
3
3
|
import { useIntl } from '@jetshop/intl';
|
|
4
4
|
// #endregion Interfaces
|
|
5
5
|
// #region
|
|
6
|
-
export function usePrice({ currencyOverride, price, previousPrice, includeVat, formatter: defaultFormatter }) {
|
|
6
|
+
export function usePrice({ currencyOverride, price, previousPrice, includeVat, formatter: defaultFormatter, hidePrice }) {
|
|
7
7
|
var _a;
|
|
8
8
|
const context = useContext(ChannelContext);
|
|
9
9
|
const t = useIntl();
|
|
@@ -42,6 +42,7 @@ export function usePrice({ currencyOverride, price, previousPrice, includeVat, f
|
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
return {
|
|
45
|
+
hidePrice,
|
|
45
46
|
hasDiscount: pricing.previousPrice && pricing.previousPrice.value
|
|
46
47
|
? pricing.price.value < pricing.previousPrice.value
|
|
47
48
|
: false,
|
package/hooks/usePrice.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePrice.js","sourceRoot":"","sources":["usePrice.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAa,MAAM,OAAO,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"usePrice.js","sourceRoot":"","sources":["usePrice.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/test-utils/variables.js
CHANGED
|
@@ -6,6 +6,7 @@ export const channels = [
|
|
|
6
6
|
name: 'INT',
|
|
7
7
|
isDefault: true,
|
|
8
8
|
displayName: 'International',
|
|
9
|
+
groupName: null,
|
|
9
10
|
url: 'https://flight.jetshop.se',
|
|
10
11
|
countries: [
|
|
11
12
|
{
|
|
@@ -486,6 +487,7 @@ export const channels = [
|
|
|
486
487
|
name: 'SE',
|
|
487
488
|
isDefault: false,
|
|
488
489
|
displayName: null,
|
|
490
|
+
groupName: null,
|
|
489
491
|
url: 'https://flight-m2.jetshop.se',
|
|
490
492
|
countries: [
|
|
491
493
|
{
|
|
@@ -554,6 +556,7 @@ export const channels = [
|
|
|
554
556
|
name: 'UK',
|
|
555
557
|
isDefault: false,
|
|
556
558
|
displayName: null,
|
|
559
|
+
groupName: null,
|
|
557
560
|
url: 'https://flight-m2.jetshop.uk',
|
|
558
561
|
countries: [
|
|
559
562
|
{
|
|
@@ -620,6 +623,7 @@ export const singleDomainChannels = [
|
|
|
620
623
|
name: 'INT',
|
|
621
624
|
isDefault: true,
|
|
622
625
|
displayName: 'International',
|
|
626
|
+
groupName: null,
|
|
623
627
|
url: 'https://flight.jetshop.se/int',
|
|
624
628
|
countries: [
|
|
625
629
|
{
|
|
@@ -1100,6 +1104,7 @@ export const singleDomainChannels = [
|
|
|
1100
1104
|
name: 'SE',
|
|
1101
1105
|
isDefault: false,
|
|
1102
1106
|
displayName: null,
|
|
1107
|
+
groupName: null,
|
|
1103
1108
|
url: 'https://flight-m2.jetshop.se/se',
|
|
1104
1109
|
countries: [
|
|
1105
1110
|
{
|
|
@@ -1168,6 +1173,7 @@ export const singleDomainChannels = [
|
|
|
1168
1173
|
name: 'UK',
|
|
1169
1174
|
isDefault: false,
|
|
1170
1175
|
displayName: null,
|
|
1176
|
+
groupName: null,
|
|
1171
1177
|
url: 'https://flight-m2.jetshop.se/uk',
|
|
1172
1178
|
countries: [
|
|
1173
1179
|
{
|
|
@@ -2408,6 +2414,11 @@ export const groupedSingleDomainChannels = [
|
|
|
2408
2414
|
name: 'United Kingdom',
|
|
2409
2415
|
code: 'UK',
|
|
2410
2416
|
isDefault: true
|
|
2417
|
+
},
|
|
2418
|
+
{
|
|
2419
|
+
name: 'Sweden',
|
|
2420
|
+
code: 'SE',
|
|
2421
|
+
isDefault: false
|
|
2411
2422
|
}
|
|
2412
2423
|
],
|
|
2413
2424
|
languages: [
|