@akinon/next 1.92.0-rc.9 → 1.92.0-snapshot-ZERO-3449-20250618101111

package/api/similar-product-list.ts

@@ -0,0 +1,63 @@
+import { NextRequest, NextResponse } from 'next/server';
+import Settings from 'settings';
+
+export async function GET(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const dynamicFilter = request.headers.get('x-search-dynamic-filter');
+    const dynamicExclude = request.headers.get('x-search-dynamic-exclude');
+
+    if (!dynamicFilter && !dynamicExclude) {
+      return NextResponse.json(
+        {
+          error:
+            'Missing x-search-dynamic-filter or x-search-dynamic-exclude header'
+        },
+        { status: 400 }
+      );
+    }
+
+    if (Settings.commerceUrl === 'default') {
+      return NextResponse.json(
+        { error: 'Commerce URL is not configured' },
+        { status: 500 }
+      );
+    }
+
+    const queryString = searchParams.toString();
+    const apiUrl = `${Settings.commerceUrl}/list${
+      queryString ? `?${queryString}` : ''
+    }`;
+
+    const headers: Record<string, string> = {
+      Accept: 'application/json',
+      'Content-Type': 'application/json'
+    };
+
+    if (dynamicFilter) {
+      headers['x-search-dynamic-filter'] = dynamicFilter;
+    } else if (dynamicExclude) {
+      headers['x-search-dynamic-exclude'] = dynamicExclude;
+    }
+
+    const response = await fetch(apiUrl, {
+      method: 'GET',
+      headers
+    });
+
+    if (!response.ok) {
+      return NextResponse.json(
+        { error: `API request failed with status: ${response.status}` },
+        { status: response.status }
+      );
+    }
+
+    const data = await response.json();
+    return NextResponse.json(data);
+  } catch (error) {
+    return NextResponse.json(
+      { error: (error as Error).message },
+      { status: 500 }
+    );
+  }
+}

package/api/similar-products.ts

@@ -0,0 +1,109 @@
+import { NextResponse } from 'next/server';
+import Settings from 'settings';
+
+const IMAGE_SEARCH_API_URL = Settings.commerceUrl + '/image-search/';
+
+const errorResponse = (message: string, status: number) => {
+  return NextResponse.json({ error: message }, { status });
+};
+
+export async function GET(request: Request) {
+  const { searchParams } = new URL(request.url);
+  const limit = searchParams.get('limit') || '20';
+  const url = searchParams.get('url');
+  const excludedProductIds = searchParams.get('excluded_product_ids');
+
+  if (!url) {
+    return errorResponse('URL parameter is required', 400);
+  }
+
+  if (Settings.commerceUrl === 'default') {
+    return errorResponse('Commerce URL is not configured', 500);
+  }
+
+  const apiParams = new URLSearchParams();
+  apiParams.append('limit', limit);
+  apiParams.append('url', url);
+
+  if (excludedProductIds) {
+    apiParams.append('excluded_product_ids', excludedProductIds);
+  }
+
+  const apiUrl = `${IMAGE_SEARCH_API_URL}?${apiParams.toString()}`;
+
+  try {
+    const response = await fetch(apiUrl, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json'
+      }
+    });
+
+    if (!response.ok) {
+      return errorResponse(
+        `API request failed with status: ${response.status}`,
+        response.status
+      );
+    }
+
+    const responseText = await response.text();
+
+    return NextResponse.json(JSON.parse(responseText));
+  } catch (error) {
+    return errorResponse((error as Error).message, 500);
+  }
+}
+
+export async function POST(request: Request) {
+  const { searchParams } = new URL(request.url);
+  const limit = searchParams.get('limit') || '20';
+
+  if (Settings.commerceUrl === 'default') {
+    return errorResponse('Commerce URL is not configured', 500);
+  }
+
+  let requestBody;
+  try {
+    requestBody = await request.json();
+  } catch (error) {
+    return errorResponse('Invalid JSON in request body', 400);
+  }
+
+  if (!requestBody.image) {
+    return errorResponse('Image data is required in request body', 400);
+  }
+
+  const apiParams = new URLSearchParams();
+  apiParams.append('limit', limit);
+
+  const apiUrl = `${IMAGE_SEARCH_API_URL}?${apiParams.toString()}`;
+
+  const bodyData: any = { image: requestBody.image };
+
+  if (requestBody.excluded_product_ids) {
+    bodyData.excluded_product_ids = requestBody.excluded_product_ids;
+  }
+
+  try {
+    const response = await fetch(apiUrl, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json'
+      },
+      body: JSON.stringify(bodyData)
+    });
+
+    if (!response.ok) {
+      return errorResponse(
+        `API request failed with status: ${response.status}`,
+        response.status
+      );
+    }
+
+    const responseData = await response.json();
+    return NextResponse.json(responseData);
+  } catch (error) {
+    return errorResponse((error as Error).message, 500);
+  }
+}

package/components/accordion.tsx

@@ -7,19 +7,15 @@ import { AccordionProps } from '../types';
 
 export const Accordion = ({
   isCollapse = false,
-  collapseClassName,
   title,
   subTitle,
   icons = ['chevron-up', 'chevron-down'],
   iconSize = 16,
   iconColor = 'fill-[#000000]',
   children,
-  headerClassName,
   className,
   titleClassName,
-  subTitleClassName,
-  dataTestId,
-  contentClassName
+  dataTestId
 }: AccordionProps) => {
   const [collapse, setCollapse] = useState(isCollapse);
 
@@ -31,22 +27,15 @@ export const Accordion = ({
       )}
     >
       <div
-        className={twMerge(
-          'flex items-center justify-between cursor-pointer',
-          headerClassName
-        )}
+        className="flex items-center justify-between cursor-pointer"
         onClick={() => setCollapse(!collapse)}
         data-testid={dataTestId}
       >
-        <div className={twMerge('flex flex-col', contentClassName)}>
+        <div className="flex flex-col">
           {title && (
             <h3 className={twMerge('text-sm', titleClassName)}>{title}</h3>
           )}
-          {subTitle && (
-            <h4 className={twMerge('text-xs text-gray-700', subTitleClassName)}>
-              {subTitle}
-            </h4>
-          )}
+          {subTitle && <h4 className="text-xs text-gray-700">{subTitle}</h4>}
         </div>
 
         {icons && (
@@ -57,11 +46,7 @@ export const Accordion = ({
           />
         )}
       </div>
-      {collapse && (
-        <div className={twMerge('mt-3 text-sm', collapseClassName)}>
-          {children}
-        </div>
-      )}
+      {collapse && <div className="mt-3 text-sm">{children}</div>}
     </div>
   );
 };

package/components/file-input.tsx

@@ -1,70 +1,8 @@
-import { useState } from 'react';
 import { forwardRef } from 'react';
-import { useLocalization } from '@akinon/next/hooks';
-import { twMerge } from 'tailwind-merge';
-import { FileInputProps } from '../types';
+import { FileInputProps } from '../types/index';
 
 export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
-  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>
-    );
+  function fileInput(props, ref) {
+    return <input type="file" {...props} ref={ref} />;
   }
 );

package/components/input.tsx

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

package/components/plugin-module.tsx

@@ -20,9 +20,7 @@ enum Plugin {
   B2B = 'pz-b2b',
   Akifast = 'pz-akifast',
   MultiBasket = 'pz-multi-basket',
-  SavedCard = 'pz-saved-card',
-  Hepsipay = 'pz-hepsipay',
-  FlowPayment = 'pz-flow-payment'
+  SavedCard = 'pz-saved-card'
 }
 
 export enum Component {
@@ -47,9 +45,7 @@ export enum Component {
   AkifastQuickLoginButton = 'QuickLoginButton',
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
-  SavedCard = 'SavedCardOption',
-  Hepsipay = 'Hepsipay',
-  FlowPayment = 'FlowPayment'
+  SavedCard = 'SavedCardOption'
 }
 
 const PluginComponents = new Map([
@@ -82,9 +78,7 @@ const PluginComponents = new Map([
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
-  [Plugin.SavedCard, [Component.SavedCard]],
-  [Plugin.Hepsipay, [Component.Hepsipay]],
-  [Plugin.FlowPayment, [Component.FlowPayment]]
+  [Plugin.SavedCard, [Component.SavedCard]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -149,10 +143,6 @@ 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'}`);
             }
           } catch (error) {
             logger.error(error);

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

@@ -62,17 +62,6 @@ 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/similar-products.ts

@@ -0,0 +1,122 @@
+import { api } from './api';
+import { product } from '../urls';
+import {
+  Product,
+  Facet,
+  FacetChoice,
+  SortOption,
+  Pagination
+} from '@akinon/next/types/commerce';
+
+export interface SimilarProductsResponse {
+  product_ids?: number[];
+  productIds?: number[];
+  similar_products?: Array<{ product_id: number }>;
+  [key: string]: any;
+}
+
+export interface SimilarProductsListResponse {
+  pagination: Pagination;
+  facets: Facet[];
+  sorters: SortOption[];
+  search_text: string | null;
+  products: Product[];
+  [key: string]: any;
+}
+
+export const similarProductsApi = api.injectEndpoints({
+  endpoints: (build) => ({
+    getSimilarProductsByUrl: build.query<
+      SimilarProductsResponse,
+      { url: string; limit?: number; excluded_product_ids?: number[] }
+    >({
+      query: ({ url, limit = 20, excluded_product_ids }) => {
+        const params = new URLSearchParams();
+        params.append('limit', String(limit));
+        params.append('url', url);
+
+        if (excluded_product_ids && excluded_product_ids.length > 0) {
+          params.append('excluded_product_ids', excluded_product_ids.join(','));
+        }
+
+        return {
+          url: `/api${product.similarProducts(params.toString())}`,
+          method: 'GET',
+          headers: {
+            Accept: 'application/json'
+          }
+        };
+      }
+    }),
+
+    getSimilarProductsByImage: build.mutation<
+      SimilarProductsResponse,
+      { image: string; limit?: number; excluded_product_ids?: number[] }
+    >({
+      query: ({ image, limit = 20, excluded_product_ids }) => {
+        const params = new URLSearchParams();
+        params.append('limit', String(limit));
+
+        return {
+          url: `/api${product.similarProducts(params.toString())}`,
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            Accept: 'application/json'
+          },
+          body: JSON.stringify({ image, excluded_product_ids })
+        };
+      }
+    }),
+
+    getSimilarProductsList: build.query<
+      SimilarProductsListResponse,
+      {
+        filter: string;
+        searchParams?: Record<string, string>;
+        isExclude?: boolean;
+      }
+    >({
+      query: ({ filter, searchParams = {}, isExclude = false }) => {
+        const params = new URLSearchParams(searchParams);
+        const queryString = params.toString();
+
+        const headerName = isExclude
+          ? 'x-search-dynamic-exclude'
+          : 'x-search-dynamic-filter';
+
+        return {
+          url: `/api${product.similarProductsList(queryString)}`,
+          headers: {
+            [headerName]: filter
+          }
+        };
+      },
+      serializeQueryArgs: ({ queryArgs }) => {
+        const { filter, searchParams = {}, isExclude = false } = queryArgs;
+        const sortedParams = Object.keys(searchParams)
+          .sort()
+          .reduce((acc, key) => {
+            acc[key] = searchParams[key];
+            return acc;
+          }, {} as Record<string, string>);
+
+        return JSON.stringify({
+          filter,
+          searchParams: sortedParams,
+          isExclude
+        });
+      }
+    })
+  }),
+  overrideExisting: true
+});
+
+export const {
+  useGetSimilarProductsByUrlQuery,
+  useGetSimilarProductsByImageMutation,
+  useGetSimilarProductsListQuery,
+  useLazyGetSimilarProductsListQuery
+} = similarProductsApi;
+
+export type { Product, Facet, FacetChoice, SortOption, Pagination };

package/data/urls.ts

@@ -182,7 +182,11 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`
+    `/bundle-product/${productPk}/?${queryString}`,
+  similarProducts: (params?: string) =>
+    `/similar-products${params ? `?${params}` : ''}`,
+  similarProductsList: (params?: string) =>
+    `/similar-product-list${params ? `?${params}` : ''}`
 };
 
 export const wishlist = {

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

@@ -72,13 +72,10 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT
+    process.env.CACHE_PORT,
+    process.env.CACHE_SECRET
   ];
 
-  if (!settings.usePrettyUrlRoute) {
-    requiredVariableValues.push(process.env.CACHE_SECRET);
-  }
-
   if (
     !requiredVariableValues.every((v) => v) &&
     process.env.NODE_ENV === 'production'

package/hooks/index.ts

@@ -11,3 +11,5 @@ export * from './use-payment-options';
 export * from './use-pagination';
 export * from './use-message-listener';
 export * from './use-sentry-uncaught-errors';
+export * from './use-similar-products';
+export * from './use-image-cropper';