@akinon/next 1.61.0 → 1.62.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/next
 
+## 1.62.0
+
+### Minor Changes
+
+- c416d18: ZERO-2915: Add delivery option null check for setAddress
+- 033b084: ZERO-2956: refactor redirect response handling for set-cookie headers
+- fcea495: ZERO-2956: add set-cookies headers in url-redirection middleware
+
 ## 1.61.0
 
 ### Minor Changes

package/components/index.ts

@@ -14,6 +14,7 @@ export * from './price';
 export * from './pz-providers';
 export * from './radio';
 export * from './react-portal';
+export * from './select';
 export * from './selected-payment-option-view';
 export * from './trans';
 export * from './link';

package/components/plugin-module.tsx

@@ -19,7 +19,8 @@ enum Plugin {
   Masterpass = 'pz-masterpass',
   B2B = 'pz-b2b',
   Akifast = 'pz-akifast',
-  MultiBasket = 'pz-multi-basket'
+  MultiBasket = 'pz-multi-basket',
+  SavedCard = 'pz-saved-card'
 }
 
 export enum Component {
@@ -43,7 +44,8 @@ export enum Component {
   BasketB2B = 'BasketB2b',
   AkifastQuickLoginButton = 'QuickLoginButton',
   AkifastCheckoutButton = 'CheckoutButton',
-  MultiBasket = 'MultiBasket'
+  MultiBasket = 'MultiBasket',
+  SavedCard = 'Option'
 }
 
 const PluginComponents = new Map([
@@ -75,7 +77,8 @@ const PluginComponents = new Map([
     Plugin.Akifast,
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
   ],
-  [Plugin.MultiBasket, [Component.MultiBasket]]
+  [Plugin.MultiBasket, [Component.MultiBasket]],
+  [Plugin.SavedCard, [Component.SavedCard]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -138,6 +141,8 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-akifast'}`);
             } else if (plugin === Plugin.MultiBasket) {
               promise = import(`${'@akinon/pz-multi-basket'}`);
+            } else if (plugin === Plugin.SavedCard) {
+              promise = import(`${'@akinon/pz-saved-card'}`);
             }
           } catch (error) {
             logger.error(error);

package/components/select.tsx

@@ -0,0 +1,70 @@
+import { forwardRef } from 'react';
+import { SelectProps } from '@theme/components/types';
+import clsx from 'clsx';
+import { Icon } from './icon';
+import { twMerge } from 'tailwind-merge';
+
+const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
+  const {
+    className,
+    options,
+    borderless = false,
+    icon,
+    iconSize,
+    error,
+    label,
+    required = false,
+    ...rest
+  } = props;
+
+  return (
+    <label
+      className={clsx('flex flex-col relative text-xs text-gray-800', {
+        'pl-7': icon
+      })}
+    >
+      {icon && (
+        <Icon
+          name={icon}
+          size={iconSize ?? 20}
+          className="absolute left-0 top-1/2 transform -translate-y-1/2"
+        />
+      )}
+
+      {label && (
+        <span className="mb-1">
+          {label} {required && <span className="text-secondary">*</span>}
+        </span>
+      )}
+      <select
+        {...rest}
+        ref={ref}
+        className={twMerge(
+          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'
+          ),
+          className
+        )}
+      >
+        {options.map((option) => (
+          <option
+            key={option.value}
+            value={option.value}
+            className={option.class}
+          >
+            {option.label}
+          </option>
+        ))}
+      </select>
+      {error && (
+        <span className="mt-1 text-sm text-error">{error.message}</span>
+      )}
+    </label>
+  );
+});
+
+Select.displayName = 'Select';
+
+export { Select };

package/components/selected-payment-option-view.tsx

@@ -17,7 +17,8 @@ const paymentTypeToView = {
   loyalty_money: 'loyalty',
   masterpass: 'credit-card',
   pay_on_delivery: 'pay-on-delivery',
-  redirection: 'redirection'
+  redirection: 'redirection',
+  saved_card: 'saved-card'
   // Add other mappings as needed
 };
 

package/hooks/use-payment-options.ts

@@ -19,6 +19,7 @@ export const usePaymentOptions = () => {
     bkm_express: 'pz-bkm',
     credit_payment: 'pz-credit-payment',
     masterpass: 'pz-masterpass',
+    saved_card: 'pz-saved-card',
     gpay: 'pz-gpay'
   };
 

package/middlewares/url-redirection.ts

@@ -1,4 +1,4 @@
-import { NextFetchEvent, NextMiddleware } from 'next/server';
+import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
 import settings from 'settings';
 import { PzNextRequest } from '.';
 import logger from '../utils/log';
@@ -58,7 +58,19 @@ const withUrlRedirection =
           req.middlewareParams.rewrites.locale
         );
 
-        return Response.redirect(redirectUrl.toString(), request.status);
+        const setCookies = request.headers.getSetCookie();
+
+        const response = NextResponse.redirect(redirectUrl.toString(), {
+          status: request.status
+        });
+
+        if (setCookies && setCookies.length > 0) {
+          for (const cookie of setCookies) {
+            response.headers.append('Set-Cookie', cookie);
+          }
+        }
+
+        return response;
       }
     } catch (error) {
       logger.error('withUrlRedirection error', {

package/package.json

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

package/plugins.d.ts

@@ -22,3 +22,8 @@ declare module '@akinon/pz-otp' {
 declare module '@akinon/pz-otp/src/redux/reducer' {
   export const showPopup: any;
 }
+
+declare module 'pz-saved-card' {
+  export const savedCardReducer: unknown;
+  export const savedCardMiddleware: unknown;
+}

package/plugins.js

@@ -12,5 +12,6 @@ module.exports = [
   'pz-b2b',
   'pz-akifast',
   'pz-multi-basket',
+  'pz-saved-card',
   'pz-tabby-extension'
 ];

package/redux/middlewares/checkout.ts

@@ -107,7 +107,8 @@ export const preOrderMiddleware: Middleware = ({
     if (
       (!preOrder.shipping_address || !preOrder.billing_address) &&
       addresses.length > 0 &&
-      preOrder.delivery_option?.delivery_option_type === 'customer'
+      (!preOrder.delivery_option ||
+        preOrder.delivery_option.delivery_option_type === 'customer')
     ) {
       dispatch(
         apiEndpoints.setAddresses.initiate({
@@ -225,7 +226,9 @@ export const contextListMiddleware: Middleware = ({
         }
 
         if (context.page_context.credit_payment_options) {
-          dispatch(setCreditPaymentOptions(context.page_context.credit_payment_options));
+          dispatch(
+            setCreditPaymentOptions(context.page_context.credit_payment_options)
+          );
         }
 
         if (context.page_context.payment_choices) {

package/redux/middlewares/index.ts

@@ -11,6 +11,8 @@ import {
 import { api } from '../../data/client/api';
 import logger from '@akinon/next/utils/log';
 
+import { savedCardMiddleware } from '@akinon/pz-saved-card';
+
 export const rtkQueryResponseHandler: Middleware =
   ({ dispatch }) =>
   (next) =>
@@ -44,7 +46,8 @@ const middlewares = [
   rtkQueryErrorHandler,
   errorMiddleware,
   preOrderMiddleware,
-  contextListMiddleware
+  contextListMiddleware,
+  savedCardMiddleware
 ];
 
 export default middlewares;

package/redux/reducers/index.ts

@@ -7,6 +7,7 @@ import { api } from '../../data/client/api';
 // Plugin reducers
 import { masterpassReducer } from '@akinon/pz-masterpass';
 import { otpReducer } from '@akinon/pz-otp';
+import { savedCardReducer } from '@akinon/pz-saved-card';
 
 const reducers = {
   [api.reducerPath]: api.reducer,
@@ -15,7 +16,8 @@ const reducers = {
   config: configReducer,
   header: headerReducer,
   masterpass: masterpassReducer,
-  otp: otpReducer
+  otp: otpReducer,
+  saved_card: savedCardReducer
 };
 
 export default reducers;

package/routes/pretty-url.tsx

@@ -63,16 +63,13 @@ export async function generateMetadata({ params }: PageProps) {
     .filter((x) => !x.startsWith('searchparams'))
     .join('/');
 
-  const searchParams = Object.fromEntries(
-    new URLSearchParams(
-      decodeURIComponent(
-        prettyurl
-          .find((x) => x.startsWith('searchparams'))
-          ?.replace('searchparams%7C', '')
-      ) ?? {}
-    ).entries()
+  const searchParams = new URLSearchParams(
+    decodeURIComponent(
+      prettyurl
+        .find((x) => x.startsWith('searchparams'))
+        ?.replace('searchparams%7C', '')
+    ) ?? {}
   );
-
   const prettyUrlResult = await resolvePrettyUrlHandler(pageSlug, null)();
 
   if (!prettyUrlResult.matched) {
@@ -162,7 +159,7 @@ export default async function Page({ params }) {
       ...params,
       pk: result.pk
     },
-    searchParams
+    searchParams: urlSearchParams
   };
 
   if (result.path.startsWith('/category/')) {