@akinon/projectzero 1.102.0-rc.79 → 1.102.0

package/app-template/src/app/[commerce]/[locale]/[currency]/product/[pk]/page.tsx

@@ -13,87 +13,89 @@ export async function generateMetadata({
   let result: Metadata = {};
 
   try {
-    const productData = await getProductData({
+    const { data } = await getProductData({
       pk: params.pk,
       searchParams
     });
 
-    if (!productData || !productData.data || !productData.data.product) {
-      return result;
-    }
+    const product = data?.product;
 
-    const { product } = productData.data;
+    if (!product) {
+      return {};
+    }
 
     result = {
       title: product.name,
-      description: String(product.attributes.description),
+      description: String(product.attributes?.description),
       twitter: {
         title: product.name,
-        description: String(product.attributes.description)
+        description: String(product.attributes?.description)
       },
       openGraph: {
         title: product.name,
-        description: String(product.attributes.description),
+        description: String(product.attributes?.description),
         images: product.productimage_set?.map((item) => ({
           url: item.image
         }))
       }
     };
-    // eslint-disable-next-line no-empty
-  } catch (error) {}
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
+  }
 
   return result;
 }
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  let productData;
-  let deliveryReturn;
+  if (params.pk === undefined || isNaN(Number(params.pk))) {
+    notFound();
+  }
 
   try {
-    [productData, deliveryReturn] = await Promise.all([
+    const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
       getProductData({
         pk: params.pk,
         searchParams
       }),
       getWidgetData({ slug: 'product-delivery-returns' })
     ]);
-  } catch (error) {
-    return notFound();
-  }
-
-  // If product data is not found, return 404
-  if (!productData || !productData.data || !productData.data.product) {
-    return notFound();
-  }
 
-  const { data, breadcrumbData } = productData;
-  const jsonLd = generateJsonLd(data.product);
+    const jsonLd = generateJsonLd(data.product);
 
-  return (
-    <>
-      <ProductLayout data={data} breadcrumbData={breadcrumbData}>
-        <div className="flex flex-col items-center">
-          <h1
-            className="mt-4 text-2xl text-center md:mt-0"
-            data-testid="product-name"
-          >
-            {data.product.name}
-          </h1>
+    return (
+      <>
+        <ProductLayout data={data} breadcrumbData={breadcrumbData}>
+          <div className="flex flex-col items-center">
+            <h1
+              className="mt-4 text-2xl text-center md:mt-0"
+              data-testid="product-name"
+            >
+              {data.product.name}
+            </h1>
 
-          <ProductInfo data={data} />
+            <ProductInfo data={data} />
 
-          <AccordionWrapper
-            data={data}
-            deliveryReturn={deliveryReturn?.attributes}
-          />
-        </div>
-      </ProductLayout>
-      <script
-        type="application/ld+json"
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
-      />
-    </>
-  );
+            <AccordionWrapper
+              data={data}
+              deliveryReturn={deliveryReturn?.attributes}
+            />
+          </div>
+        </ProductLayout>
+        <script
+          type="application/ld+json"
+          dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
+        />
+      </>
+    );
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
+  }
 }
 
 export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/special-page/[pk]/page.tsx

@@ -7,30 +7,29 @@ import SpecialPageCarousel from '@theme/widgets/special-page-carousel';
 import { notFound } from 'next/navigation';
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  let data;
-
   try {
-    data = await getSpecialPageData({ pk: params.pk, searchParams });
-  } catch (error) {
-    return notFound();
-  }
+    const data = await getSpecialPageData({ pk: params.pk, searchParams });
 
-  if (!data) {
-    return notFound();
+    return (
+      <>
+        <CategoryLayout data={data}>
+          {data.special_page && (
+            <>
+              <SpecialPageBanner data={data.special_page} />
+              <SpecialPageCarousel
+                slug={data.special_page.video_embedded_code}
+              />
+            </>
+          )}
+        </CategoryLayout>
+      </>
+    );
+  } catch (error: unknown) {
+    if ((error as Error & { status?: number })?.status === 404) {
+      notFound();
+    }
+    throw error;
   }
-
-  return (
-    <>
-      <CategoryLayout data={data}>
-        {data.special_page && (
-          <>
-            <SpecialPageBanner data={data.special_page} />
-            <SpecialPageCarousel slug={data.special_page.video_embedded_code} />
-          </>
-        )}
-      </CategoryLayout>
-    </>
-  );
 }
 
 export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/api/form/[...id]/route.ts

@@ -1 +1,7 @@
-export * from '@akinon/next/api/form';
+import { NextResponse } from 'next/server';
+
+export async function POST() {
+  // TODO: Handle Form Data
+
+  return NextResponse.json({ message: 'ok' });
+}

package/app-template/src/assets/fonts/pz-icon.css

@@ -152,6 +152,3 @@ url("./pz-icon.svg?db4ba799c4ca72f4bb855458e0cd19ee#pz-icon") format("svg");
 .pz-icon-whatsapp:before {
   content: "\f12c";
 }
-.pz-icon-camera:before {
-  content: "\f12d";
-}

package/app-template/src/components/__tests__/link.test.tsx

@@ -30,8 +30,6 @@ describe('Link Component', () => {
     wrapper = container;
   });
 
-  wrapper;
-
   it('should render without error', () => {
     const link = screen.getByRole('link');
 

package/app-template/src/components/accordion.tsx

@@ -1,25 +1,33 @@
 'use client';
 
-import { useState } from 'react';
+import { ReactNode, useState } from 'react';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
-import { AccordionProps } from './types';
+
+type AccordionProps = {
+  isCollapse?: boolean;
+  title?: string;
+  subTitle?: string;
+  icons?: string[];
+  iconSize?: number;
+  iconColor?: string;
+  children?: ReactNode;
+  className?: string;
+  titleClassName?: string;
+  dataTestId?: string;
+};
 
 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 +39,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 +58,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/app-template/src/components/currency-select.tsx

@@ -70,7 +70,6 @@ export const CurrencySelect = (props: CurrencySelectProps) => {
               onClick={confirmModalHandleClick}
               appearance="filled"
               className="font-medium px-10 py-4 h-12"
-              data-testid="currency-modal-confirm"
             >
               {t('common.currency_modal.continue')}
             </Button>

package/app-template/src/components/file-input.tsx

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

package/app-template/src/components/generate-form-fields.tsx

@@ -7,7 +7,6 @@ import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
 import DynamicForm from './dynamic-form';
-
 import {
   AllFieldClassesType,
   FieldPropertiesType,
@@ -15,7 +14,6 @@ import {
   FormPropertiesType,
   Schema
 } from '@akinon/next/types';
-import { useLocalization } from '@akinon/next/hooks';
 
 export function GenerateFormFields({
   schema,
@@ -30,14 +28,8 @@ export function GenerateFormFields({
   formProperties: FormPropertiesType;
   submitButtonText: string;
 }) {
-  const { t } = useLocalization();
   const [fields, setFields] = useState([]);
   const [loading, setIsLoading] = useState(true);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [submitStatus, setSubmitStatus] = useState<
-    'idle' | 'success' | 'error'
-  >('idle');
-  const [submitMessage, setSubmitMessage] = useState('');
 
   const generateValidationSchema = () => {
     const schemaObject = {};
@@ -88,7 +80,6 @@ export function GenerateFormFields({
   const {
     handleSubmit,
     register,
-    reset,
     formState: { errors }
   } = useForm<FormField>({
     resolver: yupResolver(generateValidationSchema())
@@ -117,10 +108,6 @@ export function GenerateFormFields({
   }, [schema, fieldProperties]);
 
   const onSubmit = async (data) => {
-    setIsSubmitting(true);
-    setSubmitStatus('idle');
-    setSubmitMessage('');
-
     try {
       const formData = new FormData();
 
@@ -128,25 +115,12 @@ export function GenerateFormFields({
         formData.append(key, data[key]);
       });
 
-      const response = await fetch(formProperties.actionUrl, {
+      fetch(formProperties.actionUrl, {
         method: 'POST',
         body: formData
       });
-
-      if (response.ok) {
-        setSubmitStatus('success');
-        setSubmitMessage(t('common.forms.success'));
-        reset();
-      } else {
-        setSubmitStatus('error');
-        setSubmitMessage(t('common.forms.error'));
-      }
     } catch (error) {
-      console.error(t('common.forms.submit_error'), error);
-      setSubmitStatus('error');
-      setSubmitMessage(t('common.forms.error'));
-    } finally {
-      setIsSubmitting(false);
+      console.error('Form submit error:', error);
     }
   };
 
@@ -363,22 +337,9 @@ export function GenerateFormFields({
           <LoaderSpinner />
         ) : (
           <>
-            {submitStatus === 'success' && (
-              <div className="mb-4 p-3 bg-green-100 border border-green-400 text-green-700 rounded">
-                {submitMessage}
-              </div>
-            )}
-
-            {submitStatus === 'error' && (
-              <div className="mb-4 p-3 bg-red-100 border border-red-400 text-red-700 rounded">
-                {submitMessage}
-              </div>
-            )}
-
             {fields.map((field: FormField) => generateField(field))}
-
-            <Button type="submit" className="w-full" disabled={isSubmitting}>
-              {isSubmitting ? t('common.forms.sending') : submitButtonText}
+            <Button type="submit" className="w-full">
+              {submitButtonText}
             </Button>
           </>
         )}

package/app-template/src/components/input.tsx

@@ -48,13 +48,7 @@ export const Input = forwardRef<
     props.className
   );
 
-  const inputProps: {
-    id?: string;
-    ref?: Ref<HTMLInputElement>;
-    className?: string;
-    onFocus?: () => void;
-    onBlur?: (event: FocusEvent<HTMLInputElement>) => void;
-  } = {
+  const inputProps: any = {
     id,
     ref,
     className: inputClass,
@@ -78,8 +72,7 @@ export const Input = forwardRef<
               hasFloatingLabel,
             'mb-2': !hasFloatingLabel,
             '-translate-y-2 bg-white inline-flex h-auto':
-              hasFloatingLabel &&
-              (focused || hasValue || props.value || props.format)
+              hasFloatingLabel && (focused || hasValue)
           })
         )}
       >

package/app-template/src/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 '@theme/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/app-template/src/components/pagination.tsx

@@ -125,7 +125,6 @@ export const Pagination = (props: PaginationProps) => {
       setPrevPage(1);
       setNextPage(1);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [page]);
 
   useEffect(() => {

package/app-template/src/components/price.tsx

@@ -56,7 +56,7 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
 
   const currentCurrencyDecimalScale = Settings.localization.currencies.find(
     (currency) => currency.code === currencyCode_
-  )?.decimalScale;
+  ).decimalScale;
 
   return (
     <NumericFormat

package/app-template/src/components/select.tsx

@@ -14,18 +14,14 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
     error,
     label,
     required = false,
-    labelClassName,
     ...rest
   } = props;
 
   return (
     <label
-      className={twMerge(
-        clsx('flex flex-col relative text-xs text-gray-800', {
-          'pl-7': icon
-        }),
-        labelClassName
-      )}
+      className={clsx('flex flex-col relative text-xs text-gray-800', {
+        'pl-7': icon
+      })}
     >
       {icon && (
         <Icon
@@ -36,40 +32,32 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
       )}
 
       {label && (
-        <span className={twMerge('mb-1', labelClassName)}>
+        <span className="mb-1">
           {label} {required && <span className="text-secondary">*</span>}
         </span>
       )}
-      <div className="relative">
-        <select
-          {...rest}
-          ref={ref}
-          className={twMerge(
-            clsx(
-              'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
-              !borderless &&
-                'border border-gray-200 transition-all duration-150 hover:border-primary',
-              'appearance-none bg-transparent'
-            ),
-            className
-          )}
-        >
-          {options?.map((option) => (
-            <option
-              key={option.value}
-              value={option.value}
-              className={option.class}
-            >
-              {option.label}
-            </option>
-          ))}
-        </select>
-        <div className="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
-          <svg className="h-4 w-4 fill-current" viewBox="0 0 20 20">
-            <path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z" />
-          </svg>
-        </div>
-      </div>
+      <select
+        {...rest}
+        ref={ref}
+        className={twMerge(
+          clsx(
+            'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
+            !borderless &&
+              'border border-gray-200 transition-all duration-150 hover:border-primary'
+          ),
+          className
+        )}
+      >
+        {options?.map((option) => (
+          <option
+            key={option.value}
+            value={option.value}
+            className={option.class}
+          >
+            {option.label}
+          </option>
+        ))}
+      </select>
       {error && (
         <span className="mt-1 text-sm text-error">{error.message}</span>
       )}