@akinon/projectzero 1.98.0 → 1.99.0-rc.66

package/app-template/src/utils/variant-validation.ts

@@ -0,0 +1,41 @@
+import React from 'react';
+import { Trans } from '@akinon/next/components/trans';
+import { VariantType } from '@akinon/next/types';
+
+export const isVariantSelectionComplete = (variants: VariantType[]): boolean => {
+  return variants?.every((variant) =>
+    variant?.options.some((opt) => opt.is_selected)
+  );
+};
+
+export const getUnselectedVariant = (variants: VariantType[]): VariantType | undefined => {
+  return variants.find((variant) =>
+    variant.options.every((opt) => !opt.is_selected)
+  );
+};
+
+export const createVariantErrorMessage = (unselectedVariant: VariantType) => {
+  const TransComponent = Trans as any;
+  return React.createElement(
+    TransComponent,
+    {
+      i18nKey: "product.please_select_variant",
+      components: {
+        VariantName: React.createElement('span', {}, unselectedVariant.attribute_name)
+      }
+    }
+  );
+};
+
+export const validateVariantSelection = (variants: VariantType[]) => {
+  const unselectedVariant = getUnselectedVariant(variants);
+  
+  if (unselectedVariant) {
+    return {
+      isValid: false,
+      errorMessage: createVariantErrorMessage(unselectedVariant)
+    };
+  }
+
+  return { isValid: true, errorMessage: null };
+};

package/app-template/src/views/account/address-form.tsx

@@ -259,23 +259,25 @@ export const AddressForm = (props: Props) => {
       {/* TODO: Fix select and textarea components */}
 
       <Select
-        className="w-full border-gray-500 text-sm mt-2"
+        className="w-full border-gray-500 text-sm"
         options={countryOptions}
         {...register('country')}
         error={errors.country}
         data-testid="address-form-country"
         label={t('account.address_book.form.country.title')}
+        labelClassName="mb-3"
         required
       />
 
       {city && (
         <Select
-          className="w-full border-gray-500 text-sm mt-2"
+          className="w-full border-gray-500 text-sm"
           options={cityOptions}
           {...register('city')}
           error={errors.city}
           data-testid="address-form-city"
           label={t('account.address_book.form.province.title')}
+          labelClassName="mb-3"
           required
         />
       )}
@@ -283,24 +285,26 @@ export const AddressForm = (props: Props) => {
         <div className="flex gap-4">
           <div className="flex-1">
             <Select
-              className="w-full border-gray-500 text-sm mt-2"
+              className="w-full border-gray-500 text-sm"
               options={townshipOptions}
               {...register('township')}
               error={errors.township}
               data-testid="address-form-township"
               label={t('account.address_book.form.township.title')}
+              labelClassName="mb-3"
               required
             />
           </div>
           {district && (
             <div className="flex-1">
               <Select
-                className="w-full border-gray-500 text-sm mt-2"
+                className="w-full border-gray-500 text-sm"
                 options={districtOptions}
                 {...register('district')}
                 error={errors.district}
                 data-testid="address-form-district"
                 label={t('account.address_book.form.district.title')}
+                labelClassName="mb-3"
                 required
               />
             </div>

package/app-template/src/views/account/content-header.tsx

@@ -31,13 +31,13 @@ export const ContentHeader = (props: Props) => {
       </h3>
       <Select
         onChange={handleChange}
-        className="w-full mb-4 md:mb-0 md:w-56 md:mr-4 text-xs"
+        className="w-full mb-4 md:mb-0 md:w-56 text-xs"
         options={orders}
         data-testid="account-orders-header-select"
       ></Select>
       <Button
         className={clsx(
-          'w-full md:w-56',
+          'w-full md:w-56 md:ms-4',
           isButtonDisabled &&
             'hover:bg-black hover:text-white disabled:opacity-75'
         )}

package/app-template/src/views/basket/basket-content.tsx

@@ -0,0 +1,106 @@
+'use client';
+
+import { useLocalization } from '@akinon/next/hooks';
+import { Basket } from '@akinon/next/types';
+import { Button, LoaderSpinner, Link } from '@theme/components';
+import { BasketItem, Summary } from '@theme/views/basket';
+import { ROUTES } from '@theme/routes';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { useEffect, useState } from 'react';
+import { pushCartView } from '@theme/utils/gtm';
+
+interface BasketContentProps {
+  initialBasket: Basket;
+  multiBasket: boolean;
+}
+
+export function BasketContent({
+  initialBasket,
+  multiBasket
+}: BasketContentProps) {
+  const { t } = useLocalization();
+  const [basket, setBasket] = useState<Basket>(initialBasket);
+
+  useEffect(() => {
+    if (basket) {
+      const products = basket.basketitem_set.map((basketItem) => ({
+        ...basketItem.product
+      }));
+      pushCartView(products);
+    }
+  }, [basket]);
+
+  const handleBasketUpdate = (updatedBasket: Basket) => {
+    setBasket(updatedBasket);
+  };
+
+  if (!basket) {
+    return (
+      <div className="flex justify-center w-full">
+        <LoaderSpinner />
+      </div>
+    );
+  }
+
+  return (
+    <div className="max-w-screen-xl p-4 flex flex-col text-primary-800 lg:p-8 xl:flex-row xl:mx-auto">
+      {basket.basketitem_set && basket.basketitem_set.length > 0 ? (
+        <>
+          <div className="flex-1 xl:mr-16">
+            <div className="flex items-center justify-between py-2 border-b border-gray-200 lg:py-3">
+              <h2 className="text-xl lg:text-2xl font-light">
+                {t('basket.my_cart')}
+              </h2>
+              <Link
+                href={ROUTES.HOME}
+                className="text-xs hover:text-secondary-500"
+              >
+                {t('basket.back_to_shopping')}
+              </Link>
+            </div>
+            <ul>
+              {multiBasket ? (
+                <PluginModule
+                  component={Component.MultiBasket}
+                  props={{
+                    BasketItem,
+                    onBasketUpdate: handleBasketUpdate
+                  }}
+                />
+              ) : (
+                basket.basketitem_set.map((basketItem, index) => (
+                  <BasketItem
+                    key={index}
+                    basketItem={basketItem}
+                    onBasketUpdate={handleBasketUpdate}
+                  />
+                ))
+              )}
+            </ul>
+          </div>
+          <Summary basket={basket} onBasketUpdate={handleBasketUpdate} />
+        </>
+      ) : (
+        <div className="flex flex-col items-center container max-w-screen-sm py-4 px-4 xs:py-6 xs:px-6 sm:py-8 sm:px-8 lg:max-w-screen-xl">
+          <h1
+            className="w-full text-xl font-light text-secondary text-center sm:text-2xl"
+            data-testid="basket-empty"
+          >
+            {t('basket.empty.title')}
+          </h1>
+
+          <div className="w-full text-sm text-black-800 text-center my-4 mb-2 sm:text-base">
+            <p>{t('basket.empty.content_first')}</p>
+            <p>{t('basket.empty.content_second')}.</p>
+          </div>
+
+          <Link href={ROUTES.HOME} passHref>
+            <Button className="px-10 mt-2" appearance="filled">
+              {t('basket.empty.button')}
+            </Button>
+          </Link>
+        </div>
+      )}
+    </div>
+  );
+}

package/app-template/src/views/basket/basket-item.tsx

@@ -3,7 +3,7 @@ import {
   useUpdateQuantityMutation
 } from '@akinon/next/data/client/basket';
 import { useAppDispatch } from '@akinon/next/redux/hooks';
-import { BasketItem as BasketItemType } from '@akinon/next/types';
+import { Basket, BasketItem as BasketItemType } from '@akinon/next/types';
 import { Price, Button, Icon, Modal, Select, Link } from '@theme/components';
 import { useState } from 'react';
 import { useAddFavoriteMutation } from '@akinon/next/data/client/wishlist';
@@ -19,11 +19,12 @@ import { pushRemoveFromCart } from '@theme/utils/gtm';
 interface Props {
   basketItem?: BasketItemType;
   namespace?: string;
+  onBasketUpdate?: (basket: Basket) => void;
 }
 
 export const BasketItem = (props: Props) => {
   const { t } = useLocalization();
-  const { basketItem, namespace } = props;
+  const { basketItem, namespace, onBasketUpdate } = props;
   const [updateQuantityMutation] = useUpdateQuantityMutation();
   const dispatch = useAppDispatch();
   const [isRemoveBasketModalOpen, setRemoveBasketModalOpen] = useState(false);
@@ -49,19 +50,21 @@ export const BasketItem = (props: Props) => {
       requestParams.namespace = namespace;
     }
 
-    await updateQuantityMutation(requestParams)
-      .unwrap()
-      .then((data) =>
-        dispatch(
-          basketApi.util.updateQueryData(
-            'getBasket',
-            undefined,
-            (draftBasket) => {
-              Object.assign(draftBasket, data.basket);
-            }
-          )
+    try {
+      const response = await updateQuantityMutation(requestParams).unwrap();
+      dispatch(
+        basketApi.util.updateQueryData(
+          'getBasket',
+          undefined,
+          (draftBasket) => {
+            Object.assign(draftBasket, response.basket);
+          }
         )
       );
+      onBasketUpdate?.(response.basket);
+    } catch (error) {
+      console.error('Error updating quantity:', error);
+    }
   };
 
   const deleteProduct = async (productPk?: number) => {

package/app-template/src/views/basket/summary.tsx

@@ -18,6 +18,7 @@ import clsx from 'clsx';
 
 interface Props {
   basket: Basket;
+  onBasketUpdate?: (basket: Basket) => void;
 }
 
 const voucherCodeFormSchema = (t) =>
@@ -27,7 +28,7 @@ const voucherCodeFormSchema = (t) =>
 
 export const Summary = (props: Props) => {
   const { t } = useLocalization();
-  const { basket } = props;
+  const { basket, onBasketUpdate } = props;
   const router = useRouter();
   const {
     register,
@@ -53,7 +54,7 @@ export const Summary = (props: Props) => {
   const removeVoucherCode = () => {
     removeVoucherCodeMutation()
       .unwrap()
-      .then((basket) =>
+      .then((basket) => {
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -62,8 +63,9 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        )
-      )
+        );
+        onBasketUpdate?.(basket);
+      })
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });
@@ -74,7 +76,7 @@ export const Summary = (props: Props) => {
       voucher_code: data.voucherCode
     })
       .unwrap()
-      .then((basket) =>
+      .then((basket) => {
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -83,8 +85,9 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        )
-      )
+        );
+        onBasketUpdate?.(basket);
+      })
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });

package/app-template/src/views/guest-login/index.tsx

@@ -51,9 +51,14 @@ const GuestLogin = () => {
       ).unwrap();
 
       Object.keys(response?.errors || {}).forEach((key) => {
+        const errorValue = response?.errors[key];
+        const message = Array.isArray(errorValue)
+          ? errorValue.join(', ')
+          : errorValue || '';
+
         setError(key as keyof GuestLoginFormParams, {
           type: 'custom',
-          message: response?.errors[key]?.join(', ')
+          message
         });
       });
     } catch (error) {

package/app-template/src/views/header/action-menu.tsx

@@ -76,7 +76,7 @@ export default function ActionMenu() {
               : 'bg-secondary-500 text-white'
           )}
         >
-          {totalQuantity}
+          <span data-testid="header-basket-count">{totalQuantity}</span>
         </Badge>
       ),
       miniBasket: <MiniBasket />

package/app-template/src/views/header/search/index.tsx

@@ -4,11 +4,11 @@ import { useEffect, useRef, useState } from 'react';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { closeSearch } from '@akinon/next/redux/reducers/header';
 import clsx from 'clsx';
-
-import { Icon } from '@theme/components';
+import { Icon, Input } from '@theme/components';
 import Results from './results';
 import { ROUTES } from '@theme/routes';
 import { useLocalization, useRouter } from '@akinon/next/hooks';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 export default function Search() {
   const { t } = useLocalization();
@@ -41,6 +41,14 @@ export default function Search() {
     };
   }, [isSearchOpen, dispatch]);
 
+  const handleSearchTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setSearchText(e.target.value);
+  };
+
+  const handleCloseSearch = () => {
+    dispatch(closeSearch());
+  };
+
   return (
     <>
       <div
@@ -66,9 +74,9 @@ export default function Search() {
               {t('common.search.results_for')}
             </span>
             <div className="flex items-center">
-              <input
+              <Input
                 value={searchText}
-                onChange={(e) => setSearchText(e.target.value)}
+                onChange={handleSearchTextChange}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && searchText.trim() !== '') {
                     router.push(`${ROUTES.LIST}/?search_text=${searchText}`);
@@ -78,14 +86,18 @@ export default function Search() {
                 placeholder={t('common.search.placeholder')}
                 ref={inputRef}
               />
+
+              <PluginModule component={Component.HeaderImageSearchFeature} />
+
               <Icon
                 name="close"
                 size={14}
-                onClick={() => dispatch(closeSearch())}
+                onClick={handleCloseSearch}
                 className="cursor-pointer"
               />
             </div>
           </div>
+
           <Results searchText={searchText} />
         </div>
       </div>

package/app-template/src/views/login/index.tsx

@@ -1,10 +1,10 @@
 'use client';
 
-import { signIn, SignInOptions } from 'next-auth/react';
+import { signIn } from 'next-auth/react';
 import { useSearchParams } from 'next/navigation';
 import { useState } from 'react';
 import { ROUTES } from '@theme/routes';
-import { LoginFormType } from '@theme/types';
+import { LoginFormType, FormType, PzSignInOptions } from '@theme/types';
 import { Button, Input, Link } from '@theme/components';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import * as yup from 'yup';
@@ -79,8 +79,9 @@ export const Login = () => {
       redirect: false,
       callbackUrl: searchParams.get('callbackUrl') ?? '/',
       captchaValidated,
-      ...data
-    } as SignInOptions);
+      ...data,
+      formType: FormType.login
+    } as PzSignInOptions);
 
     if (loginResponse.error) {
       const errors: AuthError[] = JSON.parse(loginResponse.error);
@@ -109,25 +110,25 @@ export const Login = () => {
           try {
             parsedValue = JSON.parse(item.value);
           } catch {
-            parsedValue = [item.value]; 
+            parsedValue = [item.value];
           }
         } else {
-          parsedValue = item.value; 
+          parsedValue = item.value;
         }
 
         if (Array.isArray(parsedValue)) {
           setError(item.name as keyof LoginFormType, {
             type: 'custom',
-            message: parsedValue.join(', '),
+            message: parsedValue.join(', ')
           });
         } else {
           Object.keys(parsedValue).forEach((key) => {
             const fieldName = key as keyof LoginFormType;
             const errorMessages = parsedValue[key] as string[];
-    
+
             setError(fieldName, {
               type: 'custom',
-              message: errorMessages.join(', '),
+              message: errorMessages.join(', ')
             });
           });
         }
@@ -161,7 +162,7 @@ export const Login = () => {
         method="post"
         onSubmit={handleSubmit(onSubmit)}
       >
-        <input type="hidden" value="login" {...register('formType')} />
+        <input type="hidden" value={FormType.login} {...register('formType')} />
         <input type="hidden" value={locale} {...register('locale')} />
 
         <div className={clsx(errors.email ? 'mb-8' : 'mb-4')}>

package/app-template/src/views/otp-login/index.tsx

@@ -1,8 +1,8 @@
 'use client';
 
-import { signIn, SignInOptions } from 'next-auth/react';
+import { signIn } from 'next-auth/react';
 import { useState } from 'react';
-import { OtpLoginFormType } from '@theme/types';
+import { OtpLoginFormType, FormType, PzSignInOptions } from '@theme/types';
 import { Button, Input } from '@theme/components';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import * as yup from 'yup';
@@ -47,8 +47,9 @@ export const OtpLogin = () => {
     const loginResponse = await signIn('default', {
       redirect: false,
       callbackUrl: '/',
-      ...data
-    } as SignInOptions);
+      ...data,
+      formType: FormType.otpLogin
+    } as PzSignInOptions);
 
     if (loginResponse.error) {
       const errors: AuthError[] = JSON.parse(loginResponse.error);
@@ -100,7 +101,11 @@ export const OtpLogin = () => {
         {t('auth.login.title_gsm')}
       </h2>
       <form onSubmit={handleSubmit(onSubmit)}>
-        <input type="hidden" value="otpLogin" {...register('formType')} />
+        <input
+          type="hidden"
+          value={FormType.otpLogin}
+          {...register('formType')}
+        />
         <input type="hidden" value={locale} {...register('locale')} />
 
         <div className="mb-4">
@@ -109,7 +114,7 @@ export const OtpLogin = () => {
             className="h-14"
             label={t('auth.login.form.phone.placeholder')}
             type="tel"
-            format={user_phone_format.replace(/\9/g, '#')}
+            format={user_phone_format.replace(/9/g, '#')}
             mask="_"
             allowEmptyFormatting={true}
             control={control}