@akinon/next 1.44.0 → 1.45.0-rc.1

package/types/commerce/checkout.ts

@@ -33,6 +33,23 @@ export interface ShippingOption {
   slug: string;
 }
 
+export interface DataSource {
+  pk: number;
+  name: string;
+  data_source_shipping_options: DataSourceShippingOption[];
+}
+
+export interface DataSourceShippingOption {
+  pk: number;
+  shipping_amount: string;
+  shipping_option_name: string;
+  shipping_option_logo: string | null;
+  data_source: {
+    pk: number;
+    title: string | null;
+  };
+}
+
 export interface CheckoutAddressType {
   label: string;
   text: string;
@@ -78,6 +95,8 @@ export interface PreOrder {
   retail_store?: RetailStore;
   gift_box?: GiftBox;
   credit_payment_option?: CheckoutCreditPaymentOption;
+  data_source_shipping_options: any;
+  attribute_based_shipping_options?: AttributeBasedShippingOption[];
 }
 
 export interface GuestLoginFormParams {
@@ -117,6 +136,7 @@ export interface CheckoutContext {
     redirect_url?: string;
     context_data?: any;
     balance?: string;
+    attribute_based_shipping_options?: AttributeBasedShippingOption[];
     [key: string]: any;
   };
 }
@@ -142,3 +162,13 @@ export interface BankAccount {
   pk: number;
   sort_order: number;
 }
+
+export interface AttributeBasedShippingOption {
+  pk: number;
+  shipping_amount: string | null;
+  shipping_option_name: string | null;
+  shipping_option_logo: string | null;
+  attribute_value: string | null;
+  attribute_key: string;
+  [key: string]: any;
+}

package/types/commerce/misc.ts

@@ -2,6 +2,8 @@ import { District } from './address';
 export interface Config {
   user_phone_regex: string;
   user_phone_format: string;
+  user_post_code_regex: string;
+  user_post_code_format: string;
   country: {
     pk: number;
     name: string;

package/types/commerce/order.ts

@@ -52,6 +52,10 @@ export interface OrderItem {
   quantity: string;
   unit_price: string;
   total_amount: string;
+  attributes: {
+    gift_note: string;
+    [key: string]: any;
+  };
 }
 
 export interface Order {
@@ -105,6 +109,14 @@ 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;
+  };
 }
 
 export interface Quotations {

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
@@ -68,9 +68,17 @@ export interface Currency {
    * @see https://en.wikipedia.org/wiki/ISO_4217
    */
   code: string;
+  /**
+   * Number of decimal places to display.
+   *
+   * @example
+   * decimalScale: 3
+   */
+  decimalScale?: number;
 }
 
 export interface Settings {
+  usePrettyUrlRoute?: boolean;
   commerceUrl: string;
   redis: {
     defaultExpirationTime: number;
@@ -216,7 +224,7 @@ export type Translations = { [key: string]: object };
 
 export interface PageProps<T = any> {
   params: T;
-  searchParams: URLSearchParams;
+  searchParams: { [key: string]: string | string[] | undefined };
 }
 
 export interface LayoutProps<T = any> extends PageProps<T> {
@@ -283,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/app-fetch.ts

@@ -41,7 +41,7 @@ const appFetch = async <T>(
     };
 
     init.next = {
-      revalidate: 60
+      revalidate: Settings.usePrettyUrlRoute ? 0 : 60
     };
 
     logger.debug(`FETCH START ${url}`, { requestURL, init, ip });

package/utils/generate-commerce-search-params.ts

@@ -1,11 +1,15 @@
 import logger from './log';
 
-export const generateCommerceSearchParams = (searchParams?: URLSearchParams) => {
+export const generateCommerceSearchParams = (searchParams?: {
+  [key: string]: string | string[] | undefined;
+}) => {
   if (!searchParams) {
     return null;
   }
 
-  const urlSerchParams = new URLSearchParams(searchParams);
+  const urlSerchParams = new URLSearchParams(
+    searchParams as Record<string, string>
+  );
 
   Object.entries(searchParams).forEach(([key, value]) => {
     if (typeof value === 'object') {

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;
@@ -102,6 +117,12 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
     ''
   );
 
+  const noOptionFileExtension = url?.split('.').pop()?.toLowerCase() ?? '';
+
+  if (noOptionFileExtension === 'svg' || noOptionFileExtension === 'gif') {
+    return url;
+  }
+
   let options = '';
 
   if (config) {

package/utils/menu-generator.ts

@@ -13,8 +13,8 @@ export const menuGenerator = (arr: MenuItemType[]) => {
     });
 
     Object.values(data).forEach((item) => {
-      if (item.parent) {
-        data[item.parent.pk].children.push(item);
+      if (item.parent_pk) {
+        data[item.parent_pk].children.push(item);
       } else {
         tree.push(item);
       }

package/utils/redirection-iframe.ts

@@ -0,0 +1,85 @@
+const iframeURLChange = (iframe, callback) => {
+  iframe.addEventListener('load', () => {
+    setTimeout(() => {
+      if (iframe?.contentWindow?.location) {
+        callback(iframe.contentWindow.location);
+      }
+    }, 0);
+  });
+};
+
+const removeIframe = async () => {
+  const iframeSelector = document.querySelector(
+    '.checkout-payment-redirection-iframe-wrapper'
+  );
+
+  const redirectionPaymentWrapper = document.querySelector(
+    '.checkout-redirection-payment-wrapper'
+  );
+
+  const form = redirectionPaymentWrapper.querySelector('form') as HTMLElement;
+
+  if (!iframeSelector) {
+    return;
+  }
+
+  iframeSelector.remove();
+
+  if (form) {
+    form.style.display = 'block';
+  }
+
+  location.reload();
+};
+
+export const showRedirectionIframe = (redirectUrl: string) => {
+  const iframeWrapper = document.createElement('div');
+  const iframe = document.createElement('iframe');
+  const closeButton = document.createElement('div');
+  const redirectionPaymentWrapper = document.querySelector(
+    '.checkout-redirection-payment-wrapper'
+  );
+  const form = redirectionPaymentWrapper.querySelector('form') as HTMLElement;
+
+  iframeWrapper.className = 'checkout-payment-redirection-iframe-wrapper';
+  closeButton.className = 'close-button';
+
+  iframe.setAttribute('src', redirectUrl);
+  closeButton.innerHTML = '&#x2715';
+  closeButton.addEventListener('click', removeIframe);
+
+  iframeWrapper.append(iframe, closeButton);
+
+  if (form) {
+    form.style.display = 'none';
+  }
+
+  redirectionPaymentWrapper.appendChild(iframeWrapper);
+
+  iframeURLChange(iframe, (location) => {
+    if (location.origin !== window.location.origin) {
+      return false;
+    }
+
+    const searchParams = new URLSearchParams(location.search);
+    const isOrderCompleted = location.href.includes('/orders/completed');
+
+    if (isOrderCompleted) {
+      (window.parent as any)?.postMessage?.(
+        JSON.stringify({
+          url: location.pathname
+        })
+      );
+    }
+
+    if (
+      searchParams.has('success') ||
+      isOrderCompleted ||
+      location.href.includes('/orders/checkout')
+    ) {
+      setTimeout(() => {
+        removeIframe();
+      }, 0);
+    }
+  });
+};

package/utils/server-translation.ts

@@ -5,10 +5,10 @@ import { getTranslateFn } from '../utils';
 import { Translations } from '../types';
 import settings from 'settings';
 import logger from './log';
+import { unstable_cache } from 'next/cache';
 
 export const translations: Translations = {};
 
-// TODO: Read translations from cache
 export async function getTranslations(locale_: string) {
   try {
     const locale = settings.localization.locales.find(
@@ -52,6 +52,10 @@ export async function getTranslations(locale_: string) {
   return translations;
 }
 
+export const getCachedTranslations = unstable_cache(async (locale: string) =>
+  getTranslations(locale)
+);
+
 export function t(path: string) {
   return getTranslateFn(path, translations);
 }

package/with-pz-config.js

@@ -8,6 +8,7 @@ const defaultConfig = {
   transpilePackages: ['@akinon/next', ...pzPlugins.map((p) => `@akinon/${p}`)],
   skipTrailingSlashRedirect: true,
   poweredByHeader: false,
+  cacheMaxMemorySize: 0,
   env: {
     NEXT_PUBLIC_SENTRY_DSN: process.env.SENTRY_DSN
   },
@@ -65,7 +66,12 @@ const defaultConfig = {
   }
 };
 
-const withPzConfig = (myNextConfig = {}) => {
+const withPzConfig = (
+  myNextConfig = {},
+  options = {
+    useCacheHandler: false
+  }
+) => {
   let extendedConfig = deepMerge({}, defaultConfig, myNextConfig);
 
   const originalPzHeadersFunction = defaultConfig.headers;
@@ -91,6 +97,10 @@ const withPzConfig = (myNextConfig = {}) => {
     return [...pzRewrites, ...myRewrites];
   };
 
+  if (options.useCacheHandler && process.env.CACHE_HOST) {
+    extendedConfig.cacheHandler = require.resolve('./lib/cache-handler.mjs');
+  }
+
   return extendedConfig;
 };