@akinon/projectzero 1.81.0 → 1.82.0-rc.0

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.81.0",
+  "version": "1.82.0-rc.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,26 +22,26 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "1.81.0",
-    "@akinon/pz-akifast": "1.81.0",
-    "@akinon/pz-b2b": "1.81.0",
-    "@akinon/pz-basket-gift-pack": "1.81.0",
-    "@akinon/pz-bkm": "1.81.0",
-    "@akinon/pz-checkout-gift-pack": "1.81.0",
-    "@akinon/pz-click-collect": "1.81.0",
-    "@akinon/pz-credit-payment": "1.81.0",
-    "@akinon/pz-gpay": "1.81.0",
-    "@akinon/pz-masterpass": "1.81.0",
-    "@akinon/pz-one-click-checkout": "1.81.0",
-    "@akinon/pz-otp": "1.81.0",
-    "@akinon/pz-pay-on-delivery": "1.81.0",
-    "@akinon/pz-saved-card": "1.81.0",
-    "@akinon/pz-tabby-extension": "1.81.0",
-    "@akinon/pz-tamara-extension": "1.81.0",
+    "@akinon/next": "1.82.0-rc.0",
+    "@akinon/pz-akifast": "1.82.0-rc.0",
+    "@akinon/pz-b2b": "1.82.0-rc.0",
+    "@akinon/pz-basket-gift-pack": "1.82.0-rc.0",
+    "@akinon/pz-bkm": "1.82.0-rc.0",
+    "@akinon/pz-checkout-gift-pack": "1.82.0-rc.0",
+    "@akinon/pz-click-collect": "1.82.0-rc.0",
+    "@akinon/pz-credit-payment": "1.82.0-rc.0",
+    "@akinon/pz-gpay": "1.82.0-rc.0",
+    "@akinon/pz-masterpass": "1.82.0-rc.0",
+    "@akinon/pz-one-click-checkout": "1.82.0-rc.0",
+    "@akinon/pz-otp": "1.82.0-rc.0",
+    "@akinon/pz-pay-on-delivery": "1.82.0-rc.0",
+    "@akinon/pz-saved-card": "1.82.0-rc.0",
+    "@akinon/pz-tabby-extension": "1.82.0-rc.0",
+    "@akinon/pz-tamara-extension": "1.82.0-rc.0",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
-    "@sentry/nextjs": "7.116.0",
+    "@sentry/nextjs": "8.35.0",
     "dayjs": "1.11.5",
     "lossless-json": "2.0.5",
     "next": "14.2.5",
@@ -62,7 +62,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.81.0",
+    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

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

@@ -1,87 +1,14 @@
-'use client';
-
-import { useEffect } from 'react';
-import { ROUTES } from '@theme/routes';
-import { useGetBasketQuery } from '@akinon/next/data/client/basket';
-import { pushCartView } from '@theme/utils/gtm';
-import { Button, LoaderSpinner, Link } from '@theme/components';
-import { BasketItem, Summary } from '@theme/views/basket';
-import { useLocalization } from '@akinon/next/hooks';
-import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { BasketContent } from '@theme/views/basket/basket-content';
+import { getBasketData } from '@akinon/next/data/server/basket';
 import settings from '@theme/settings';
 
-export default function Page() {
-  const { data: basket, isLoading, isSuccess } = useGetBasketQuery();
-  const { t } = useLocalization();
-  const multiBasket = settings.plugins?.multiBasket ?? false;
-
-  useEffect(() => {
-    if (isSuccess) {
-      const products = basket.basketitem_set.map((basketItem) => ({
-        ...basketItem.product
-      }));
-      pushCartView(products);
-    }
-  }, [basket, isSuccess]);
-
-  return (
-    <div className="max-w-screen-xl p-4 flex flex-col text-primary-800 lg:p-8 xl:flex-row xl:mx-auto">
-      {isLoading && (
-        <div className="flex justify-center w-full">
-          <LoaderSpinner />
-        </div>
-      )}
-      {isSuccess &&
-        (basket && 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 }}
-                  />
-                ) : (
-                  basket.basketitem_set.map((basketItem, index) => (
-                    <BasketItem basketItem={basketItem} key={index} />
-                  ))
-                )}
-              </ul>
-            </div>
-            <Summary basket={basket} />
-          </>
-        ) : (
-          <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>
+export default async function Page() {
+  const { basket } = await getBasketData();
 
-            <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>
+  const multiBasket: boolean =
+    typeof settings.plugins?.multiBasket === 'boolean'
+      ? settings.plugins.multiBasket
+      : false;
 
-            <Link href={ROUTES.HOME} passHref>
-              <Button className="px-10 mt-2" appearance="filled">
-                {t('basket.empty.button')}
-              </Button>
-            </Link>
-          </div>
-        ))}
-    </div>
-  );
+  return <BasketContent initialBasket={basket} multiBasket={multiBasket} />;
 }

package/app-template/src/components/widget/widget-placeholder.tsx

@@ -0,0 +1,12 @@
+import 'server-only';
+import { DynamicWidgetContainer } from '../dynamic-widget-renderer';
+
+export default async function WidgetPlaceholder({ slug }: { slug: string }) {
+  return (
+    <>
+      <DynamicWidgetContainer />
+    </>
+  );
+
+  return <div>WidgetPlaceholder</div>;
+}

package/app-template/src/settings.js

@@ -1,6 +1,10 @@
 const { LocaleUrlStrategy } = require('@akinon/next/localization');
 const { ROUTES } = require('@theme/routes');
 
+/* IMPORTANT *
+ * In order to use one locale in the locales array and hide the default locale in the URL, you need to set the localeUrlStrategy to LocaleUrlStrategy.ShowAllLocales.
+ */
+
 const commerceUrl = encodeURI(process.env.SERVICE_BACKEND_URL ?? 'default');
 
 /** @type {import('@akinon/next/types').Settings} */
@@ -14,6 +18,7 @@ module.exports = {
     { translationKey: 'size', key: 'size' }
   ],
   localization: {
+    // If there is one locale in the locales array, the default locale will be hidden in the URL.
     locales: [
       {
         label: 'EN',
@@ -41,7 +46,7 @@ module.exports = {
       }
     ],
     defaultLocaleValue: 'en',
-    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale,
+    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale, // If there is one locale in the locales array, the default locale will be hidden in the URL and localeUrlStrategy should be set to LocaleUrlStrategy.ShowAllLocales.
     redirectToDefaultLocale: true,
     defaultCurrencyCode: 'usd'
   },

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

@@ -94,6 +94,25 @@ export const OrderCancellationItem = ({
           {selectOption}
         </div>
         <div>{fileInput}</div>
+        {item.active_cancellation_request?.cancellation_request_image_set && (
+          <div className="flex flex-wrap gap-2">
+            {item.active_cancellation_request?.cancellation_request_image_set?.map(
+              (item) => {
+                return (
+                  <div className="relative w-16 h-16" key={item.id}>
+                    <Image
+                      src={item.image}
+                      alt={item.description}
+                      aspectRatio={1}
+                      sizes="64px"
+                      fill
+                    />
+                  </div>
+                );
+              }
+            )}
+          </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/category/category-header.tsx

@@ -91,12 +91,18 @@ export const CategoryHeader = (props: Props) => {
                     value: String(value)
                   });
                 }}
-                className={clsx(
-                  'cursor-pointer',
-                  Number(layoutSize) === value ? 'fill-black' : 'fill-gray-500'
-                )}
+                className="cursor-pointer"
               >
-                <Icon key={value} name={icon} size={16} />
+                <Icon
+                  key={value}
+                  name={icon}
+                  size={16}
+                  className={
+                    Number(layoutSize) === value
+                      ? 'text-black'
+                      : 'text-gray-500'
+                  }
+                />
               </a>
             ))}
           </div>

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

@@ -22,12 +22,24 @@ export default function Search() {
     if (isSearchOpen) {
       inputRef.current?.focus();
       document.body.style.overflow = 'hidden';
+
+      const handleEscKey = (e: KeyboardEvent) => {
+        if (e.key === 'Escape') {
+          dispatch(closeSearch());
+        }
+      };
+
+      document.addEventListener('keydown', handleEscKey);
+      return () => {
+        document.removeEventListener('keydown', handleEscKey);
+        document.body.style.overflow = 'auto';
+      };
     }
 
     return () => {
       document.body.style.overflow = 'auto';
     };
-  }, [isSearchOpen]);
+  }, [isSearchOpen, dispatch]);
 
   return (
     <>

package/commands/plugins.ts

@@ -113,6 +113,10 @@ export default async () => {
     {
       name: 'Tabby Payment Extension',
       value: 'pz-tabby-extension'
+    },
+    {
+      name: 'Tamara Payment Extension',
+      value: 'pz-tamara-extension'
     }
   ];
 

package/dist/commands/plugins.js

@@ -127,6 +127,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         {
             name: 'Tabby Payment Extension',
             value: 'pz-tabby-extension'
+        },
+        {
+            name: 'Tamara Payment Extension',
+            value: 'pz-tamara-extension'
         }
     ];
     const prompt = new Prompt({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.81.0",
+  "version": "1.82.0-rc.0",
   "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');