@akinon/next 1.92.0-rc.9 → 1.92.0-snapshot-ZERO-3448-20250616104958

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/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/instrumentation/node.ts

@@ -4,19 +4,17 @@ import { Resource } from '@opentelemetry/resources';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
 
-if (process.env.NODE_ENV === 'development') {
-  const sdk = new NodeSDK({
-    resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
-    }),
-    spanProcessor: new SimpleSpanProcessor(
-      new OTLPTraceExporter({
-        url: `${
-          process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
-        }/api/traces`
-      })
-    )
-  });
+const sdk = new NodeSDK({
+  resource: new Resource({
+    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
+  }),
+  spanProcessor: new SimpleSpanProcessor(
+    new OTLPTraceExporter({
+      url: `${
+        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
+      }/api/traces`
+    })
+  )
+});
 
-  sdk.start();
-}
+sdk.start();

package/lib/cache.ts

@@ -31,8 +31,6 @@ export const CacheKey = {
     `category_${pk}_${encodeURIComponent(
       JSON.stringify(searchParams)
     )}${hashCacheKey(headers)}`,
-  Basket: (namespace?: string) => `basket${namespace ? `_${namespace}` : ''}`,
-  AllBaskets: () => 'all_baskets',
   CategorySlug: (slug: string) => `category_${slug}`,
   SpecialPage: (
     pk: number,

package/middlewares/complete-gpay.ts

@@ -145,8 +145,7 @@ const withCompleteGpay =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-gpay',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/complete-masterpass.ts

@@ -145,8 +145,7 @@ const withCompleteMasterpass =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-masterpass',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,