@akinon/next 1.59.0 → 1.60.0-rc.7

package/data/server/special-page.ts

@@ -4,25 +4,30 @@ import { GetCategoryResponse } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch from '../../utils/app-fetch';
 import header from '../../redux/reducers/header';
+import { ServerVariables } from '../../utils/server-variables';
 
 const getSpecialPageDataHandler = (
   pk: number,
+  locale: string,
+  currency: string,
   searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const data: GetCategoryResponse = await appFetch(
-      `${category.getSpecialPageByPk(pk)}${params}`,
-      {
+    const data: GetCategoryResponse = await appFetch({
+      url: `${category.getSpecialPageByPk(pk)}${params}`,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
           ...(headers ?? {})
         }
       }
-    );
+    });
 
     return data;
   };
@@ -30,16 +35,21 @@ const getSpecialPageDataHandler = (
 
 export const getSpecialPageData = async ({
   pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   searchParams,
   headers
 }: {
   pk: number;
+  locale?: string;
+  currency?: string;
   searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
-    getSpecialPageDataHandler(pk, searchParams, headers),
+    locale,
+    getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
     {
       expire: 300
     }

package/data/server/widget.ts

@@ -3,25 +3,32 @@ import 'server-only';
 import { CacheOptions, WidgetResultType } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { widgets } from '../urls';
+import { ServerVariables } from '../../utils/server-variables';
 
-const getWidgetDataHandler = (slug: string) => async () => {
-  if (!slug) {
-    return null;
-  }
+const getWidgetDataHandler =
+  (slug: string, locale: string, currency: string) => async () => {
+    if (!slug) {
+      return null;
+    }
 
-  return await appFetch(widgets.getWidget(slug));
-};
+    return await appFetch({ url: widgets.getWidget(slug), locale, currency });
+  };
 
 export const getWidgetData = async <T>({
   slug,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   cacheOptions
 }: {
   slug: string;
+  locale?: string;
+  currency?: string;
   cacheOptions?: CacheOptions;
 }): Promise<WidgetResultType<T>> => {
   return Cache.wrap(
     CacheKey.Widget(slug),
-    getWidgetDataHandler(slug),
+    locale,
+    getWidgetDataHandler(slug, locale, currency),
     cacheOptions
   );
 };

package/data/urls.ts

@@ -83,6 +83,8 @@ export const checkout = {
   setDeliveryOption: '/orders/checkout/?page=DeliveryOptionSelectionPage',
   setAddresses: '/orders/checkout/?page=AddressSelectionPage',
   setShippingOption: '/orders/checkout/?page=ShippingOptionSelectionPage',
+  setDataSourceShippingOption:
+    '/orders/checkout/?page=DataSourceShippingOptionSelectionPage',
   setPaymentOption: '/orders/checkout/?page=PaymentOptionSelectionPage',
   setBinNumber: '/orders/checkout/?page=BinNumberPage',
   setMasterpassBinNumber: '/orders/checkout/?page=MasterpassBinNumberPage',
@@ -109,6 +111,8 @@ export const checkout = {
   loyaltyMoneyUsage: '/orders/checkout/?page=LoyaltyMoneyUsagePage',
   setOrderNote: '/orders/checkout/?page=OrderNotePage',
   couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage',
+  setAttributeBasedShippingOption:
+    '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage',
   deliveryBagsPage: '/orders/checkout/?page=DeliveryBagsPage',
   setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage'
 };
@@ -199,7 +203,10 @@ export const b2b = {
   draftBaskets: '/b2b/basket/drafts/',
   divisions: '/b2b/my-divisions/',
   myQuotations: '/b2b/my-quotations/',
-  loadBasket: (id) => `/b2b/basket/${id}/load/`
+  loadBasket: (id) => `/b2b/basket/${id}/load/`,
+  statusBasket: (cacheKey) => `/b2b/basket/?status_cache_key=${cacheKey}`,
+  basketExport: (queryString) => `/b2b/basket/?upload=true&${queryString}`,
+  basketImport: '/b2b/basket/bulk-import/'
 };
 
 export const widgets = {

package/hocs/server/with-segment-defaults.tsx

@@ -2,7 +2,6 @@ import settings from 'settings';
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
 import { redirect } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
-import { getTranslations } from '../../utils/server-translation';
 import { ROUTES } from 'routes';
 import logger from '../../utils/log';
 
@@ -50,7 +49,11 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
     return redirect(ROUTES.HOME);
   }
 
+  const { getTranslations } = settings.useOptimizedTranslations
+    ? require('translations')
+    : require('../../utils/server-translation');
   const translations = await getTranslations(params.locale);
+
   componentProps.translations = translations;
 
   const locale = settings.localization.locales.find(

package/hooks/index.ts

@@ -8,4 +8,5 @@ export * from './use-media-query';
 export * from './use-on-click-outside';
 export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
-export * from './use-pagination';
+export * from './use-pagination';
+export * from './use-message-listener';

package/hooks/use-message-listener.ts

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+
+export const useMessageListener = () => {
+  useEffect(() => {
+    const handleMessage = (event: MessageEvent) => {
+      if (event.origin !== window.location.origin) {
+        return;
+      }
+
+      if (event.data && typeof event.data === 'string') {
+        const messageData = JSON.parse(event.data);
+        if (messageData?.url) {
+          window.location.href = messageData.url;
+        }
+      }
+    };
+
+    window.addEventListener('message', handleMessage);
+
+    return () => {
+      window.removeEventListener('message', handleMessage);
+    };
+  }, []);
+};

package/hooks/use-pagination.ts

@@ -116,7 +116,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) - 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return '#';
+    return null;
   }, [state.page, pathname, urlSearchParams]);
 
   const next = useMemo(() => {
@@ -124,7 +124,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) + 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return '#';
+    return null;
   }, [state.page, state.last, pathname, urlSearchParams]);
 
   return {

package/hooks/use-payment-options.ts

@@ -19,7 +19,8 @@ export const usePaymentOptions = () => {
     bkm_express: 'pz-bkm',
     credit_payment: 'pz-credit-payment',
     masterpass: 'pz-masterpass',
-    gpay: 'pz-gpay'
+    gpay: 'pz-gpay',
+    saved_card: 'pz-saved-card'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/lib/cache-handler.mjs

@@ -0,0 +1,33 @@
+import { CacheHandler } from '@neshca/cache-handler';
+import createLruHandler from '@neshca/cache-handler/local-lru';
+import createRedisHandler from '@neshca/cache-handler/redis-stack';
+import { createClient } from 'redis';
+
+CacheHandler.onCreation(async () => {
+  const redisUrl = `redis://${process.env.CACHE_HOST}:${
+    process.env.CACHE_PORT
+  }/${process.env.CACHE_BUCKET ?? '0'}`;
+
+  const client = createClient({
+    url: redisUrl
+  });
+
+  client.on('error', (error) => {
+    console.error('Redis client error', { redisUrl, error });
+  });
+
+  await client.connect();
+
+  const redisHandler = await createRedisHandler({
+    client,
+    timeoutMs: 5000
+  });
+
+  const localHandler = createLruHandler();
+
+  return {
+    handlers: [redisHandler, localHandler]
+  };
+});
+
+export default CacheHandler;

package/lib/cache.ts

@@ -3,7 +3,6 @@ import { RedisClientType } from 'redis';
 import Settings from 'settings';
 import { CacheOptions } from '../types';
 import logger from '../utils/log';
-import { ServerVariables } from '../utils/server-variables';
 
 const hashCacheKey = (object?: Record<string, string>) => {
   if (!object) {
@@ -59,10 +58,8 @@ export const CacheKey = {
 export class Cache {
   static PROXY_URL = `${process.env.NEXT_PUBLIC_URL}/api/cache`;
 
-  static formatKey(key: string) {
-    return encodeURIComponent(
-      `${Settings.commerceUrl}_${ServerVariables.locale}_${key}`
-    );
+  static formatKey(key: string, locale: string) {
+    return encodeURIComponent(`${Settings.commerceUrl}_${locale}_${key}`);
   }
 
   static clientPool: Pool<RedisClientType> = createPool(
@@ -155,9 +152,14 @@ export class Cache {
 
   static async wrap<T = any>(
     key: string,
+    locale: string,
     handler: () => Promise<T>,
     options?: CacheOptions
   ): Promise<T> {
+    if (Settings.usePrettyUrlRoute) {
+      return await handler();
+    }
+
     const requiredVariables = [
       process.env.CACHE_HOST,
       process.env.CACHE_PORT,
@@ -174,7 +176,7 @@ export class Cache {
     };
 
     const _options = Object.assign(defaultOptions, options);
-    const formattedKey = Cache.formatKey(key);
+    const formattedKey = Cache.formatKey(key, locale);
 
     logger.debug('Cache wrap', { key, formattedKey, _options });
 

package/middlewares/currency.ts

@@ -74,7 +74,8 @@ const withCurrency =
         req.cookies.get('pz-currency')?.value !== activeCurrency &&
         url.pathname.match(urlLocaleMatcherRegex) &&
         !url.search.includes('mobile_app=true') &&
-        !url.search.includes('page=CreditCardThreeDSecurePage')
+        !url.search.includes('page=CreditCardThreeDSecurePage') &&
+        !url.search.includes('page=RedirectionPageCompletePage')
       ) {
         logger.info('Currency changed. Resetting basket...', {
           sessionid: req.cookies.get('osessionid')?.value ?? '',