@jetshop/core 5.11.0 → 5.12.1
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/ChannelHandler.js +2 -2
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/analytics/AnalyticsProvider.d.ts +4 -0
- package/analytics/AnalyticsProvider.js +17 -1
- package/analytics/AnalyticsProvider.js.map +1 -1
- package/analytics/integrations/ga4.js +1 -1
- package/analytics/integrations/ga4.js.map +1 -1
- package/analytics/integrations/gtag/gtag.d.ts +0 -1
- package/analytics/integrations/gtag/gtag.js +39 -28
- package/analytics/integrations/gtag/gtag.js.map +1 -1
- package/analytics/integrations/gtm/index.d.ts +0 -1
- package/analytics/integrations/gtm/index.js +37 -24
- package/analytics/integrations/gtm/index.js.map +1 -1
- package/analytics/integrations/releware/index.js +1 -1
- package/analytics/integrations/releware/index.js.map +1 -1
- package/analytics/integrations/unslugify.d.ts +1 -0
- package/analytics/integrations/unslugify.js +18 -0
- package/analytics/integrations/unslugify.js.map +1 -0
- package/analytics/trackerRegistry.d.ts +8 -3
- package/analytics/trackerRegistry.js +41 -17
- package/analytics/trackerRegistry.js.map +1 -1
- package/analytics/utils/breadcrumbsWithoutProduct.d.ts +1 -0
- package/analytics/utils/breadcrumbsWithoutProduct.js +9 -0
- package/analytics/utils/breadcrumbsWithoutProduct.js.map +1 -0
- package/boot/PreviewHandler.js.map +1 -1
- package/boot/addMissingConfig.js +1 -1
- package/boot/addMissingConfig.js.map +1 -1
- package/cart/AddToCartFormik.d.ts +2 -2
- package/cart/AddToCartFormik.js +11 -11
- package/cart/AddToCartFormik.js.map +1 -1
- package/components/ChannelContext/ChannelContext.d.ts +2 -0
- package/components/ChannelContext/ChannelContext.js.map +1 -1
- package/components/ChannelContext/ChannelProvider.js +18 -1
- package/components/ChannelContext/ChannelProvider.js.map +1 -1
- package/components/ChannelContext/ChannelProvider.test.js +3 -1
- package/components/ConfigProvider.d.ts +2 -0
- package/components/ConfigProvider.js.map +1 -1
- package/components/DynamicRoute/CategoryRoute.js +9 -2
- package/components/DynamicRoute/CategoryRoute.js.map +1 -1
- package/components/DynamicRoute/ContentRoute.js +9 -1
- package/components/DynamicRoute/ContentRoute.js.map +1 -1
- package/components/DynamicRoute/PreviewRoute.js +12 -2
- package/components/DynamicRoute/PreviewRoute.js.map +1 -1
- package/components/DynamicRoute/ProductRoute.js +12 -4
- package/components/DynamicRoute/ProductRoute.js.map +1 -1
- package/components/Filters/utils/replaceInSearch.d.ts +1 -0
- package/components/Filters/utils/updateHistory.d.ts +3 -0
- package/components/Head.js +4 -4
- package/components/Head.js.map +1 -1
- package/components/Mutation/AddToCart/addToCartUtils.d.ts +1 -1
- package/components/Mutation/AddToCart/addToCartUtils.js +7 -1
- package/components/Mutation/AddToCart/addToCartUtils.js.map +1 -1
- package/components/Mutation/RemoveFromCart.js +10 -1
- package/components/Mutation/RemoveFromCart.js.map +1 -1
- package/components/Mutation/useDecrementQuantity.js +8 -3
- package/components/Mutation/useDecrementQuantity.js.map +1 -1
- package/components/Mutation/useIncrementQuantity.js +8 -3
- package/components/Mutation/useIncrementQuantity.js.map +1 -1
- package/components/Mutation/useRemoveFromCart.js +10 -1
- package/components/Mutation/useRemoveFromCart.js.map +1 -1
- package/components/PreviewContext.js +3 -1
- package/components/PreviewContext.js.map +1 -1
- package/components/StructuredData/StructuredBreadcrumbData.d.ts +8 -3
- package/components/StructuredData/StructuredBreadcrumbData.js +42 -24
- package/components/StructuredData/StructuredBreadcrumbData.js.map +1 -1
- package/components/StructuredData/StructuredCategoryData.d.ts +16 -0
- package/components/StructuredData/StructuredCategoryData.js +18 -0
- package/components/StructuredData/StructuredCategoryData.js.map +1 -0
- package/components/StructuredData/StructuredPageData.d.ts +16 -0
- package/components/StructuredData/StructuredPageData.js +17 -0
- package/components/StructuredData/StructuredPageData.js.map +1 -0
- package/components/StructuredData/StructuredProductData.js +2 -2
- package/components/StructuredData/StructuredProductData.js.map +1 -1
- package/components/StructuredData/index.d.ts +2 -0
- package/components/StructuredData/index.js +2 -0
- package/components/StructuredData/index.js.map +1 -1
- package/data/fragments/ChannelsFragment.gql +4 -0
- package/data/fragments/ProductListsFragments.gql +94 -0
- package/data/fragments/RouteMetaFragment.gql +18 -0
- package/data/mutations/productListMutations.gql +18 -0
- package/data/queries/ProductLists.gql +8 -0
- package/dependencies.d.ts +10 -1
- package/helpers/isRelativeUrl.d.ts +1 -0
- package/helpers/isRelativeUrl.js +4 -0
- package/helpers/isRelativeUrl.js.map +1 -0
- package/hooks/PackageProducts/usePackageProductItem.d.ts +3 -4
- package/hooks/ProductList/ProductListContext.js +16 -4
- package/hooks/ProductList/ProductListContext.js.map +1 -1
- package/hooks/ProductList/ProductLists.gql +0 -0
- package/hooks/useAddMultipleToCart.js +11 -5
- package/hooks/useAddMultipleToCart.js.map +1 -1
- package/hooks/useProductVariants/useProductVariants.d.ts +1 -2
- package/hooks/useProductVariants/useProductVariants.js +1 -1
- package/hooks/useProductVariants/useProductVariants.js.map +1 -1
- 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 +3 -2
- package/resolvers/filters/updateQueryString.js +12 -8
- package/resolvers/filters/updateQueryString.js.map +1 -1
- package/server/tracking/facebook.d.ts +2 -2
- package/server/tracking/facebook.js +11 -12
- 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 +4 -2
- package/types.d.ts +5 -2
package/dependencies.d.ts
CHANGED
@@ -11,7 +11,7 @@ declare module '@jetshop/intl/config';
|
|
11
11
|
declare module 'store-css';
|
12
12
|
declare module 'dnscache';
|
13
13
|
declare module 'isbot' {
|
14
|
-
export default function(userAgent: string): boolean;
|
14
|
+
export default function (userAgent: string): boolean;
|
15
15
|
}
|
16
16
|
declare module '*.gql' {
|
17
17
|
import { DocumentNode } from 'graphql';
|
@@ -32,6 +32,15 @@ declare module '@jetshop/core/data/mutations/accountMutations.gql' {
|
|
32
32
|
export const resetRequest: DocumentNode;
|
33
33
|
}
|
34
34
|
|
35
|
+
declare module '@jetshop/core/data/mutations/productListMutations.gql' {
|
36
|
+
export const CreateProductList: DocumentNode;
|
37
|
+
export const DeleteProductList: DocumentNode;
|
38
|
+
}
|
39
|
+
|
40
|
+
declare module '@jetshop/core/data/queries/ProductLists.gql' {
|
41
|
+
export const ProductLists: DocumentNode;
|
42
|
+
}
|
43
|
+
|
35
44
|
declare module '*.svg' {
|
36
45
|
import React = require('react');
|
37
46
|
|
@@ -0,0 +1 @@
|
|
1
|
+
export declare function isRelativeUrl(url?: string): boolean;
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"isRelativeUrl.js","sourceRoot":"","sources":["isRelativeUrl.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAC1E,CAAC"}
|
@@ -1,18 +1,17 @@
|
|
1
1
|
import { PackageItem } from '../../types';
|
2
|
-
declare type UpdateItem = (articleNumber: string, variantArticleNumber: string, valid: boolean) => void;
|
2
|
+
export declare type UpdateItem = (articleNumber: string, variantArticleNumber: string, valid: boolean) => void;
|
3
3
|
export declare function usePackageProductItem(item: PackageItem, updateItem: UpdateItem, { preselectCheapest }?: {
|
4
4
|
preselectCheapest?: boolean;
|
5
5
|
}): {
|
6
6
|
stockStatus: import("@jetshop/ui/Stock/StockStatusContainer").StockStatusContainerRender;
|
7
7
|
variantHandler: {
|
8
8
|
selectedVariant: import("../../types").ProductVariant;
|
9
|
-
validation: "
|
9
|
+
validation: import("../useProductVariants/useProductVariants").VariantValidation;
|
10
10
|
getSelectedValue: (option: import("../../types").ProductVariantOption) => string;
|
11
11
|
selectValue: (value: string, option: import("../../types").ProductVariantOption) => void;
|
12
|
-
validateSelection: (value: string, option: import("../../types").ProductVariantOption) => "
|
12
|
+
validateSelection: (value: string, option: import("../../types").ProductVariantOption) => import("../useProductVariants/useProductVariants").VariantValidation;
|
13
13
|
getVariantForSelection: (value: string, option: import("../../types").ProductVariantOption) => import("../../types").ProductVariant;
|
14
14
|
missingOptions: import("../../types").ProductVariantOption[];
|
15
15
|
getMissingOptions: () => import("../../types").ProductVariantOption[];
|
16
16
|
};
|
17
17
|
};
|
18
|
-
export {};
|
@@ -11,6 +11,9 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
11
11
|
};
|
12
12
|
import React, { useEffect, useMemo } from 'react';
|
13
13
|
import { useMutation, useQuery } from 'react-apollo';
|
14
|
+
import useWarningInDev from '@jetshop/core/hooks/useWarningInDev';
|
15
|
+
import productListQueries from '@jetshop/core/data/queries/ProductLists.gql';
|
16
|
+
import productListMutations from '@jetshop/core/data/mutations/productListMutations.gql';
|
14
17
|
import { emptyProductLists, productListMapToArray, PRODUCT_LISTS_KEY } from '.';
|
15
18
|
import useAuth from '../../components/AuthContext/useAuth';
|
16
19
|
import { useThunkReducer } from '../useThunkReducer';
|
@@ -18,11 +21,20 @@ import { createListAction, deleteListAction, loginAction, refreshAction } from '
|
|
18
21
|
import { normalizeServerList } from './list-transforms';
|
19
22
|
import { init, reducer } from './product-list-reducer';
|
20
23
|
export const ProductListContext = React.createContext(undefined);
|
24
|
+
function useMissingQueryWarning(property, queries) {
|
25
|
+
return useWarningInDev(!(property in queries), `No \`${property}\` query available in \`queries\` for \`ProductListProvider\`. ` +
|
26
|
+
`Check migration guide for 5.11.0 (product lists section) to remove this warning`);
|
27
|
+
}
|
21
28
|
export const ProductListProvider = function ProductListProvider(_a) {
|
22
29
|
var { queries, initialState = {} } = _a, rest = __rest(_a, ["queries", "initialState"]);
|
30
|
+
// NOTE: Warn about missing queries, should be removed in next major release.
|
31
|
+
useMissingQueryWarning('all', queries);
|
32
|
+
useMissingQueryWarning('createList', queries);
|
33
|
+
useMissingQueryWarning('deleteList', queries);
|
23
34
|
const { loggedIn } = useAuth();
|
24
35
|
const requestIdRef = React.useRef(null);
|
25
|
-
const
|
36
|
+
const allQuery = queries.all || productListQueries.ProductLists;
|
37
|
+
const { data: serverList, client } = useQuery(allQuery, {
|
26
38
|
skip: !loggedIn
|
27
39
|
});
|
28
40
|
const lists = serverList
|
@@ -44,9 +56,9 @@ export const ProductListProvider = function ProductListProvider(_a) {
|
|
44
56
|
// loginMutation is a mutation to merge product lists
|
45
57
|
const [loginMutation] = useMutation(queries.login);
|
46
58
|
// To be used to fetch all lists of user after login
|
47
|
-
const fetchAll = () => client.query({ query:
|
48
|
-
const [createMutation] = useMutation(queries.createList);
|
49
|
-
const [deleteListMutation] = useMutation(queries.deleteList);
|
59
|
+
const fetchAll = () => client.query({ query: allQuery });
|
60
|
+
const [createMutation] = useMutation(queries.createList || productListMutations.CreateProductList);
|
61
|
+
const [deleteListMutation] = useMutation(queries.deleteList || productListMutations.DeleteProductList);
|
50
62
|
function deleteList(listId) {
|
51
63
|
dispatch(deleteListAction({ listId, deleteListMutation }));
|
52
64
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ProductListContext.js","sourceRoot":"","sources":["ProductListContext.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAW,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
1
|
+
{"version":3,"file":"ProductListContext.js","sourceRoot":"","sources":["ProductListContext.tsx"],"names":[],"mappings":"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"}
|
File without changes
|
@@ -4,6 +4,8 @@ import { useContext, useState } from 'react';
|
|
4
4
|
import throwErrorInDev from '../helpers/throwErrorInDev';
|
5
5
|
import { useTracker } from '../analytics/Analytics';
|
6
6
|
import { trackProductEvent } from '../analytics/tracking';
|
7
|
+
import { unSlugify } from '../analytics/integrations/unslugify';
|
8
|
+
import { breadcrumbsWithoutProduct } from '../analytics/utils/breadcrumbsWithoutProduct';
|
7
9
|
export function useAddMultipleToCart(items, hookQueries, hookCallbacks) {
|
8
10
|
const track = useTracker();
|
9
11
|
const client = useApolloClient();
|
@@ -30,11 +32,15 @@ export function useAddMultipleToCart(items, hookQueries, hookCallbacks) {
|
|
30
32
|
if (!queries || !queries.addMultipleToCartMutation || !queries.cartQuery) {
|
31
33
|
return Promise.reject(`You must pass cartQuery and addMultipleToCartMutation to useAddMultipletoCart or to the addMultiple fn`);
|
32
34
|
}
|
33
|
-
items.forEach(item => {
|
35
|
+
items.forEach((item) => {
|
36
|
+
var _a, _b, _c;
|
34
37
|
track(trackProductEvent({
|
35
38
|
action: 'add',
|
36
39
|
product: item,
|
37
|
-
quantity: item.quantity
|
40
|
+
quantity: item.quantity,
|
41
|
+
category: breadcrumbsWithoutProduct((_a = item.primaryRoute) === null || _a === void 0 ? void 0 : _a.breadcrumbs) ||
|
42
|
+
unSlugify((_c = (_b = item.canonicalCategory) === null || _b === void 0 ? void 0 : _b.primaryRoute) === null || _c === void 0 ? void 0 : _c.path) ||
|
43
|
+
''
|
38
44
|
}));
|
39
45
|
});
|
40
46
|
setStatus('loading');
|
@@ -52,13 +58,13 @@ export function useAddMultipleToCart(items, hookQueries, hookCallbacks) {
|
|
52
58
|
preOrderDate
|
53
59
|
}))
|
54
60
|
},
|
55
|
-
refetchQueries: resp => {
|
61
|
+
refetchQueries: (resp) => {
|
56
62
|
// When errors are present, the cart does not get automatically
|
57
63
|
// updated. We have to use refetchQueries in that case.
|
58
64
|
return (resp.errors && [{ query: queries.cartQuery, variables: { cartId } }]);
|
59
65
|
}
|
60
66
|
})
|
61
|
-
.then(resp => {
|
67
|
+
.then((resp) => {
|
62
68
|
setData(resp);
|
63
69
|
(callbacks === null || callbacks === void 0 ? void 0 : callbacks.onCompleted) && callbacks.onCompleted(resp);
|
64
70
|
// Update the cart context
|
@@ -72,7 +78,7 @@ export function useAddMultipleToCart(items, hookQueries, hookCallbacks) {
|
|
72
78
|
}
|
73
79
|
return resp;
|
74
80
|
})
|
75
|
-
.catch(err => {
|
81
|
+
.catch((err) => {
|
76
82
|
console.log('error!', err);
|
77
83
|
setStatus('error');
|
78
84
|
(callbacks === null || callbacks === void 0 ? void 0 : callbacks.onError) && callbacks.onError(err);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useAddMultipleToCart.js","sourceRoot":"","sources":["useAddMultipleToCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAO7C,OAAO,eAAe,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;
|
1
|
+
{"version":3,"file":"useAddMultipleToCart.js","sourceRoot":"","sources":["useAddMultipleToCart.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { Product, ProductVariant, ProductVariantOption } from '../../types';
|
2
|
-
declare type VariantValidation = 'outOfStock' | 'valid' | 'incomplete' | 'invalid';
|
2
|
+
export declare type VariantValidation = 'outOfStock' | 'valid' | 'incomplete' | 'invalid';
|
3
3
|
/**
|
4
4
|
* Given a product, this hook provides methods for getting and setting variants on that product,
|
5
5
|
* as well as methods to validate the current and proposed combination of values.
|
@@ -17,4 +17,3 @@ export declare function useProductVariants(product: Product, { initialVariant, p
|
|
17
17
|
missingOptions: ProductVariantOption[];
|
18
18
|
getMissingOptions: () => ProductVariantOption[];
|
19
19
|
};
|
20
|
-
export {};
|
@@ -68,7 +68,7 @@ export function useProductVariants(product, { initialVariant, preselectCheapest
|
|
68
68
|
return;
|
69
69
|
const validation = validateSelection(value, option);
|
70
70
|
if (validation !== 'invalid') {
|
71
|
-
selectValues(state => {
|
71
|
+
selectValues((state) => {
|
72
72
|
const newState = [...state];
|
73
73
|
newState[selectedIndex] = value;
|
74
74
|
return newState;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useProductVariants.js","sourceRoot":"","sources":["useProductVariants.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"useProductVariants.js","sourceRoot":"","sources":["useProductVariants.ts"],"names":[],"mappings":"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"}
|
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;
|
9
|
+
export declare function updateListFilterQueryString(activeFilters: ActiveFilters, history?: History): void;
|
10
|
+
export declare function updateBooleanQueryString(activeFilters: ActiveFilters, history?: History): void;
|
10
11
|
export declare function updateRangeQueryString(activeFilters: ActiveFilters): 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, {
|
@@ -67,7 +71,7 @@ export function updateRangeQueryString(activeFilters) {
|
|
67
71
|
}
|
68
72
|
else {
|
69
73
|
const params = { range: {} };
|
70
|
-
activeRangeFilters.forEach(filter => {
|
74
|
+
activeRangeFilters.forEach((filter) => {
|
71
75
|
params.range[filter.id] = [filter.min, filter.max];
|
72
76
|
});
|
73
77
|
queryString = qs.stringify(params, {
|
@@ -91,7 +95,7 @@ export function updateMultiListQueryString(activeFilters) {
|
|
91
95
|
}
|
92
96
|
else {
|
93
97
|
const params = { multiList: {} };
|
94
|
-
activeMultiFilters.forEach(filter => {
|
98
|
+
activeMultiFilters.forEach((filter) => {
|
95
99
|
params.multiList[filter.id] = filter.values;
|
96
100
|
});
|
97
101
|
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":"AAAA,OAAO,EAAE,oBAAoB,EAAW,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CACzC,aAA4B,EAC5B,OAAiB;IAEjB,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,GAAG,oBAAoB,EAAE,CAAC;KAClC;IAED,MAAM,iBAAiB,GAAG,aAAa,CAAC,WAAW,CAAC;IACpD,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,gEAAgE;QAChE,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;KAC5C;SAAM;QACL,MAAM,MAAM,GAIR,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACjB,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE;YACjC,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;KACJ;IACD,eAAe,CAAC;QACd,OAAO;QACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW;QACX,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,cAAc;KAC1B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,aAA4B,EAC5B,OAAiB;IAEjB,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,GAAG,oBAAoB,EAAE,CAAC;KAClC;IAED,MAAM,iBAAiB,GAAG,aAAa,CAAC,cAAc,CAAC;IAEvD,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,gEAAgE;QAChE,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;KAC/C;SAAM;QACL,MAAM,MAAM,GAIR,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAEpB,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE;YACjC,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;KACJ;IACD,eAAe,CAAC;QACd,OAAO;QACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW;QACX,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,cAAc;KAC1B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,aAA4B;IACjE,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,kBAAkB,GAAG,aAAa,CAAC,YAAY,CAAC;IAEtD,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,iEAAiE;QACjE,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KAC7C;SAAM;QACL,MAAM,MAAM,GAIR,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAElB,kBAAkB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACpC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE;YACjC,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;KACJ;IACD,eAAe,CAAC;QACd,OAAO;QACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW;QACX,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,cAAc;KAC1B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,aAA4B;IACrE,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,kBAAkB,GAAG,aAAa,CAAC,gBAAgB,CAAC;IAE1D,IAAI,WAAW,GAAG,EAAE,CAAC;IAErB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACjD;SAAM;QACL,MAAM,MAAM,GAIR,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QAEtB,kBAAkB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACpC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE;YACjC,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;KACJ;IAED,eAAe,CAAC;QACd,OAAO;QACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW;QACX,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,cAAc;KAC1B,CAAC,CAAC;AACL,CAAC"}
|
@@ -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'
|
@@ -67,7 +66,7 @@ export default function createFacebookTracker(config) {
|
|
67
66
|
content_type: 'product',
|
68
67
|
currency: data.currency,
|
69
68
|
value: (_b = productData.product.price) === null || _b === void 0 ? void 0 : _b.incVat
|
70
|
-
} }));
|
69
|
+
} }), data.pixelId, data.token);
|
71
70
|
}
|
72
71
|
else if (productData.action === 'view') {
|
73
72
|
return yield trackFacebookEvent(Object.assign(Object.assign({}, defaults), { event_name: 'ViewContent', custom_data: {
|
@@ -84,7 +83,7 @@ export default function createFacebookTracker(config) {
|
|
84
83
|
content_type: 'product',
|
85
84
|
currency: data.currency,
|
86
85
|
value: (_d = productData.product.price) === null || _d === void 0 ? void 0 : _d.incVat
|
87
|
-
} }));
|
86
|
+
} }), data.pixelId, data.token);
|
88
87
|
}
|
89
88
|
break;
|
90
89
|
case 'trackAddToWishList':
|
@@ -94,9 +93,9 @@ export default function createFacebookTracker(config) {
|
|
94
93
|
content_category: data.context.list || '',
|
95
94
|
content_ids: [wishListData.articleNumber],
|
96
95
|
currency: data.currency
|
97
|
-
} }));
|
96
|
+
} }), data.pixelId, data.token);
|
98
97
|
case 'trackRegister':
|
99
|
-
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);
|
100
99
|
case 'trackCartCheckout':
|
101
100
|
const checkoutData = data.props;
|
102
101
|
return yield trackFacebookEvent(Object.assign(Object.assign({}, defaults), { event_name: 'InitiateCheckout', custom_data: {
|
@@ -114,13 +113,13 @@ export default function createFacebookTracker(config) {
|
|
114
113
|
currency: data.currency,
|
115
114
|
num_items: checkoutData.cart.totalQuantity,
|
116
115
|
value: checkoutData.cart.productTotal.incVat
|
117
|
-
} }));
|
116
|
+
} }), data.pixelId, data.token);
|
118
117
|
case 'trackPageView':
|
119
118
|
const pageViewData = data.props;
|
120
119
|
return yield trackFacebookEvent(Object.assign(Object.assign({}, defaults), { event_name: 'PageView', custom_data: {
|
121
120
|
content_name: pageViewData.title,
|
122
121
|
currency: data.currency
|
123
|
-
} }));
|
122
|
+
} }), data.pixelId, data.token);
|
124
123
|
}
|
125
124
|
}
|
126
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":"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"}
|
@@ -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"}
|
@@ -3,7 +3,7 @@ import {
|
|
3
3
|
BaseTrackingEvents,
|
4
4
|
TrackingFunctionContext,
|
5
5
|
TrackingProps
|
6
|
-
} from '
|
6
|
+
} from '@jetshop/core/analytics/trackerRegistry';
|
7
7
|
|
8
8
|
interface Item {
|
9
9
|
id: string; // SKU
|
@@ -26,6 +26,8 @@ export type ServerTracker = (
|
|
26
26
|
context: TrackingFunctionContext;
|
27
27
|
location: string;
|
28
28
|
eventId: string;
|
29
|
+
pixelId?: string;
|
30
|
+
token?: string;
|
29
31
|
},
|
30
|
-
req: Request
|
32
|
+
req: Request & { universalCookies: Cookies; breakpoint: string }
|
31
33
|
) => void;
|