@akinon/projectzero 1.82.0-rc.9 → 1.83.0

package/app-template/next-env.d.ts

@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

package/app-template/package.json

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

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

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

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

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

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

@@ -1,14 +1,87 @@
-import { BasketContent } from '@theme/views/basket/basket-content';
-import { getBasketData } from '@akinon/next/data/server/basket';
+'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 settings from '@theme/settings';
 
-export default async function Page() {
-  const { basket } = await getBasketData();
+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>
 
-  const multiBasket: boolean =
-    typeof settings.plugins?.multiBasket === 'boolean'
-      ? settings.plugins.multiBasket
-      : false;
+            <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>
 
-  return <BasketContent initialBasket={basket} multiBasket={multiBasket} />;
+            <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/app/[commerce]/[locale]/[currency]/error.tsx

@@ -3,38 +3,10 @@
 import { useLocalization } from '@akinon/next/hooks';
 import { Link } from '@theme/components';
 import { ROUTES } from '@theme/routes';
-import { useEffect } from 'react';
-import * as Sentry from '@sentry/nextjs';
-import { ClientLogType } from '@akinon/next/sentry';
 
-export default function ErrorPage({
-  error,
-  reset
-}: {
-  error: Error & { digest?: string };
-  reset: () => void;
-}) {
+export default function Error() {
   const { t } = useLocalization();
 
-  useEffect(() => {
-    Sentry.withScope(function (scope) {
-      scope.setLevel('fatal');
-      scope.setTags({
-        APP_TYPE: 'ProjectZeroNext',
-        TYPE: 'Client',
-        LOG_TYPE: ClientLogType.UNCAUGHT_ERROR_PAGE
-      });
-      scope.setExtra('error', error);
-
-      const error_ = new Error('FATAL: Uncaught client error');
-      error_.name = 'UNCAUGHT_ERROR_PAGE';
-
-      Sentry.captureException(error_, {
-        fingerprint: ['UNCAUGHT_ERROR_PAGE', error.digest]
-      });
-    });
-  }, [error]);
-
   return (
     <section className="text-center px-6 my-14 md:px-0 md:m-14">
       <div className="text-7xl font-bold md:text-8xl">500</div>

package/app-template/src/settings.js

@@ -1,10 +1,6 @@
 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} */
@@ -18,7 +14,6 @@ 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',
@@ -46,7 +41,7 @@ module.exports = {
       }
     ],
     defaultLocaleValue: 'en',
-    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.
+    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale,
     redirectToDefaultLocale: true,
     defaultCurrencyCode: 'usd'
   },

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 { Basket, BasketItem as BasketItemType } from '@akinon/next/types';
+import { 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,12 +19,11 @@ 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, onBasketUpdate } = props;
+  const { basketItem, namespace } = props;
   const [updateQuantityMutation] = useUpdateQuantityMutation();
   const dispatch = useAppDispatch();
   const [isRemoveBasketModalOpen, setRemoveBasketModalOpen] = useState(false);
@@ -50,21 +49,19 @@ export const BasketItem = (props: Props) => {
       requestParams.namespace = namespace;
     }
 
-    try {
-      const response = await updateQuantityMutation(requestParams).unwrap();
-      dispatch(
-        basketApi.util.updateQueryData(
-          'getBasket',
-          undefined,
-          (draftBasket) => {
-            Object.assign(draftBasket, response.basket);
-          }
+    await updateQuantityMutation(requestParams)
+      .unwrap()
+      .then((data) =>
+        dispatch(
+          basketApi.util.updateQueryData(
+            'getBasket',
+            undefined,
+            (draftBasket) => {
+              Object.assign(draftBasket, data.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,7 +18,6 @@ import clsx from 'clsx';
 
 interface Props {
   basket: Basket;
-  onBasketUpdate?: (basket: Basket) => void;
 }
 
 const voucherCodeFormSchema = (t) =>
@@ -28,7 +27,7 @@ const voucherCodeFormSchema = (t) =>
 
 export const Summary = (props: Props) => {
   const { t } = useLocalization();
-  const { basket, onBasketUpdate } = props;
+  const { basket } = props;
   const router = useRouter();
   const {
     register,
@@ -54,7 +53,7 @@ export const Summary = (props: Props) => {
   const removeVoucherCode = () => {
     removeVoucherCodeMutation()
       .unwrap()
-      .then((basket) => {
+      .then((basket) =>
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -63,9 +62,8 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        );
-        onBasketUpdate?.(basket);
-      })
+        )
+      )
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });
@@ -76,7 +74,7 @@ export const Summary = (props: Props) => {
       voucher_code: data.voucherCode
     })
       .unwrap()
-      .then((basket) => {
+      .then((basket) =>
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -85,9 +83,8 @@ 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/header/action-menu.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { ReactNode, useMemo, useRef, useCallback } from 'react';
-import { useGetMiniBasketQuery } from '@akinon/next/data/client/basket';
+import { useGetBasketQuery } from '@akinon/next/data/client/basket';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import {
   closeMiniBasket,
@@ -29,11 +29,8 @@ interface MenuItem {
 export default function ActionMenu() {
   const dispatch = useAppDispatch();
 
-  const { data: miniBasket } = useGetMiniBasketQuery();
-  const totalQuantity = useMemo(
-    () => miniBasket?.total_quantity ?? 0,
-    [miniBasket]
-  );
+  const { data } = useGetBasketQuery();
+  const totalQuantity = useMemo(() => data?.total_quantity ?? 0, [data]);
 
   const { open: miniBasketOpen } = useAppSelector(
     (state) => state.root.miniBasket

package/app-template/src/views/header/mini-basket.tsx

@@ -5,7 +5,6 @@ import clsx from 'clsx';
 import {
   basketApi,
   useGetBasketQuery,
-  useGetMiniBasketQuery,
   useUpdateQuantityMutation
 } from '@akinon/next/data/client/basket';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
@@ -152,16 +151,12 @@ export default function MiniBasket() {
   );
   const dispatch = useAppDispatch();
   const { data: basket, isLoading, isSuccess } = useGetBasketQuery();
-  const { data: miniBasket } = useGetMiniBasketQuery();
   const { t } = useLocalization();
   const { highlightedItem } = useAppSelector((state) => state.root.miniBasket);
   const [highlightedItemPk, setHighlightedItemPk] = useState(0);
   const [sortedBasket, setSortedBasket] = useState([]);
 
-  const totalQuantity = useMemo(
-    () => miniBasket?.total_quantity ?? 0,
-    [miniBasket]
-  );
+  const totalQuantity = useMemo(() => basket?.total_quantity ?? 0, [basket]);
   const miniBasketList = useRef();
 
   useEffect(() => {

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

@@ -10,10 +10,9 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import clsx from 'clsx';
 import { useLocalization } from '@akinon/next/hooks';
 import { useOtpLoginMutation } from '@akinon/next/data/client/user';
-import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
+import { useAppSelector } from '@akinon/next/redux/hooks';
 import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import { AuthError } from '@akinon/next/types';
-import { showPopup } from '@akinon/pz-otp/src/redux/reducer';
 
 const loginFormSchema = (t) =>
   yup.object().shape({
@@ -26,9 +25,9 @@ const loginFormSchema = (t) =>
   });
 
 export const OtpLogin = () => {
-  const dispatch = useAppDispatch();
   const { user_phone_format } = useAppSelector((state) => state.config);
   const { t, locale } = useLocalization();
+  const [showOtpModal, setShowOtpModal] = useState(false);
   const [otpLoginMutation] = useOtpLoginMutation();
 
   const {
@@ -80,7 +79,7 @@ export const OtpLogin = () => {
     })
       .unwrap()
       .then(() => {
-        dispatch(showPopup());
+        setShowOtpModal(true);
       })
       .catch((error) => {
         if (error.status === 429) {
@@ -137,14 +136,17 @@ export const OtpLogin = () => {
         </Button>
       </form>
 
-      <PluginModule
-        component={Component.Otp}
-        props={{
-          data: getValues(),
-          submitAction: loginHandler,
-          error: formError
-        }}
-      />
+      {showOtpModal && (
+        <PluginModule
+          component={Component.Otp}
+          props={{
+            setShowPopup: setShowOtpModal,
+            data: getValues(),
+            submitAction: loginHandler,
+            error: formError
+          }}
+        />
+      )}
     </section>
   );
 };

package/package.json

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

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

@@ -1,12 +0,0 @@
-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/views/basket/basket-content.tsx

@@ -1,106 +0,0 @@
-'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>
-  );
-}