@q2devel/q2-core 1.0.72 → 1.0.74
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/dist/api/cart/Cart.service.d.ts +12 -3
- package/dist/api/cart/Cart.service.d.ts.map +1 -1
- package/dist/api/cart/Cart.service.js +45 -24
- package/dist/api/cart/CartService.types.d.ts +2 -14
- package/dist/api/cart/CartService.types.d.ts.map +1 -1
- package/dist/api/content/getBanners.d.ts +10 -2
- package/dist/api/content/getBanners.d.ts.map +1 -1
- package/dist/api/content/getBanners.js +19 -5
- package/dist/api/content/getBlog.d.ts +9 -2
- package/dist/api/content/getBlog.d.ts.map +1 -1
- package/dist/api/content/getBlog.js +19 -4
- package/dist/api/getTerms.d.ts +9 -2
- package/dist/api/getTerms.d.ts.map +1 -1
- package/dist/api/getTerms.js +16 -3
- package/dist/api/pages/branch/branch.service.d.ts +9 -2
- package/dist/api/pages/branch/branch.service.d.ts.map +1 -1
- package/dist/api/pages/branch/branch.service.js +16 -2
- package/dist/api/pages/faq/faq.service.d.ts +9 -2
- package/dist/api/pages/faq/faq.service.d.ts.map +1 -1
- package/dist/api/pages/faq/faq.service.js +14 -2
- package/dist/api/pages/page/page.service.d.ts +9 -2
- package/dist/api/pages/page/page.service.d.ts.map +1 -1
- package/dist/api/pages/page/page.service.js +14 -2
- package/dist/api/products/getProducts.d.ts +1 -2
- package/dist/api/products/getProducts.d.ts.map +1 -1
- package/dist/api/products/getProducts.js +5 -4
- package/dist/context.d.ts +14 -0
- package/dist/context.d.ts.map +1 -1
- package/dist/hooks/cart/api/useGetCurrentCart.js +1 -1
- package/dist/hooks/cart/api/useGetOrderHistory.js +1 -1
- package/dist/hooks/cart/api/useGetUserCart.js +1 -1
- package/dist/hooks/products/useGetProducts.d.ts +0 -1
- package/dist/hooks/products/useGetProducts.d.ts.map +1 -1
- package/dist/hooks/products/useGetProducts.js +1 -2
- package/dist/types/content/Blog.d.ts +9 -0
- package/dist/types/content/Blog.d.ts.map +1 -1
- package/dist/types/products/Product.d.ts +2 -3
- package/dist/types/products/Product.d.ts.map +1 -1
- package/dist/utils/mapProducts.d.ts +32 -1
- package/dist/utils/mapProducts.d.ts.map +1 -1
- package/dist/utils/mapProducts.js +9 -76
- package/dist/utils/test.d.ts +1 -0
- package/dist/utils/test.d.ts.map +1 -0
- package/dist/utils/test.js +1 -0
- package/package.json +6 -2
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
import { AxiosRequestConfig } from 'axios';
|
|
2
2
|
import { CoreContext } from '../../context';
|
|
3
3
|
import { AddToCartRequest, AddToCartResponse, Cart, CartItem, DeleteCartItemRequest, OrderHistoryResponse, UpdateCartItemRequest } from './CartService.types';
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
type Params = {
|
|
5
|
+
include?: string[];
|
|
6
|
+
filters?: Array<{
|
|
7
|
+
path: string;
|
|
8
|
+
value: string | string[] | null;
|
|
9
|
+
operator?: string;
|
|
10
|
+
}>;
|
|
11
|
+
};
|
|
12
|
+
export declare const getUserCart: (ctx: CoreContext, { include, filters, }: Params, config?: AxiosRequestConfig) => Promise<Cart>;
|
|
13
|
+
export declare const getCurrentCart: (ctx: CoreContext, activeToken: string, { include, filters, }: Params, config?: AxiosRequestConfig) => Promise<Cart>;
|
|
6
14
|
export declare const addToCart: (ctx: CoreContext, activeToken: string | undefined, request: AddToCartRequest, config?: AxiosRequestConfig) => Promise<AddToCartResponse>;
|
|
7
15
|
export declare const updateCartItem: (ctx: CoreContext, orderId: string, itemId: string, request: UpdateCartItemRequest, config?: AxiosRequestConfig) => Promise<CartItem>;
|
|
8
16
|
export declare const deleteCartItem: (ctx: CoreContext, orderId: string, request: DeleteCartItemRequest, config?: AxiosRequestConfig) => Promise<void>;
|
|
@@ -10,5 +18,6 @@ export declare const clearCart: (ctx: CoreContext, cartId: string, config?: Axio
|
|
|
10
18
|
export declare const applyCoupon: (ctx: CoreContext, cartId: string, couponCode: string, config?: AxiosRequestConfig) => Promise<Cart>;
|
|
11
19
|
export declare const removeCoupon: (ctx: CoreContext, cartId: string, couponId: string, config?: AxiosRequestConfig) => Promise<void>;
|
|
12
20
|
export declare const getCartToken: (ctx: CoreContext, config?: AxiosRequestConfig) => Promise<string>;
|
|
13
|
-
export declare const getOrderHistory: (ctx: CoreContext, config?: AxiosRequestConfig) => Promise<OrderHistoryResponse>;
|
|
21
|
+
export declare const getOrderHistory: (ctx: CoreContext, { include, filters, }: Params, config?: AxiosRequestConfig) => Promise<OrderHistoryResponse>;
|
|
22
|
+
export {};
|
|
14
23
|
//# sourceMappingURL=Cart.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cart.service.d.ts","sourceRoot":"","sources":["../../../api/cart/Cart.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"Cart.service.d.ts","sourceRoot":"","sources":["../../../api/cart/Cart.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EACH,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,EACJ,QAAQ,EACR,qBAAqB,EAErB,oBAAoB,EACpB,qBAAqB,EACxB,MAAM,qBAAqB,CAAA;AAS5B,KAAK,MAAM,GAAG;IACV,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;CACL,CAAA;AACD,eAAO,MAAM,WAAW,GACpB,KAAK,WAAW,EAChB,uBASG,MAAM,EACT,SAAQ,kBAAuB,KAChC,OAAO,CAAC,IAAI,CAyEd,CAAA;AAED,eAAO,MAAM,cAAc,GACvB,KAAK,WAAW,EAChB,aAAa,MAAM,EACnB,uBAQG,MAAM,EACT,SAAQ,kBAAuB,KAChC,OAAO,CAAC,IAAI,CAuEd,CAAA;AAED,eAAO,MAAM,SAAS,GAClB,KAAK,WAAW,EAChB,aAAa,MAAM,GAAG,SAAS,EAC/B,SAAS,gBAAgB,EACzB,SAAQ,kBAAuB,KAChC,OAAO,CAAC,iBAAiB,CAmB3B,CAAA;AAED,eAAO,MAAM,cAAc,GACvB,KAAK,WAAW,EAChB,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,SAAS,qBAAqB,EAC9B,SAAQ,kBAAuB,KAChC,OAAO,CAAC,QAAQ,CAOlB,CAAA;AAED,eAAO,MAAM,cAAc,GACvB,KAAK,WAAW,EAChB,SAAS,MAAM,EACf,SAAS,qBAAqB,EAC9B,SAAQ,kBAAuB,KAChC,OAAO,CAAC,IAAI,CAMd,CAAA;AAED,eAAO,MAAM,SAAS,GAClB,KAAK,WAAW,EAChB,QAAQ,MAAM,EACd,SAAQ,kBAAuB,KAChC,OAAO,CAAC,IAAI,CAKd,CAAA;AAED,eAAO,MAAM,WAAW,GACpB,KAAK,WAAW,EAChB,QAAQ,MAAM,EACd,YAAY,MAAM,EAClB,SAAQ,kBAAuB,KAChC,OAAO,CAAC,IAAI,CAYd,CAAA;AAED,eAAO,MAAM,YAAY,GACrB,KAAK,WAAW,EAChB,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,SAAQ,kBAAuB,KAChC,OAAO,CAAC,IAAI,CAQd,CAAA;AAED,eAAO,MAAM,YAAY,GACrB,KAAK,WAAW,EAChB,SAAQ,kBAAuB,KAChC,OAAO,CAAC,MAAM,CAQhB,CAAA;AAED,eAAO,MAAM,eAAe,GACxB,KAAK,WAAW,EAChB,uBAMG,MAAM,EACT,SAAQ,kBAAuB,KAChC,OAAO,CAAC,oBAAoB,CAqE9B,CAAA"}
|
|
@@ -6,21 +6,24 @@ const getHeaders = (ctx, customHeaders = {}) => ({
|
|
|
6
6
|
...(ctx.accessToken && { Authorization: `Bearer ${ctx.accessToken}` }),
|
|
7
7
|
...customHeaders,
|
|
8
8
|
});
|
|
9
|
-
export const getUserCart = async (ctx,
|
|
9
|
+
export const getUserCart = async (ctx, { include = [
|
|
10
|
+
'order_items',
|
|
11
|
+
'order_items.purchased_entity',
|
|
12
|
+
'order_items.purchased_entity.product_id',
|
|
13
|
+
'order_items.purchased_entity.field_image',
|
|
14
|
+
'order_items.purchased_entity.field_image.field_media_image',
|
|
15
|
+
], filters = [], }, config = {}) => {
|
|
10
16
|
if (!ctx.userId)
|
|
11
17
|
throw new Error('Missing userId in context');
|
|
12
18
|
const params = new DrupalJsonApiParams()
|
|
13
19
|
.addFilter('state', 'draft')
|
|
14
20
|
.addFilter('uid.meta', ctx.userId)
|
|
15
|
-
.addInclude(
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
// 'order_items.purchased_entity.product_id.field_image',
|
|
22
|
-
// 'order_items.purchased_entity.product_id.field_image.field_media_image',
|
|
23
|
-
]);
|
|
21
|
+
.addInclude(include);
|
|
22
|
+
if (filters.length) {
|
|
23
|
+
filters.forEach((filter) => {
|
|
24
|
+
params.addFilter(filter.path, filter.value, filter.operator);
|
|
25
|
+
});
|
|
26
|
+
}
|
|
24
27
|
const { data } = await ctx.axios.get(`/jsonapi/commerce_order/default?${params.getQueryString()}`, { ...config, headers: getHeaders(ctx, config.headers) });
|
|
25
28
|
if (!data.data || (Array.isArray(data.data) && data.data.length === 0)) {
|
|
26
29
|
return {
|
|
@@ -40,12 +43,12 @@ export const getUserCart = async (ctx, config = {}) => {
|
|
|
40
43
|
.map((item) => {
|
|
41
44
|
const defaultProduct = item.purchased_entity?.product_id;
|
|
42
45
|
const variationProduct = item.purchased_entity;
|
|
43
|
-
const variations = defaultProduct?.variations ?? [];
|
|
44
46
|
if (!defaultProduct || !variationProduct) {
|
|
45
47
|
console.warn('Invalid order item structure', item);
|
|
46
48
|
return null;
|
|
47
49
|
}
|
|
48
|
-
const
|
|
50
|
+
const mapProductFn = ctx.mapProduct || mapProduct;
|
|
51
|
+
const baseProduct = mapProductFn(defaultProduct, variationProduct, ctx);
|
|
49
52
|
return {
|
|
50
53
|
...baseProduct,
|
|
51
54
|
quantity: parseFloat(item.quantity || '0'),
|
|
@@ -68,10 +71,23 @@ export const getUserCart = async (ctx, config = {}) => {
|
|
|
68
71
|
},
|
|
69
72
|
};
|
|
70
73
|
};
|
|
71
|
-
export const getCurrentCart = async (ctx, activeToken,
|
|
74
|
+
export const getCurrentCart = async (ctx, activeToken, { include = [
|
|
75
|
+
'order_items',
|
|
76
|
+
'order_items.purchased_entity',
|
|
77
|
+
'order_items.purchased_entity.product_id',
|
|
78
|
+
'order_items.purchased_entity.field_image',
|
|
79
|
+
'order_items.purchased_entity.field_image.field_media_image',
|
|
80
|
+
], filters = [], }, config = {}) => {
|
|
72
81
|
if (!activeToken)
|
|
73
82
|
throw new Error('Missing activeToken in context');
|
|
74
|
-
const
|
|
83
|
+
const params = new DrupalJsonApiParams()
|
|
84
|
+
.addInclude(include);
|
|
85
|
+
if (filters.length) {
|
|
86
|
+
filters.forEach((filter) => {
|
|
87
|
+
params.addFilter(filter.path, filter.value, filter.operator);
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
const { data } = await ctx.axios.get(`/jsonapi/carts?cartToken=${activeToken}&${params.getQueryString()}`, { ...config, headers: getHeaders(ctx, config.headers) });
|
|
75
91
|
if (!data.data || data.data.length === 0) {
|
|
76
92
|
return {
|
|
77
93
|
data: {
|
|
@@ -90,12 +106,12 @@ export const getCurrentCart = async (ctx, activeToken, config = {}) => {
|
|
|
90
106
|
.map((item) => {
|
|
91
107
|
const defaultProduct = item.purchased_entity?.product_id;
|
|
92
108
|
const variationProduct = item.purchased_entity;
|
|
93
|
-
const variations = defaultProduct?.variations ?? [];
|
|
94
109
|
if (!defaultProduct || !variationProduct) {
|
|
95
110
|
console.warn('Invalid order item structure', item);
|
|
96
111
|
return null;
|
|
97
112
|
}
|
|
98
|
-
const
|
|
113
|
+
const mapProductFn = ctx.mapProduct || mapProduct;
|
|
114
|
+
const baseProduct = mapProductFn(defaultProduct, variationProduct, ctx);
|
|
99
115
|
return {
|
|
100
116
|
...baseProduct,
|
|
101
117
|
quantity: parseFloat(item.quantity || '0'),
|
|
@@ -170,17 +186,22 @@ export const getCartToken = async (ctx, config = {}) => {
|
|
|
170
186
|
const { data } = await ctx.axios.get(`/cart?_format=json&cartToken=${ctx.cartToken}`, { ...config, headers: getHeaders(ctx, config.headers) });
|
|
171
187
|
return data;
|
|
172
188
|
};
|
|
173
|
-
export const getOrderHistory = async (ctx,
|
|
189
|
+
export const getOrderHistory = async (ctx, { include = [
|
|
190
|
+
'order_items',
|
|
191
|
+
'order_items.purchased_entity',
|
|
192
|
+
'order_items.purchased_entity.product_id',
|
|
193
|
+
], filters = [], }, config = {}) => {
|
|
174
194
|
if (!ctx.userId)
|
|
175
195
|
throw new Error('Missing userId in context');
|
|
176
196
|
const params = new DrupalJsonApiParams()
|
|
177
197
|
.addFilter('state', 'completed')
|
|
178
198
|
.addFilter('uid.meta', ctx.userId)
|
|
179
|
-
.addInclude(
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
199
|
+
.addInclude(include);
|
|
200
|
+
if (filters.length) {
|
|
201
|
+
filters.forEach((filter) => {
|
|
202
|
+
params.addFilter(filter.path, filter.value, filter.operator);
|
|
203
|
+
});
|
|
204
|
+
}
|
|
184
205
|
const { data } = await ctx.axios.get(`/jsonapi/commerce_order/default?${params.getQueryString()}`, { ...config, headers: getHeaders(ctx, config.headers) });
|
|
185
206
|
if (!data.data || (Array.isArray(data.data) && data.data.length === 0)) {
|
|
186
207
|
return { data: [] };
|
|
@@ -194,12 +215,12 @@ export const getOrderHistory = async (ctx, config = {}) => {
|
|
|
194
215
|
.map((item) => {
|
|
195
216
|
const defaultProduct = item.purchased_entity?.product_id;
|
|
196
217
|
const variationProduct = item.purchased_entity;
|
|
197
|
-
const variations = defaultProduct?.variations ?? [];
|
|
198
218
|
if (!defaultProduct || !variationProduct) {
|
|
199
219
|
console.warn('Invalid order item structure', item);
|
|
200
220
|
return null;
|
|
201
221
|
}
|
|
202
|
-
const
|
|
222
|
+
const mapProductFn = ctx.mapProduct || mapProduct;
|
|
223
|
+
const baseProduct = mapProductFn(defaultProduct, variationProduct, ctx);
|
|
203
224
|
return {
|
|
204
225
|
...baseProduct,
|
|
205
226
|
quantity: parseFloat(item.quantity || '0'),
|
|
@@ -90,22 +90,10 @@ export type Cart = {
|
|
|
90
90
|
};
|
|
91
91
|
};
|
|
92
92
|
};
|
|
93
|
-
export type CartItem = {
|
|
94
|
-
|
|
95
|
-
variation_uuid: string;
|
|
93
|
+
export type CartItem = Product & {
|
|
94
|
+
quantity: number;
|
|
96
95
|
drupalOrderItemId: number;
|
|
97
|
-
images: Array<{
|
|
98
|
-
href: string;
|
|
99
|
-
alt: string;
|
|
100
|
-
}>;
|
|
101
|
-
type: string;
|
|
102
|
-
variation_name: string;
|
|
103
96
|
price: number;
|
|
104
|
-
field_news?: boolean;
|
|
105
|
-
field_aftersale?: boolean;
|
|
106
|
-
quantity: number;
|
|
107
|
-
product_id: string;
|
|
108
|
-
product_name: string;
|
|
109
97
|
order_item_id: string;
|
|
110
98
|
};
|
|
111
99
|
export type AddToCartResponse = Array<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CartService.types.d.ts","sourceRoot":"","sources":["../../../api/cart/CartService.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAEtD,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,EAAE,KAAK,CAAC;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,EAAE,EAAE,MAAM,CAAA;QACV,IAAI,EAAE;YACF,QAAQ,EAAE,MAAM,CAAA;YAChB,OAAO,EAAE,OAAO,CAAA;SACnB,CAAA;KACJ,CAAC,CAAA;CACL,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAChC,IAAI,EAAE;QACF,IAAI,EAAE,sBAAsB,CAAA;QAC5B,EAAE,EAAE,MAAM,CAAA;QACV,UAAU,EAAE;YACR,QAAQ,EAAE,MAAM,CAAA;SACnB,CAAA;KACJ,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAChC,IAAI,EAAE,KAAK,CAAC;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,EAAE,EAAE,MAAM,CAAA;KACb,CAAC,CAAA;CACL,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,OAAO,EAAE;QACL,OAAO,EAAE,MAAM,CAAA;QACf,IAAI,EAAE,GAAG,CAAA;KACZ,CAAA;IACD,IAAI,EAAE,KAAK,CAAC;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,EAAE,EAAE,MAAM,CAAA;QACV,UAAU,EAAE;YACR,yBAAyB,EAAE,MAAM,CAAA;YACjC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;YAC3B,WAAW,EAAE;gBACT,MAAM,EAAE,MAAM,CAAA;gBACd,aAAa,EAAE,MAAM,CAAA;gBACrB,SAAS,EAAE,MAAM,CAAA;aACpB,CAAA;YACD,KAAK,EAAE,MAAM,CAAA;YACb,WAAW,EAAE;gBACT,QAAQ,EAAE;oBACN,MAAM,EAAE,MAAM,CAAA;oBACd,aAAa,EAAE,MAAM,CAAA;oBACrB,SAAS,EAAE,MAAM,CAAA;iBACpB,CAAA;gBACD,KAAK,EAAE;oBACH,MAAM,EAAE,MAAM,CAAA;oBACd,aAAa,EAAE,MAAM,CAAA;oBACrB,SAAS,EAAE,MAAM,CAAA;iBACpB,CAAA;aACJ,CAAA;SACJ,CAAA;QACD,aAAa,EAAE;YACX,WAAW,EAAE;gBACT,IAAI,EAAE,KAAK,CAAC;oBACR,IAAI,EAAE,MAAM,CAAA;oBACZ,EAAE,EAAE,MAAM,CAAA;oBACV,IAAI,EAAE;wBACF,0BAA0B,EAAE,MAAM,CAAA;qBACrC,CAAA;iBACJ,CAAC,CAAA;aACL,CAAA;SACJ,CAAA;KACJ,CAAC,CAAA;IACF,QAAQ,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,EAAE,EAAE,MAAM,CAAA;QACV,UAAU,EAAE,GAAG,CAAA;QACf,aAAa,EAAE,GAAG,CAAA;KACrB,CAAC,CAAA;IACF,KAAK,EAAE;QACH,IAAI,EAAE;YACF,IAAI,EAAE,MAAM,CAAA;SACf,CAAA;KACJ,CAAA;CACJ,CAAA;AAGD,MAAM,MAAM,IAAI,GAAG;IACf,IAAI,EAAE;QACF,EAAE,EAAE,MAAM,CAAA;QACV,aAAa,EAAE,MAAM,CAAA;QACrB,SAAS,EAAE,QAAQ,EAAE,CAAA;QACrB,KAAK,EAAE;YACH,MAAM,EAAE,MAAM,CAAA;YACd,aAAa,EAAE,MAAM,CAAA;YACrB,SAAS,EAAE,MAAM,CAAA;SACpB,CAAA;KACJ,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"CartService.types.d.ts","sourceRoot":"","sources":["../../../api/cart/CartService.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,16 @@ import { CoreContext } from '../../context';
|
|
|
2
2
|
import { BannerItem } from '../../types/content/Banners';
|
|
3
3
|
type GetBannersInput = {
|
|
4
4
|
location: string;
|
|
5
|
-
|
|
5
|
+
include?: string[];
|
|
6
|
+
sort?: Array<{
|
|
7
|
+
field: string;
|
|
8
|
+
direction?: 'ASC' | 'DESC';
|
|
9
|
+
}>;
|
|
10
|
+
filter?: Array<{
|
|
11
|
+
field: string;
|
|
12
|
+
value: string | number;
|
|
13
|
+
}>;
|
|
6
14
|
};
|
|
7
|
-
export declare const getBanners: (ctx: CoreContext, { location,
|
|
15
|
+
export declare const getBanners: (ctx: CoreContext, { location, include, sort, filter, }: GetBannersInput) => Promise<BannerItem[]>;
|
|
8
16
|
export {};
|
|
9
17
|
//# sourceMappingURL=getBanners.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBanners.d.ts","sourceRoot":"","sources":["../../../api/content/getBanners.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAGxD,KAAK,eAAe,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,
|
|
1
|
+
{"version":3,"file":"getBanners.d.ts","sourceRoot":"","sources":["../../../api/content/getBanners.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAGxD,KAAK,eAAe,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;CAC5D,CAAA;AAED,eAAO,MAAM,UAAU,GACnB,KAAK,WAAW,EAChB,sCAKG,eAAe,KACnB,OAAO,CAAC,UAAU,EAAE,CA8DtB,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
|
|
2
2
|
import mapIncludedResources from '../../utils/mapIncludedResources';
|
|
3
|
-
export const getBanners = async (ctx, { location,
|
|
3
|
+
export const getBanners = async (ctx, { location, include = ['field_media_image_1', 'field_location'], sort, filter, }) => {
|
|
4
4
|
const cacheKey = ['banner', ctx.locale, location].join(':');
|
|
5
5
|
if (ctx.getCache) {
|
|
6
6
|
const cached = await ctx.getCache(cacheKey);
|
|
@@ -11,10 +11,24 @@ export const getBanners = async (ctx, { location, mapFn }) => {
|
|
|
11
11
|
? `/jsonapi/media/banners`
|
|
12
12
|
: `/${ctx.locale}/jsonapi/media/banners`;
|
|
13
13
|
const params = new DrupalJsonApiParams()
|
|
14
|
-
.addInclude(
|
|
14
|
+
.addInclude(include)
|
|
15
15
|
.addFilter('langcode', ctx.locale)
|
|
16
|
-
.addFilter('field_location.name', location)
|
|
17
|
-
|
|
16
|
+
.addFilter('field_location.name', location);
|
|
17
|
+
// Default sort
|
|
18
|
+
if (sort && sort.length > 0) {
|
|
19
|
+
sort.forEach(({ field, direction = 'DESC' }) => {
|
|
20
|
+
params.addSort(field, direction);
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
params.addSort('created', 'DESC');
|
|
25
|
+
}
|
|
26
|
+
// Custom filters
|
|
27
|
+
if (filter && filter.length > 0) {
|
|
28
|
+
filter.forEach(({ field, value }) => {
|
|
29
|
+
params.addFilter(field, String(value));
|
|
30
|
+
});
|
|
31
|
+
}
|
|
18
32
|
const { data } = await ctx.axios.get(`${url}?${params.getQueryString()}`);
|
|
19
33
|
const resources = mapIncludedResources(data);
|
|
20
34
|
const mapped = resources.map((item) => {
|
|
@@ -31,7 +45,7 @@ export const getBanners = async (ctx, { location, mapFn }) => {
|
|
|
31
45
|
field_image: ctx.makeAbsoluteUrl(item.field_media_image_1?.uri?.url),
|
|
32
46
|
created: item.created,
|
|
33
47
|
};
|
|
34
|
-
return
|
|
48
|
+
return ctx.mapBanner ? ctx.mapBanner(item, base, ctx) : base;
|
|
35
49
|
});
|
|
36
50
|
if (ctx.setCache) {
|
|
37
51
|
await ctx.setCache(cacheKey, mapped);
|
|
@@ -4,8 +4,15 @@ type GetBlogParams = {
|
|
|
4
4
|
blogId?: string;
|
|
5
5
|
limit?: number;
|
|
6
6
|
include?: string[];
|
|
7
|
-
|
|
7
|
+
sort?: Array<{
|
|
8
|
+
field: string;
|
|
9
|
+
direction?: 'ASC' | 'DESC';
|
|
10
|
+
}>;
|
|
11
|
+
filter?: Array<{
|
|
12
|
+
field: string;
|
|
13
|
+
value: string | number;
|
|
14
|
+
}>;
|
|
8
15
|
};
|
|
9
|
-
export declare const getBlog: (ctx: CoreContext, { blogId, limit, include,
|
|
16
|
+
export declare const getBlog: (ctx: CoreContext, { blogId, limit, include, sort, filter, }: GetBlogParams) => Promise<BlogItem[]>;
|
|
10
17
|
export {};
|
|
11
18
|
//# sourceMappingURL=getBlog.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBlog.d.ts","sourceRoot":"","sources":["../../../api/content/getBlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAGnD,KAAK,aAAa,GAAG;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"getBlog.d.ts","sourceRoot":"","sources":["../../../api/content/getBlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAGnD,KAAK,aAAa,GAAG;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;CAC5D,CAAA;AAED,eAAO,MAAM,OAAO,GAChB,KAAK,WAAW,EAChB,2CAMG,aAAa,KACjB,OAAO,CAAC,QAAQ,EAAE,CAyEpB,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
|
|
2
2
|
import mapIncludedResources from '../../utils/mapIncludedResources';
|
|
3
|
-
export const getBlog = async (ctx, { blogId, limit, include = ['field_image', 'field_tags'],
|
|
3
|
+
export const getBlog = async (ctx, { blogId, limit, include = ['field_image', 'field_tags'], sort, filter, }) => {
|
|
4
4
|
const cacheKey = [
|
|
5
5
|
'blog',
|
|
6
6
|
ctx.locale,
|
|
@@ -16,8 +16,22 @@ export const getBlog = async (ctx, { blogId, limit, include = ['field_image', 'f
|
|
|
16
16
|
}
|
|
17
17
|
const params = new DrupalJsonApiParams()
|
|
18
18
|
.addFilter('langcode', ctx.locale)
|
|
19
|
-
.addInclude(include)
|
|
20
|
-
|
|
19
|
+
.addInclude(include);
|
|
20
|
+
// Default sort
|
|
21
|
+
if (sort && sort.length > 0) {
|
|
22
|
+
sort.forEach(({ field, direction = 'DESC' }) => {
|
|
23
|
+
params.addSort(field, direction);
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
params.addSort('drupal_internal__nid', 'DESC');
|
|
28
|
+
}
|
|
29
|
+
// Custom filters
|
|
30
|
+
if (filter && filter.length > 0) {
|
|
31
|
+
filter.forEach(({ field, value }) => {
|
|
32
|
+
params.addFilter(field, String(value));
|
|
33
|
+
});
|
|
34
|
+
}
|
|
21
35
|
if (blogId)
|
|
22
36
|
params.addFilter('drupal_internal__nid', blogId);
|
|
23
37
|
if (limit)
|
|
@@ -43,8 +57,9 @@ export const getBlog = async (ctx, { blogId, limit, include = ['field_image', 'f
|
|
|
43
57
|
: [],
|
|
44
58
|
created: item.created,
|
|
45
59
|
changed: item.changed,
|
|
60
|
+
langcode: item.langcode,
|
|
46
61
|
};
|
|
47
|
-
return
|
|
62
|
+
return ctx.mapBlog ? ctx.mapBlog(item, base, ctx) : base;
|
|
48
63
|
});
|
|
49
64
|
if (ctx.setCache) {
|
|
50
65
|
await ctx.setCache(cacheKey, mapped);
|
package/dist/api/getTerms.d.ts
CHANGED
|
@@ -3,9 +3,16 @@ import { Term } from '../types/Term';
|
|
|
3
3
|
type GetTermsInput = {
|
|
4
4
|
categoryId?: string[];
|
|
5
5
|
include?: string[];
|
|
6
|
+
sort?: Array<{
|
|
7
|
+
field: string;
|
|
8
|
+
direction?: 'ASC' | 'DESC';
|
|
9
|
+
}>;
|
|
6
10
|
sortField?: string;
|
|
7
|
-
|
|
11
|
+
filter?: Array<{
|
|
12
|
+
field: string;
|
|
13
|
+
value: string | number;
|
|
14
|
+
}>;
|
|
8
15
|
};
|
|
9
|
-
export declare const getTerms: (ctx: CoreContext, { categoryId, include, sortField,
|
|
16
|
+
export declare const getTerms: (ctx: CoreContext, { categoryId, include, sort, sortField, filter, }: GetTermsInput) => Promise<Term[]>;
|
|
10
17
|
export {};
|
|
11
18
|
//# sourceMappingURL=getTerms.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTerms.d.ts","sourceRoot":"","sources":["../../api/getTerms.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAIpC,KAAK,aAAa,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,
|
|
1
|
+
{"version":3,"file":"getTerms.d.ts","sourceRoot":"","sources":["../../api/getTerms.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAIpC,KAAK,aAAa,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;CAC5D,CAAA;AAED,eAAO,MAAM,QAAQ,GACjB,KAAK,WAAW,EAChB,mDAYG,aAAa,KACjB,OAAO,CAAC,IAAI,EAAE,CAoGhB,CAAA"}
|
package/dist/api/getTerms.js
CHANGED
|
@@ -7,7 +7,7 @@ export const getTerms = async (ctx, { categoryId, include = [
|
|
|
7
7
|
'field_icon.field_media_image',
|
|
8
8
|
'field_image',
|
|
9
9
|
'field_image.field_media_image',
|
|
10
|
-
], sortField,
|
|
10
|
+
], sort, sortField, filter, }) => {
|
|
11
11
|
const cacheKey = [
|
|
12
12
|
'terms',
|
|
13
13
|
ctx.locale,
|
|
@@ -24,9 +24,22 @@ export const getTerms = async (ctx, { categoryId, include = [
|
|
|
24
24
|
.addInclude(include)
|
|
25
25
|
.addFilter('langcode', ctx.locale)
|
|
26
26
|
.addPageLimit(50);
|
|
27
|
-
|
|
27
|
+
// Custom sort
|
|
28
|
+
if (sort && sort.length > 0) {
|
|
29
|
+
sort.forEach(({ field, direction = 'DESC' }) => {
|
|
30
|
+
params.addSort(field, direction);
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
else if (sortField) {
|
|
34
|
+
// Deprecated: support old sortField for backward compatibility
|
|
28
35
|
params.addSort(sortField);
|
|
29
36
|
}
|
|
37
|
+
// Custom filters
|
|
38
|
+
if (filter && filter.length > 0) {
|
|
39
|
+
filter.forEach(({ field, value }) => {
|
|
40
|
+
params.addFilter(field, String(value));
|
|
41
|
+
});
|
|
42
|
+
}
|
|
30
43
|
if (categoryId) {
|
|
31
44
|
params.addFilter('drupal_internal__tid', categoryId, 'IN');
|
|
32
45
|
}
|
|
@@ -70,7 +83,7 @@ export const getTerms = async (ctx, { categoryId, include = [
|
|
|
70
83
|
? ctx.makeAbsoluteUrl(item.field_image.field_media_image.uri.url)
|
|
71
84
|
: undefined,
|
|
72
85
|
};
|
|
73
|
-
return
|
|
86
|
+
return ctx.mapTerm ? ctx.mapTerm(item, base, ctx) : base;
|
|
74
87
|
}));
|
|
75
88
|
await ctx.setCache?.(cacheKey, mapped);
|
|
76
89
|
return mapped;
|
|
@@ -2,8 +2,15 @@ import { CoreContext } from '../../../context';
|
|
|
2
2
|
import { Contact } from './branchService.types';
|
|
3
3
|
type GetBranchInput = {
|
|
4
4
|
include?: string[];
|
|
5
|
-
|
|
5
|
+
sort?: Array<{
|
|
6
|
+
field: string;
|
|
7
|
+
direction?: 'ASC' | 'DESC';
|
|
8
|
+
}>;
|
|
9
|
+
filter?: Array<{
|
|
10
|
+
field: string;
|
|
11
|
+
value: string | number;
|
|
12
|
+
}>;
|
|
6
13
|
};
|
|
7
|
-
export declare const getBranch: (ctx: CoreContext, { include,
|
|
14
|
+
export declare const getBranch: (ctx: CoreContext, { include, sort, filter, }: GetBranchInput) => Promise<Contact | null>;
|
|
8
15
|
export {};
|
|
9
16
|
//# sourceMappingURL=branch.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch.service.d.ts","sourceRoot":"","sources":["../../../../api/pages/branch/branch.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAG9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE/C,KAAK,cAAc,GAAG;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,
|
|
1
|
+
{"version":3,"file":"branch.service.d.ts","sourceRoot":"","sources":["../../../../api/pages/branch/branch.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAG9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE/C,KAAK,cAAc,GAAG;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;CAC5D,CAAA;AAED,eAAO,MAAM,SAAS,GAClB,KAAK,WAAW,EAChB,4BAIG,cAAc,KAClB,OAAO,CAAC,OAAO,GAAG,IAAI,CAgExB,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
|
|
2
2
|
import mapIncludedResources from '../../../utils/mapIncludedResources';
|
|
3
|
-
export const getBranch = async (ctx, { include = ['field_branch'],
|
|
3
|
+
export const getBranch = async (ctx, { include = ['field_branch'], sort, filter, }) => {
|
|
4
4
|
const cacheKey = ['branch', ctx.locale].join(':');
|
|
5
5
|
if (ctx.getCache) {
|
|
6
6
|
const cached = await ctx.getCache(cacheKey);
|
|
@@ -13,6 +13,18 @@ export const getBranch = async (ctx, { include = ['field_branch'], mapFn }) => {
|
|
|
13
13
|
const params = new DrupalJsonApiParams()
|
|
14
14
|
.addFilter('langcode', ctx.locale)
|
|
15
15
|
.addInclude(include);
|
|
16
|
+
// Custom sort
|
|
17
|
+
if (sort && sort.length > 0) {
|
|
18
|
+
sort.forEach(({ field, direction = 'DESC' }) => {
|
|
19
|
+
params.addSort(field, direction);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
// Custom filters
|
|
23
|
+
if (filter && filter.length > 0) {
|
|
24
|
+
filter.forEach(({ field, value }) => {
|
|
25
|
+
params.addFilter(field, String(value));
|
|
26
|
+
});
|
|
27
|
+
}
|
|
16
28
|
const { data } = await ctx.axios.get(`${url}?${params.getQueryString()}`);
|
|
17
29
|
const resources = mapIncludedResources(data);
|
|
18
30
|
const contactBranchSection = resources?.[0];
|
|
@@ -34,7 +46,9 @@ export const getBranch = async (ctx, { include = ['field_branch'], mapFn }) => {
|
|
|
34
46
|
note: b.field_note,
|
|
35
47
|
})) || [],
|
|
36
48
|
};
|
|
37
|
-
const mapped =
|
|
49
|
+
const mapped = ctx.mapBranch
|
|
50
|
+
? ctx.mapBranch(contactBranchSection, base, ctx)
|
|
51
|
+
: base;
|
|
38
52
|
if (ctx.setCache) {
|
|
39
53
|
await ctx.setCache(cacheKey, mapped);
|
|
40
54
|
}
|
|
@@ -2,8 +2,15 @@ import { CoreContext } from '../../../context';
|
|
|
2
2
|
import { Faq } from './faqService.types';
|
|
3
3
|
type GetFaqInput = {
|
|
4
4
|
include?: string[];
|
|
5
|
-
|
|
5
|
+
sort?: Array<{
|
|
6
|
+
field: string;
|
|
7
|
+
direction?: 'ASC' | 'DESC';
|
|
8
|
+
}>;
|
|
9
|
+
filter?: Array<{
|
|
10
|
+
field: string;
|
|
11
|
+
value: string | number;
|
|
12
|
+
}>;
|
|
6
13
|
};
|
|
7
|
-
export declare const getFaq: (ctx: CoreContext, { include,
|
|
14
|
+
export declare const getFaq: (ctx: CoreContext, { include, sort, filter, }: GetFaqInput) => Promise<Faq | null>;
|
|
8
15
|
export {};
|
|
9
16
|
//# sourceMappingURL=faq.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"faq.service.d.ts","sourceRoot":"","sources":["../../../../api/pages/faq/faq.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAG9C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AAExC,KAAK,WAAW,GAAG;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"faq.service.d.ts","sourceRoot":"","sources":["../../../../api/pages/faq/faq.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAG9C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AAExC,KAAK,WAAW,GAAG;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;CAC5D,CAAA;AAED,eAAO,MAAM,MAAM,GACf,KAAK,WAAW,EAChB,4BAIG,WAAW,KACf,OAAO,CAAC,GAAG,GAAG,IAAI,CAwDpB,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
|
|
2
2
|
import mapIncludedResources from '../../../utils/mapIncludedResources';
|
|
3
|
-
export const getFaq = async (ctx, { include = ['field_questions'],
|
|
3
|
+
export const getFaq = async (ctx, { include = ['field_questions'], sort, filter, }) => {
|
|
4
4
|
const cacheKey = ['faq', ctx.locale].join(':');
|
|
5
5
|
if (ctx.getCache) {
|
|
6
6
|
const cached = await ctx.getCache(cacheKey);
|
|
@@ -13,6 +13,18 @@ export const getFaq = async (ctx, { include = ['field_questions'], mapFn }) => {
|
|
|
13
13
|
const params = new DrupalJsonApiParams()
|
|
14
14
|
.addFilter('langcode', ctx.locale)
|
|
15
15
|
.addInclude(include);
|
|
16
|
+
// Custom sort
|
|
17
|
+
if (sort && sort.length > 0) {
|
|
18
|
+
sort.forEach(({ field, direction = 'DESC' }) => {
|
|
19
|
+
params.addSort(field, direction);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
// Custom filters
|
|
23
|
+
if (filter && filter.length > 0) {
|
|
24
|
+
filter.forEach(({ field, value }) => {
|
|
25
|
+
params.addFilter(field, String(value));
|
|
26
|
+
});
|
|
27
|
+
}
|
|
16
28
|
const { data } = await ctx.axios.get(`${url}?${params.getQueryString()}`);
|
|
17
29
|
const resources = mapIncludedResources(data);
|
|
18
30
|
const faqItem = resources?.[0];
|
|
@@ -28,7 +40,7 @@ export const getFaq = async (ctx, { include = ['field_questions'], mapFn }) => {
|
|
|
28
40
|
answer: q.field_answer,
|
|
29
41
|
})) || [],
|
|
30
42
|
};
|
|
31
|
-
const mapped =
|
|
43
|
+
const mapped = ctx.mapFaq ? ctx.mapFaq(faqItem, base, ctx) : base;
|
|
32
44
|
if (ctx.setCache) {
|
|
33
45
|
await ctx.setCache(cacheKey, mapped);
|
|
34
46
|
}
|
|
@@ -3,8 +3,15 @@ import { Page } from './pageService.types';
|
|
|
3
3
|
type GetPageInput = {
|
|
4
4
|
pageId: string;
|
|
5
5
|
include?: string[];
|
|
6
|
-
|
|
6
|
+
sort?: Array<{
|
|
7
|
+
field: string;
|
|
8
|
+
direction?: 'ASC' | 'DESC';
|
|
9
|
+
}>;
|
|
10
|
+
filter?: Array<{
|
|
11
|
+
field: string;
|
|
12
|
+
value: string | number;
|
|
13
|
+
}>;
|
|
7
14
|
};
|
|
8
|
-
export declare const getPage: (ctx: CoreContext, { pageId, include,
|
|
15
|
+
export declare const getPage: (ctx: CoreContext, { pageId, include, sort, filter, }: GetPageInput) => Promise<Page | null>;
|
|
9
16
|
export {};
|
|
10
17
|
//# sourceMappingURL=page.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.service.d.ts","sourceRoot":"","sources":["../../../../api/pages/page/page.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAE1C,KAAK,YAAY,GAAG;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,
|
|
1
|
+
{"version":3,"file":"page.service.d.ts","sourceRoot":"","sources":["../../../../api/pages/page/page.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAE1C,KAAK,YAAY,GAAG;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;CAC5D,CAAA;AAED,eAAO,MAAM,OAAO,GAChB,KAAK,WAAW,EAChB,oCAKG,YAAY,KAChB,OAAO,CAAC,IAAI,GAAG,IAAI,CA4DrB,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
|
|
2
2
|
import mapIncludedResources from '../../../utils/mapIncludedResources';
|
|
3
|
-
export const getPage = async (ctx, { pageId, include = ['node_type'],
|
|
3
|
+
export const getPage = async (ctx, { pageId, include = ['node_type'], sort, filter, }) => {
|
|
4
4
|
const cacheKey = ['page', ctx.locale, pageId].join(':');
|
|
5
5
|
if (ctx.getCache) {
|
|
6
6
|
try {
|
|
@@ -17,6 +17,18 @@ export const getPage = async (ctx, { pageId, include = ['node_type'], mapFn }) =
|
|
|
17
17
|
.addFilter('drupal_internal__nid', pageId)
|
|
18
18
|
.addFilter('langcode', ctx.locale)
|
|
19
19
|
.addInclude(include);
|
|
20
|
+
// Custom sort
|
|
21
|
+
if (sort && sort.length > 0) {
|
|
22
|
+
sort.forEach(({ field, direction = 'DESC' }) => {
|
|
23
|
+
params.addSort(field, direction);
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
// Custom filters
|
|
27
|
+
if (filter && filter.length > 0) {
|
|
28
|
+
filter.forEach(({ field, value }) => {
|
|
29
|
+
params.addFilter(field, String(value));
|
|
30
|
+
});
|
|
31
|
+
}
|
|
20
32
|
const { data } = await ctx.axios.get(`${url}?${params.getQueryString()}`);
|
|
21
33
|
const resources = mapIncludedResources(data);
|
|
22
34
|
if (!resources.length)
|
|
@@ -29,7 +41,7 @@ export const getPage = async (ctx, { pageId, include = ['node_type'], mapFn }) =
|
|
|
29
41
|
title: item.title,
|
|
30
42
|
body: item.body?.processed,
|
|
31
43
|
};
|
|
32
|
-
return
|
|
44
|
+
return ctx.mapPage ? ctx.mapPage(item, base, ctx) : base;
|
|
33
45
|
});
|
|
34
46
|
const page = mappedPages[0];
|
|
35
47
|
if (ctx.setCache) {
|
|
@@ -16,9 +16,8 @@ type GetProductsParams = {
|
|
|
16
16
|
tag?: string;
|
|
17
17
|
include?: string[];
|
|
18
18
|
cache?: boolean;
|
|
19
|
-
mapFnVariations?: (base: Product, raw: any) => Product | Promise<Product>;
|
|
20
19
|
};
|
|
21
|
-
export declare const getProducts: (ctx: CoreContext, { locale, categoryId, productId, searchTerm, limit, offset, filters, sort, tag, include, cache,
|
|
20
|
+
export declare const getProducts: (ctx: CoreContext, { locale, categoryId, productId, searchTerm, limit, offset, filters, sort, tag, include, cache, }: GetProductsParams) => Promise<Product[]>;
|
|
22
21
|
type GetProductCountParams = {
|
|
23
22
|
categoryId?: string[];
|
|
24
23
|
tag?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProducts.d.ts","sourceRoot":"","sources":["../../../api/products/getProducts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAKtD,KAAK,iBAAiB,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;IACF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"getProducts.d.ts","sourceRoot":"","sources":["../../../api/products/getProducts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAKtD,KAAK,iBAAiB,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;IACF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,WAAW,GACpB,KAAK,WAAW,EAChB,mGAkBG,iBAAiB,KACrB,OAAO,CAAC,OAAO,EAAE,CAyEnB,CAAA;AAED,KAAK,qBAAqB,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;IACF,KAAK,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,eAAe,GACxB,KAAK,WAAW,EAChB,sCAKG,qBAAqB,KACzB,OAAO,CAAC,MAAM,CA6ChB,CAAA"}
|
|
@@ -8,7 +8,7 @@ export const getProducts = async (ctx, { locale, categoryId, productId, searchTe
|
|
|
8
8
|
'product_id.field_image',
|
|
9
9
|
'product_id.field_image.field_media_image',
|
|
10
10
|
'field_image.field_media_image',
|
|
11
|
-
], cache = true,
|
|
11
|
+
], cache = true, }) => {
|
|
12
12
|
const currentLocale = locale || ctx.locale;
|
|
13
13
|
const cacheKey = [
|
|
14
14
|
'products',
|
|
@@ -61,10 +61,11 @@ export const getProducts = async (ctx, { locale, categoryId, productId, searchTe
|
|
|
61
61
|
: `/${currentLocale}/jsonapi/index/variation`;
|
|
62
62
|
const { data } = await ctx.axios.get(queryString ? `${url}?${queryString}` : url);
|
|
63
63
|
const resolvedProducts = mapIncludedResources(data, 5);
|
|
64
|
+
const mapProductFn = ctx.mapProduct || mapProduct;
|
|
64
65
|
const mappedProducts = await Promise.all(resolvedProducts.map(async (item) => {
|
|
65
|
-
const base =
|
|
66
|
-
if (
|
|
67
|
-
|
|
66
|
+
const base = await mapProductFn(item.product_id, item, ctx);
|
|
67
|
+
if (!base) {
|
|
68
|
+
throw new Error(`Failed to map product for item: ${item.id}`);
|
|
68
69
|
}
|
|
69
70
|
return base;
|
|
70
71
|
}));
|
package/dist/context.d.ts
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
import { AxiosInstance } from 'axios';
|
|
2
|
+
import { Product } from './types/products/Product';
|
|
3
|
+
import { BannerItem } from './types/content/Banners';
|
|
4
|
+
import { BlogItem } from './types/content/Blog';
|
|
5
|
+
import { Term } from './types/Term';
|
|
6
|
+
import { Page } from './api/pages/page/pageService.types';
|
|
7
|
+
import { Contact } from './api/pages/branch/branchService.types';
|
|
8
|
+
import { Faq } from './api/pages/faq/faqService.types';
|
|
2
9
|
export type CoreContext = {
|
|
3
10
|
axios: AxiosInstance;
|
|
4
11
|
defaultLocale: string;
|
|
@@ -11,5 +18,12 @@ export type CoreContext = {
|
|
|
11
18
|
getCache?: <T = any>(key: string) => Promise<T | null>;
|
|
12
19
|
setCache?: <T = any>(key: string, value: T) => Promise<void>;
|
|
13
20
|
logoUrl?: string;
|
|
21
|
+
mapProduct?: (defaultProduct: any, variationProduct: any, ctx: CoreContext) => Product;
|
|
22
|
+
mapBlog?: (item: any, base: BlogItem, ctx: CoreContext) => BlogItem;
|
|
23
|
+
mapTerm?: (item: any, base: Term, ctx: CoreContext) => Term;
|
|
24
|
+
mapBanner?: (item: any, base: BannerItem, ctx: CoreContext) => BannerItem;
|
|
25
|
+
mapPage?: (item: any, base: Page, ctx: CoreContext) => Page;
|
|
26
|
+
mapBranch?: (item: any, base: Contact, ctx: CoreContext) => Contact;
|
|
27
|
+
mapFaq?: (item: any, base: Faq, ctx: CoreContext) => Faq;
|
|
14
28
|
};
|
|
15
29
|
//# sourceMappingURL=context.d.ts.map
|
package/dist/context.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAA;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAA;AAEtD,MAAM,MAAM,WAAW,GAAG;IACtB,KAAK,EAAE,aAAa,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IACzC,QAAQ,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;IACtD,QAAQ,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,KAAK,OAAO,CAAA;IACtF,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,KAAK,QAAQ,CAAA;IACnE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,KAAK,IAAI,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,KAAK,UAAU,CAAA;IACzE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,KAAK,IAAI,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,KAAK,OAAO,CAAA;IACnE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,KAAK,GAAG,CAAA;CAC3D,CAAA"}
|
|
@@ -6,7 +6,7 @@ export const useGetCurrentCart = ({ activeToken, ctx }) => {
|
|
|
6
6
|
queryFn: ({ signal }) => {
|
|
7
7
|
if (!activeToken)
|
|
8
8
|
throw new Error('Cart token is not available');
|
|
9
|
-
return getCurrentCart(ctx, activeToken, { signal });
|
|
9
|
+
return getCurrentCart(ctx, activeToken, {}, { signal });
|
|
10
10
|
},
|
|
11
11
|
enabled: !!activeToken && !ctx.userId,
|
|
12
12
|
});
|
|
@@ -8,7 +8,7 @@ export const useGetOrderHistory = (ctx) => {
|
|
|
8
8
|
throw new Error('User ID is required to get order history');
|
|
9
9
|
}
|
|
10
10
|
console.debug('Fetching order history for user:', ctx.userId);
|
|
11
|
-
return getOrderHistory(ctx, { signal });
|
|
11
|
+
return getOrderHistory(ctx, {}, { signal });
|
|
12
12
|
},
|
|
13
13
|
enabled: !!ctx.userId,
|
|
14
14
|
});
|
|
@@ -14,7 +14,6 @@ type UseGetProductsOptions = {
|
|
|
14
14
|
tag?: string;
|
|
15
15
|
include?: string[];
|
|
16
16
|
cache?: boolean;
|
|
17
|
-
mapFnVariations?: (base: any, raw: any) => any;
|
|
18
17
|
enabled?: boolean;
|
|
19
18
|
};
|
|
20
19
|
export declare const useGetProducts: (ctx: CoreContext, locale: string, options?: UseGetProductsOptions) => import("@tanstack/react-query").UseQueryResult<import("../..").Product[], Error>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGetProducts.d.ts","sourceRoot":"","sources":["../../../hooks/products/useGetProducts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,KAAK,qBAAqB,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;IACF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,
|
|
1
|
+
{"version":3,"file":"useGetProducts.d.ts","sourceRoot":"","sources":["../../../hooks/products/useGetProducts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,KAAK,qBAAqB,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;IACF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,cAAc,GACvB,KAAK,WAAW,EAChB,QAAQ,MAAM,EACd,UAAU,qBAAqB,qFA8ClC,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useQuery } from '@tanstack/react-query';
|
|
2
2
|
import { getProducts } from '../../api/products/getProducts';
|
|
3
3
|
export const useGetProducts = (ctx, locale, options) => {
|
|
4
|
-
const { categoryId, productId, searchTerm, limit, offset, filters, sort, tag, include, cache,
|
|
4
|
+
const { categoryId, productId, searchTerm, limit, offset, filters, sort, tag, include, cache, enabled = true, } = options || {};
|
|
5
5
|
return useQuery({
|
|
6
6
|
queryKey: [
|
|
7
7
|
'products',
|
|
@@ -28,7 +28,6 @@ export const useGetProducts = (ctx, locale, options) => {
|
|
|
28
28
|
tag,
|
|
29
29
|
include,
|
|
30
30
|
cache,
|
|
31
|
-
mapFnVariations,
|
|
32
31
|
}),
|
|
33
32
|
enabled,
|
|
34
33
|
});
|
|
@@ -12,5 +12,14 @@ export type BlogItem = {
|
|
|
12
12
|
field_carousel_items?: BannerItem[];
|
|
13
13
|
created: string;
|
|
14
14
|
changed: string;
|
|
15
|
+
langcode: string;
|
|
16
|
+
promote?: boolean;
|
|
17
|
+
field_section?: Array<{
|
|
18
|
+
id: number;
|
|
19
|
+
text?: string;
|
|
20
|
+
image_gallery?: Array<{
|
|
21
|
+
uri: string;
|
|
22
|
+
}>;
|
|
23
|
+
}>;
|
|
15
24
|
};
|
|
16
25
|
//# sourceMappingURL=Blog.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Blog.d.ts","sourceRoot":"","sources":["../../../types/content/Blog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,MAAM,QAAQ,GAAG;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,oBAAoB,CAAC,EAAE,UAAU,EAAE,CAAA;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"Blog.d.ts","sourceRoot":"","sources":["../../../types/content/Blog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,MAAM,QAAQ,GAAG;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,oBAAoB,CAAC,EAAE,UAAU,EAAE,CAAA;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAGhB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,aAAa,CAAC,EAAE,KAAK,CAAC;QAClB,EAAE,EAAE,MAAM,CAAA;QACV,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,aAAa,CAAC,EAAE,KAAK,CAAC;YAClB,GAAG,EAAE,MAAM,CAAA;SACd,CAAC,CAAA;KACL,CAAC,CAAA;CACL,CAAA"}
|
|
@@ -25,14 +25,13 @@ export type Product = {
|
|
|
25
25
|
product_name: string;
|
|
26
26
|
changed: string | Date;
|
|
27
27
|
variations?: ProductVariation[];
|
|
28
|
+
field_gateway_payment?: boolean;
|
|
28
29
|
badges?: Array<{
|
|
29
30
|
text: string;
|
|
30
31
|
color: string;
|
|
31
32
|
}>;
|
|
32
33
|
related_products?: Product[];
|
|
33
|
-
|
|
34
|
-
field_aftersale?: boolean;
|
|
35
|
-
field_gateway_payment?: boolean;
|
|
34
|
+
field_configurable?: boolean;
|
|
36
35
|
field_care?: any[];
|
|
37
36
|
field_features?: any[];
|
|
38
37
|
field_returns?: any[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Product.d.ts","sourceRoot":"","sources":["../../../types/products/Product.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG;IAClB,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,QAAQ,EAAE,GAAG,CAAA;IACb,gBAAgB,EAAE;QACd,IAAI,EAAE,MAAM,CAAA;QACZ,GAAG,EAAE,MAAM,CAAA;KACd,EAAE,CAAA;IACH,cAAc,EAAE;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,GAAG,EAAE,MAAM,CAAA;KACd,EAAE,CAAA;IACH,UAAU,EAAE;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,GAAG,EAAE,MAAM,CAAA;KACd,EAAE,CAAA;IACH,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAG/B,MAAM,CAAC,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;KAChB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"Product.d.ts","sourceRoot":"","sources":["../../../types/products/Product.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,35 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CoreContext } from '../context';
|
|
2
|
+
import { Product, RawProductVariation } from '../types/products/Product';
|
|
3
|
+
export type Badge = {
|
|
4
|
+
text: string;
|
|
5
|
+
color: string;
|
|
6
|
+
};
|
|
7
|
+
export type MappedImage = {
|
|
8
|
+
href: string;
|
|
9
|
+
alt: string;
|
|
10
|
+
};
|
|
11
|
+
export declare function getImageUrl(img: any): string;
|
|
12
|
+
export declare function mapImages(images: any, ctx: CoreContext): MappedImage[];
|
|
13
|
+
export declare function mapVariations(variations?: RawProductVariation[]): any[];
|
|
14
|
+
export declare function mapProductBase(defaultProduct: any, variationProduct: any, ctx: any): {
|
|
15
|
+
variation_id: any;
|
|
16
|
+
variation_uuid: any;
|
|
17
|
+
type: any;
|
|
18
|
+
variation_name: any;
|
|
19
|
+
sku: any;
|
|
20
|
+
ean: any;
|
|
21
|
+
field_gateway_payment: any;
|
|
22
|
+
description: any;
|
|
23
|
+
price: any;
|
|
24
|
+
discountPercent: number | null;
|
|
25
|
+
variation_images: MappedImage[];
|
|
26
|
+
default_images: MappedImage[];
|
|
27
|
+
all_images: MappedImage[];
|
|
28
|
+
product_id: any;
|
|
29
|
+
product_name: any;
|
|
30
|
+
changed: any;
|
|
31
|
+
category: any;
|
|
32
|
+
};
|
|
2
33
|
export declare function mapProduct(defaultProduct: any, variationProduct: any, ctx: any): Product;
|
|
3
34
|
export declare function mapProductLite(defaultProduct: any, variationProduct: any, ctx: any): any;
|
|
4
35
|
//# sourceMappingURL=mapProducts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapProducts.d.ts","sourceRoot":"","sources":["../../utils/mapProducts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mapProducts.d.ts","sourceRoot":"","sources":["../../utils/mapProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AAGxE,MAAM,MAAM,KAAK,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AACnD,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvD,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAW5C;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,GAAG,WAAW,EAAE,CA0BtE;AAED,wBAAgB,aAAa,CAAC,UAAU,GAAE,mBAAmB,EAAO,GAAG,GAAG,EAAE,CAqB3E;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;;;;;;;;;;;;;;;;;;EAgClF;AAED,wBAAgB,UAAU,CACtB,cAAc,EAAE,GAAG,EACnB,gBAAgB,EAAE,GAAG,EACrB,GAAG,EAAE,GAAG,GACT,OAAO,CAeT;AAED,wBAAgB,cAAc,CAC1B,cAAc,EAAE,GAAG,EACnB,gBAAgB,EAAE,GAAG,EACrB,GAAG,EAAE,GAAG,GACT,GAAG,CAKL"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getDiscountPercent } from '../utils/generalHelper';
|
|
2
|
-
function getImageUrl(img) {
|
|
2
|
+
export function getImageUrl(img) {
|
|
3
3
|
if (img?.field_media_image?.uri?.url) {
|
|
4
4
|
return img.field_media_image.uri.url;
|
|
5
5
|
}
|
|
@@ -11,7 +11,7 @@ function getImageUrl(img) {
|
|
|
11
11
|
}
|
|
12
12
|
return '';
|
|
13
13
|
}
|
|
14
|
-
function mapImages(images, ctx) {
|
|
14
|
+
export function mapImages(images, ctx) {
|
|
15
15
|
const imagesArray = Array.isArray(images) ? images : images ? [images] : [];
|
|
16
16
|
if (imagesArray.length === 0) {
|
|
17
17
|
return [{ href: ctx.logoUrl || '/logo.png', alt: 'Q2' }];
|
|
@@ -37,7 +37,7 @@ function mapImages(images, ctx) {
|
|
|
37
37
|
});
|
|
38
38
|
return result;
|
|
39
39
|
}
|
|
40
|
-
function mapVariations(variations = []) {
|
|
40
|
+
export function mapVariations(variations = []) {
|
|
41
41
|
return variations.map((v) => {
|
|
42
42
|
const discountPercentVariation = getDiscountPercent(v.price, v.list_price);
|
|
43
43
|
return {
|
|
@@ -55,23 +55,13 @@ function mapVariations(variations = []) {
|
|
|
55
55
|
};
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
|
-
function mapProductBase(defaultProduct, variationProduct, ctx) {
|
|
58
|
+
export function mapProductBase(defaultProduct, variationProduct, ctx) {
|
|
59
59
|
const defaultImages = defaultProduct.field_image;
|
|
60
60
|
const variationImages = variationProduct.field_image;
|
|
61
|
-
const
|
|
62
|
-
const allImages = [imosImage, variationImages, defaultImages]
|
|
61
|
+
const allImages = [variationImages, defaultImages]
|
|
63
62
|
.filter(Boolean)
|
|
64
63
|
.flat();
|
|
65
64
|
const discountPercent = getDiscountPercent(variationProduct.price, variationProduct.list_price);
|
|
66
|
-
const badges = [
|
|
67
|
-
...(defaultProduct.field_configurable ? [{ text: 'Možno konfigurovat', color: 'bg-[#364153] text-white' }] : []),
|
|
68
|
-
...(variationProduct.field_news
|
|
69
|
-
? [{ text: 'Novinka', color: 'bg-green-100 text-green-800' }]
|
|
70
|
-
: []),
|
|
71
|
-
...(variationProduct.field_aftersale
|
|
72
|
-
? [{ text: 'Doprodej', color: 'bg-red-100 text-red-800' }]
|
|
73
|
-
: []),
|
|
74
|
-
];
|
|
75
65
|
return {
|
|
76
66
|
variation_id: variationProduct.drupal_internal__variation_id,
|
|
77
67
|
variation_uuid: variationProduct.id,
|
|
@@ -79,76 +69,19 @@ function mapProductBase(defaultProduct, variationProduct, ctx) {
|
|
|
79
69
|
variation_name: variationProduct.title,
|
|
80
70
|
sku: variationProduct.sku,
|
|
81
71
|
ean: variationProduct.field_ean,
|
|
72
|
+
field_gateway_payment: variationProduct.field_gateway_payment ?? false,
|
|
82
73
|
description: defaultProduct.field_description?.processed ?? '',
|
|
83
74
|
price: variationProduct?.list_price?.number
|
|
84
75
|
? variationProduct.list_price.number
|
|
85
76
|
: (variationProduct.price?.number ?? 0),
|
|
86
77
|
discountPercent,
|
|
78
|
+
variation_images: mapImages(variationImages, ctx),
|
|
79
|
+
default_images: mapImages(defaultImages, ctx),
|
|
80
|
+
all_images: mapImages(allImages, ctx),
|
|
87
81
|
product_id: defaultProduct.drupal_internal__product_id,
|
|
88
82
|
product_name: defaultProduct.title,
|
|
89
83
|
changed: variationProduct.changed,
|
|
90
84
|
category: defaultProduct.field_category ?? '',
|
|
91
|
-
variation_images: mapImages(variationImages, ctx),
|
|
92
|
-
default_images: mapImages(defaultImages, ctx),
|
|
93
|
-
all_images: mapImages(allImages, ctx),
|
|
94
|
-
badges,
|
|
95
|
-
variations: mapVariations(defaultProduct.variations),
|
|
96
|
-
field_news: variationProduct.field_news ?? false,
|
|
97
|
-
field_aftersale: variationProduct.field_aftersale ?? false,
|
|
98
|
-
field_gateway_payment: variationProduct.field_gateway_payment ?? false,
|
|
99
|
-
field_care: defaultProduct.field_care ?? [],
|
|
100
|
-
field_features: defaultProduct.field_features ?? [],
|
|
101
|
-
field_returns: defaultProduct.field_returns ?? [],
|
|
102
|
-
field_shipping: defaultProduct.field_shipping ?? [],
|
|
103
|
-
...(variationProduct.packaging
|
|
104
|
-
? { packaging: variationProduct.packaging }
|
|
105
|
-
: {}),
|
|
106
|
-
...(variationProduct.country
|
|
107
|
-
? { country: variationProduct.country }
|
|
108
|
-
: {}),
|
|
109
|
-
...(variationProduct.weight &&
|
|
110
|
-
variationProduct.weight.number &&
|
|
111
|
-
variationProduct.weight.unit
|
|
112
|
-
? {
|
|
113
|
-
weight: `${Number(variationProduct.weight.number)
|
|
114
|
-
.toFixed(2)
|
|
115
|
-
.toString()} ${variationProduct.weight.unit}`,
|
|
116
|
-
}
|
|
117
|
-
: {}),
|
|
118
|
-
...(variationProduct.weight && variationProduct.weight.unit
|
|
119
|
-
? { volume_unit: variationProduct.weight.unit }
|
|
120
|
-
: {}),
|
|
121
|
-
...(variationProduct.weight && variationProduct.weight.number
|
|
122
|
-
? { volume_number: variationProduct.weight.number }
|
|
123
|
-
: {}),
|
|
124
|
-
...(variationProduct.field_discount
|
|
125
|
-
? { field_discount: variationProduct.field_discount }
|
|
126
|
-
: {}),
|
|
127
|
-
...(variationProduct.field_composition
|
|
128
|
-
? { field_composition: variationProduct.field_composition }
|
|
129
|
-
: {}),
|
|
130
|
-
...(variationProduct.field_nutritional_info
|
|
131
|
-
? {
|
|
132
|
-
field_nutritional_info: variationProduct.field_nutritional_info,
|
|
133
|
-
}
|
|
134
|
-
: {}),
|
|
135
|
-
...(variationProduct.field_species
|
|
136
|
-
? { field_species: variationProduct.field_species }
|
|
137
|
-
: {}),
|
|
138
|
-
...(variationProduct.field_volume
|
|
139
|
-
? { field_volume: variationProduct.field_volume }
|
|
140
|
-
: {}),
|
|
141
|
-
...(defaultProduct.field_manufacturer
|
|
142
|
-
? {
|
|
143
|
-
field_manufacturer: {
|
|
144
|
-
name: defaultProduct.field_manufacturer.name,
|
|
145
|
-
status: defaultProduct.field_manufacturer.status,
|
|
146
|
-
description: defaultProduct.field_manufacturer.description
|
|
147
|
-
.processed,
|
|
148
|
-
field_image: mapImages(defaultProduct.field_manufacturer.field_image, ctx),
|
|
149
|
-
},
|
|
150
|
-
}
|
|
151
|
-
: {}),
|
|
152
85
|
};
|
|
153
86
|
}
|
|
154
87
|
export function mapProduct(defaultProduct, variationProduct, ctx) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=test.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../utils/test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@q2devel/q2-core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.74",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"exports": {
|
|
@@ -28,12 +28,16 @@
|
|
|
28
28
|
"@types/react-dom": "^19.1.6",
|
|
29
29
|
"typescript": "^5.8.3"
|
|
30
30
|
},
|
|
31
|
+
"peerDependencies": {
|
|
32
|
+
"react": ">=19.2.1",
|
|
33
|
+
"react-dom": ">=19.2.1"
|
|
34
|
+
},
|
|
31
35
|
"dependencies": {
|
|
32
36
|
"@tanstack/react-query": "^5.80.6",
|
|
33
37
|
"axios": "^1.9.0",
|
|
34
38
|
"drupal-jsonapi-params": "^2.3.2",
|
|
35
39
|
"js-cookie": "^3.0.5",
|
|
36
40
|
"jwt-decode": "^4.0.0",
|
|
37
|
-
"react": "
|
|
41
|
+
"react": "19.2.1"
|
|
38
42
|
}
|
|
39
43
|
}
|