@akinon/projectzero 1.87.0 → 1.88.0

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @akinon/projectzero
 
+## 1.88.0
+
 ## 1.87.0
 
 ## 1.86.0

package/app-template/.env.example

@@ -1,9 +1,11 @@
 NEXTAUTH_SECRET=PDpBb/aSJESgBbPLHw1+jveHXqyvkC7GC1Z82jvE04s=
+# When using dev-ssl command, NEXTAUTH_URL should be updated to https://localhost:3000
 NEXTAUTH_URL=http://localhost:3000
 NEXT_PUBLIC_MAP_API_KEY=YOUR_MAP_API_KEY
 NEXT_PUBLIC_GTM_KEY=GTM_KEY
 NEXT_PUBLIC_URL=http://localhost:3000
 SERVICE_BACKEND_URL=https://02fde10fee4440269e695aa10707dfaf.lb.akinoncloud.com
+SITEMAP_S3_BUCKET_NAME=0fb534
 
 # LOG_LEVEL_DEV=debug # For more details, please refer to the Logging documentation.
 

package/app-template/CHANGELOG.md

@@ -1,5 +1,38 @@
 # projectzeronext
 
+## 1.88.0
+
+### Minor Changes
+
+- 3037704: ZERO-3328: Add data-testid attributes for improved testing in BasketItem and BasketGiftPack components
+- dbddebc: ZERO-3330: Update environment variables and enhance XML sitemap route error handling
+- a786e0e: ZERO-3335: Use optional chaining to prevent runtime errors
+- 054b94d: ZERO-3261: Add rejected return image to order page
+
+### Patch Changes
+
+- Updated dependencies [ce64181]
+- Updated dependencies [3037704]
+- Updated dependencies [c4f0568]
+- Updated dependencies [f3dcb1e]
+- Updated dependencies [8154859]
+  - @akinon/pz-checkout-gift-pack@1.88.0
+  - @akinon/pz-basket-gift-pack@1.88.0
+  - @akinon/next@1.88.0
+  - @akinon/pz-akifast@1.88.0
+  - @akinon/pz-b2b@1.88.0
+  - @akinon/pz-bkm@1.88.0
+  - @akinon/pz-click-collect@1.88.0
+  - @akinon/pz-credit-payment@1.88.0
+  - @akinon/pz-gpay@1.88.0
+  - @akinon/pz-masterpass@1.88.0
+  - @akinon/pz-one-click-checkout@1.88.0
+  - @akinon/pz-otp@1.88.0
+  - @akinon/pz-pay-on-delivery@1.88.0
+  - @akinon/pz-saved-card@1.88.0
+  - @akinon/pz-tabby-extension@1.88.0
+  - @akinon/pz-tamara-extension@1.88.0
+
 ## 1.87.0
 
 ### Minor Changes

package/app-template/README.md

@@ -6,6 +6,12 @@ Headless Akinon Commerce Cloud Storefront.
 
 Run `cp .env.example .env && yarn` command at project root and all dependencies should be installed.
 
+## Environment Variables
+
+### Required Environment Variables
+
+- `SITEMAP_S3_BUCKET_NAME`: S3 bucket name for XML sitemaps (e.g., "0fb534"). This is required for the sitemap route to function correctly.
+
 ### Build
 
 To build the app, run the following command:

package/app-template/package.json

@@ -1,11 +1,12 @@
 {
   "name": "projectzeronext",
-  "version": "1.87.0",
+  "version": "1.88.0",
   "private": true,
   "license": "MIT",
   "scripts": {
     "clean": "rm -rf node_modules && rm -rf .next",
     "dev": "next dev",
+    "dev-ssl": "next dev --experimental-https",
     "build": "next build",
     "start": "next start -p 8008",
     "type-check": "tsc",
@@ -23,22 +24,22 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.87.0",
-    "@akinon/pz-akifast": "1.87.0",
-    "@akinon/pz-b2b": "1.87.0",
-    "@akinon/pz-basket-gift-pack": "1.87.0",
-    "@akinon/pz-bkm": "1.87.0",
-    "@akinon/pz-checkout-gift-pack": "1.87.0",
-    "@akinon/pz-click-collect": "1.87.0",
-    "@akinon/pz-credit-payment": "1.87.0",
-    "@akinon/pz-gpay": "1.87.0",
-    "@akinon/pz-masterpass": "1.87.0",
-    "@akinon/pz-one-click-checkout": "1.87.0",
-    "@akinon/pz-otp": "1.87.0",
-    "@akinon/pz-pay-on-delivery": "1.87.0",
-    "@akinon/pz-saved-card": "1.87.0",
-    "@akinon/pz-tabby-extension": "1.87.0",
-    "@akinon/pz-tamara-extension": "1.87.0",
+    "@akinon/next": "1.88.0",
+    "@akinon/pz-akifast": "1.88.0",
+    "@akinon/pz-b2b": "1.88.0",
+    "@akinon/pz-basket-gift-pack": "1.88.0",
+    "@akinon/pz-bkm": "1.88.0",
+    "@akinon/pz-checkout-gift-pack": "1.88.0",
+    "@akinon/pz-click-collect": "1.88.0",
+    "@akinon/pz-credit-payment": "1.88.0",
+    "@akinon/pz-gpay": "1.88.0",
+    "@akinon/pz-masterpass": "1.88.0",
+    "@akinon/pz-one-click-checkout": "1.88.0",
+    "@akinon/pz-otp": "1.88.0",
+    "@akinon/pz-pay-on-delivery": "1.88.0",
+    "@akinon/pz-saved-card": "1.88.0",
+    "@akinon/pz-tabby-extension": "1.88.0",
+    "@akinon/pz-tamara-extension": "1.88.0",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -61,7 +62,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.87.0",
+    "@akinon/eslint-plugin-projectzero": "1.88.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/public/locales/en/account.json

@@ -254,6 +254,10 @@
       "cancelled": "Cancelled",
       "cancellation_request_recieved": "Cancellation Request Recieved",
       "close_button": "Close",
+      "return_status": "Return Status",
+      "rejected": "Return Rejected",
+      "completed": "Return Completed",
+      "explanation": "Explanation",
       "success": {
         "title": "Success",
         "description": "Your request have been recieved and will be evaluated as soon as possible."

package/app-template/public/locales/tr/account.json

@@ -254,6 +254,10 @@
       "cancelled": "İptal edildi",
       "cancellation_request_recieved": "İptal talebi alındı",
       "close_button": "Kapat",
+      "return_status": "İade Durumu",
+      "rejected": "İade reddedildi",
+      "completed": "İade tamamlandı",
+      "explanation": "Açıklama",
       "success": {
         "title": "Başarılı",
         "description": "Talebiniz alınmış olup en kısa sürede değerlendirilecektir."

package/app-template/src/app/[commerce]/[locale]/[currency]/account/orders/[id]/page.tsx

@@ -206,8 +206,7 @@ const AccountOrderDetail = ({ params: { id } }) => {
                           </div>
 
                           {(item.is_cancellable || item.is_refundable) &&
-                            order.is_cancellable &&
-                            item.status.value == '400' && (
+                            order.is_cancellable && (
                               <div className="lg:ml-24">
                                 <Link
                                   href={`${ROUTES.ACCOUNT_ORDERS}/${order.id}/cancellation`}
@@ -225,7 +224,6 @@ const AccountOrderDetail = ({ params: { id } }) => {
                               </div>
                             )}
                         </div>
-
                         <div className="flex flex-col justify-center items-end lg:ml-6 lg:min-w-[7rem]">
                           {parseFloat(item.retail_price) >
                             parseFloat(item.price) && (
@@ -249,6 +247,70 @@ const AccountOrderDetail = ({ params: { id } }) => {
                   );
                 })}
               </div>
+
+              {group.map((item) =>
+                item.cancellationrequest_set?.map((cancellationItem) => {
+                  const status = cancellationItem.status?.value;
+                  const isRejected = status === 'rejected';
+                  const isCompleted = status === 'completed';
+
+                  const filteredImages =
+                    cancellationItem.cancellation_request_image_set?.filter(
+                      (img) =>
+                        isRejected
+                          ? !img.is_uploaded_by_user
+                          : isCompleted
+                          ? img.is_uploaded_by_user
+                          : false
+                    ) || [];
+
+                  const statusText = isRejected
+                    ? t('account.my_orders.return.rejected')
+                    : isCompleted
+                    ? t('account.my_orders.return.completed')
+                    : null;
+
+                  if (!statusText || filteredImages.length === 0) return null;
+
+                  return (
+                    <div
+                      className="w-full px-4 lg:px-7"
+                      key={cancellationItem.id}
+                    >
+                      <div className="flex flex-col py-2 gap-4 border-t border-gray">
+                        <div className="flex flex-col">
+                          <div className="text-sm font-semibold">
+                            {t('account.my_orders.return.return_status')}
+                            <span className="font-normal"> {statusText}</span>
+                          </div>
+
+                          <div className="flex gap-2 mt-2 flex-wrap">
+                            {filteredImages.map((img) => (
+                              <div className="flex flex-col gap-2" key={img.id}>
+                                <Link href={img.image} target="_blank">
+                                  <Image
+                                    src={img.image}
+                                    width={112}
+                                    height={150}
+                                    alt={img.description}
+                                  />
+                                </Link>
+
+                                {img.description && (
+                                  <p className="text-xs">
+                                    {t('account.my_orders.return.explanation')}:
+                                    {img.description}
+                                  </p>
+                                )}
+                              </div>
+                            ))}
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  );
+                })
+              )}
             </div>
           );
         })}

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

@@ -1,5 +1,18 @@
 import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 
+/**
+ * XML Sitemap Route
+ *
+ * This route serves XML sitemaps from an S3 bucket.
+ *
+ * Required environment variables:
+ * - SITEMAP_S3_BUCKET_NAME: The name of the S3 bucket containing the sitemaps
+ *   Example: "0fb534"
+ *
+ * If the environment variable is not set, the route will return a 503 Service Unavailable
+ * response with a JSON error message.
+ */
+
 export const dynamic = 'force-dynamic';
 
 export async function GET(request: Request, context: { params }) {
@@ -7,9 +20,42 @@ export async function GET(request: Request, context: { params }) {
   const url = new URL(request.url);
   const matchedLocale = url.pathname.match(urlLocaleMatcherRegex);
 
+  const s3BucketName = process.env.SITEMAP_S3_BUCKET_NAME;
+
+  if (!s3BucketName) {
+    return new Response(
+      JSON.stringify({
+        error: 'Configuration error',
+        message: 'Please set the SITEMAP_S3_BUCKET_NAME environment variable'
+      }),
+      {
+        status: 503,
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+    );
+  }
+
   const sitemap = await fetch(
-    `https://s3.eu-central-1.amazonaws.com/0fb534/sitemaps/sitemaps/sitemap-${node}.xml.gz`
+    `https://s3.eu-central-1.amazonaws.com/${s3BucketName}/sitemaps/sitemaps/sitemap-${node}.xml.gz`
   );
+
+  if (!sitemap.ok) {
+    return new Response(
+      JSON.stringify({
+        error: 'Sitemap not found',
+        message: `Failed to fetch sitemap for node: ${node}`
+      }),
+      {
+        status: 503,
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+    );
+  }
+
   let sitemapContent = await sitemap.text();
 
   sitemapContent = sitemapContent.replace(

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

@@ -48,7 +48,7 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
           className
         )}
       >
-        {options.map((option) => (
+        {options?.map((option) => (
           <option
             key={option.value}
             value={option.value}

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

@@ -39,7 +39,7 @@ export const Tabs = (props: Props) => {
             tabBarPosition === 'left' || tabBarPosition === 'right'
         })}
       >
-        {children.map((item, index) => (
+        {children?.map((item, index) => (
           <Tab
             key={item.props.title}
             title={item.props.title}
@@ -52,7 +52,7 @@ export const Tabs = (props: Props) => {
         ))}
       </ul>
 
-      <div className="w-full">{children[selectedTabIndex]}</div>
+      <div className="w-full">{children?.[selectedTabIndex]}</div>
     </div>
   );
 };

package/app-template/src/redux/middlewares/category.ts

@@ -4,7 +4,7 @@ import { setSelectedFacets } from '@theme/redux/reducers/category';
 
 const getSelectedFacets = (facets: Array<Facet>) => {
   return facets
-    .map((facet) => {
+    ?.map((facet) => {
       return {
         ...facet,
         data: {

package/app-template/src/redux/reducers/category.ts

@@ -32,7 +32,7 @@ const categorySlice = createSlice({
     toggleFacet(state, action) {
       const facets = JSON.parse(JSON.stringify(state.facets));
 
-      state.selectedFacets = facets.map((facet) => {
+      state.selectedFacets = facets?.map((facet) => {
         if (facet.key === action.payload.facet.key) {
           facet.data.choices = facet.data.choices
             .map((choice) => {

package/app-template/src/utils/convert-facet-search-params.ts

@@ -1,7 +1,7 @@
 import { Facet } from '@akinon/next/types';
 
 const convertFacetSearchParams = (facets: Facet[]) => {
-  const _facets: string[][] = facets.flatMap((facet) => {
+  const _facets: string[][] = facets?.flatMap((facet) => {
     return [
       ...facet.data.choices.map((choice) => {
         return [facet.search_key, choice.value as string];

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

@@ -94,25 +94,6 @@ 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-item.tsx

@@ -87,6 +87,7 @@ export const BasketItem = (props: Props) => {
       <li
         key={basketItem.id}
         className="flex border-b border-gray-200 py-3 relative"
+        data-testid="basket-item"
       >
         <div className="w-20 lg:w-[105px] mr-4 shrink-0">
           <Link href={basketItem.product.absolute_url} passHref>

package/app-template/src/views/category/category-active-filters.tsx

@@ -69,7 +69,7 @@ const CategoryActiveFilters = () => {
 
   return (
     <div className="grid grid-cols-2 md:grid-cols-4 lg:grid-cols-6 gap-2 mb-4">
-      {facets.map((facet) =>
+      {facets?.map((facet) =>
         facet?.data?.choices
           ?.filter((choice) => choice.is_selected)
           ?.map(

package/app-template/src/views/category/category-header.tsx

@@ -121,7 +121,7 @@ export const CategoryHeader = (props: Props) => {
         </Button>
         <Select
           options={sortOptions}
-          value={sortOptions.find(({ is_selected }) => is_selected).value}
+          value={sortOptions?.find(({ is_selected }) => is_selected)?.value}
           data-testid="list-sorter"
           onChange={(e) => {
             handleSelectFilter({

package/app-template/src/views/category/category-info.tsx

@@ -102,7 +102,7 @@ export default function ListPage(props: ListPageProps) {
               </div>
             )}
 
-            {data.products.length === 0 && page > 1 && <LoaderSpinner />}
+            {data.products?.length === 0 && page > 1 && <LoaderSpinner />}
 
             <div
               className={clsx('grid gap-x-4 gap-y-12 grid-cols-2', {
@@ -111,7 +111,7 @@ export default function ListPage(props: ListPageProps) {
                 'lg:grid-cols-3': layoutSize === 3
               })}
             >
-              {data.products.map((product, index) => (
+              {data?.products?.map((product, index) => (
                 <ProductItem
                   key={product.pk}
                   product={product}
@@ -121,7 +121,7 @@ export default function ListPage(props: ListPageProps) {
                 />
               ))}
             </div>
-            {data.products.length > 0 && (
+            {data?.products?.length > 0 && (
               <Pagination
                 total={data.pagination.total_count}
                 limit={data.pagination.page_size}

package/app-template/src/views/category/filters/index.tsx

@@ -23,7 +23,7 @@ export const Filters = (props: Props) => {
   const [isPending, startTransition] = useTransition();
 
   const haveFilter = useMemo(() => {
-    return facets.some((facet) =>
+    return facets?.some((facet) =>
       facet?.data?.choices?.some((choice) => choice.is_selected)
     );
   }, [facets]);
@@ -50,7 +50,7 @@ export const Filters = (props: Props) => {
         <span>{t('category.filters.ready_to_wear')}</span>
       </div>
 
-      {facets.map((facet) => {
+      {facets?.map((facet) => {
         return (
           <FilterItem
             key={facet.key}

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

@@ -18,7 +18,7 @@ const PaymentStep = () => {
         'pointer-events-none opacity-30': isPaymentStepBusy
       })}
     >
-      <div className="w-full mt-4 flex justify-start border border-gray-400 -mb-px z-10 md:mt-0 md:border-r-0 md:border-b-0 md:w-auto order-2 md:order-none">
+      <div className="w-full mt-4 flex justify-start border border-gray-400 -mb-px z-10 md:mt-0 md:border-r-0 md:border-b-0 md:w-auto order-2 md:order-none overflow-x-auto">
         <PaymentOptionButtons />
       </div>
       <div className="w-full border border-solid border-gray-400 bg-white">

package/app-template/src/views/installment-options/index.tsx

@@ -22,7 +22,7 @@ const InstallmentOptions = (props: InstallmentProps) => {
 
   useEffect(() => {
     if (isSuccess && data) {
-      setActiveCardSlug(data.results[0].slug);
+      setActiveCardSlug(data.results?.[0]?.slug);
     }
   }, [isSuccess, data]);
 

package/package.json

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