@akinon/projectzero 1.77.0 → 1.78.0-rc.1

package/app-template/src/views/account/orders/order-cancellation-item.tsx

@@ -8,7 +8,8 @@ export const OrderCancellationItem = ({
   item,
   value,
   onChange,
-  selectOption
+  selectOption,
+  fileInput
 }) => {
   const { t } = useLocalization();
   const checkboxStatus =
@@ -38,7 +39,6 @@ export const OrderCancellationItem = ({
     <div className="flex flex-wrap justify-between border-gray border-b mb-4 pb-3">
       <div className="flex gap-3 mb-5 lg:mb-0">
         {checkboxStatus && (
-          // TODO: Static image will change (TR)
           <Checkbox
             className="m-auto"
             data-testid="account-orders-return-checkbox"
@@ -80,7 +80,7 @@ export const OrderCancellationItem = ({
           </div>
         </div>
       </div>
-      <div className="flex flex-wrap justify-between w-full items-start lg:items-center lg:w-auto">
+      <div className="flex flex-wrap justify-between w-full items-start lg:items-center lg:w-80 gap-4">
         <div className="w-full flex flex-col lg:items-center lg:flex-row">
           {item.active_cancellation_request?.easy_return?.code && (
             <div className="flex items-center">
@@ -93,6 +93,7 @@ export const OrderCancellationItem = ({
 
           {selectOption}
         </div>
+        <div>{fileInput}</div>
       </div>
     </div>
   );

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/login/index.tsx

@@ -103,10 +103,34 @@ export const Login = () => {
       )?.data as string[];
 
       fieldErrors?.forEach((item) => {
-        setError(item.name as keyof LoginFormType, {
-          type: 'custom',
-          message: item.value.join(', ')
-        });
+        let parsedValue: Record<string, string[]> | string[] = [];
+
+        if (typeof item.value === 'string') {
+          try {
+            parsedValue = JSON.parse(item.value);
+          } catch {
+            parsedValue = [item.value]; 
+          }
+        } else {
+          parsedValue = item.value; 
+        }
+
+        if (Array.isArray(parsedValue)) {
+          setError(item.name as keyof LoginFormType, {
+            type: 'custom',
+            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(', '),
+            });
+          });
+        }
       });
 
       if (nonFieldErrors?.length) {

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

@@ -143,6 +143,7 @@ export const Register = () => {
     if (registerResponse.error) {
       const errors: AuthError[] = JSON.parse(registerResponse.error);
 
+
       if (errors.find((error) => error.type === 'captcha')) {
         if (await validateCaptcha()) {
           onSubmit(data);
@@ -164,10 +165,34 @@ export const Register = () => {
       )?.data as string[];
 
       fieldErrors?.forEach((item) => {
-        setError(item.name as keyof RegisterFormType, {
-          type: 'custom',
-          message: item.value.join(', ')
-        });
+        let parsedValue: Record<string, string[]> | string[] = [];
+
+        if (typeof item.value === 'string') {
+          try {
+            parsedValue = JSON.parse(item.value);
+          } catch {
+            parsedValue = [item.value]; 
+          }
+        } else {
+          parsedValue = item.value; 
+        }
+
+        if (Array.isArray(parsedValue)) {
+          setError(item.name as keyof RegisterFormType, {
+            type: 'custom',
+            message: parsedValue.join(', '),
+          });
+        } else {
+          Object.keys(parsedValue).forEach((key) => {
+            const fieldName = key as keyof RegisterFormType;
+            const errorMessages = parsedValue[key] as string[];
+    
+            setError(fieldName, {
+              type: 'custom',
+              message: errorMessages.join(', '),
+            });
+          });
+        }
       });
 
       if (nonFieldErrors?.length) {
@@ -303,7 +328,7 @@ export const Register = () => {
             labelStyle="floating"
             label={t('auth.register.form.phone.placeholder')}
             className="h-14"
-            format={user_phone_format.replace(/\9/g, '#')}
+            format={user_phone_format.replace(/9/g, '#')}
             allowEmptyFormatting
             mask="_"
             control={control}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.77.0",
+  "version": "1.78.0-rc.1",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {

package/app-template/sentry.edge.config.ts

@@ -1,3 +0,0 @@
-import { initSentry } from '@akinon/next/sentry';
-
-initSentry('Edge');

package/app-template/sentry.server.config.ts

@@ -1,3 +0,0 @@
-import { initSentry } from '@akinon/next/sentry';
-
-initSentry('Server');