@akinon/next 1.42.0-rc.1 → 1.42.0-rc.11

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @akinon/next
 
+## 1.42.0-rc.11
+
+### Minor Changes
+
+- 8d9ac9a: ZERO-2794: Add field to order type
+
+## 1.42.0-rc.10
+
+## 1.42.0-rc.9
+
+## 1.42.0-rc.8
+
+### Minor Changes
+
+- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
+
+## 1.42.0-rc.7
+
+## 1.42.0-rc.6
+
+### Minor Changes
+
+- 146ea39: ZERO-2774: Update imports
+
+## 1.42.0-rc.5
+
+## 1.42.0-rc.4
+
+### Minor Changes
+
+- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
+
+## 1.42.0-rc.3
+
+### Minor Changes
+
+- fda5b92: ZERO-2725: fix invalid import
+
+## 1.42.0-rc.2
+
 ## 1.42.0-rc.1
 
 ## 1.42.0-rc.0

package/components/input.tsx

@@ -1,6 +1,7 @@
 import clsx from 'clsx';
 import { forwardRef, FocusEvent, useState, Ref } from 'react';
 import { Controller } from 'react-hook-form';
+
 // @ts-ignore
 import { PatternFormat, PatternFormatProps } from 'react-number-format';
 import { InputProps } from '../types';

package/components/pagination.tsx

@@ -1,10 +1,9 @@
 'use client';
 
 import { MouseEvent, useCallback, useEffect, useState } from 'react';
-import { PaginationProps } from '@theme/components/types';
+import { PaginationProps } from '../types';
 import { twMerge } from 'tailwind-merge';
 import clsx from 'clsx';
-
 import usePagination from '@akinon/next/hooks/use-pagination';
 import { useLocalization } from '@akinon/next/hooks';
 import { useRouter } from '@akinon/next/hooks';

package/components/price.tsx

@@ -1,11 +1,12 @@
 import { useMemo } from 'react';
+
 // @ts-ignore
 import { NumericFormat, NumericFormatProps } from 'react-number-format';
 import { getCurrency } from '@akinon/next/utils';
 
 import { useLocalization } from '@akinon/next/hooks';
 import { PriceProps } from '../types';
-import Settings from '@theme/settings';
+import Settings from 'settings';
 
 export const Price = (props: NumericFormatProps & PriceProps) => {
   const {

package/data/client/api.ts

@@ -9,7 +9,7 @@ import {
 } from '@reduxjs/toolkit/query/react';
 import settings from 'settings';
 import { getCookie } from '../../utils';
-import { RootState } from '@theme/redux/store';
+import { RootState } from 'redux/store';
 
 interface CustomBaseQueryApi extends BaseQueryApi {
   getState: () => RootState;

package/data/server/product.ts

@@ -1,11 +1,8 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
-import {
-  BreadcrumbResultType,
-  ProductCategoryResult,
-  ProductResult
-} from '../../types';
+import { ProductCategoryResult, ProductResult } from '../../types';
 import appFetch from '../../utils/app-fetch';
+import logger from '../../utils/log';
 
 type GetProduct = {
   pk: number;
@@ -50,9 +47,17 @@ const getProductDataHandler = ({
       }
     );
 
-    const breadcrumbUrl = product.breadcrumbUrl(
-      productCategoryData.results[0].menuitemmodel
-    );
+    const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
+
+    if (!menuItemModel) {
+      logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
+        handler: 'getProductDataHandler',
+        pk
+      });
+      return { data, breadcrumbData: undefined };
+    }
+
+    const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
     const breadcrumbData = await appFetch<any>(breadcrumbUrl, {
       headers: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.42.0-rc.1",
+  "version": "1.42.0-rc.11",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.42.0-rc.1",
+    "@akinon/eslint-plugin-projectzero": "1.42.0-rc.11",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/types/commerce/order.ts

@@ -109,8 +109,13 @@ export interface Order {
   shipping_option: number;
   tracking_number: string;
   tracking_url: string;
+  [key: string]: any;
   bank: {
+    pk: number;
+    name: string;
+    slug: string;
     logo: string;
+    [key: string]: any;
   };
 }
 

package/types/index.ts

@@ -2,7 +2,7 @@ import { LocaleUrlStrategy } from '../localization';
 import { PzNextRequest } from '../middlewares';
 import { Control, FieldError } from 'react-hook-form';
 import { ReactNode } from 'react';
-
+import { UsePaginationType } from '../hooks/use-pagination';
 declare global {
   interface Window {
     // we did it like this because declare types needs to be identical, if not it will fail
@@ -291,3 +291,21 @@ export interface AccordionProps {
 export interface PluginModuleComponentProps {
   settings?: Record<string, any>;
 }
+
+export interface PaginationProps {
+  total: number | undefined;
+  limit?: number | undefined;
+  currentPage: number | undefined;
+  numberOfPages?: number | undefined;
+  containerClassName?: string;
+  moreButtonClassName?: string;
+  prevClassName?: string;
+  nextClassName?: string;
+  pageClassName?: string;
+  threshold?: number | undefined;
+  delta?: number | undefined;
+  render?: (pagination: UsePaginationType) => ReactNode;
+  type?: 'infinite' | 'list' | 'more';
+  onPageChange?: (page: number) => void;
+  direction?: 'next' | 'prev';
+}

package/utils/index.ts

@@ -63,18 +63,33 @@ export function getTranslateFn(path: string, translations: any) {
 
 export function buildClientRequestUrl(
   path: string,
-  options?: ClientRequestOptions
+  options?: ClientRequestOptions & { cache?: boolean }
 ) {
   let url = `/api/client${path}`;
 
+  let hasQuery = url.includes('?');
+
   if (options) {
-    if (url.includes('?')) {
-      url += '&';
-    } else {
-      url += '?';
+    const { cache, ...otherOptions } = options;
+
+    if (Object.keys(otherOptions).length > 0) {
+      if (hasQuery) {
+        url += '&';
+      } else {
+        url += '?';
+        hasQuery = true;
+      }
+      url += `options=${encodeURIComponent(JSON.stringify(otherOptions))}`;
     }
 
-    url += `options=${encodeURIComponent(JSON.stringify(options))}`;
+    if (cache === false) {
+      if (hasQuery) {
+        url += '&';
+      } else {
+        url += '?';
+      }
+      url += `t=${Date.now()}`;
+    }
   }
 
   return url;