@akinon/next 1.56.0 → 1.58.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @akinon/next
 
+## 1.58.0
+
+### Minor Changes
+
+- f3d076b: ZERO-2864: create tabby extension plugin
+
+## 1.57.0
+
+### Minor Changes
+
+- fad2768: ZERO-2739: add gpay to payment plugin map
+- dff0d59: ZERO-2659: add formData support to proxy api requests
+
 ## 1.56.0
 
 ### Minor Changes

package/api/client.ts

@@ -84,12 +84,13 @@ async function proxyRequest(...args) {
     fetchOptions.headers['Content-Type'] = options.contentType;
   }
 
+  const isMultipartFormData = req.headers.get('content-type')?.includes('multipart/form-data;');
+
   if (req.method !== 'GET') {
-    const formData = new URLSearchParams();
-    let body = {};
+    let body: Record<string, any> | FormData = {};
 
     try {
-      body = await req.json();
+      body = isMultipartFormData ? await req.formData() : await req.json();
     } catch (error) {
       logger.error(
         `Client Proxy Request - Error while parsing request body to JSON`,
@@ -100,13 +101,21 @@ async function proxyRequest(...args) {
       );
     }
 
-    Object.keys(body ?? {}).forEach((key) => {
-      if (body[key]) {
-        formData.append(key, body[key]);
-      }
-    });
+    if (isMultipartFormData) {
+      fetchOptions.body = body as FormData;
+    } else {
+      const formData = new FormData();
 
-    fetchOptions.body = !options.useFormData ? JSON.stringify(body) : formData;
+      Object.keys(body ?? {}).forEach((key) => {
+        if (body[key]) {
+          formData.append(key, body[key]);
+        }
+      });
+
+      fetchOptions.body = !options.useFormData
+        ? JSON.stringify(body)
+        : formData;
+    }
   }
 
   let url = `${commerceUrl}/${slug.replace(/,/g, '/')}`;

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

@@ -6,6 +6,21 @@ import dynamic from 'next/dynamic';
 import { PaymentOptionViews } from 'views/checkout/steps/payment';
 import { useMemo } from 'react';
 
+const fallbackView = () => <div />;
+
+const paymentTypeToView = {
+  bkm_express: 'bkm',
+  credit_card: 'credit-card',
+  credit_payment: 'credit-payment',
+  funds_transfer: 'funds-transfer',
+  gpay: 'gpay',
+  loyalty_money: 'loyalty',
+  masterpass: 'credit-card',
+  pay_on_delivery: 'pay-on-delivery',
+  redirection: 'redirection'
+  // Add other mappings as needed
+};
+
 export default function SelectedPaymentOptionView() {
   const { payment_option } = useAppSelector(
     (state: RootState) => state.checkout.preOrder
@@ -14,7 +29,7 @@ export default function SelectedPaymentOptionView() {
   const Component = useMemo(
     () =>
       dynamic(
-        () => {
+        async () => {
           const customOption = PaymentOptionViews.find(
             (opt) => opt.slug === payment_option?.slug
           );
@@ -29,46 +44,20 @@ export default function SelectedPaymentOptionView() {
             });
           }
 
-          let promise: any;
+          const view = paymentTypeToView[payment_option?.payment_type] || null;
 
-          try {
-            if (payment_option?.payment_type === 'credit_card') {
-              promise = import(
-                `views/checkout/steps/payment/options/credit-card`
-              );
-            } else if (payment_option?.payment_type === 'funds_transfer') {
-              promise = import(
-                `views/checkout/steps/payment/options/funds-transfer`
-              );
-            } else if (payment_option?.payment_type === 'redirection') {
-              promise = import(
-                `views/checkout/steps/payment/options/redirection`
-              );
-            } else if (payment_option?.payment_type === 'pay_on_delivery') {
-              promise = import(
-                `views/checkout/steps/payment/options/pay-on-delivery`
-              );
-            } else if (payment_option?.payment_type === 'loyalty_money') {
-              promise = import(`views/checkout/steps/payment/options/loyalty`);
-            } else if (payment_option?.payment_type === 'masterpass') {
-              promise = import(
-                `views/checkout/steps/payment/options/credit-card`
+          if (view) {
+            try {
+              const mod = await import(
+                `views/checkout/steps/payment/options/${view}`
               );
+              return mod.default || fallbackView;
+            } catch (error) {
+              return fallbackView;
             }
-            // else if (payment_option.payment_type === 'credit_payment') {
-            //   promise = import(`views/checkout/steps/payment/options/credit-payment`);
-            // }
-            // else if (payment_option.payment_type === 'gpay') {
-            //   promise = import(`views/checkout/steps/payment/options/gpay`);
-            // }
-            // else if (payment_option.payment_type === 'bkm_express') {
-            //   promise = import(`views/checkout/steps/payment/options/bkm`);
-            // }
-          } catch (error) {}
+          }
 
-          return promise
-            ? promise.then((mod) => mod.default).catch(() => () => null)
-            : new Promise<any>((resolve) => resolve(() => null));
+          return fallbackView;
         },
         { ssr: false }
       ),

package/data/client/account.ts

@@ -123,15 +123,16 @@ const accountApi = api.injectEndpoints({
       query: ({ page, status, limit }) =>
         buildClientRequestUrl(account.getQuotations(page, status, limit))
     }),
-    sendContact: builder.mutation<void, ContactFormType>({
-      query: (body) => ({
-        url: buildClientRequestUrl(account.sendContact, {
-          contentType: 'application/json',
-          responseType: 'text'
-        }),
-        method: 'POST',
-        body
-      })
+    sendContact: builder.mutation<void, FormData>({
+      query: (body) => {
+        return {
+          url: buildClientRequestUrl(account.sendContact, {
+            useFormData: true
+          }),
+          method: 'POST',
+          body
+        };
+      }
     }),
     cancelOrder: builder.mutation<void, AccountOrderCancellation>({
       query: ({ id, ...body }) => ({

package/hooks/use-payment-options.ts

@@ -18,7 +18,8 @@ export const usePaymentOptions = () => {
     pay_on_delivery: 'pz-pay-on-delivery',
     bkm_express: 'pz-bkm',
     credit_payment: 'pz-credit-payment',
-    masterpass: 'pz-masterpass'
+    masterpass: 'pz-masterpass',
+    gpay: 'pz-gpay'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/package.json

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

package/plugins.js

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

package/types/commerce/account.ts

@@ -61,4 +61,5 @@ export type ContactFormType = {
   order?: string;
   country_code?: string;
   order_needed?: boolean;
+  file?: FileList
 };