@akinon/projectzero 1.118.0-rc.8 → 1.118.0

package/app-template/src/app/[commerce]/[locale]/[currency]/users/reset/[[...id]]/page.tsx

@@ -1,12 +1,11 @@
 'use client';
 
-import { Button, Input, Link, LoaderSpinner } from '@theme/components';
+import { Button, Input, Link } from '@theme/components';
 import { useForm, SubmitHandler } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
 import {
   usePasswordResetMutation,
-  useGetValidatePasswordResetTokenQuery,
   PasswordResetType
 } from '@akinon/next/data/client/account';
 import { useLocalization } from '@akinon/next/hooks';
@@ -16,16 +15,6 @@ export default function NewPassword({ params: { id } }) {
   const { t } = useLocalization();
   const [newPassword, { isSuccess: formSuccess }] = usePasswordResetMutation();
 
-  const token = id?.join('/');
-
-  const {
-    data: validationData,
-    isLoading: isValidating,
-    error: validationError
-  } = useGetValidatePasswordResetTokenQuery(token, {
-    skip: !token
-  });
-
   const newPasswordFormSchema = (t) =>
     yup.object().shape({
       password: yup
@@ -35,10 +24,7 @@ export default function NewPassword({ params: { id } }) {
           /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{6,}$/,
           t('forgot_password.create_new_password.form.error.password_rule')
         )
-        .max(
-          50,
-          t('forgot_password.create_new_password.form.error.password_max')
-        ),
+        .max(50, t('forgot_password.create_new_password.form.error.password_max')),
       repeatPassword: yup
         .string()
         .required(t('forgot_password.create_new_password.form.error.required'))
@@ -59,31 +45,6 @@ export default function NewPassword({ params: { id } }) {
     newPassword(data);
   };
 
-  if (isValidating) {
-    return (
-      <div className="container my-12 flex flex-col items-center px-4">
-        <div className="w-full xl:w-5/12 text-center">
-          <LoaderSpinner />
-        </div>
-      </div>
-    );
-  }
-
-  if (validationError || !validationData?.validlink) {
-    return (
-      <div className="container my-12 flex flex-col items-center px-4">
-        <div className="w-full xl:w-5/12 text-center">
-          <div className="text-2xl mb-4 text-error">
-            {t('account.password_reset.expired_link_message')}
-          </div>
-          <Link href="/users/password/reset" className="underline text-primary">
-            {t('account.password_reset.continue_password_reset')}
-          </Link>
-        </div>
-      </div>
-    );
-  }
-
   return (
     <div className="container my-12 flex flex-col items-center px-4">
       <div className="w-full xl:w-5/12 text-center">
@@ -118,10 +79,7 @@ export default function NewPassword({ params: { id } }) {
                   required
                 />
 
-                <PasswordRulesFeedback
-                  password={passwordValue}
-                  isVisible={errors?.password ? true : false}
-                />
+                <PasswordRulesFeedback password={passwordValue} isVisible={errors?.password ? true : false}/>
               </div>
 
               <div className="mb-2 text-left">

package/app-template/src/app/[commerce]/[locale]/[currency]/xml-sitemap/[node]/route.ts

@@ -58,12 +58,10 @@ export async function GET(request: Request, context: { params }) {
 
   let sitemapContent = await sitemap.text();
 
-  if (matchedLocale?.[0]) {
-    const localeSuffix = matchedLocale[0];
-    const domainRegex = /(?<=<loc>\s*)https?:\/\/[^/<\s]+/g;
-
-    sitemapContent = sitemapContent.replace(domainRegex, `$&${localeSuffix}`);
-  }
+  sitemapContent = sitemapContent.replace(
+    /\.com/g,
+    `.com${matchedLocale?.[0] ?? ''}`
+  );
 
   return new Response(sitemapContent, {
     headers: {

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

@@ -41,14 +41,12 @@ export const Modal = (props: ModalProps) => {
           'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
           overlayClassName
         )}
-        onClick={(e) => e.stopPropagation()}
       />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
           className
         )}
-        onClick={(e) => e.stopPropagation()}
       >
         {(showCloseButton || title) && (
           <div

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

@@ -48,7 +48,7 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
             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 focus:border-primary',
+                'border border-gray-200 transition-all duration-150 hover:border-primary',
               'appearance-none bg-transparent'
             ),
             className

package/app-template/src/hooks/index.ts

@@ -1,3 +1 @@
-export * from './use-contract';
-export * from './use-fav-button';
 export * from './use-add-product-to-basket';

package/app-template/src/middleware.ts

@@ -14,8 +14,7 @@ export const config = {
     '/((?!api|_next|[\\w-\\/*]+\\.\\w+).*)',
     '/(.*sitemap\\.xml)',
     '/(.+\\.)(html|htm|aspx|asp|php)',
-    '/(.*orders\\/checkout-with-token.*)',
-    '/(.*orders\\/post-checkout.*)'
+    '/(.*orders\\/checkout-with-token.*)'
   ]
 };
 

package/app-template/src/plugins.js

@@ -19,7 +19,6 @@ module.exports = [
   'pz-hepsipay',
   'pz-flow-payment',
   'pz-virtual-try-on',
-  'pz-similar-products',
   'pz-cybersource-uc',
   'pz-hepsipay',
   'pz-masterpass-rest',

package/app-template/src/views/account/orders/order-detail-header.tsx

@@ -21,7 +21,7 @@ export const OrderDetailHeader = ({ title, order, children }: Props) => {
         <div>
           <span>{t('account.my_orders.detail.order_number')}</span>:{' '}
           <span data-testid="account-orders-return-order-id">
-            {order?.number}
+            {order.number}
           </span>
         </div>
 

package/app-template/src/views/checkout/steps/payment/options/credit-card/index.tsx

@@ -16,7 +16,7 @@ import PaymentHeader from '../../payment-header';
 import CreditCardInstallments from './installments';
 import { useLocalization } from '@akinon/next/hooks';
 import { Image } from '@akinon/next/components/image';
-import { getPosError, checkPaymentWillRedirect } from '@akinon/next/utils';
+import { getPosError } from '@akinon/next/utils';
 import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import { PaymentOption } from '@akinon/next/types';
 
@@ -101,7 +101,7 @@ const CheckoutCreditCard = () => {
     setValue: setFormValue,
     trigger: validateInput,
     control,
-    formState: { errors, isSubmitting },
+    formState: { errors },
     setError,
     getValues,
     clearErrors
@@ -119,12 +119,8 @@ const CheckoutCreditCard = () => {
   const [years, setYears] = useState([]);
   const [formError, setFormError] = useState(null);
   const [cardBinNumber, setCardBinNumber] = useState(null);
-  const [isProcessing, setIsProcessing] = useState(false);
   const [setBinNumber] = useSetBinNumberMutation();
-  const [completeCreditCardPayment, { isLoading: isCompletingPayment }] =
-    useCompleteCreditCardPaymentMutation();
-
-  const isButtonDisabled = isSubmitting || isCompletingPayment || isProcessing;
+  const [completeCreditCardPayment] = useCompleteCreditCardPaymentMutation();
 
   const handleCardNumberChange = (value) => {
     const binNumber = value.replace(/\D/g, '').substring(0, 6);
@@ -140,20 +136,9 @@ const CheckoutCreditCard = () => {
   };
 
   const onSubmit: SubmitHandler<CreditCardForm> = async (data) => {
-    if (isButtonDisabled) return;
-
-    setIsProcessing(true);
-
-    try {
-      const response = await completeCreditCardPayment(data).unwrap();
-      setFormError(response?.errors);
+    const response = await completeCreditCardPayment(data).unwrap();
 
-      if (response?.errors || !checkPaymentWillRedirect(response)) {
-        setIsProcessing(false);
-      }
-    } catch (error) {
-      setIsProcessing(false);
-    }
+    setFormError(response?.errors);
   };
 
   useEffect(() => {
@@ -407,7 +392,6 @@ const CheckoutCreditCard = () => {
             <Button
               className="group uppercase mt-4 inline-flex items-center justify-center"
               type="submit"
-              disabled={isButtonDisabled}
               data-testid="checkout-credit-card-place-order"
             >
               <span>{t('checkout.payment.credit_card.form.button')}</span>

package/app-template/src/views/checkout/steps/payment/options/funds-transfer.tsx

@@ -12,7 +12,6 @@ import * as yup from 'yup';
 import CheckoutAgreements from '../agreements';
 import PaymentHeader from '../payment-header';
 import { useLocalization } from '@akinon/next/hooks';
-import { checkPaymentWillRedirect } from '@akinon/next/utils';
 import { Image } from '@akinon/next/components/image';
 import { Trans } from '@akinon/next/components/trans';
 
@@ -26,39 +25,21 @@ const CheckoutFundsTransfer = () => {
   const {
     handleSubmit,
     control,
-    formState: { errors, isSubmitting }
+    formState: { errors }
   } = useForm({
     resolver: yupResolver(fundsTransferFormSchema())
   });
   const [formError, setFormError] = useState(null);
-  const [isProcessing, setIsProcessing] = useState(false);
   const { bankAccounts, selectedBankAccountPk, preOrder } = useAppSelector(
     (state: RootState) => state.checkout
   );
   const [setFundsTransferOption] = useSetFundsTransferOptionMutation();
-  const [completeFundsTransfer, { isLoading: isCompletingPayment }] =
-    useCompleteFundsTransferMutation();
-
-  const isButtonDisabled = isSubmitting || isCompletingPayment || isProcessing;
+  const [completeFundsTransfer] = useCompleteFundsTransferMutation();
 
   const onSubmit: SubmitHandler<null> = async () => {
-    if (isButtonDisabled) return;
-
-    setIsProcessing(true);
-
-    try {
-      const response = await completeFundsTransfer().unwrap();
-      setFormError(response?.errors?.non_field_errors);
-
-      if (
-        response?.errors?.non_field_errors ||
-        !checkPaymentWillRedirect(response)
-      ) {
-        setIsProcessing(false);
-      }
-    } catch (error) {
-      setIsProcessing(false);
-    }
+    const response = await completeFundsTransfer().unwrap();
+
+    setFormError(response?.errors?.non_field_errors);
   };
 
   useEffect(() => {
@@ -174,7 +155,6 @@ const CheckoutFundsTransfer = () => {
           <Button
             className="group uppercase mt-4 inline-flex items-center justify-center w-full"
             type="submit"
-            disabled={isButtonDisabled}
             data-testid="checkout-bank-account-place-order"
           >
             <span> {t('checkout.payment.fund_transfer.button')}</span>

package/app-template/src/views/checkout/steps/payment/options/loyalty.tsx

@@ -1,35 +1,16 @@
 'use client';
 
-import { useState } from 'react';
 import { useCompleteLoyaltyPaymentMutation } from '@akinon/next/data/client/checkout';
 import { useAppSelector } from '@akinon/next/redux/hooks';
 import { useForm } from 'react-hook-form';
-import { checkPaymentWillRedirect } from '@akinon/next/utils';
 
 export default function LoyaltyPayment() {
   const { payment_option } = useAppSelector((state) => state.checkout.preOrder);
   const { handleSubmit } = useForm();
-  const [completeLoyaltyPayment, { isLoading: isCompletingPayment }] =
-    useCompleteLoyaltyPaymentMutation();
-  const [isProcessing, setIsProcessing] = useState(false);
-
-  const isButtonDisabled = isCompletingPayment || isProcessing;
+  const [completeLoyaltyPayment] = useCompleteLoyaltyPaymentMutation();
 
   const onSubmit = async () => {
-    if (isButtonDisabled) return;
-
-    setIsProcessing(true);
-
-    try {
-      const response = await completeLoyaltyPayment().unwrap();
-
-      if (response?.errors || !checkPaymentWillRedirect(response)) {
-        setIsProcessing(false);
-      }
-    } catch (error) {
-      console.error('Error completing loyalty payment:', error);
-      setIsProcessing(false);
-    }
+    completeLoyaltyPayment();
   };
 
   return (

package/app-template/src/views/checkout/steps/payment/options/redirection.tsx

@@ -8,7 +8,7 @@ import { useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as yup from 'yup';
 import { useEffect, useState } from 'react';
-import { getPosError, checkPaymentWillRedirect } from '@akinon/next/utils';
+import { getPosError } from '@akinon/next/utils';
 import { useMessageListener } from '@akinon/next/hooks';
 
 interface FormValues {
@@ -26,33 +26,16 @@ const formSchema = () =>
 export default function RedirectionPayment() {
   const { payment_option } = useAppSelector((state) => state.checkout.preOrder);
   const [formError, setFormError] = useState(null);
-  const [isProcessing, setIsProcessing] = useState(false);
   const {
     register,
     handleSubmit,
-    formState: { errors, isSubmitting }
+    formState: { errors }
   } = useForm<FormValues>({
     resolver: yupResolver(formSchema())
   });
-  const [completeRedirectionPayment, { isLoading: isCompletingPayment }] =
-    useCompleteRedirectionPaymentMutation();
-
-  const isButtonDisabled = isSubmitting || isCompletingPayment || isProcessing;
-
+  const [completeRedirectionPayment] = useCompleteRedirectionPaymentMutation();
   const onSubmit = async () => {
-    if (isButtonDisabled) return;
-
-    setIsProcessing(true);
-
-    try {
-      const response = await completeRedirectionPayment().unwrap();
-
-      if (response?.errors || !checkPaymentWillRedirect(response)) {
-        setIsProcessing(false);
-      }
-    } catch (error) {
-      setIsProcessing(false);
-    }
+    completeRedirectionPayment();
   };
 
   useMessageListener();
@@ -108,7 +91,6 @@ export default function RedirectionPayment() {
 
         <Button
           data-testid="checkout-submit-button"
-          disabled={isButtonDisabled}
           className={twMerge('w-full md:w-36 px-4 md:px-0')}
         >
           {payment_option.name}

package/app-template/src/views/checkout/steps/shipping/address-box.tsx

@@ -85,7 +85,7 @@ const AddressBox = ({
   };
 
   const onSubmit = (data) => {
-    editAddress({ ...data, invalidateTag: 'Checkout' })
+    editAddress({ ...data, invalidateTag: 'Addresses' })
       .unwrap()
       .then((editAddressResponse) => {
         handleAddressClick(addressType, editAddressResponse);
@@ -96,7 +96,7 @@ const AddressBox = ({
   };
 
   const handleRemoveAddress = async (addressPk: number) => {
-    await removeAddress({ id: addressPk, invalidateTag: 'Checkout' });
+    await removeAddress({ id: addressPk, invalidateTag: 'Addresses' });
     setRemoveAddressModalOpen(false);
     dispatch(resetCheckoutState());
 
@@ -168,10 +168,7 @@ const AddressBox = ({
         <Button
           appearance="ghost"
           className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
-          onClick={(e) => {
-            e.stopPropagation();
-            setIsEditAddressModalOpen(true);
-          }}
+          onClick={() => setIsEditAddressModalOpen(true)}
           data-testid="checkout-address-edit"
         >
           {t('checkout.address.box.edit')}
@@ -183,26 +180,21 @@ const AddressBox = ({
           setOpen={setIsEditAddressModalOpen}
           className="w-full sm:w-[28rem] max-h-[90vh] overflow-y-auto"
         >
-          <div onClick={(e) => e.stopPropagation()}>
-            <AddressForm
-              data={{
-                ...address,
-                country: address.country?.pk,
-                city: address.city?.pk,
-                township: address.township?.pk,
-                district: address.district?.pk
-              }}
-              onSubmit={onSubmit}
-            />
-          </div>
+          <AddressForm
+            data={{
+              ...address,
+              country: address.country?.pk,
+              city: address.city?.pk,
+              township: address.township?.pk,
+              district: address.district?.pk
+            }}
+            onSubmit={onSubmit}
+          />
         </Modal>
         <Button
           appearance="ghost"
           className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
-          onClick={(e) => {
-            e.stopPropagation();
-            setRemoveAddressModalOpen(true);
-          }}
+          onClick={() => setRemoveAddressModalOpen(true)}
           data-testid="checkout-address-remove"
         >
           {t('checkout.address.box.remove')}
@@ -215,18 +207,14 @@ const AddressBox = ({
         setOpen={setRemoveAddressModalOpen}
         showCloseButton={false}
       >
-        <div
-          className="text-center px-6 py-10"
-          onClick={(e) => e.stopPropagation()}
-        >
+        <div className="text-center px-6 py-10">
           <p className="mb-4">
             {t('account.address_book.modal.delete_description')}
           </p>
           <div className="space-x-3 flex justify-center">
             <Button
               appearance="outlined"
-              onClick={(e) => {
-                e.stopPropagation();
+              onClick={() => {
                 setRemoveAddressModalOpen(false);
               }}
               data-testid="remove-address-modal-cancel"
@@ -236,8 +224,7 @@ const AddressBox = ({
             <Button
               appearance="filled"
               disabled={removeAddressLoading}
-              onClick={(e) => {
-                e.stopPropagation();
+              onClick={() => {
                 handleRemoveAddress(address.pk);
               }}
               className={

package/app-template/src/views/checkout/steps/shipping/addresses.tsx

@@ -77,7 +77,7 @@ const Addresses = () => {
   }, [billing_and_shipping_same]);
 
   const onSubmit = (data) => {
-    addAddress({ ...data, invalidateTag: 'Checkout' })
+    addAddress({ ...data, invalidateTag: 'Addresses' })
       .unwrap()
       .then((addAddressResponse) => {
         if (addressList.length === 0) {

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

@@ -4,7 +4,8 @@ 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, Input } from '@theme/components';
+
+import { Icon } from '@theme/components';
 import Results from './results';
 import { ROUTES } from '@theme/routes';
 import { useLocalization, useRouter } from '@akinon/next/hooks';
@@ -41,14 +42,6 @@ export default function Search() {
     };
   }, [isSearchOpen, dispatch]);
 
-  const handleSearchTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchText(e.target.value);
-  };
-
-  const handleCloseSearch = () => {
-    dispatch(closeSearch());
-  };
-
   return (
     <>
       <div
@@ -74,9 +67,9 @@ export default function Search() {
               {t('common.search.results_for')}
             </span>
             <div className="flex items-center">
-              <Input
+              <input
                 value={searchText}
-                onChange={handleSearchTextChange}
+                onChange={(e) => setSearchText(e.target.value)}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && searchText.trim() !== '') {
                     router.push(`${ROUTES.LIST}/?search_text=${searchText}`);
@@ -98,12 +91,11 @@ export default function Search() {
               <Icon
                 name="close"
                 size={14}
-                onClick={handleCloseSearch}
+                onClick={() => dispatch(closeSearch())}
                 className="cursor-pointer"
               />
             </div>
           </div>
-
           <Results searchText={searchText} />
         </div>
       </div>