@akinon/next 1.82.0-rc.0 → 1.82.0-rc.10
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/.eslintrc.js +12 -0
- package/CHANGELOG.md +79 -0
- package/components/client-root.tsx +20 -0
- package/data/client/basket.ts +60 -16
- package/data/client/misc.ts +25 -1
- package/data/client/product.ts +17 -1
- package/data/urls.ts +8 -2
- package/instrumentation/node.ts +15 -13
- package/middlewares/default.ts +3 -3
- package/package.json +2 -2
- package/redux/middlewares/checkout.ts +0 -142
- package/redux/middlewares/pre-order/address.ts +2 -0
- package/redux/middlewares/pre-order/attribute-based-shipping-option.ts +2 -0
- package/redux/middlewares/pre-order/data-source-shipping-option.ts +2 -0
- package/redux/middlewares/pre-order/delivery-option.ts +2 -0
- package/redux/middlewares/pre-order/index.ts +14 -10
- package/redux/middlewares/pre-order/installment-option.ts +2 -0
- package/redux/middlewares/pre-order/payment-option.ts +2 -0
- package/redux/middlewares/pre-order/redirection.ts +2 -0
- package/redux/middlewares/pre-order/shipping-option.ts +2 -0
- package/sentry/index.ts +36 -17
package/.eslintrc.js
CHANGED
|
@@ -24,6 +24,18 @@ module.exports = {
|
|
|
24
24
|
parserOptions: {
|
|
25
25
|
sourceType: 'script'
|
|
26
26
|
}
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
env: {
|
|
30
|
+
node: true
|
|
31
|
+
},
|
|
32
|
+
files: ['redux/middlewares/pre-order/index.ts'],
|
|
33
|
+
rules: {
|
|
34
|
+
'@akinon/projectzero/check-pre-order-middleware-order': 'error'
|
|
35
|
+
},
|
|
36
|
+
parserOptions: {
|
|
37
|
+
sourceType: 'script'
|
|
38
|
+
}
|
|
27
39
|
}
|
|
28
40
|
],
|
|
29
41
|
parser: '@typescript-eslint/parser',
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,84 @@
|
|
|
1
1
|
# @akinon/next
|
|
2
2
|
|
|
3
|
+
## 1.82.0-rc.10
|
|
4
|
+
|
|
5
|
+
## 1.82.0-rc.9
|
|
6
|
+
|
|
7
|
+
### Minor Changes
|
|
8
|
+
|
|
9
|
+
- 9abd011: ZERO-3267: Refactor error handling in ErrorPage component to set error details in Sentry scope
|
|
10
|
+
|
|
11
|
+
## 1.82.0-rc.8
|
|
12
|
+
|
|
13
|
+
### Minor Changes
|
|
14
|
+
|
|
15
|
+
- 17bfadc: ZERO-3275: Disable OpenTelemetry monitoring in production environment
|
|
16
|
+
|
|
17
|
+
## 1.82.0-rc.7
|
|
18
|
+
|
|
19
|
+
### Minor Changes
|
|
20
|
+
|
|
21
|
+
- c3b2f3f: ZERO-3267: Enable sentry client errors and filter them by log type
|
|
22
|
+
|
|
23
|
+
## 1.82.0-rc.6
|
|
24
|
+
|
|
25
|
+
### Minor Changes
|
|
26
|
+
|
|
27
|
+
- 0b1bd07f: ZERO-3240: Remove unused preOrderMiddleware
|
|
28
|
+
|
|
29
|
+
## 1.82.0-rc.5
|
|
30
|
+
|
|
31
|
+
### Minor Changes
|
|
32
|
+
|
|
33
|
+
- 6f506afc: ZERO-3229: Implement mini basket query for basket total quantity
|
|
34
|
+
- c0c19629: ZERO-3258: Add new API endpoints for fetching Bukalemun image URL and bundle product data
|
|
35
|
+
- 9be2c081: ZERO-3243: Improve basket update query handling with optimistic updates
|
|
36
|
+
|
|
37
|
+
## 1.82.0-rc.4
|
|
38
|
+
|
|
39
|
+
### Minor Changes
|
|
40
|
+
|
|
41
|
+
- b6e5b624: ZERO-3257: Enhance locale middleware to redirect using existing or default locale and support 303 status for POST requests
|
|
42
|
+
|
|
43
|
+
## 1.82.0-rc.3
|
|
44
|
+
|
|
45
|
+
## 1.82.0-rc.2
|
|
46
|
+
|
|
47
|
+
### Minor Changes
|
|
48
|
+
|
|
49
|
+
- 757ee539: ZERO-3207: Add SMS send & verify endpoints with state management
|
|
50
|
+
- 5dfeea04: ZERO-2801: Revert ZERO-2801
|
|
51
|
+
- 2d9b2b2c: ZERO-2816: Add segment to headers
|
|
52
|
+
- 40a46853: ZERO-3182: Optimize basket update mutation with optimistic update
|
|
53
|
+
- f49bb74f: ZERO-3097: Add setCookie to logging in payment redirection middlewares
|
|
54
|
+
- 0e051352: ZERO-3244: Encode URL search parameters
|
|
55
|
+
- e9541a13: ZERO-2816: Add headers to url
|
|
56
|
+
- 4d3deb4f: ZERO-2935: sentry 8 upgrade
|
|
57
|
+
- 72fd4d67: ZERO-3084: Fix URL search parameters encoding in default middleware
|
|
58
|
+
- c53ef7b9: ZERO-2668: The Link component has been updated to improve the logic for handling href values. Previously, if the href was not a string or started with 'http', it would return the href as is. Now, if the href is not provided, it will default to '#' to prevent any potential errors. Additionally, if the href is a string and does not start with 'http', it will be formatted with the locale and pathname, based on the localeUrlStrategy and defaultLocaleValue. This ensures that the correct href is generated based on the localization settings.
|
|
59
|
+
- 64699d3f: ZERO-2761: Fix invalid import for plugin module
|
|
60
|
+
- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
|
|
61
|
+
- d552629f: ZERO-3182: Refactor basketApi to use invalidatesTags and comment out onQueryStarted logic
|
|
62
|
+
- 17f87524: ZERO-2816: Make the incoming currency lowercase
|
|
63
|
+
- 65d3b862: ZERO-3054: Update headers in appFetch
|
|
64
|
+
- bbe18b9f: ZERO-2575: Fix build error
|
|
65
|
+
- 4920742c: Disable getCachedTranslations
|
|
66
|
+
- 7e56d6b6: ZERO-2841: Update api tagTypes
|
|
67
|
+
- 43c182ee: ZERO-3054: Update Redis variable checks to conditionally include CACHE_SECRET
|
|
68
|
+
- 2d305aaf: ZERO-2935: Update Sentry configuration: remove hideSourceMaps option and add it to withPzConfig
|
|
69
|
+
- eeb20bea: Revert "ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing"
|
|
70
|
+
- f2c92d5c: ZERO-2816: Update cookie name
|
|
71
|
+
- 7bd3d992: ZERO-2801: Refactor locale middleware to handle single locale configuration
|
|
72
|
+
- fdd255ee: ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing
|
|
73
|
+
- 49eeebfa: ZERO-2909: Add deleteCollectionItem query to wishlistApi
|
|
74
|
+
- 3f9b8d7e: ZERO-2761: Update plugins.js for akinon-next
|
|
75
|
+
|
|
76
|
+
## 1.82.0-rc.1
|
|
77
|
+
|
|
78
|
+
### Minor Changes
|
|
79
|
+
|
|
80
|
+
- 0e051352: ZERO-3244: Encode URL search parameters
|
|
81
|
+
|
|
3
82
|
## 1.82.0-rc.0
|
|
4
83
|
|
|
5
84
|
### Minor Changes
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
3
|
import { useMobileIframeHandler } from '../hooks';
|
|
4
|
+
import * as Sentry from '@sentry/nextjs';
|
|
5
|
+
import { initSentry } from '../sentry';
|
|
6
|
+
import { useEffect } from 'react';
|
|
4
7
|
|
|
5
8
|
export default function ClientRoot({
|
|
6
9
|
children,
|
|
@@ -11,6 +14,23 @@ export default function ClientRoot({
|
|
|
11
14
|
}) {
|
|
12
15
|
const { preventPageRender } = useMobileIframeHandler({ sessionId });
|
|
13
16
|
|
|
17
|
+
const initializeSentry = async () => {
|
|
18
|
+
const response = await fetch('/api/sentry', { next: { revalidate: 0 } });
|
|
19
|
+
const data = await response.json();
|
|
20
|
+
|
|
21
|
+
const options = {
|
|
22
|
+
dsn: data.dsn
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
initSentry('Client', options);
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
useEffect(() => {
|
|
29
|
+
if (!Sentry.isInitialized()) {
|
|
30
|
+
initializeSentry();
|
|
31
|
+
}
|
|
32
|
+
}, []);
|
|
33
|
+
|
|
14
34
|
if (preventPageRender) {
|
|
15
35
|
return null;
|
|
16
36
|
}
|
package/data/client/basket.ts
CHANGED
|
@@ -24,6 +24,26 @@ export const basketApi = api.injectEndpoints({
|
|
|
24
24
|
transformResponse: (response: { basket: Basket }) => response.basket,
|
|
25
25
|
providesTags: ['Basket']
|
|
26
26
|
}),
|
|
27
|
+
getMiniBasket: build.query<
|
|
28
|
+
{ pk: number | null; total_quantity: number },
|
|
29
|
+
void
|
|
30
|
+
>({
|
|
31
|
+
query: () =>
|
|
32
|
+
buildClientRequestUrl(basket.getMiniBasket, {
|
|
33
|
+
contentType: 'application/json'
|
|
34
|
+
}),
|
|
35
|
+
providesTags: ['Basket']
|
|
36
|
+
}),
|
|
37
|
+
getMiniBasketDetail: build.query<
|
|
38
|
+
{ pk: number | null; total_quantity: number },
|
|
39
|
+
{ namespace: string }
|
|
40
|
+
>({
|
|
41
|
+
query: ({ namespace }) =>
|
|
42
|
+
buildClientRequestUrl(basket.getMiniBasketDetail(namespace), {
|
|
43
|
+
contentType: 'application/json'
|
|
44
|
+
}),
|
|
45
|
+
providesTags: ['MultiBasket']
|
|
46
|
+
}),
|
|
27
47
|
getBasketDetail: build.query<Basket, { namespace: string }>({
|
|
28
48
|
query: ({ namespace }) =>
|
|
29
49
|
buildClientRequestUrl(basket.getBasketDetail(namespace)),
|
|
@@ -84,23 +104,45 @@ export const basketApi = api.injectEndpoints({
|
|
|
84
104
|
method: 'PUT',
|
|
85
105
|
body
|
|
86
106
|
}),
|
|
87
|
-
|
|
88
|
-
|
|
107
|
+
async onQueryStarted(_, { dispatch, queryFulfilled }) {
|
|
108
|
+
try {
|
|
109
|
+
const { data } = await queryFulfilled;
|
|
110
|
+
|
|
111
|
+
dispatch(
|
|
112
|
+
basketApi.util.updateQueryData(
|
|
113
|
+
'getBasket',
|
|
114
|
+
undefined,
|
|
115
|
+
() => data.basket
|
|
116
|
+
)
|
|
117
|
+
);
|
|
89
118
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
119
|
+
if (data.basket.namespace) {
|
|
120
|
+
dispatch(
|
|
121
|
+
basketApi.util.updateQueryData(
|
|
122
|
+
'getBasketDetail',
|
|
123
|
+
{ namespace: data.basket.namespace },
|
|
124
|
+
() => data.basket
|
|
125
|
+
)
|
|
126
|
+
);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
dispatch(
|
|
130
|
+
basketApi.util.updateQueryData(
|
|
131
|
+
'getAllBaskets',
|
|
132
|
+
undefined,
|
|
133
|
+
(baskets) => {
|
|
134
|
+
if (!baskets) return baskets;
|
|
135
|
+
|
|
136
|
+
return baskets.map((basket) =>
|
|
137
|
+
basket.pk === data.basket.pk ? data.basket : basket
|
|
138
|
+
);
|
|
139
|
+
}
|
|
140
|
+
)
|
|
141
|
+
);
|
|
142
|
+
} catch (error) {
|
|
143
|
+
console.error('Error updating quantity:', error);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
104
146
|
}),
|
|
105
147
|
clearBasket: build.mutation<Basket, void>({
|
|
106
148
|
query: (body) => ({
|
|
@@ -141,6 +183,8 @@ export const basketApi = api.injectEndpoints({
|
|
|
141
183
|
|
|
142
184
|
export const {
|
|
143
185
|
useGetBasketQuery,
|
|
186
|
+
useGetMiniBasketQuery,
|
|
187
|
+
useGetMiniBasketDetailQuery,
|
|
144
188
|
useLazyGetBasketDetailQuery,
|
|
145
189
|
useGetAllBasketsQuery,
|
|
146
190
|
useRemoveBasketMutation,
|
package/data/client/misc.ts
CHANGED
|
@@ -92,6 +92,29 @@ export const miscApi = api.injectEndpoints({
|
|
|
92
92
|
transformResponse: (response: { menu: MenuItemType[] }) => {
|
|
93
93
|
return response.menu;
|
|
94
94
|
}
|
|
95
|
+
}),
|
|
96
|
+
getBukalemunImageUrl: builder.query<
|
|
97
|
+
any,
|
|
98
|
+
{ current_chapter: string; sku: string; selected_attributes: any }
|
|
99
|
+
>({
|
|
100
|
+
query: ({ current_chapter, sku, selected_attributes }) => {
|
|
101
|
+
const data = {
|
|
102
|
+
...selected_attributes,
|
|
103
|
+
current_chapter,
|
|
104
|
+
sku
|
|
105
|
+
};
|
|
106
|
+
|
|
107
|
+
const params = new URLSearchParams(data);
|
|
108
|
+
|
|
109
|
+
return {
|
|
110
|
+
url: buildClientRequestUrl(
|
|
111
|
+
misc.bukalemunImageUrl(params.toString()),
|
|
112
|
+
{
|
|
113
|
+
responseType: 'json'
|
|
114
|
+
}
|
|
115
|
+
)
|
|
116
|
+
};
|
|
117
|
+
}
|
|
95
118
|
})
|
|
96
119
|
}),
|
|
97
120
|
overrideExisting: true
|
|
@@ -102,5 +125,6 @@ export const {
|
|
|
102
125
|
useEmailSubscriptionMutation,
|
|
103
126
|
useSetLanguageMutation,
|
|
104
127
|
useGetWidgetQuery,
|
|
105
|
-
useGetMenuQuery
|
|
128
|
+
useGetMenuQuery,
|
|
129
|
+
useGetBukalemunImageUrlQuery
|
|
106
130
|
} = miscApi;
|
package/data/client/product.ts
CHANGED
|
@@ -75,6 +75,21 @@ export const productApi = api.injectEndpoints({
|
|
|
75
75
|
query: (productPk) => ({
|
|
76
76
|
url: buildClientRequestUrl(product.installments(productPk))
|
|
77
77
|
})
|
|
78
|
+
}),
|
|
79
|
+
getBundleProductData: build.query<
|
|
80
|
+
any,
|
|
81
|
+
{ productPk: string; queryString: string }
|
|
82
|
+
>({
|
|
83
|
+
query: ({ productPk, queryString }) => {
|
|
84
|
+
return {
|
|
85
|
+
url: buildClientRequestUrl(
|
|
86
|
+
product.bundleProduct(productPk, queryString),
|
|
87
|
+
{
|
|
88
|
+
responseType: 'json'
|
|
89
|
+
}
|
|
90
|
+
)
|
|
91
|
+
};
|
|
92
|
+
}
|
|
78
93
|
})
|
|
79
94
|
}),
|
|
80
95
|
overrideExisting: true
|
|
@@ -85,5 +100,6 @@ export const {
|
|
|
85
100
|
useGetProductByPkQuery,
|
|
86
101
|
useGetRetailStoreStockMutation,
|
|
87
102
|
useGetInstallmentsQuery,
|
|
88
|
-
useGetProductByParamsQuery
|
|
103
|
+
useGetProductByParamsQuery,
|
|
104
|
+
useGetBundleProductDataQuery
|
|
89
105
|
} = productApi;
|
package/data/urls.ts
CHANGED
|
@@ -74,7 +74,10 @@ export const address = {
|
|
|
74
74
|
|
|
75
75
|
export const basket = {
|
|
76
76
|
getBasket: '/baskets/basket/',
|
|
77
|
+
getMiniBasket: '/baskets/basket/mini/',
|
|
77
78
|
getBasketDetail: (namespace: string) => `/baskets/basket/${namespace}/`,
|
|
79
|
+
getMiniBasketDetail: (namespace: string) =>
|
|
80
|
+
`/baskets/basket/${namespace}/mini/`,
|
|
78
81
|
getAllBaskets: '/baskets/basket-list/',
|
|
79
82
|
removeBasket: (pk: number) => `/baskets/basket-list/${pk}/`,
|
|
80
83
|
selectMainBasket: (pk: number) => `/baskets/basket-list/id/${pk}/main/`,
|
|
@@ -162,7 +165,8 @@ export const misc = {
|
|
|
162
165
|
parent ? `&parent=${parent}` : ''
|
|
163
166
|
}`,
|
|
164
167
|
cmsSeo: (slug: string | string[]) => `/cms/seo/?url=${slug ? slug : '/'}`,
|
|
165
|
-
setCurrency: '/users/activate-currency/'
|
|
168
|
+
setCurrency: '/users/activate-currency/',
|
|
169
|
+
bukalemunImageUrl: (params: string) => `/bukalemun/?${params}`
|
|
166
170
|
};
|
|
167
171
|
|
|
168
172
|
export const product = {
|
|
@@ -176,7 +180,9 @@ export const product = {
|
|
|
176
180
|
slug: (slug: string) => `/${slug}/`,
|
|
177
181
|
categoryUrl: (pk: number) => `/products/${pk}/category_nodes/?limit=1`,
|
|
178
182
|
breadcrumbUrl: (menuitemmodel: string) =>
|
|
179
|
-
`/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item
|
|
183
|
+
`/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
|
|
184
|
+
bundleProduct: (productPk: string, queryString: string) =>
|
|
185
|
+
`/bundle-product/${productPk}/?${queryString}`
|
|
180
186
|
};
|
|
181
187
|
|
|
182
188
|
export const wishlist = {
|
package/instrumentation/node.ts
CHANGED
|
@@ -4,17 +4,19 @@ import { Resource } from '@opentelemetry/resources';
|
|
|
4
4
|
import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
|
|
5
5
|
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
new
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
7
|
+
if (process.env.NODE_ENV === 'development') {
|
|
8
|
+
const sdk = new NodeSDK({
|
|
9
|
+
resource: new Resource({
|
|
10
|
+
[SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
|
|
11
|
+
}),
|
|
12
|
+
spanProcessor: new SimpleSpanProcessor(
|
|
13
|
+
new OTLPTraceExporter({
|
|
14
|
+
url: `${
|
|
15
|
+
process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
|
|
16
|
+
}/api/traces`
|
|
17
|
+
})
|
|
18
|
+
)
|
|
19
|
+
});
|
|
19
20
|
|
|
20
|
-
sdk.start();
|
|
21
|
+
sdk.start();
|
|
22
|
+
}
|
package/middlewares/default.ts
CHANGED
|
@@ -285,9 +285,9 @@ const withPzDefault =
|
|
|
285
285
|
url.pathname =
|
|
286
286
|
url.pathname +
|
|
287
287
|
(/\/$/.test(url.pathname) ? '' : '/') +
|
|
288
|
-
`searchparams|${
|
|
289
|
-
.toString()
|
|
290
|
-
|
|
288
|
+
`searchparams|${encodeURIComponent(
|
|
289
|
+
url.searchParams.toString()
|
|
290
|
+
)}`;
|
|
291
291
|
}
|
|
292
292
|
|
|
293
293
|
if (
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@akinon/next",
|
|
3
3
|
"description": "Core package for Project Zero Next",
|
|
4
|
-
"version": "1.82.0-rc.
|
|
4
|
+
"version": "1.82.0-rc.10",
|
|
5
5
|
"private": false,
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"bin": {
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"set-cookie-parser": "2.6.0"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@akinon/eslint-plugin-projectzero": "1.82.0-rc.
|
|
33
|
+
"@akinon/eslint-plugin-projectzero": "1.82.0-rc.10",
|
|
34
34
|
"@types/react-redux": "7.1.30",
|
|
35
35
|
"@types/set-cookie-parser": "2.4.7",
|
|
36
36
|
"@typescript-eslint/eslint-plugin": "6.7.4",
|
|
@@ -16,10 +16,8 @@ import {
|
|
|
16
16
|
setLoyaltyBalance,
|
|
17
17
|
setPaymentChoices,
|
|
18
18
|
setPaymentOptions,
|
|
19
|
-
setPreOrder,
|
|
20
19
|
setRetailStores,
|
|
21
20
|
setShippingOptions,
|
|
22
|
-
setShippingStepCompleted,
|
|
23
21
|
setHepsipayAvailability,
|
|
24
22
|
setWalletPaymentData,
|
|
25
23
|
setPayOnDeliveryOtpModalActive
|
|
@@ -59,146 +57,6 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
|
|
|
59
57
|
};
|
|
60
58
|
};
|
|
61
59
|
|
|
62
|
-
export const preOrderMiddleware: Middleware = ({
|
|
63
|
-
getState,
|
|
64
|
-
dispatch
|
|
65
|
-
}: MiddlewareParams) => {
|
|
66
|
-
return (next) => (action) => {
|
|
67
|
-
const result: CheckoutResult = next(action);
|
|
68
|
-
const preOrder = result?.payload?.pre_order;
|
|
69
|
-
|
|
70
|
-
if (
|
|
71
|
-
!preOrder ||
|
|
72
|
-
action?.meta?.arg?.endpointName === 'guestLogin' ||
|
|
73
|
-
action?.meta?.arg?.endpointName === 'getCheckoutLoyaltyBalance'
|
|
74
|
-
) {
|
|
75
|
-
return result;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
const {
|
|
79
|
-
deliveryOptions,
|
|
80
|
-
addressList: addresses,
|
|
81
|
-
shippingOptions,
|
|
82
|
-
dataSourceShippingOptions,
|
|
83
|
-
paymentOptions,
|
|
84
|
-
installmentOptions,
|
|
85
|
-
attributeBasedShippingOptions
|
|
86
|
-
} = getState().checkout;
|
|
87
|
-
const { endpoints: apiEndpoints } = checkoutApi;
|
|
88
|
-
|
|
89
|
-
if (preOrder.is_redirected) {
|
|
90
|
-
const contextList = result?.payload?.context_list;
|
|
91
|
-
|
|
92
|
-
if (
|
|
93
|
-
contextList.find(
|
|
94
|
-
(ctx) => ctx.page_name === 'RedirectionPaymentSelectedPage'
|
|
95
|
-
)
|
|
96
|
-
) {
|
|
97
|
-
dispatch(
|
|
98
|
-
apiEndpoints.setPaymentOption.initiate(preOrder.payment_option?.pk)
|
|
99
|
-
);
|
|
100
|
-
return;
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
dispatch(setPreOrder(preOrder));
|
|
105
|
-
|
|
106
|
-
if (!preOrder.delivery_option && deliveryOptions.length > 0) {
|
|
107
|
-
dispatch(
|
|
108
|
-
apiEndpoints.setDeliveryOption.initiate(
|
|
109
|
-
deliveryOptions.find((opt) => opt.delivery_option_type === 'customer')
|
|
110
|
-
?.pk
|
|
111
|
-
)
|
|
112
|
-
);
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
if (
|
|
116
|
-
(!preOrder.shipping_address || !preOrder.billing_address) &&
|
|
117
|
-
addresses.length > 0 &&
|
|
118
|
-
(!preOrder.delivery_option ||
|
|
119
|
-
preOrder.delivery_option.delivery_option_type === 'customer')
|
|
120
|
-
) {
|
|
121
|
-
dispatch(
|
|
122
|
-
apiEndpoints.setAddresses.initiate({
|
|
123
|
-
shippingAddressPk: addresses[0].pk,
|
|
124
|
-
billingAddressPk: addresses[0].pk
|
|
125
|
-
})
|
|
126
|
-
);
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
if (
|
|
130
|
-
shippingOptions.length > 0 &&
|
|
131
|
-
(!preOrder.shipping_option ||
|
|
132
|
-
!shippingOptions.find((opt) => opt.pk === preOrder.shipping_option?.pk))
|
|
133
|
-
) {
|
|
134
|
-
dispatch(apiEndpoints.setShippingOption.initiate(shippingOptions[0].pk));
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
if (
|
|
138
|
-
dataSourceShippingOptions.length > 0 &&
|
|
139
|
-
!preOrder.data_source_shipping_options
|
|
140
|
-
) {
|
|
141
|
-
const selectedDataSourceShippingOptionsPks =
|
|
142
|
-
dataSourceShippingOptions.map(
|
|
143
|
-
(opt) => opt.data_source_shipping_options[0].pk
|
|
144
|
-
);
|
|
145
|
-
|
|
146
|
-
dispatch(
|
|
147
|
-
apiEndpoints.setDataSourceShippingOptions.initiate(
|
|
148
|
-
selectedDataSourceShippingOptionsPks
|
|
149
|
-
)
|
|
150
|
-
);
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
if (
|
|
154
|
-
Object.keys(attributeBasedShippingOptions).length > 0 &&
|
|
155
|
-
!preOrder.attribute_based_shipping_options
|
|
156
|
-
) {
|
|
157
|
-
const initialSelectedOptions: Record<string, number> = Object.fromEntries(
|
|
158
|
-
Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
|
|
159
|
-
key,
|
|
160
|
-
options.attribute_based_shipping_options[0].pk
|
|
161
|
-
])
|
|
162
|
-
);
|
|
163
|
-
|
|
164
|
-
dispatch(
|
|
165
|
-
apiEndpoints.setAttributeBasedShippingOptions.initiate(
|
|
166
|
-
initialSelectedOptions
|
|
167
|
-
)
|
|
168
|
-
);
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
if (!preOrder.payment_option && paymentOptions.length > 0) {
|
|
172
|
-
dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
|
|
173
|
-
}
|
|
174
|
-
|
|
175
|
-
if (
|
|
176
|
-
!preOrder.installment &&
|
|
177
|
-
preOrder.payment_option?.payment_type !== 'saved_card' &&
|
|
178
|
-
installmentOptions.length > 0
|
|
179
|
-
) {
|
|
180
|
-
dispatch(
|
|
181
|
-
apiEndpoints.setInstallmentOption.initiate(installmentOptions[0].pk)
|
|
182
|
-
);
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
dispatch(
|
|
186
|
-
setShippingStepCompleted(
|
|
187
|
-
[
|
|
188
|
-
preOrder.delivery_option?.delivery_option_type === 'retail_store'
|
|
189
|
-
? true
|
|
190
|
-
: preOrder.shipping_address?.pk,
|
|
191
|
-
preOrder.billing_address?.pk,
|
|
192
|
-
preOrder.shipping_option?.pk,
|
|
193
|
-
addresses.length > 0
|
|
194
|
-
].every(Boolean)
|
|
195
|
-
)
|
|
196
|
-
);
|
|
197
|
-
|
|
198
|
-
return result;
|
|
199
|
-
};
|
|
200
|
-
};
|
|
201
|
-
|
|
202
60
|
export const contextListMiddleware: Middleware = ({
|
|
203
61
|
dispatch,
|
|
204
62
|
getState
|
|
@@ -10,16 +10,20 @@ import { paymentOptionMiddleware } from './payment-option';
|
|
|
10
10
|
import { installmentOptionMiddleware } from './installment-option';
|
|
11
11
|
import { shippingStepMiddleware } from './shipping-step';
|
|
12
12
|
|
|
13
|
+
// ⚠️ WARNING: Redux Toolkit applies middlewares in reverse order (from last to first).
|
|
14
|
+
// This list is written **in reverse execution order** to ensure they run in the correct sequence.
|
|
15
|
+
// If you add a new middleware, make sure to insert it **in reverse order** based on execution priority.
|
|
16
|
+
|
|
13
17
|
export const preOrderMiddlewares = [
|
|
14
|
-
|
|
15
|
-
redirectionMiddleware,
|
|
16
|
-
setPreOrderMiddleware,
|
|
17
|
-
deliveryOptionMiddleware,
|
|
18
|
-
setAddressMiddleware,
|
|
19
|
-
shippingOptionMiddleware,
|
|
20
|
-
dataSourceShippingOptionMiddleware,
|
|
21
|
-
attributeBasedShippingOptionMiddleware,
|
|
22
|
-
paymentOptionMiddleware,
|
|
18
|
+
shippingStepMiddleware,
|
|
23
19
|
installmentOptionMiddleware,
|
|
24
|
-
|
|
20
|
+
paymentOptionMiddleware,
|
|
21
|
+
attributeBasedShippingOptionMiddleware,
|
|
22
|
+
dataSourceShippingOptionMiddleware,
|
|
23
|
+
shippingOptionMiddleware,
|
|
24
|
+
setAddressMiddleware,
|
|
25
|
+
deliveryOptionMiddleware,
|
|
26
|
+
setPreOrderMiddleware,
|
|
27
|
+
redirectionMiddleware,
|
|
28
|
+
preOrderValidationMiddleware
|
|
25
29
|
];
|
package/sentry/index.ts
CHANGED
|
@@ -1,29 +1,48 @@
|
|
|
1
1
|
import * as Sentry from '@sentry/nextjs';
|
|
2
2
|
|
|
3
|
-
const SENTRY_DSN: string =
|
|
3
|
+
const SENTRY_DSN: string | undefined =
|
|
4
4
|
process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
|
|
5
5
|
|
|
6
|
+
export enum ClientLogType {
|
|
7
|
+
UNCAUGHT_ERROR_PAGE = 'UNCAUGHT_ERROR_PAGE',
|
|
8
|
+
CHECKOUT = 'CHECKOUT'
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
const ALLOWED_CLIENT_LOG_TYPES: ClientLogType[] = [
|
|
12
|
+
ClientLogType.UNCAUGHT_ERROR_PAGE,
|
|
13
|
+
ClientLogType.CHECKOUT
|
|
14
|
+
];
|
|
15
|
+
|
|
6
16
|
export const initSentry = (
|
|
7
17
|
type: 'Server' | 'Client' | 'Edge',
|
|
8
18
|
options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
|
|
9
19
|
) => {
|
|
10
20
|
// TODO: Handle options with ESLint rules
|
|
11
21
|
|
|
12
|
-
|
|
22
|
+
Sentry.init({
|
|
23
|
+
dsn:
|
|
24
|
+
options.dsn ||
|
|
25
|
+
SENTRY_DSN ||
|
|
26
|
+
'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
|
|
27
|
+
initialScope: {
|
|
28
|
+
tags: {
|
|
29
|
+
APP_TYPE: 'ProjectZeroNext',
|
|
30
|
+
TYPE: type
|
|
31
|
+
}
|
|
32
|
+
},
|
|
33
|
+
tracesSampleRate: 1.0,
|
|
34
|
+
integrations: [],
|
|
35
|
+
beforeSend: (event, hint) => {
|
|
36
|
+
if (
|
|
37
|
+
type === 'Client' &&
|
|
38
|
+
!ALLOWED_CLIENT_LOG_TYPES.includes(
|
|
39
|
+
event.tags?.LOG_TYPE as ClientLogType
|
|
40
|
+
)
|
|
41
|
+
) {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
13
44
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
SENTRY_DSN ||
|
|
18
|
-
'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
|
|
19
|
-
initialScope: {
|
|
20
|
-
tags: {
|
|
21
|
-
APP_TYPE: 'ProjectZeroNext',
|
|
22
|
-
TYPE: type
|
|
23
|
-
}
|
|
24
|
-
},
|
|
25
|
-
tracesSampleRate: 1.0,
|
|
26
|
-
integrations: []
|
|
27
|
-
});
|
|
28
|
-
}
|
|
45
|
+
return event;
|
|
46
|
+
}
|
|
47
|
+
});
|
|
29
48
|
};
|