@jetshop/core 5.12.0 → 5.12.3
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/ChannelHandler.js +3 -6
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/ChannelHandler/PreserveRedirectRouteQuery.gql +1 -1
- package/ChannelHandler/redirectUtils.d.ts +2 -1
- package/ChannelHandler/redirectUtils.js +5 -3
- package/ChannelHandler/redirectUtils.js.map +1 -1
- package/analytics/trackerRegistry.js +10 -3
- package/analytics/trackerRegistry.js.map +1 -1
- package/boot/addMissingConfig.js +1 -1
- package/boot/addMissingConfig.js.map +1 -1
- package/components/Auth/formatSignupInput.js +3 -2
- package/components/Auth/formatSignupInput.js.map +1 -1
- package/components/Filters/utils/replaceInSearch.d.ts +1 -0
- package/components/Filters/utils/updateHistory.d.ts +3 -0
- package/components/SortOrder/SortOrderContainer.d.ts +15 -3
- package/components/SortOrder/SortOrderContainer.js +27 -18
- package/components/SortOrder/SortOrderContainer.js.map +1 -1
- package/hooks/Filters/useSortOrder.d.ts +1 -0
- package/hooks/Filters/useSortOrder.js +6 -3
- package/hooks/Filters/useSortOrder.js.map +1 -1
- package/hooks/ProductList/list-transforms.d.ts +1 -0
- package/package.json +1 -1
- package/resolvers/filters/defaultActiveFilters.d.ts +1 -1
- package/resolvers/filters/defaultActiveFilters.js.map +1 -1
- package/resolvers/filters/filterParams.d.ts +1 -1
- package/resolvers/filters/filterParams.js +5 -5
- package/resolvers/filters/filterParams.js.map +1 -1
- package/resolvers/filters/index.d.ts +4 -4
- package/resolvers/filters/updateQueryString.d.ts +4 -3
- package/resolvers/filters/updateQueryString.js +16 -10
- package/resolvers/filters/updateQueryString.js.map +1 -1
- package/server/tracking/facebook.d.ts +1 -1
- package/server/tracking/facebook.js +12 -15
- package/server/tracking/facebook.js.map +1 -1
- package/server/tracking/middleware.d.ts +5 -1
- package/server/tracking/middleware.js.map +1 -1
- package/server/tracking/types.d.ts +2 -2
- package/types.d.ts +17 -0
@@ -38,14 +38,11 @@ export class ChannelHandler {
|
|
38
38
|
const routePathsArray = routes
|
39
39
|
? Object.keys(routes).map((key) => routes[key].path)
|
40
40
|
: [];
|
41
|
-
if (routePathsArray.
|
41
|
+
if (routePathsArray.find((routePath) => path.startsWith(routePath))) {
|
42
42
|
return Promise.resolve(path);
|
43
43
|
}
|
44
44
|
if (path) {
|
45
|
-
|
46
|
-
// getPrimaryRoutePath will pick up the selected channel
|
47
|
-
this.setSelectedChannel(newChannel);
|
48
|
-
return this.getPrimaryRoutePath(path);
|
45
|
+
return this.getPrimaryRoutePath(path, newChannel, this.setSelectedChannel);
|
49
46
|
}
|
50
47
|
else {
|
51
48
|
return Promise.resolve('/');
|
@@ -89,7 +86,7 @@ export class ChannelHandler {
|
|
89
86
|
};
|
90
87
|
this.updateChannel = (_a) => {
|
91
88
|
var { config } = _a, args = __rest(_a, ["config"]);
|
92
|
-
this.getRedirectUrl(Object.assign(Object.assign({}, args), { url: window.location.href, preserveRedirect: config.preserveRedirect }))
|
89
|
+
this.getRedirectUrl(Object.assign(Object.assign({}, args), { url: window.location.href, preserveRedirect: config.preserveRedirect, routes: config.routes }))
|
93
90
|
.then((url) => window.location.assign(url))
|
94
91
|
.catch((url) => window.location.assign(url));
|
95
92
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ChannelHandler.js","sourceRoot":"","sources":["ChannelHandler.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AAGpB,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,OAAO,EACR,MAAM,gBAAgB,CAAC;AAGxB,MAAM,OAAO,cAAc;IAMzB,YACE,OAKI;QACF,eAAe,EAAE,SAAS;QAC1B,kBAAkB,EAAE,SAAS;QAC7B,QAAQ,EAAE,SAAS;QACnB,mBAAmB,EAAE,SAAS;KAC/B;QAcH,2BAAsB,GAAG,CAAC,mBAAwC,EAAE,EAAE,CACpE,CAAC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,CAAC;QAEnD,uBAAkB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC;QAEhD,uBAAkB,GAAG,CAAC,eAAgC,EAAE,EAAE;YACxD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACzC,CAAC,CAAC;QAEF,0BAAqB,GAAG,CAAC,kBAAmC,EAAE,EAAE;YAC9D,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC/C,CAAC,CAAC;QAEF,0BAAqB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC;QAEtD,gBAAW,GAAG,CAAC,QAAmB,EAAE,EAAE;YACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC;QAEF,gBAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;QAElC,sBAAiB,GAAG,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAElE,uBAAkB,GAAG,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE5D,yBAAoB,GAAG,CAAC,EAC9B,GAAG,EACH,UAAU,EACV,MAAM,EAKP,EAAmB,EAAE;YACpB,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YAC9C,MAAM,eAAe,GAAG,MAAM;gBAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACpD,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,eAAe,CAAC,
|
1
|
+
{"version":3,"file":"ChannelHandler.js","sourceRoot":"","sources":["ChannelHandler.ts"],"names":[],"mappings":"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"}
|
@@ -1,3 +1,4 @@
|
|
1
1
|
import ApolloClient from 'apollo-client';
|
2
|
-
|
2
|
+
import { SelectedChannel } from '../components/ChannelContext/ChannelContext';
|
3
|
+
export declare type GetPrimaryRoutePath = (path: string, newChannel: SelectedChannel, setSelectedChannel: (selectedChannel: SelectedChannel) => void) => Promise<string>;
|
3
4
|
export declare function primaryRouteForPathFetcher(client: ApolloClient<any>): GetPrimaryRoutePath;
|
@@ -19,7 +19,7 @@ const PathnameRedirectQueryMap = {
|
|
19
19
|
Page: PagePathnameRedirectQuery
|
20
20
|
};
|
21
21
|
export function primaryRouteForPathFetcher(client) {
|
22
|
-
return (path) => __awaiter(this, void 0, void 0, function* () {
|
22
|
+
return (path, newChannel, setSelectedChannel) => __awaiter(this, void 0, void 0, function* () {
|
23
23
|
try {
|
24
24
|
if (!path) {
|
25
25
|
throw new Error('No path was provided');
|
@@ -30,12 +30,14 @@ export function primaryRouteForPathFetcher(client) {
|
|
30
30
|
path
|
31
31
|
}
|
32
32
|
});
|
33
|
-
const { id, __typename } = routeQueryResult.data.route.object;
|
33
|
+
const { id, __typename, pageId } = routeQueryResult.data.route.object;
|
34
|
+
const idUesdForRedirect = id || pageId;
|
35
|
+
setSelectedChannel(newChannel);
|
34
36
|
const pathnameQueryResult = yield client.query({
|
35
37
|
fetchPolicy: 'network-only',
|
36
38
|
query: PathnameRedirectQueryMap[__typename],
|
37
39
|
variables: {
|
38
|
-
id
|
40
|
+
id: idUesdForRedirect
|
39
41
|
}
|
40
42
|
});
|
41
43
|
return pathnameQueryResult.data[__typename].primaryRoute.path;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"redirectUtils.js","sourceRoot":"","sources":["redirectUtils.ts"],"names":[],"mappings":";;;;;;;;;AASA,OAAO,0BAA0B,MAAM,kCAAkC,CAAC;AAC1E,OAAO,4BAA4B,MAAM,oCAAoC,CAAC;AAC9E,OAAO,6BAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,yBAAyB,MAAM,iCAAiC,CAAC;
|
1
|
+
{"version":3,"file":"redirectUtils.js","sourceRoot":"","sources":["redirectUtils.ts"],"names":[],"mappings":";;;;;;;;;AASA,OAAO,0BAA0B,MAAM,kCAAkC,CAAC;AAC1E,OAAO,4BAA4B,MAAM,oCAAoC,CAAC;AAC9E,OAAO,6BAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,yBAAyB,MAAM,iCAAiC,CAAC;AAGxE,MAAM,wBAAwB,GAAG;IAC/B,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE,6BAA6B;IACvC,SAAS,EAAE,8BAA8B;IACzC,IAAI,EAAE,yBAAyB;CAChC,CAAC;AASF,MAAM,UAAU,0BAA0B,CACxC,MAAyB;IAEzB,OAAO,CAAO,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,EAAE;QACpD,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YAED,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,KAAK,CAQxC;gBACD,KAAK,EAAE,0BAA0B;gBACjC,SAAS,EAAE;oBACT,IAAI;iBACL;aACF,CAAC,CAAC;YAEH,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YACtE,MAAM,iBAAiB,GAAG,EAAE,IAAI,MAAM,CAAC;YACvC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAE/B,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,KAAK,CAK3C;gBACD,WAAW,EAAE,cAAc;gBAC3B,KAAK,EAAE,wBAAwB,CAAC,UAAU,CAAC;gBAC3C,SAAS,EAAE;oBACT,EAAE,EAAE,iBAAiB;iBACtB;aACF,CAAC,CAAC;YACH,OAAO,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;SAC/D;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,GAAG,CAAC;SACZ;IACH,CAAC,CAAA,CAAC;AACJ,CAAC"}
|
@@ -74,9 +74,16 @@ export function createServerTracker({ currency, useArticleNumberAsId, pixelId, t
|
|
74
74
|
headers: {
|
75
75
|
'Content-Type': 'application/json'
|
76
76
|
},
|
77
|
-
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
78
|
-
|
79
|
-
|
77
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId, props: {
|
78
|
+
listName: props.listName,
|
79
|
+
products: props.products.map((product) => ({
|
80
|
+
articleNumber: product.articleNumber,
|
81
|
+
id: product.id,
|
82
|
+
price: product.price,
|
83
|
+
name: product.name,
|
84
|
+
previousPrice: product.previousPrice
|
85
|
+
}))
|
86
|
+
}, context, location: window.location.href }))
|
80
87
|
});
|
81
88
|
},
|
82
89
|
trackPageView(props, context, eventId) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"trackerRegistry.js","sourceRoot":"","sources":["trackerRegistry.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,aAAa,MAAM,eAAe,CAAC;AAmI1C,MAAM,CAAC,MAAM,cAAc,GAAiC;IAC1D,cAAc;IACd,mBAAmB;IACnB,WAAW;IACX,WAAW;IACX,eAAe;IACf,iBAAiB;IACjB,WAAW;IACX,YAAY;IACZ,eAAe;IACf,oBAAoB;CACrB,CAAC;AA4BF,MAAM,UAAU,mBAAmB,CAAC,EAClC,QAAQ,EACR,oBAAoB,EACpB,OAAO,EACP,KAAK,EAMN;IACC,MAAM,QAAQ,GAAG;QACf,oBAAoB;QACpB,QAAQ;QACR,OAAO;QACP,KAAK;KACN,CAAC;IACF,MAAM,aAAa,GAAY;QAC7B,IAAI,EAAE,QAAQ;QACd,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO;YAClC,KAAK,CAAC,4BAA4B,EAAE;gBAClC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,iCACf,QAAQ,KACX,OAAO;oBACP,KAAK;oBACL,OAAO,EACP,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,IAC9B;aACH,CAAC,CAAC;QACL,CAAC;QACK,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO;;gBAC7C,IAAI;oBACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,iCAAiC,EAAE;wBAC9D,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE;4BACP,cAAc,EAAE,kBAAkB;yBACnC;wBACD,IAAI,EAAE,IAAI,CAAC,SAAS,iCACf,QAAQ,KACX,OAAO,EACP,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,EAC3B,OAAO,EACP,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,IAC9B;qBACH,CAAC,CAAC;oBACH,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC1B;gBAAC,OAAO,KAAK,EAAE;oBACd,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBACvB;YACH,CAAC;SAAA;QACD,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO;YAC/B,KAAK,CAAC,yBAAyB,EAAE;gBAC/B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,iCACf,QAAQ,KACX,OAAO;oBACP,KAAK;oBACL,OAAO,EACP,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,IAC9B;aACH,CAAC,CAAC;QACL,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO;YAC/B,KAAK,CAAC,yBAAyB,EAAE;gBAC/B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,iCACf,QAAQ,KACX,OAAO;
|
1
|
+
{"version":3,"file":"trackerRegistry.js","sourceRoot":"","sources":["trackerRegistry.ts"],"names":[],"mappings":"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"}
|
package/boot/addMissingConfig.js
CHANGED
@@ -25,7 +25,7 @@ export function addMissingConfig(userConfig) {
|
|
25
25
|
}
|
26
26
|
if (!userConfig.routes)
|
27
27
|
userConfig.routes = {};
|
28
|
-
Object.keys(routeList).forEach(key => {
|
28
|
+
Object.keys(routeList).forEach((key) => {
|
29
29
|
if (!userConfig.routes.hasOwnProperty(key))
|
30
30
|
userConfig.routes[key] = { path: routeList[key] };
|
31
31
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"addMissingConfig.js","sourceRoot":"","sources":["addMissingConfig.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAA8B;IAClD,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE,QAAQ;IACf,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,WAAW;IACpB,cAAc,EAAE,kBAAkB;IAClC,aAAa,EAAE,iBAAiB;IAChC,OAAO,EAAE,UAAU;CACpB,CAAC;AAEF,sDAAsD;AACtD,MAAM,UAAU,gBAAgB,CAAC,UAAuB;IACtD,IAAI,CAAC,UAAU,CAAC,uBAAuB,EAAE;QACvC,UAAU,CAAC,uBAAuB,GAAG;YACnC,QAAQ;YACR,iBAAiB;YACjB,kBAAkB;SACnB,CAAC;KACH;IAED,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;QACzB,UAAU,CAAC,SAAS,GAAG,QAAQ,CAAC;KACjC;IAED,IAAI,CAAC,UAAU,CAAC,MAAM;QAAE,UAAU,CAAC,MAAM,GAAG,EAAE,CAAC;IAC/C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,GAAG,
|
1
|
+
{"version":3,"file":"addMissingConfig.js","sourceRoot":"","sources":["addMissingConfig.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAA8B;IAClD,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE,QAAQ;IACf,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,WAAW;IACpB,cAAc,EAAE,kBAAkB;IAClC,aAAa,EAAE,iBAAiB;IAChC,OAAO,EAAE,UAAU;CACpB,CAAC;AAEF,sDAAsD;AACtD,MAAM,UAAU,gBAAgB,CAAC,UAAuB;IACtD,IAAI,CAAC,UAAU,CAAC,uBAAuB,EAAE;QACvC,UAAU,CAAC,uBAAuB,GAAG;YACnC,QAAQ;YACR,iBAAiB;YACjB,kBAAkB;SACnB,CAAC;KACH;IAED,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;QACzB,UAAU,CAAC,SAAS,GAAG,QAAQ,CAAC;KACjC;IAED,IAAI,CAAC,UAAU,CAAC,MAAM;QAAE,UAAU,CAAC,MAAM,GAAG,EAAE,CAAC;IAC/C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACrC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC;YACxC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
12
12
|
// Map forms to { valuename: { value: "value" } } format required for input
|
13
13
|
// e.g. { country: { value: "Sweden" } }
|
14
14
|
export function formatSignupInput(values, { userType }) {
|
15
|
-
const { emailAddress, password, pid, organizationNumber, country, externalId = '' } = values, rest = __rest(values, ["emailAddress", "password", "pid", "organizationNumber", "country", "externalId"]);
|
15
|
+
const { emailAddress, password, pid, organizationNumber, country, externalId = '', priceListAccessCode = undefined, consents = [] } = values, rest = __rest(values, ["emailAddress", "password", "pid", "organizationNumber", "country", "externalId", "priceListAccessCode", "consents"]);
|
16
16
|
// Currently passing through country.code:country.name for the country
|
17
17
|
// selector. This is a hack for now to get the code and name separately.
|
18
18
|
const [countryCode, countryName] = country.split(':');
|
@@ -32,8 +32,9 @@ export function formatSignupInput(values, { userType }) {
|
|
32
32
|
password,
|
33
33
|
pid,
|
34
34
|
organizationNumber,
|
35
|
+
priceListAccessCode,
|
35
36
|
externalId,
|
36
|
-
consents
|
37
|
+
consents
|
37
38
|
};
|
38
39
|
}
|
39
40
|
//# sourceMappingURL=formatSignupInput.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"formatSignupInput.js","sourceRoot":"","sources":["formatSignupInput.ts"],"names":[],"mappings":";;;;;;;;;;;AAOA,2EAA2E;AAC3E,wCAAwC;AACxC,MAAM,UAAU,iBAAiB,CAC/B,MAAuB,EACvB,EAAE,QAAQ,EAAuC;IAEjD,MAAM,EACJ,YAAY,EACZ,QAAQ,EACR,GAAG,EACH,kBAAkB,EAClB,OAAO,EACP,UAAU,GAAG,EAAE,
|
1
|
+
{"version":3,"file":"formatSignupInput.js","sourceRoot":"","sources":["formatSignupInput.ts"],"names":[],"mappings":";;;;;;;;;;;AAOA,2EAA2E;AAC3E,wCAAwC;AACxC,MAAM,UAAU,iBAAiB,CAC/B,MAAuB,EACvB,EAAE,QAAQ,EAAuC;IAEjD,MAAM,EACJ,YAAY,EACZ,QAAQ,EACR,GAAG,EACH,kBAAkB,EAClB,OAAO,EACP,UAAU,GAAG,EAAE,EACf,mBAAmB,GAAG,SAAS,EAC/B,QAAQ,GAAG,EAAE,KAEX,MAAM,EADL,IAAI,UACL,MAAM,EAVJ,qHAUL,CAAS,CAAC;IAEX,sEAAsE;IACtE,wEAAwE;IACxE,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtD,MAAM,YAAY,GAEd;QACF,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;KACpC,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE;QACtC,YAAY,CAAC,KAAK,CAAC,GAAG;YACpB,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK;SACjD,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAwB;QAC9B,cAAc,EAAE,YAAY;QAC5B,YAAY;QACZ,QAAQ;QACR,GAAG;QACH,kBAAkB;QAClB,mBAAmB;QACnB,UAAU;QACV,QAAQ;KACT,CAAC;AACJ,CAAC"}
|
@@ -5,6 +5,7 @@ interface UpdateHistory {
|
|
5
5
|
hash: string;
|
6
6
|
search: {
|
7
7
|
page?: string;
|
8
|
+
[key: string]: any;
|
8
9
|
};
|
9
10
|
resetPage?: boolean;
|
10
11
|
/**
|
@@ -14,9 +15,11 @@ interface UpdateHistory {
|
|
14
15
|
routeType?: string;
|
15
16
|
}
|
16
17
|
export declare function pushHistory(args: UpdateHistory): {
|
18
|
+
[key: string]: any;
|
17
19
|
page?: string;
|
18
20
|
};
|
19
21
|
export declare function replaceHistory(args: UpdateHistory): {
|
22
|
+
[key: string]: any;
|
20
23
|
page?: string;
|
21
24
|
};
|
22
25
|
export {};
|
@@ -1,6 +1,7 @@
|
|
1
1
|
import * as React from 'react';
|
2
2
|
import { RouteComponentProps } from 'react-router-dom';
|
3
|
-
import {
|
3
|
+
import type { History, Location } from 'history';
|
4
|
+
import { Direction, ISortOrderContext } from '@jetshop/core/components/SortOrder/SortOrderContext';
|
4
5
|
export interface SortOrderContainerProps extends RouteComponentProps<{}> {
|
5
6
|
children(context: ISortOrderContext): React.ReactNode;
|
6
7
|
}
|
@@ -10,16 +11,27 @@ export declare const sortTypes: {
|
|
10
11
|
export declare const sortValues: {
|
11
12
|
[key: string]: {
|
12
13
|
text: () => {
|
13
|
-
text: React.
|
14
|
+
text: React.FunctionComponent;
|
14
15
|
};
|
15
16
|
direction: string;
|
16
17
|
}[];
|
17
18
|
};
|
19
|
+
export declare function getSortOrderFromQueryString(search: Location['search']): {
|
20
|
+
sortOrder: any;
|
21
|
+
direction: any;
|
22
|
+
};
|
23
|
+
interface SortOrderUpdate {
|
24
|
+
value: string;
|
25
|
+
direction: Direction;
|
26
|
+
history: History;
|
27
|
+
location: Location;
|
28
|
+
}
|
29
|
+
export declare function updateSortOrderHistory({ value, direction, history, location }: SortOrderUpdate): void;
|
18
30
|
declare class SortOrderContainer extends React.Component<SortOrderContainerProps, ISortOrderContext> {
|
19
31
|
state: ISortOrderContext;
|
20
32
|
constructor(props: SortOrderContainerProps);
|
21
33
|
componentDidMount(): void;
|
22
|
-
onSelect: (value: string, direction:
|
34
|
+
onSelect: (value: string, direction: Direction) => boolean;
|
23
35
|
render(): JSX.Element;
|
24
36
|
}
|
25
37
|
declare const _default: React.ComponentClass<Pick<SortOrderContainerProps, "children"> & {
|
@@ -48,21 +48,35 @@ export const sortValues = {
|
|
48
48
|
}
|
49
49
|
]
|
50
50
|
};
|
51
|
+
export function getSortOrderFromQueryString(search) {
|
52
|
+
const parsedSearch = qs.parse(search, {
|
53
|
+
ignoreQueryPrefix: true
|
54
|
+
});
|
55
|
+
if (Object.keys(parsedSearch).includes('orderBy')) {
|
56
|
+
return {
|
57
|
+
sortOrder: parsedSearch.orderBy,
|
58
|
+
direction: parsedSearch.direction
|
59
|
+
};
|
60
|
+
}
|
61
|
+
}
|
62
|
+
export function updateSortOrderHistory({ value, direction, history, location }) {
|
63
|
+
const currentSearch = qs.parse(window.location.search, { ignoreQueryPrefix: true }) || {};
|
64
|
+
const newSearch = Object.assign(Object.assign({}, currentSearch), { orderBy: value, direction });
|
65
|
+
pushHistory({
|
66
|
+
history,
|
67
|
+
pathname: location.pathname,
|
68
|
+
hash: location.hash,
|
69
|
+
search: newSearch,
|
70
|
+
resetPage: true,
|
71
|
+
routeType: 'sortOrderChange'
|
72
|
+
});
|
73
|
+
}
|
51
74
|
class SortOrderContainer extends React.Component {
|
52
75
|
constructor(props) {
|
53
76
|
super(props);
|
54
77
|
this.onSelect = (value, direction) => {
|
55
78
|
const { location, history } = this.props;
|
56
|
-
|
57
|
-
const newSearch = Object.assign(Object.assign({}, currentSearch), { orderBy: value, direction });
|
58
|
-
pushHistory({
|
59
|
-
history,
|
60
|
-
pathname: location.pathname,
|
61
|
-
hash: location.hash,
|
62
|
-
search: newSearch,
|
63
|
-
resetPage: true,
|
64
|
-
routeType: 'sortOrderChange'
|
65
|
-
});
|
79
|
+
updateSortOrderHistory({ location, history, value, direction });
|
66
80
|
this.setState({ sortOrder: value, direction });
|
67
81
|
return true;
|
68
82
|
};
|
@@ -74,14 +88,9 @@ class SortOrderContainer extends React.Component {
|
|
74
88
|
}
|
75
89
|
componentDidMount() {
|
76
90
|
if (this.props.location.search) {
|
77
|
-
const
|
78
|
-
|
79
|
-
|
80
|
-
if (Object.keys(search).includes('orderBy')) {
|
81
|
-
this.setState({
|
82
|
-
sortOrder: search.orderBy,
|
83
|
-
direction: search.direction
|
84
|
-
});
|
91
|
+
const sortOrder = getSortOrderFromQueryString(this.props.location.search);
|
92
|
+
if (sortOrder) {
|
93
|
+
this.setState(sortOrder);
|
85
94
|
}
|
86
95
|
}
|
87
96
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SortOrderContainer.js","sourceRoot":"","sources":["SortOrderContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAuB,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
1
|
+
{"version":3,"file":"SortOrderContainer.js","sourceRoot":"","sources":["SortOrderContainer.tsx"],"names":[],"mappings":"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"}
|
@@ -5,8 +5,12 @@ export function useSortOrder({ sortOrders }) {
|
|
5
5
|
// Mutate sort order obj to include asc/desc & appropriate text
|
6
6
|
// eg { text: 'Price low to high', direction: 'ASCENDING' }
|
7
7
|
const { changeSortOrder, direction, sortOrder } = React.useContext(SortOrderContext);
|
8
|
-
const mappedSortOrder = sortOrders
|
9
|
-
|
8
|
+
const mappedSortOrder = getMappedSortOrder(sortOrders);
|
9
|
+
return { changeSortOrder, direction, sortOrder, mappedSortOrder };
|
10
|
+
}
|
11
|
+
export function getMappedSortOrder(sortOrders) {
|
12
|
+
return sortOrders.reduce((sorts, curr) => {
|
13
|
+
const mutatedSorts = sortValues[sortTypes[curr.value]].map((type) => {
|
10
14
|
return Object.assign(Object.assign({}, curr), { text: (React.createElement("span", null,
|
11
15
|
curr['text'],
|
12
16
|
" ",
|
@@ -14,6 +18,5 @@ export function useSortOrder({ sortOrders }) {
|
|
14
18
|
});
|
15
19
|
return [...sorts, ...mutatedSorts];
|
16
20
|
}, []);
|
17
|
-
return { changeSortOrder, direction, sortOrder, mappedSortOrder };
|
18
21
|
}
|
19
22
|
//# sourceMappingURL=useSortOrder.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useSortOrder.js","sourceRoot":"","sources":["useSortOrder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,UAAU,EACX,MAAM,uDAAuD,CAAC;AAC/D,OAAO,gBAAgB,MAAM,qDAAqD,CAAC;AAEnF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,UAAU,YAAY,CAAC,EAC3B,UAAU,EAGX;IACC,+DAA+D;IAC/D,2DAA2D;IAC3D,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,
|
1
|
+
{"version":3,"file":"useSortOrder.js","sourceRoot":"","sources":["useSortOrder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,UAAU,EACX,MAAM,uDAAuD,CAAC;AAC/D,OAAO,gBAAgB,MAAM,qDAAqD,CAAC;AAEnF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,UAAU,YAAY,CAAC,EAC3B,UAAU,EAGX;IACC,+DAA+D;IAC/D,2DAA2D;IAC3D,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAC7C,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACrC,MAAM,eAAe,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACvD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,UAA8B;IAE9B,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvC,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClE,uCACK,IAAI,KACP,IAAI,EAAE,CACJ;oBACG,IAAI,CAAC,MAAM,CAAC;;oBAAG,IAAI,CAAC,IAAI,CACpB,CACR,EACD,SAAS,EAAE,IAAI,CAAC,SAAS,IACzB;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,YAAY,CAAC,CAAC;IACrC,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
|
@@ -56,6 +56,7 @@ productQueryResult: ProductsQuery): {
|
|
56
56
|
barcode?: string;
|
57
57
|
configurations?: import("../../types").ProductConfiguration[];
|
58
58
|
hasConfigurations: boolean;
|
59
|
+
hasFamilyMembers: boolean;
|
59
60
|
configurationPrice?: import("../../types").ProductConfigurationPrice;
|
60
61
|
quantitySuffix?: string;
|
61
62
|
isPreOrder?: boolean;
|
package/package.json
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"defaultActiveFilters.js","sourceRoot":"","sources":["defaultActiveFilters.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"defaultActiveFilters.js","sourceRoot":"","sources":["defaultActiveFilters.ts"],"names":[],"mappings":"AAGA,MAAM,oBAAoB,GAAkB;IAC1C,WAAW,EAAE,EAAE;IACf,YAAY,EAAE,EAAE;IAChB,cAAc,EAAE,EAAE;IAClB,gBAAgB,EAAE,EAAE;IACpB,UAAU,EAAE,eAAe;CAC5B,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|
@@ -20,7 +20,7 @@ export function getActiveFiltersFromSearch(query) {
|
|
20
20
|
: query;
|
21
21
|
const typeMapValues = new Set(Object.keys(typeMap));
|
22
22
|
const filterParams = Object.keys(initialSearchParams)
|
23
|
-
.map(param => {
|
23
|
+
.map((param) => {
|
24
24
|
return typeMapValues.has(param)
|
25
25
|
? { [param]: initialSearchParams[param] }
|
26
26
|
: false;
|
@@ -42,7 +42,7 @@ export function getActiveFiltersFromSearch(query) {
|
|
42
42
|
function convertFilterQueryToActiveFilter({ initialSearchParams, filter, activeFilters }) {
|
43
43
|
switch (Object.keys(filter)[0]) {
|
44
44
|
case 'list':
|
45
|
-
return (activeFilters['listFilters'] = Object.keys(filter.list).map(id => {
|
45
|
+
return (activeFilters['listFilters'] = Object.keys(filter.list).map((id) => {
|
46
46
|
const filter = {
|
47
47
|
id,
|
48
48
|
values: initialSearchParams.list[id],
|
@@ -51,7 +51,7 @@ function convertFilterQueryToActiveFilter({ initialSearchParams, filter, activeF
|
|
51
51
|
return filter;
|
52
52
|
}));
|
53
53
|
case 'range':
|
54
|
-
return (activeFilters['rangeFilters'] = Object.keys(filter.range).map(id => {
|
54
|
+
return (activeFilters['rangeFilters'] = Object.keys(filter.range).map((id) => {
|
55
55
|
const filter = {
|
56
56
|
id,
|
57
57
|
min: +initialSearchParams.range[id][0],
|
@@ -61,7 +61,7 @@ function convertFilterQueryToActiveFilter({ initialSearchParams, filter, activeF
|
|
61
61
|
return filter;
|
62
62
|
}));
|
63
63
|
case 'boolean':
|
64
|
-
return (activeFilters['booleanFilters'] = Object.keys(filter.boolean).map(id => {
|
64
|
+
return (activeFilters['booleanFilters'] = Object.keys(filter.boolean).map((id) => {
|
65
65
|
const filter = {
|
66
66
|
id,
|
67
67
|
value: JSON.parse(initialSearchParams.boolean[id]),
|
@@ -70,7 +70,7 @@ function convertFilterQueryToActiveFilter({ initialSearchParams, filter, activeF
|
|
70
70
|
return filter;
|
71
71
|
}));
|
72
72
|
case 'multiList':
|
73
|
-
return (activeFilters['multiListFilters'] = Object.keys(filter.multiList).map(id => {
|
73
|
+
return (activeFilters['multiListFilters'] = Object.keys(filter.multiList).map((id) => {
|
74
74
|
const filter = {
|
75
75
|
id,
|
76
76
|
values: initialSearchParams.multiList[id],
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"filterParams.js","sourceRoot":"","sources":["filterParams.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAW9D,MAAM,OAAO,GAAkC;IAC7C,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE,cAAc;IACrB,OAAO,EAAE,gBAAgB;IACzB,SAAS,EAAE,kBAAkB;CAC9B,CAAC;AAEF,MAAM,UAAU,0BAA0B,CAAC,KAAsB;IAC/D,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,OAAO,oBAAoB,CAAC;KAC7B;IAED,6EAA6E;IAC7E,MAAM,mBAAmB,GACvB,OAAO,KAAK,KAAK,QAAQ;QACvB,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE;YACd,iBAAiB,EAAE,IAAI;YACvB,UAAU,EAAE,GAAG;SAChB,CAAC;QACJ,CAAC,CAAC,KAAK,CAAC;IAEZ,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC;SAClD,GAAG,CAAC,KAAK,
|
1
|
+
{"version":3,"file":"filterParams.js","sourceRoot":"","sources":["filterParams.ts"],"names":[],"mappings":"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"}
|
@@ -13,15 +13,15 @@ export interface ActiveFilters extends FilterInput {
|
|
13
13
|
booleanFilters?: ActiveBooleanFilter[];
|
14
14
|
multiListFilters?: ActiveMultiListFilter[];
|
15
15
|
}
|
16
|
-
interface ActiveListFilter extends ListFilterInput {
|
16
|
+
export interface ActiveListFilter extends ListFilterInput {
|
17
17
|
__typename: 'ListFilterInput';
|
18
18
|
}
|
19
|
-
interface ActiveRangeFilter extends RangeFilterInput {
|
19
|
+
export interface ActiveRangeFilter extends RangeFilterInput {
|
20
20
|
__typename: 'RangeFilterInput';
|
21
21
|
}
|
22
|
-
interface ActiveBooleanFilter extends BooleanFilterInput {
|
22
|
+
export interface ActiveBooleanFilter extends BooleanFilterInput {
|
23
23
|
__typename: 'BooleanFilterInput';
|
24
24
|
}
|
25
|
-
interface ActiveMultiListFilter extends MultiListFilterInput {
|
25
|
+
export interface ActiveMultiListFilter extends MultiListFilterInput {
|
26
26
|
__typename: 'MultiListFilterInput';
|
27
27
|
}
|
@@ -1,3 +1,4 @@
|
|
1
|
+
import { History } from 'history';
|
1
2
|
import { ActiveFilters } from '.';
|
2
3
|
/**
|
3
4
|
We need to keep the query string in sync with the current active filter state.
|
@@ -5,7 +6,7 @@ import { ActiveFilters } from '.';
|
|
5
6
|
*
|
6
7
|
* @param activeFilters The full list of active filters from the client cache
|
7
8
|
*/
|
8
|
-
export declare function updateListFilterQueryString(activeFilters: ActiveFilters): void;
|
9
|
-
export declare function updateBooleanQueryString(activeFilters: ActiveFilters): void;
|
10
|
-
export declare function updateRangeQueryString(activeFilters: ActiveFilters): void;
|
9
|
+
export declare function updateListFilterQueryString(activeFilters: ActiveFilters, history?: History): void;
|
10
|
+
export declare function updateBooleanQueryString(activeFilters: ActiveFilters, history?: History): void;
|
11
|
+
export declare function updateRangeQueryString(activeFilters: ActiveFilters, history?: History): void;
|
11
12
|
export declare function updateMultiListQueryString(activeFilters: ActiveFilters): void;
|
@@ -7,8 +7,10 @@ import { replaceInSearch } from '../../components/Filters/utils/replaceInSearch'
|
|
7
7
|
*
|
8
8
|
* @param activeFilters The full list of active filters from the client cache
|
9
9
|
*/
|
10
|
-
export function updateListFilterQueryString(activeFilters) {
|
11
|
-
|
10
|
+
export function updateListFilterQueryString(activeFilters, history) {
|
11
|
+
if (history === undefined) {
|
12
|
+
history = createBrowserHistory();
|
13
|
+
}
|
12
14
|
const activeListFilters = activeFilters.listFilters;
|
13
15
|
let queryString = '';
|
14
16
|
if (activeListFilters.length === 0) {
|
@@ -17,7 +19,7 @@ export function updateListFilterQueryString(activeFilters) {
|
|
17
19
|
}
|
18
20
|
else {
|
19
21
|
const params = { list: {} };
|
20
|
-
activeListFilters.forEach(filter => {
|
22
|
+
activeListFilters.forEach((filter) => {
|
21
23
|
params.list[filter.id] = filter.values;
|
22
24
|
});
|
23
25
|
queryString = qs.stringify(params, {
|
@@ -32,8 +34,10 @@ export function updateListFilterQueryString(activeFilters) {
|
|
32
34
|
routeType: 'filterChange'
|
33
35
|
});
|
34
36
|
}
|
35
|
-
export function updateBooleanQueryString(activeFilters) {
|
36
|
-
|
37
|
+
export function updateBooleanQueryString(activeFilters, history) {
|
38
|
+
if (history === undefined) {
|
39
|
+
history = createBrowserHistory();
|
40
|
+
}
|
37
41
|
const activeBoolFilters = activeFilters.booleanFilters;
|
38
42
|
let queryString = '';
|
39
43
|
if (activeBoolFilters.length === 0) {
|
@@ -42,7 +46,7 @@ export function updateBooleanQueryString(activeFilters) {
|
|
42
46
|
}
|
43
47
|
else {
|
44
48
|
const params = { boolean: {} };
|
45
|
-
activeBoolFilters.forEach(filter => {
|
49
|
+
activeBoolFilters.forEach((filter) => {
|
46
50
|
params.boolean[filter.id] = filter.value;
|
47
51
|
});
|
48
52
|
queryString = qs.stringify(params, {
|
@@ -57,8 +61,10 @@ export function updateBooleanQueryString(activeFilters) {
|
|
57
61
|
routeType: 'filterChange'
|
58
62
|
});
|
59
63
|
}
|
60
|
-
export function updateRangeQueryString(activeFilters) {
|
61
|
-
|
64
|
+
export function updateRangeQueryString(activeFilters, history) {
|
65
|
+
if (history === undefined) {
|
66
|
+
history = createBrowserHistory();
|
67
|
+
}
|
62
68
|
const activeRangeFilters = activeFilters.rangeFilters;
|
63
69
|
let queryString = '';
|
64
70
|
if (activeRangeFilters.length === 0) {
|
@@ -67,7 +73,7 @@ export function updateRangeQueryString(activeFilters) {
|
|
67
73
|
}
|
68
74
|
else {
|
69
75
|
const params = { range: {} };
|
70
|
-
activeRangeFilters.forEach(filter => {
|
76
|
+
activeRangeFilters.forEach((filter) => {
|
71
77
|
params.range[filter.id] = [filter.min, filter.max];
|
72
78
|
});
|
73
79
|
queryString = qs.stringify(params, {
|
@@ -91,7 +97,7 @@ export function updateMultiListQueryString(activeFilters) {
|
|
91
97
|
}
|
92
98
|
else {
|
93
99
|
const params = { multiList: {} };
|
94
|
-
activeMultiFilters.forEach(filter => {
|
100
|
+
activeMultiFilters.forEach((filter) => {
|
95
101
|
params.multiList[filter.id] = filter.values;
|
96
102
|
});
|
97
103
|
queryString = qs.stringify(params, {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"updateQueryString.js","sourceRoot":"","sources":["updateQueryString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,
|
1
|
+
{"version":3,"file":"updateQueryString.js","sourceRoot":"","sources":["updateQueryString.ts"],"names":[],"mappings":"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"}
|
@@ -10,18 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
10
10
|
import fetch from 'node-fetch';
|
11
11
|
import requestIp from 'request-ip';
|
12
12
|
function getUserData(req) {
|
13
|
-
var _a, _b;
|
14
13
|
return {
|
15
14
|
client_ip_address: requestIp.getClientIp(req),
|
16
15
|
client_user_agent: req.headers['user-agent'],
|
17
|
-
fbc:
|
18
|
-
fbp:
|
16
|
+
fbc: req.universalCookies.get('_fbc') || '',
|
17
|
+
fbp: req.universalCookies.get('_fbp') || ''
|
19
18
|
};
|
20
19
|
}
|
21
|
-
function createTrackFacebookEvent({
|
22
|
-
return function trackFacebookEvent(data) {
|
20
|
+
function createTrackFacebookEvent({ pixelId, token }) {
|
21
|
+
return function trackFacebookEvent(data, channelPixelId, channelToken) {
|
23
22
|
return __awaiter(this, void 0, void 0, function* () {
|
24
|
-
const response = yield fetch(`https://graph.facebook.com/
|
23
|
+
const response = yield fetch(`https://graph.facebook.com/v13.0/${channelPixelId || pixelId}/events?access_token=${channelToken || token}`, {
|
25
24
|
method: 'POST',
|
26
25
|
headers: {
|
27
26
|
'Content-Type': 'application/json'
|
@@ -47,9 +46,7 @@ export default function createFacebookTracker(config) {
|
|
47
46
|
event_time,
|
48
47
|
action_source: 'website',
|
49
48
|
event_source_url: data.location,
|
50
|
-
event_id: data.eventId
|
51
|
-
pixelID: data.pixelID,
|
52
|
-
token: data.token
|
49
|
+
event_id: data.eventId
|
53
50
|
};
|
54
51
|
switch (event) {
|
55
52
|
case 'trackProduct':
|
@@ -69,7 +66,7 @@ export default function createFacebookTracker(config) {
|
|
69
66
|
content_type: 'product',
|
70
67
|
currency: data.currency,
|
71
68
|
value: (_b = productData.product.price) === null || _b === void 0 ? void 0 : _b.incVat
|
72
|
-
} }));
|
69
|
+
} }), data.pixelId, data.token);
|
73
70
|
}
|
74
71
|
else if (productData.action === 'view') {
|
75
72
|
return yield trackFacebookEvent(Object.assign(Object.assign({}, defaults), { event_name: 'ViewContent', custom_data: {
|
@@ -86,7 +83,7 @@ export default function createFacebookTracker(config) {
|
|
86
83
|
content_type: 'product',
|
87
84
|
currency: data.currency,
|
88
85
|
value: (_d = productData.product.price) === null || _d === void 0 ? void 0 : _d.incVat
|
89
|
-
} }));
|
86
|
+
} }), data.pixelId, data.token);
|
90
87
|
}
|
91
88
|
break;
|
92
89
|
case 'trackAddToWishList':
|
@@ -96,9 +93,9 @@ export default function createFacebookTracker(config) {
|
|
96
93
|
content_category: data.context.list || '',
|
97
94
|
content_ids: [wishListData.articleNumber],
|
98
95
|
currency: data.currency
|
99
|
-
} }));
|
96
|
+
} }), data.pixelId, data.token);
|
100
97
|
case 'trackRegister':
|
101
|
-
return yield trackFacebookEvent(Object.assign(Object.assign({}, defaults), { event_name: 'CompleteRegistration', custom_data: {} }));
|
98
|
+
return yield trackFacebookEvent(Object.assign(Object.assign({}, defaults), { event_name: 'CompleteRegistration', custom_data: {} }), data.pixelId, data.token);
|
102
99
|
case 'trackCartCheckout':
|
103
100
|
const checkoutData = data.props;
|
104
101
|
return yield trackFacebookEvent(Object.assign(Object.assign({}, defaults), { event_name: 'InitiateCheckout', custom_data: {
|
@@ -116,13 +113,13 @@ export default function createFacebookTracker(config) {
|
|
116
113
|
currency: data.currency,
|
117
114
|
num_items: checkoutData.cart.totalQuantity,
|
118
115
|
value: checkoutData.cart.productTotal.incVat
|
119
|
-
} }));
|
116
|
+
} }), data.pixelId, data.token);
|
120
117
|
case 'trackPageView':
|
121
118
|
const pageViewData = data.props;
|
122
119
|
return yield trackFacebookEvent(Object.assign(Object.assign({}, defaults), { event_name: 'PageView', custom_data: {
|
123
120
|
content_name: pageViewData.title,
|
124
121
|
currency: data.currency
|
125
|
-
} }));
|
122
|
+
} }), data.pixelId, data.token);
|
126
123
|
}
|
127
124
|
}
|
128
125
|
catch (error) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"facebook.js","sourceRoot":"","sources":["facebook.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,SAAS,MAAM,YAAY,CAAC;
|
1
|
+
{"version":3,"file":"facebook.js","sourceRoot":"","sources":["facebook.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,SAAS,MAAM,YAAY,CAAC;AAwJnC,SAAS,WAAW,CAClB,GAAgE;IAEhE,OAAO;QACL,iBAAiB,EAAE,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC;QAC7C,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;QAC5C,GAAG,EAAE,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE;QAC3C,GAAG,EAAE,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE;KAC5C,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,EAChC,OAAO,EACP,KAAK,EAIN;IACC,OAAO,SAAe,kBAAkB,CACtC,IAAmB,EACnB,cAAuB,EACvB,YAAqB;;YAErB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,oCACE,cAAc,IAAI,OACpB,wBAAwB,YAAY,IAAI,KAAK,EAAE,EAC/C;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,IAAI,EAAE,CAAC,IAAI,CAAC;iBACb,CAAC;aACH,CACF,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC;KAAA,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,MAG7C;IACC,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAkB,CAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;;QAC1D,IAAI;YACF,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YACvC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YACjD,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC;YACvD,MAAM,QAAQ,GAAG;gBACf,SAAS;gBACT,UAAU;gBACV,aAAa,EAAE,SAAS;gBACxB,gBAAgB,EAAE,IAAI,CAAC,QAAQ;gBAC/B,QAAQ,EAAE,IAAI,CAAC,OAAO;aACvB,CAAC;YACF,QAAQ,KAAK,EAAE;gBACb,KAAK,cAAc;oBACjB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAsC,CAAC;oBAChE,IAAI,WAAW,CAAC,MAAM,KAAK,KAAK,EAAE;wBAChC,OAAO,MAAM,kBAAkB,iCAExB,QAAQ,KACX,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE;gCACX,QAAQ,EAAE;oCACR;wCACE,EAAE,EAAE,oBAAoB;4CACtB,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa;4CACnC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE;wCACrC,QAAQ,EAAE,WAAW,CAAC,QAAQ;wCAC9B,UAAU,EAAE,MAAA,WAAW,CAAC,OAAO,CAAC,KAAK,0CAAE,MAAM;qCAC9C;iCACF;gCACD,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;gCACtC,YAAY,EAAE,SAAS;gCACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gCACvB,KAAK,EAAE,MAAA,WAAW,CAAC,OAAO,CAAC,KAAK,0CAAE,MAAM;6BACzC,KAEH,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CAAC;qBACH;yBAAM,IAAI,WAAW,CAAC,MAAM,KAAK,MAAM,EAAE;wBACxC,OAAO,MAAM,kBAAkB,iCAExB,QAAQ,KACX,UAAU,EAAE,aAAa,EACzB,WAAW,EAAE;gCACX,QAAQ,EAAE;oCACR;wCACE,EAAE,EAAE,oBAAoB;4CACtB,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa;4CACnC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE;wCACrC,QAAQ,EAAE,WAAW,CAAC,QAAQ;wCAC9B,UAAU,EAAE,MAAA,WAAW,CAAC,OAAO,CAAC,KAAK,0CAAE,MAAM;qCAC9C;iCACF;gCACD,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;gCACtC,YAAY,EAAE,SAAS;gCACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gCACvB,KAAK,EAAE,MAAA,WAAW,CAAC,OAAO,CAAC,KAAK,0CAAE,MAAM;6BACzC,KAEH,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CAAC;qBACH;oBACD,MAAM;gBACR,KAAK,oBAAoB;oBACvB,MAAM,YAAY,GAChB,IAAI,CAAC,KAA4C,CAAC;oBACpD,OAAO,MAAM,kBAAkB,iCAExB,QAAQ,KACX,UAAU,EAAE,eAAe,EAC3B,WAAW,EAAE;4BACX,YAAY,EAAE,YAAY,CAAC,WAAW;4BACtC,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE;4BACzC,WAAW,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC;4BACzC,QAAQ,EAAE,IAAI,CAAC,QAAQ;yBACxB,KAEH,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CAAC;gBACJ,KAAK,eAAe;oBAClB,OAAO,MAAM,kBAAkB,iCAExB,QAAQ,KACX,UAAU,EAAE,sBAAsB,EAClC,WAAW,EAAE,EAAE,KAEjB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CAAC;gBACJ,KAAK,mBAAmB;oBACtB,MAAM,YAAY,GAAG,IAAI,CAAC,KAA2C,CAAC;oBACtE,OAAO,MAAM,kBAAkB,iCAExB,QAAQ,KACX,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE;4BACX,WAAW,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAChD,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAC/D;4BACD,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;gCAC7C,OAAO;oCACL,EAAE,EAAE,oBAAoB;wCACtB,CAAC,CAAC,IAAI,CAAC,aAAa;wCACpB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;oCACtB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oCACvB,UAAU,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,KAAK,0CAAE,MAAM;iCACvC,CAAC;4BACJ,CAAC,CAAC;4BACF,QAAQ,EAAE,IAAI,CAAC,QAAQ;4BACvB,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,aAAa;4BAC1C,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM;yBAC7C,KAEH,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CAAC;gBACJ,KAAK,eAAe;oBAClB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAuC,CAAC;oBAClE,OAAO,MAAM,kBAAkB,iCAExB,QAAQ,KACX,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE;4BACX,YAAY,EAAE,YAAY,CAAC,KAAK;4BAChC,QAAQ,EAAE,IAAI,CAAC,QAAQ;yBACxB,KAEH,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CAAC;aACL;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAA,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC"}
|
@@ -1,4 +1,8 @@
|
|
1
1
|
import { Response, Request } from 'express';
|
2
|
+
import { Cookies } from 'react-cookie';
|
2
3
|
import { ServerTracker } from './types';
|
3
|
-
declare function trackingMiddleware(trackers: ServerTracker[]): (req: Request
|
4
|
+
declare function trackingMiddleware(trackers: ServerTracker[]): (req: Request & {
|
5
|
+
universalCookies: Cookies;
|
6
|
+
breakpoint: string;
|
7
|
+
}, res: Response) => void;
|
4
8
|
export default trackingMiddleware;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["middleware.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["middleware.ts"],"names":[],"mappings":"AAIA,SAAS,kBAAkB,CAAC,QAAyB;IACnD,OAAO,CACL,GAAgE,EAChE,GAAa,EACP,EAAE;QACR,IAAI;YACF,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;YAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;YACrD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;SACvB;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;SACvB;IACH,CAAC,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}
|
@@ -26,8 +26,8 @@ export type ServerTracker = (
|
|
26
26
|
context: TrackingFunctionContext;
|
27
27
|
location: string;
|
28
28
|
eventId: string;
|
29
|
-
|
29
|
+
pixelId?: string;
|
30
30
|
token?: string;
|
31
31
|
},
|
32
|
-
req: Request
|
32
|
+
req: Request & { universalCookies: Cookies; breakpoint: string }
|
33
33
|
) => void;
|
package/types.d.ts
CHANGED
@@ -207,6 +207,7 @@ export type Category = Document & {
|
|
207
207
|
mainHeader?: Maybe<Scalars['String']>;
|
208
208
|
content?: Maybe<Scalars['String']>;
|
209
209
|
externalId?: Maybe<Scalars['String']>;
|
210
|
+
externalDiscountId?: Maybe<Scalars['String']>;
|
210
211
|
images?: Maybe<Array<Maybe<CategoryImage>>>;
|
211
212
|
/** NB: Carries a performance cost, as asking for this will result in a separate API call in the backend. */
|
212
213
|
products?: Maybe<PagedResult>;
|
@@ -736,6 +737,7 @@ export type DeleteCustomerProductListResult = {
|
|
736
737
|
|
737
738
|
export type Discount = {
|
738
739
|
__typename?: 'Discount';
|
740
|
+
externalId?: Maybe<Scalars['ID']>;
|
739
741
|
name?: Maybe<Scalars['String']>;
|
740
742
|
value?: Maybe<Price>;
|
741
743
|
description?: Maybe<Scalars['String']>;
|
@@ -928,6 +930,12 @@ export type MultiListFilterList = {
|
|
928
930
|
hasActiveItems: Scalars['Boolean'];
|
929
931
|
};
|
930
932
|
|
933
|
+
export type MultipleContent = {
|
934
|
+
__typename?: 'MultipleContent';
|
935
|
+
notFoundIds: Array<Maybe<Scalars['ID']>>;
|
936
|
+
content: Array<Maybe<Content>>;
|
937
|
+
};
|
938
|
+
|
931
939
|
export type Mutation = {
|
932
940
|
__typename?: 'Mutation';
|
933
941
|
subscribeToStockNotifications?: Maybe<Scalars['Boolean']>;
|
@@ -1335,6 +1343,7 @@ export type Order = {
|
|
1335
1343
|
orderDate?: Maybe<Scalars['DateTime']>;
|
1336
1344
|
currency?: Maybe<Currency>;
|
1337
1345
|
attachments?: Maybe<Array<Maybe<OrderAttachment>>>;
|
1346
|
+
orderPurchaseLocation?: Maybe<Scalars['String']>;
|
1338
1347
|
};
|
1339
1348
|
|
1340
1349
|
|
@@ -1700,6 +1709,7 @@ export type Product = Document & {
|
|
1700
1709
|
*/
|
1701
1710
|
configurations?: Maybe<Array<Maybe<ProductConfiguration>>>;
|
1702
1711
|
hasConfigurations: Scalars['Boolean'];
|
1712
|
+
hasFamilyMembers: Scalars['Boolean'];
|
1703
1713
|
/**
|
1704
1714
|
* Calculates the price of the product based on the configuration choices that's
|
1705
1715
|
* been made. NB: Carries a performance cost, as asking for this will result in a
|
@@ -1989,6 +1999,8 @@ export type Query = {
|
|
1989
1999
|
externalCustomerLookup?: Maybe<ExternalCustomerResult>;
|
1990
2000
|
/** Get information on person by Key(personal id number or phone number) */
|
1991
2001
|
personLookup?: Maybe<PersonLookup>;
|
2002
|
+
/** Returns Content found by list of its IDs. Also not found Content IDs are listed. */
|
2003
|
+
content?: Maybe<MultipleContent>;
|
1992
2004
|
/** get channel by id, null gets default channel */
|
1993
2005
|
channel?: Maybe<Channel>;
|
1994
2006
|
/** get all channels */
|
@@ -2072,6 +2084,11 @@ export type QueryPersonLookupArgs = {
|
|
2072
2084
|
};
|
2073
2085
|
|
2074
2086
|
|
2087
|
+
export type QueryContentArgs = {
|
2088
|
+
ids: Array<Maybe<Scalars['String']>>;
|
2089
|
+
};
|
2090
|
+
|
2091
|
+
|
2075
2092
|
export type QueryChannelArgs = {
|
2076
2093
|
id?: Maybe<Scalars['String']>;
|
2077
2094
|
};
|