@akinon/next 1.93.0 → 1.95.0-rc.54

package/components/file-input.tsx

@@ -1,8 +1,70 @@
+import { useState } from 'react';
 import { forwardRef } from 'react';
-import { FileInputProps } from '../types/index';
+import { useLocalization } from '@akinon/next/hooks';
+import { twMerge } from 'tailwind-merge';
+import { FileInputProps } from '../types';
 
 export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
-  function fileInput(props, ref) {
-    return <input type="file" {...props} ref={ref} />;
+  function FileInput(
+    {
+      buttonClassName,
+      onChange,
+      fileClassName,
+      fileNameWrapperClassName,
+      fileInputClassName,
+      ...props
+    },
+    ref
+  ) {
+    const { t } = useLocalization();
+    const [fileNames, setFileNames] = useState<string[]>([]);
+
+    const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+      const files = Array.from(event.target.files || []);
+      setFileNames(files.map((file) => file.name));
+
+      if (onChange) {
+        onChange(event);
+      }
+    };
+
+    return (
+      <div className="relative">
+        <input
+          type="file"
+          {...props}
+          ref={ref}
+          className={twMerge(
+            'absolute inset-0 w-full h-full opacity-0 cursor-pointer',
+            fileInputClassName
+          )}
+          onChange={handleFileChange}
+        />
+        <button
+          type="button"
+          className={twMerge(
+            'bg-primary text-white py-2 px-4 text-sm',
+            buttonClassName
+          )}
+        >
+          {t('common.file_input.select_file')}
+        </button>
+        <div
+          className={twMerge('mt-1 text-gray-500', fileNameWrapperClassName)}
+        >
+          {fileNames.length > 0 ? (
+            <ul className={twMerge('list-disc pl-4 text-xs', fileClassName)}>
+              {fileNames.map((name, index) => (
+                <li key={index}>{name}</li>
+              ))}
+            </ul>
+          ) : (
+            <span className={twMerge('text-xs', fileClassName)}>
+              {t('common.file_input.no_file')}
+            </span>
+          )}
+        </div>
+      </div>
+    );
   }
 );

package/components/input.tsx

@@ -1,6 +1,8 @@
 import clsx from 'clsx';
 import { forwardRef, FocusEvent, useState, Ref } from 'react';
 import { Controller } from 'react-hook-form';
+
+// @ts-ignore
 import { PatternFormat, PatternFormatProps } from 'react-number-format';
 import { InputProps } from '../types';
 import { twMerge } from 'tailwind-merge';

package/components/link.tsx

@@ -10,7 +10,9 @@ type LinkProps = Omit<
   React.AnchorHTMLAttributes<HTMLAnchorElement>,
   keyof NextLinkProps
 > &
-  NextLinkProps;
+  NextLinkProps & {
+    href: string;
+  };
 
 export const Link = ({ children, href, ...rest }: LinkProps) => {
   const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
@@ -26,19 +28,21 @@ export const Link = ({ children, href, ...rest }: LinkProps) => {
       return href;
     }
 
-    const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
-    const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
-
-    if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
-      return hrefWithLocale;
-    } else if (
-      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
-      locale !== defaultLocaleValue
-    ) {
-      return hrefWithLocale;
+    if (typeof href === 'string' && !href.startsWith('http')) {
+      const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
+      const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
+
+      if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
+        return hrefWithLocale;
+      } else if (
+        localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
+        locale !== defaultLocaleValue
+      ) {
+        return hrefWithLocale;
+      }
     }
 
-    return href || '#';
+    return href;
   }, [href, defaultLocaleValue, locale, localeUrlStrategy]);
 
   return (

package/components/modal.tsx

@@ -4,16 +4,7 @@ import { ReactPortal } from './react-portal';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
 import { useEffect } from 'react';
-
-export interface ModalProps {
-  portalId: string;
-  children?: React.ReactNode;
-  open?: boolean;
-  setOpen?: (open: boolean) => void;
-  title?: React.ReactNode;
-  showCloseButton?: React.ReactNode;
-  className?: string;
-}
+import { ModalProps } from '../types';
 
 export const Modal = (props: ModalProps) => {
   const {
@@ -23,7 +14,14 @@ export const Modal = (props: ModalProps) => {
     setOpen,
     title = '',
     showCloseButton = true,
-    className
+    className,
+    overlayClassName,
+    headerWrapperClassName,
+    titleClassName,
+    closeButtonClassName,
+    iconName = 'close',
+    iconSize = 16,
+    iconClassName
   } = props;
 
   useEffect(() => {
@@ -38,7 +36,12 @@ export const Modal = (props: ModalProps) => {
 
   return (
     <ReactPortal wrapperId={portalId}>
-      <div className="fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50" />
+      <div
+        className={twMerge(
+          'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
+          overlayClassName
+        )}
+      />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
@@ -46,15 +49,28 @@ export const Modal = (props: ModalProps) => {
         )}
       >
         {(showCloseButton || title) && (
-          <div className="flex px-6 py-4 border-b border-gray-400">
-            {title && <h3 className="text-lg font-light">{title}</h3>}
+          <div
+            className={twMerge(
+              'flex px-6 py-4 border-b border-gray-400',
+              headerWrapperClassName
+            )}
+          >
+            {title && (
+              <h3 className={twMerge('text-lg font-light', titleClassName)}>
+                {title}
+              </h3>
+            )}
             {showCloseButton && (
               <button
                 type="button"
                 onClick={() => setOpen(false)}
-                className="ml-auto"
+                className={twMerge('ml-auto', closeButtonClassName)}
               >
-                <Icon name="close" size={16} />
+                <Icon
+                  name={iconName}
+                  size={iconSize}
+                  className={iconClassName}
+                />
               </button>
             )}
           </div>

package/components/plugin-module.tsx

@@ -20,7 +20,10 @@ enum Plugin {
   B2B = 'pz-b2b',
   Akifast = 'pz-akifast',
   MultiBasket = 'pz-multi-basket',
-  SavedCard = 'pz-saved-card'
+  SavedCard = 'pz-saved-card',
+  Hepsipay = 'pz-hepsipay',
+  FlowPayment = 'pz-flow-payment',
+  SimilarProducts = 'pz-similar-products'
 }
 
 export enum Component {
@@ -45,7 +48,16 @@ export enum Component {
   AkifastQuickLoginButton = 'QuickLoginButton',
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
-  SavedCard = 'SavedCardOption'
+  SavedCard = 'SavedCardOption',
+  Hepsipay = 'Hepsipay',
+  FlowPayment = 'FlowPayment',
+  SimilarProductsModal = 'SimilarProductsModal',
+  SimilarProductsFilterSidebar = 'SimilarProductsFilterSidebar',
+  SimilarProductsResultsGrid = 'SimilarProductsResultsGrid',
+  SimilarProductsPlugin = 'SimilarProductsPlugin',
+  ProductImageSearchFeature = 'ProductImageSearchFeature',
+  ImageSearchButton = 'ImageSearchButton',
+  HeaderImageSearchFeature = 'HeaderImageSearchFeature'
 }
 
 const PluginComponents = new Map([
@@ -78,7 +90,21 @@ const PluginComponents = new Map([
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
-  [Plugin.SavedCard, [Component.SavedCard]]
+  [Plugin.SavedCard, [Component.SavedCard]],
+  [Plugin.Hepsipay, [Component.Hepsipay]],
+  [Plugin.FlowPayment, [Component.FlowPayment]],
+  [
+    Plugin.SimilarProducts,
+    [
+      Component.SimilarProductsModal,
+      Component.SimilarProductsFilterSidebar,
+      Component.SimilarProductsResultsGrid,
+      Component.SimilarProductsPlugin,
+      Component.ProductImageSearchFeature,
+      Component.ImageSearchButton,
+      Component.HeaderImageSearchFeature
+    ]
+  ]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -143,6 +169,12 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-multi-basket'}`);
             } else if (plugin === Plugin.SavedCard) {
               promise = import(`${'@akinon/pz-saved-card'}`);
+            } else if (plugin === Plugin.Hepsipay) {
+              promise = import(`${'@akinon/pz-hepsipay'}`);
+            } else if (plugin === Plugin.FlowPayment) {
+              promise = import(`${'@akinon/pz-flow-payment'}`);
+            } else if (plugin === Plugin.SimilarProducts) {
+              promise = import(`${'@akinon/pz-similar-products'}`);
             }
           } catch (error) {
             logger.error(error);

package/components/selected-payment-option-view.tsx

@@ -62,6 +62,17 @@ export default function SelectedPaymentOptionView({
               : fallbackView;
           }
 
+          if (
+            payment_option?.payment_type === 'wallet' &&
+            wallet_method === 'checkout_flow'
+          ) {
+            const mod = await import('@akinon/pz-flow-payment');
+
+            return typeof mod?.default === 'function'
+              ? mod.default
+              : fallbackView;
+          }
+
           const view = paymentTypeToView[payment_option?.payment_type] || null;
 
           if (view) {

package/data/client/checkout.ts

@@ -35,8 +35,10 @@ import {
 
 interface CheckoutResponse {
   pre_order?: PreOrder;
-  errors: {
-    non_field_errors: string;
+  errors?: {
+    non_field_errors?: string;
+    sample_products?: string[];
+    [key: string]: string | string[] | undefined;
   };
   context_list?: CheckoutContext[];
   template_name?: string;
@@ -181,7 +183,10 @@ export const checkoutApi = api.injectEndpoints({
   endpoints: (build) => ({
     fetchCheckout: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.fetchCheckout, {})
+        url: buildClientRequestUrl(
+          `${checkout.fetchCheckout}?page=IndexPage`,
+          {}
+        )
       }),
       providesTags: ['Checkout']
     }),
@@ -867,6 +872,21 @@ export const checkoutApi = api.injectEndpoints({
         method: 'POST',
         body
       })
+    }),
+    saveSampleProducts: build.mutation<CheckoutResponse, number[] | undefined>({
+      query: (products = []) => {
+        const formData = new FormData();
+
+        products.forEach((product) => {
+          formData.append('sample_products', String(product));
+        });
+
+        return {
+          url: buildClientRequestUrl(checkout.saveSampleProducts),
+          method: 'POST',
+          body: formData
+        };
+      }
     })
   }),
   overrideExisting: false
@@ -914,5 +934,6 @@ export const {
   useSetWalletCompletePageMutation,
   useSendSmsMutation,
   useVerifySmsMutation,
-  useResetCheckoutStateQuery
+  useResetCheckoutStateQuery,
+  useSaveSampleProductsMutation
 } = checkoutApi;

package/data/server/basket.ts

@@ -0,0 +1,72 @@
+import { Cache, CacheKey } from '../../lib/cache';
+import { basket } from '../../data/urls';
+import { Basket } from '../../types';
+import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
+import logger from '../../utils/log';
+
+type GetBasketParams = {
+  locale?: string;
+  currency?: string;
+  namespace?: string;
+};
+
+const getBasketDataHandler = ({
+  locale,
+  currency,
+  namespace
+}: GetBasketParams) => {
+  return async function () {
+    try {
+      const url = namespace
+        ? basket.getBasketDetail(namespace)
+        : basket.getBasket;
+
+      const basketData = await appFetch<{ basket: Basket }>({
+        url,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
+        }
+      });
+
+      if (!basketData?.basket) {
+        logger.warn('Basket data is undefined', {
+          handler: 'getBasketDataHandler',
+          namespace
+        });
+      }
+
+      return basketData;
+    } catch (error) {
+      logger.error('Error fetching basket data', {
+        handler: 'getBasketDataHandler',
+        error,
+        namespace
+      });
+      throw error;
+    }
+  };
+};
+
+export const getBasketData = async ({
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
+  namespace
+}: GetBasketParams = {}) => {
+  return Cache.wrap(
+    CacheKey.Basket(namespace),
+    locale,
+    getBasketDataHandler({ locale, currency, namespace }),
+    {
+      expire: 0,
+      cache: false
+    }
+  );
+};
+
+

package/data/server/category.ts

@@ -5,7 +5,6 @@ import { category, product } from '../urls';
 import { Cache, CacheKey } from '../../lib/cache';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
-import { headers as nHeaders } from 'next/headers';
 import { ServerVariables } from '../../utils/server-variables';
 
 function getCategoryDataHandler(
@@ -18,19 +17,30 @@ function getCategoryDataHandler(
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const rawData = await appFetch<string>({
-      url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
-        }
-      },
-      responseType: FetchResponseType.TEXT
-    });
+    let rawData: string;
+
+    try {
+      rawData = await appFetch<string>({
+        url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
+        },
+        responseType: FetchResponseType.TEXT
+      });
+    } catch (error) {
+      logger.error('Failed to fetch category data', {
+        handler: 'getCategoryDataHandler',
+        pk,
+        error: error.message
+      });
+      return null;
+    }
 
     let data: GetCategoryResponse;
 
@@ -48,8 +58,8 @@ function getCategoryDataHandler(
       logger.fatal('Error while parsing category data', {
         handler: 'getCategoryDataHandler',
         error,
-        rawData: rawData.startsWith('<!DOCTYPE html>')
-          ? `${rawData.substring(0, 50)}...`
+        rawData: rawData?.startsWith?.('<!DOCTYPE html>')
+          ? `${rawData?.substring(0, 50)}...`
           : rawData
       });
     }
@@ -64,17 +74,27 @@ function getCategoryDataHandler(
       return { data, breadcrumbData: undefined };
     }
 
-    const breadcrumbData = await appFetch<any>({
-      url: product.breadcrumbUrl(menuItemModel),
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+    let breadcrumbData: { menu?: unknown } = {};
+
+    try {
+      breadcrumbData = await appFetch<{ menu?: unknown }>({
+        url: product.breadcrumbUrl(menuItemModel),
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
         }
-      }
-    });
+      });
+    } catch (error) {
+      logger.warn('Failed to fetch breadcrumb data', {
+        handler: 'getCategoryDataHandler',
+        pk,
+        error: error.message
+      });
+    }
 
     return { data, breadcrumbData: breadcrumbData?.menu };
   };
@@ -138,8 +158,8 @@ function getCategoryBySlugDataHandler(
       logger.fatal('Error while parsing category data', {
         handler: 'getCategoryBySlugDataHandler',
         error,
-        rawData: rawData.startsWith('<!DOCTYPE html>')
-          ? `${rawData.substring(0, 50)}...`
+        rawData: rawData?.startsWith?.('<!DOCTYPE html>')
+          ? `${rawData?.substring(0, 50)}...`
           : rawData
       });
     }

package/data/server/flatpage.ts

@@ -11,20 +11,24 @@ const getFlatPageDataHandler = (
   headers?: Record<string, string>
 ) => {
   return async function () {
-    const data = await appFetch<FlatPage>({
-      url: flatpage.getFlatPageByPk(pk),
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    try {
+      const data = await appFetch<FlatPage>({
+        url: flatpage.getFlatPageByPk(pk),
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
-      }
-    });
+      });
 
-    return data;
+      return data;
+    } catch (error) {
+      return null;
+    }
   };
 };
 

package/data/server/landingpage.ts

@@ -11,20 +11,24 @@ const getLandingPageHandler = (
   headers?: Record<string, string>
 ) => {
   return async function () {
-    const data = await appFetch<LandingPage>({
-      url: landingpage.getLandingPageByPk(pk),
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    try {
+      const data = await appFetch<LandingPage>({
+        url: landingpage.getLandingPageByPk(pk),
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
-      }
-    });
+      });
 
-    return data;
+      return data;
+    } catch (error) {
+      return null;
+    }
   };
 };
 

package/data/server/list.ts

@@ -16,19 +16,29 @@ const getListDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const rawData = await appFetch<string>({
-      url: `${category.list}${params}`,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
-        }
-      },
-      responseType: FetchResponseType.TEXT
-    });
+    let rawData: string;
+
+    try {
+      rawData = await appFetch<string>({
+        url: `${category.list}${params}`,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
+        },
+        responseType: FetchResponseType.TEXT
+      });
+    } catch (error) {
+      logger.error('Failed to fetch list data', {
+        handler: 'getListDataHandler',
+        error: error.message
+      });
+      return null;
+    }
 
     let data: GetCategoryResponse;