@akinon/next 1.73.0-rc.2 → 1.73.0-rc.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @akinon/next
 
+## 1.73.0-rc.4
+
+### Minor Changes
+
+- c594b469: ZERO-3078: get saved cards from page context
+
+## 1.73.0-rc.3
+
+### Minor Changes
+
+- 5e3333dc: ZERO-3078: get saved cards from page context
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- 07b2298e: ZERO-3074: Exclude url schemes to init url without locales
+
 ## 1.73.0-rc.2
 
 ### Minor Changes

package/components/link.tsx

@@ -2,7 +2,7 @@
 
 import { useLocalization } from '@akinon/next/hooks';
 import { LocaleUrlStrategy } from '@akinon/next/localization';
-import { urlLocaleMatcherRegex } from '@akinon/next/utils';
+import { urlLocaleMatcherRegex, urlSchemes } from '@akinon/next/utils';
 import NextLink, { LinkProps as NextLinkProps } from 'next/link';
 import { useMemo } from 'react';
 
@@ -21,6 +21,13 @@ export const Link = ({ children, href, ...rest }: LinkProps) => {
       return '#';
     }
 
+    if (
+      typeof href !== 'string' ||
+      urlSchemes.some((scheme) => href.startsWith(scheme))
+    ) {
+      return href;
+    }
+
     if (typeof href === 'string' && !href.startsWith('http')) {
       const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
       const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;

package/data/server/basket.ts

@@ -0,0 +1,72 @@
+import { Cache, CacheKey } from '../../lib/cache';
+import { basket } from '../../data/urls';
+import { Basket } from '../../types';
+import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
+import logger from '../../utils/log';
+
+type GetBasketParams = {
+  locale?: string;
+  currency?: string;
+  namespace?: string;
+};
+
+const getBasketDataHandler = ({
+  locale,
+  currency,
+  namespace
+}: GetBasketParams) => {
+  return async function () {
+    try {
+      const url = namespace
+        ? basket.getBasketDetail(namespace)
+        : basket.getBasket;
+
+      const basketData = await appFetch<{ basket: Basket }>({
+        url,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
+        }
+      });
+
+      if (!basketData?.basket) {
+        logger.warn('Basket data is undefined', {
+          handler: 'getBasketDataHandler',
+          namespace
+        });
+      }
+
+      return basketData;
+    } catch (error) {
+      logger.error('Error fetching basket data', {
+        handler: 'getBasketDataHandler',
+        error,
+        namespace
+      });
+      throw error;
+    }
+  };
+};
+
+export const getBasketData = async ({
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
+  namespace
+}: GetBasketParams = {}) => {
+  return Cache.wrap(
+    CacheKey.Basket(namespace),
+    locale,
+    getBasketDataHandler({ locale, currency, namespace }),
+    {
+      expire: 0,
+      cache: false
+    }
+  );
+};
+
+

package/lib/cache.ts

@@ -31,6 +31,8 @@ export const CacheKey = {
     `category_${pk}_${encodeURIComponent(
       JSON.stringify(searchParams)
     )}${hashCacheKey(headers)}`,
+  Basket: (namespace?: string) => `basket${namespace ? `_${namespace}` : ''}`,
+  AllBaskets: () => 'all_baskets',
   CategorySlug: (slug: string) => `category_${slug}`,
   SpecialPage: (
     pk: number,

package/package.json

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

package/plugins.d.ts

@@ -26,8 +26,8 @@ declare module '@akinon/pz-otp/src/redux/reducer' {
 
 declare module '@akinon/pz-saved-card' {
   export const savedCardReducer: any;
+  export const savedCardMiddleware: any;
   export const SavedCardOption: any;
-  export const savedCardReducer: any;
 }
 
 declare module '@akinon/pz-iyzico-saved-card' {

package/redux/middlewares/index.ts

@@ -13,6 +13,9 @@ import {
 import { api } from '../../data/client/api';
 import logger from '@akinon/next/utils/log';
 
+// Plugin middlewares
+import { savedCardMiddleware } from '@akinon/pz-saved-card';
+
 export const rtkQueryResponseHandler: Middleware =
   ({ dispatch }) =>
   (next) =>
@@ -48,7 +51,8 @@ const middlewares = [
   preOrderMiddleware,
   contextListMiddleware,
   hepsiPayMiddleware,
-  walletPaymentMiddleware
+  walletPaymentMiddleware,
+  savedCardMiddleware
 ];
 
 export default middlewares;

package/utils/index.ts

@@ -174,3 +174,37 @@ export const getPosError = () => {
 
   return error;
 };
+
+export const urlSchemes = [
+  'http',
+  'tel:',
+  'mailto:',
+  'sms:',
+  'whatsapp:',
+  'skype:',
+  'ftp:',
+  'file:',
+  '//',
+  '#',
+  'viber:',
+  'tg:',
+  'slack:',
+  'data:',
+  'market:',
+  'intent:',
+  'webcal:',
+  'geo:',
+  'maps:',
+  'news:',
+  'facetime:',
+  'facetime-audio:',
+  'spotify:',
+  'steam:',
+  'ms-settings:',
+  'zoommtg:',
+  'zoomus:',
+  'blob:',
+  'wss:',
+  'sftp:',
+  'magnet:'
+] as const;