@akinon/next 1.42.0-rc.9 → 1.43.0-rc.0

package/CHANGELOG.md

@@ -1,47 +1,17 @@
 # @akinon/next
 
-## 1.42.0-rc.9
-
-## 1.42.0-rc.8
-
-### Minor Changes
-
-- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
-
-## 1.42.0-rc.7
-
-## 1.42.0-rc.6
-
-### Minor Changes
-
-- 146ea39: ZERO-2774: Update imports
-
-## 1.42.0-rc.5
-
-## 1.42.0-rc.4
-
-### Minor Changes
-
-- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
-
-## 1.42.0-rc.3
-
-### Minor Changes
-
-- fda5b92: ZERO-2725: fix invalid import
-
-## 1.42.0-rc.2
-
-## 1.42.0-rc.1
-
-## 1.42.0-rc.0
+## 1.43.0-rc.0
 
 ### Minor Changes
 
 - 90282b5: ZERO-2729: Audit packages for yarn and npm and also update app-template
 - 572d2e8: ZERO-2667: Add iframe support for redirection payment methods
 - a4c8d6a: ZERO-2663: Fix the image url for gif and svgs and return them without options
+- fda5b92: ZERO-2725: fix invalid import
+- 2d9b2b2: ZERO-2816: Add segment to headers
 - c53ea3e: ZERO-2609: Reset additional form fields when selectedFormType is not company
+- 8d9ac9a: ZERO-2794: Add field to order type
+- e9541a1: ZERO-2816: Add headers to url
 - c53ef7b: 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.
 - 0d3a913: ZERO-2725: Update decimal scale in Price component
 - 1448a96: ZERO-2612: add errors type in CheckoutState
@@ -49,16 +19,26 @@
 - 75080fd: ZERO-2630: Add max limit to postcode area
 - 91265bb: ZERO-2551: Improve pretty url and caching performance
 - bbe18b9: ZERO-2575: Fix build error
+- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
+- 94b6928: ZERO-2551: Add cache handler check in url-redirection middleware
 - 98bb8dc: ZERO-2706: Cache getTranlations method
+- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
 - dcc8a15: ZERO-2694: added build step to RC branch pipeline
 - fad2768: ZERO-2739: add gpay to payment plugin map
 - dff0d59: ZERO-2659: add formData support to proxy api requests
 - beb499e: ZERO-2551: Add new tsconfig paths
+- 146ea39: ZERO-2774: Update imports
 - c47be30: ZERO-2744: Update Order and OrderItem types
 - e9a46ac: ZERO-2738: add CVC input to registered cards in Masterpass
 - f046f8e: ZERO-2575: update version for react-number-format
 - 86d2531: ZERO-2693: resolve dependency collision warning for eslint-config-next
 
+## 1.42.0
+
+### Minor Changes
+
+- 5ea00a6: ZERO-2761: Add multi basket package
+
 ## 1.41.0
 
 ### Minor Changes

package/api/client.ts

@@ -4,6 +4,7 @@ import settings from 'settings';
 import logger from '../utils/log';
 import formatCookieString from '../utils/format-cookie-string';
 import cookieParser from 'set-cookie-parser';
+import { cookies } from 'next/headers';
 
 interface RouteParams {
   params: {
@@ -74,6 +75,20 @@ async function proxyRequest(...args) {
     }
   } as RequestInit;
 
+  const nextCookies = cookies();
+  const segment = nextCookies.get('pz-segment')?.value;
+  const currency = nextCookies.get('pz-external-currency')?.value;
+
+  if (segment) {
+    fetchOptions.headers['X-Segment-Id'] = segment;
+  }
+
+  if (currency) {
+    fetchOptions.headers = Object.assign({}, fetchOptions.headers, {
+      'x-currency': currency
+    });
+  }
+
   if (options.contentType) {
     fetchOptions.headers['Content-Type'] = options.contentType;
   }

package/components/plugin-module.tsx

@@ -18,7 +18,8 @@ enum Plugin {
   CreditPayment = 'pz-credit-payment',
   Masterpass = 'pz-masterpass',
   B2B = 'pz-b2b',
-  Akifast = 'pz-akifast'
+  Akifast = 'pz-akifast',
+  MultiBasket = 'pz-multi-basket'
 }
 
 export enum Component {
@@ -41,7 +42,8 @@ export enum Component {
   MyQuotationsB2B = 'AccountMyQuotations',
   BasketB2B = 'BasketB2b',
   AkifastQuickLoginButton = 'QuickLoginButton',
-  AkifastCheckoutButton = 'CheckoutButton'
+  AkifastCheckoutButton = 'CheckoutButton',
+  MultiBasket = 'MultiBasket'
 }
 
 const PluginComponents = new Map([
@@ -72,7 +74,8 @@ const PluginComponents = new Map([
   [
     Plugin.Akifast,
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
-  ]
+  ],
+  [Plugin.MultiBasket, [Component.MultiBasket]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -133,6 +136,8 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-b2b'}`);
             } else if (plugin === Plugin.Akifast) {
               promise = import(`${'@akinon/pz-akifast'}`);
+            } else if (plugin === Plugin.MultiBasket) {
+              promise = import('@akinon/pz-multi-basket');
             }
           } catch (error) {
             logger.error(error);

package/data/client/api.ts

@@ -67,6 +67,7 @@ export const api = createApi({
   baseQuery: customBaseQuery,
   tagTypes: [
     'Basket',
+    'AllBaskets',
     'BasketB2b',
     'DraftsB2b',
     'Product',

package/data/client/basket.ts

@@ -24,6 +24,44 @@ export const basketApi = api.injectEndpoints({
       transformResponse: (response: { basket: Basket }) => response.basket,
       providesTags: ['Basket']
     }),
+    getBasketDetail: build.mutation<Basket, { namespace: string }>({
+      query: ({ namespace }) => ({
+        url: buildClientRequestUrl(basket.getBasketDetail(namespace), {
+          contentType: 'application/json'
+        }),
+        method: 'GET'
+      }),
+      invalidatesTags: ['AllBaskets']
+    }),
+    getAllBaskets: build.query<Basket[], void>({
+      query: () =>
+        buildClientRequestUrl(basket.getAllBaskets, {
+          contentType: 'application/json'
+        }),
+      transformResponse: (response: { baskets: Basket[] }) => response.baskets,
+      providesTags: ['AllBaskets']
+    }),
+    removeBasket: build.mutation<Basket, { pk: number }>({
+      query: ({ pk }) => ({
+        url: buildClientRequestUrl(basket.removeBasket(pk), {
+          contentType: 'application/json'
+        }),
+        method: 'DELETE',
+        body: { pk }
+      }),
+      invalidatesTags: ['AllBaskets', 'Basket']
+    }),
+    selectMainBasket: build.mutation<Basket, { pk: number }>({
+      query: ({ pk }) => ({
+        url: buildClientRequestUrl(basket.selectMainBasket(pk), {
+          contentType: 'application/json'
+        }),
+        method: 'POST',
+        body: { pk }
+      }),
+      transformResponse: (response: { baskets: Basket }) => response.baskets,
+      invalidatesTags: ['AllBaskets', 'Basket']
+    }),
     updateQuantity: build.mutation<
       UpdateQuantityResponse,
       UpdateQuantityRequest
@@ -75,6 +113,10 @@ export const basketApi = api.injectEndpoints({
 
 export const {
   useGetBasketQuery,
+  useGetBasketDetailMutation,
+  useGetAllBasketsQuery,
+  useRemoveBasketMutation,
+  useSelectMainBasketMutation,
   useUpdateQuantityMutation,
   useClearBasketMutation,
   useApplyVoucherCodeMutation,

package/data/urls.ts

@@ -56,7 +56,11 @@ export const address = {
 };
 
 export const basket = {
-  getBasket: '/baskets/basket/'
+  getBasket: '/baskets/basket/',
+  getBasketDetail: (namespace: string) => `/baskets/basket/${namespace}/`,
+  getAllBaskets: '/baskets/basket-list/',
+  removeBasket: (pk: number) => `/baskets/basket-list/${pk}/`,
+  selectMainBasket: (pk: number) => `/baskets/basket-list/id/${pk}/main/`
 };
 
 export const category = {

package/middlewares/default.ts

@@ -84,14 +84,40 @@ const withPzDefault =
       req.nextUrl.pathname.includes('/orders/hooks/') ||
       req.nextUrl.pathname.includes('/orders/checkout-with-token/')
     ) {
-      return NextResponse.rewrite(
+      const segment = url.searchParams.get('segment');
+      const currency = url.searchParams.get('currency');
+
+      const headers = {};
+
+      if (segment) {
+        headers['X-Segment-Id'] = segment;
+      }
+
+      if (currency) {
+        headers['x-currency'] = currency;
+      }
+
+      const response = NextResponse.rewrite(
         new URL(
           `${Settings.commerceUrl}${req.nextUrl.pathname.replace(
             urlLocaleMatcherRegex,
             ''
           )}`
-        )
+        ),
+        {
+          headers
+        }
       );
+
+      if (segment) {
+        response.cookies.set('pz-segment', segment);
+      }
+
+      if (currency) {
+        response.cookies.set('pz-external-currency', currency);
+      }
+
+      return response;
     }
 
     if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {

package/middlewares/url-redirection.ts

@@ -11,6 +11,10 @@ import { ROUTES } from 'routes';
 const withUrlRedirection =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
+    if (settings.usePrettyUrlRoute) {
+      return middleware(req, event);
+    }
+
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const pathnameWithoutLocale = url.pathname.replace(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.42.0-rc.9",
+  "version": "1.43.0-rc.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -20,7 +20,7 @@
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.0.7",
+    "@neshca/cache-handler": "1.5.1",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.42.0-rc.9",
+    "@akinon/eslint-plugin-projectzero": "1.43.0-rc.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/types/commerce/basket.ts

@@ -16,6 +16,7 @@ export interface Basket {
   total_discount_amount: string;
   total_product_amount: string;
   upsell_messages: any[];
+  namespace?: string;
 }
 
 export interface BasketItem {

package/types/commerce/order.ts

@@ -109,8 +109,13 @@ export interface Order {
   shipping_option: number;
   tracking_number: string;
   tracking_url: string;
+  [key: string]: any;
   bank: {
+    pk: number;
+    name: string;
+    slug: string;
     logo: string;
+    [key: string]: any;
   };
 }