@akinon/next 1.15.0 → 1.16.0

package/hooks/use-payment-options.ts

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

package/instrumentation/index.ts

@@ -0,0 +1,5 @@
+export async function register() {
+  if (process.env.NEXT_RUNTIME === 'nodejs') {
+    await import('./node');
+  }
+}

package/instrumentation/node.ts

@@ -0,0 +1,20 @@
+import { NodeSDK } from '@opentelemetry/sdk-node';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
+import { Resource } from '@opentelemetry/resources';
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
+
+const sdk = new NodeSDK({
+  resource: new Resource({
+    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
+  }),
+  spanProcessor: new SimpleSpanProcessor(
+    new OTLPTraceExporter({
+      url: `${
+        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
+      }/api/traces`
+    })
+  )
+});
+
+sdk.start();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -14,6 +14,11 @@
     "pz-postdev": "bin/pz-postdev.js"
   },
   "dependencies": {
+    "@opentelemetry/sdk-node": "0.46.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
+    "@opentelemetry/resources": "1.19.0",
+    "@opentelemetry/semantic-conventions": "1.19.0",
+    "@opentelemetry/sdk-trace-node": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
     "cross-spawn": "7.0.3",
     "react-redux": "8.1.3",
@@ -26,7 +31,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.15.0",
+    "@akinon/eslint-plugin-projectzero": "1.16.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/plugins.js

@@ -8,5 +8,4 @@ module.exports = [
   'pz-otp',
   'pz-bkm',
   'pz-credit-payment',
-  'pz-masterpass'
 ];

package/redux/middlewares/checkout.ts

@@ -1,265 +1,265 @@
-'use client';
-
-import { Middleware } from '@reduxjs/toolkit';
-import {
-  setAddressList,
-  setBankAccounts,
-  setCanGuestPurchase,
-  setCardType,
-  setDeliveryOptions,
-  setErrors,
-  setHasGiftBox,
-  setInstallmentOptions,
-  setLoyaltyBalance,
-  setPaymentChoices,
-  setPaymentOptions,
-  setPreOrder,
-  setRetailStores,
-  setShippingOptions,
-  setShippingStepCompleted,
-  setCreditPaymentOptions
-} from '../../redux/reducers/checkout';
-import { RootState, TypedDispatch } from 'redux/store';
-import { checkoutApi } from '../../data/client/checkout';
-import { CheckoutContext, PreOrder } from '../../types';
-import { getCookie, setCookie } from '../../utils';
-import settings from 'settings';
-import { LocaleUrlStrategy } from '../../localization';
-import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
-
-interface CheckoutResult {
-  payload: {
-    errors?: any;
-    pre_order?: PreOrder;
-    context_list?: CheckoutContext[];
-  };
-}
-
-interface MiddlewareParams {
-  getState: () => RootState;
-  dispatch: TypedDispatch;
-}
-
-export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
-  return (next) => (action) => {
-    const result: CheckoutResult = next(action);
-    const errors = result?.payload?.errors;
-
-    if (errors) {
-      dispatch(setErrors(errors));
-    }
-
-    return result;
-  };
-};
-
-export const preOrderMiddleware: Middleware = ({
-  getState,
-  dispatch
-}: MiddlewareParams) => {
-  return (next) => (action) => {
-    const result: CheckoutResult = next(action);
-    const preOrder = result?.payload?.pre_order;
-
-    if (
-      !preOrder ||
-      action?.meta?.arg?.endpointName === 'guestLogin' ||
-      action?.meta?.arg?.endpointName === 'getCheckoutLoyaltyBalance'
-    ) {
-      return result;
-    }
-
-    const {
-      deliveryOptions,
-      addressList: addresses,
-      shippingOptions,
-      paymentOptions,
-      installmentOptions
-    } = getState().checkout;
-    const { endpoints: apiEndpoints } = checkoutApi;
-
-    if (preOrder.is_redirected) {
-      const contextList = result?.payload?.context_list;
-
-      if (
-        contextList.find(
-          (ctx) => ctx.page_name === 'RedirectionPaymentSelectedPage'
-        )
-      ) {
-        dispatch(
-          apiEndpoints.setPaymentOption.initiate(preOrder.payment_option?.pk)
-        );
-        return;
-      }
-    }
-
-    dispatch(setPreOrder(preOrder));
-
-    if (!preOrder.delivery_option && deliveryOptions.length > 0) {
-      dispatch(
-        apiEndpoints.setDeliveryOption.initiate(
-          deliveryOptions.find((opt) => opt.delivery_option_type === 'customer')
-            ?.pk
-        )
-      );
-    }
-
-    if (
-      (!preOrder.shipping_address || !preOrder.billing_address) &&
-      addresses.length > 0 &&
-      preOrder.delivery_option?.delivery_option_type === 'customer'
-    ) {
-      dispatch(
-        apiEndpoints.setAddresses.initiate({
-          shippingAddressPk: addresses[0].pk,
-          billingAddressPk: addresses[0].pk
-        })
-      );
-    }
-
-    if (
-      shippingOptions.length > 0 &&
-      (!preOrder.shipping_option ||
-        !shippingOptions.find((opt) => opt.pk === preOrder.shipping_option?.pk))
-    ) {
-      dispatch(apiEndpoints.setShippingOption.initiate(shippingOptions[0].pk));
-    }
-
-    if (!preOrder.payment_option && paymentOptions.length > 0) {
-      dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
-    }
-
-    if (!preOrder.installment && installmentOptions.length > 0) {
-      dispatch(
-        apiEndpoints.setInstallmentOption.initiate(installmentOptions[0].pk)
-      );
-    }
-
-    dispatch(
-      setShippingStepCompleted(
-        [
-          preOrder.delivery_option?.delivery_option_type === 'retail_store'
-            ? true
-            : preOrder.shipping_address?.pk,
-          preOrder.billing_address?.pk,
-          preOrder.shipping_option?.pk,
-          addresses.length > 0
-        ].every(Boolean)
-      )
-    );
-
-    return result;
-  };
-};
-
-export const contextListMiddleware: Middleware = ({
-  dispatch,
-  getState
-}: MiddlewareParams) => {
-  return (next) => (action) => {
-    const { isMobileApp } = getState().root;
-    const result: CheckoutResult = next(action);
-
-    if (result?.payload?.context_list) {
-      result.payload.context_list.forEach((context) => {
-        const redirectUrl = context.page_context.redirect_url;
-
-        if (redirectUrl) {
-          const currentLocale = getCookie('pz-locale');
-
-          let url = redirectUrl;
-
-          if (currentLocale && !redirectUrl.includes('/orders/redirection')) {
-            const { defaultLocaleValue, localeUrlStrategy } =
-              settings.localization;
-
-            url =
-              currentLocale === defaultLocaleValue &&
-              localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales
-                ? redirectUrl
-                : `/${currentLocale}${redirectUrl}`;
-          }
-
-          const urlObj = new URL(url, window.location.origin);
-          urlObj.searchParams.set('t', new Date().getTime().toString());
-
-          if (
-            (isMobileApp ||
-              /iPad|iPhone|iPod|Android/i.test(navigator.userAgent)) &&
-            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
-              result.payload?.pre_order?.payment_option?.slug
-            )
-          ) {
-            showMobile3dIframe(urlObj.toString());
-          } else {
-            window.location.href = urlObj.toString();
-          }
-
-          return;
-        }
-
-        if (context.page_context.has_gift_box) {
-          dispatch(setHasGiftBox(context.page_context.has_gift_box));
-        }
-
-        if (typeof context.page_context.can_guest_purchase === 'boolean') {
-          dispatch(
-            setCanGuestPurchase(context.page_context.can_guest_purchase)
-          );
-        }
-
-        if (context.page_context.delivery_options) {
-          dispatch(setDeliveryOptions(context.page_context.delivery_options));
-        }
-
-        if (context.page_context.addresses) {
-          dispatch(setAddressList(context.page_context.addresses));
-        }
-
-        if (context.page_context.shipping_options) {
-          dispatch(setShippingOptions(context.page_context.shipping_options));
-        }
-
-        if (context.page_context.payment_options) {
-          dispatch(setPaymentOptions(context.page_context.payment_options));
-        }
-
-        if (context.page_context.credit_payment_options) {
-          dispatch(setCreditPaymentOptions(context.page_context.credit_payment_options));
-        }
-
-        if (context.page_context.payment_choices) {
-          dispatch(setPaymentChoices(context.page_context.payment_choices));
-        }
-
-        if (context.page_context.bank_accounts) {
-          dispatch(setBankAccounts(context.page_context.bank_accounts));
-        }
-
-        if (
-          !result.payload.context_list.find(
-            (ctx) => ctx.page_name === 'DeliveryOptionSelectionPage'
-          )
-        ) {
-          if (context.page_context.card_type) {
-            dispatch(setCardType(context.page_context.card_type));
-          }
-
-          if (context.page_context.installments) {
-            dispatch(setInstallmentOptions(context.page_context.installments));
-          }
-        }
-
-        if (context.page_context.balance) {
-          dispatch(setLoyaltyBalance(context.page_context.balance));
-        }
-
-        if (context.page_context.retail_stores) {
-          dispatch(setRetailStores(context.page_context.retail_stores));
-        }
-      });
-    }
-
-    return result;
-  };
-};
+'use client';
+
+import { Middleware } from '@reduxjs/toolkit';
+import {
+  setAddressList,
+  setBankAccounts,
+  setCanGuestPurchase,
+  setCardType,
+  setDeliveryOptions,
+  setErrors,
+  setHasGiftBox,
+  setInstallmentOptions,
+  setLoyaltyBalance,
+  setPaymentChoices,
+  setPaymentOptions,
+  setPreOrder,
+  setRetailStores,
+  setShippingOptions,
+  setShippingStepCompleted,
+  setCreditPaymentOptions
+} from '../../redux/reducers/checkout';
+import { RootState, TypedDispatch } from 'redux/store';
+import { checkoutApi } from '../../data/client/checkout';
+import { CheckoutContext, PreOrder } from '../../types';
+import { getCookie, setCookie } from '../../utils';
+import settings from 'settings';
+import { LocaleUrlStrategy } from '../../localization';
+import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
+
+interface CheckoutResult {
+  payload: {
+    errors?: any;
+    pre_order?: PreOrder;
+    context_list?: CheckoutContext[];
+  };
+}
+
+interface MiddlewareParams {
+  getState: () => RootState;
+  dispatch: TypedDispatch;
+}
+
+export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
+  return (next) => (action) => {
+    const result: CheckoutResult = next(action);
+    const errors = result?.payload?.errors;
+
+    if (errors) {
+      dispatch(setErrors(errors));
+    }
+
+    return result;
+  };
+};
+
+export const preOrderMiddleware: Middleware = ({
+  getState,
+  dispatch
+}: MiddlewareParams) => {
+  return (next) => (action) => {
+    const result: CheckoutResult = next(action);
+    const preOrder = result?.payload?.pre_order;
+
+    if (
+      !preOrder ||
+      action?.meta?.arg?.endpointName === 'guestLogin' ||
+      action?.meta?.arg?.endpointName === 'getCheckoutLoyaltyBalance'
+    ) {
+      return result;
+    }
+
+    const {
+      deliveryOptions,
+      addressList: addresses,
+      shippingOptions,
+      paymentOptions,
+      installmentOptions
+    } = getState().checkout;
+    const { endpoints: apiEndpoints } = checkoutApi;
+
+    if (preOrder.is_redirected) {
+      const contextList = result?.payload?.context_list;
+
+      if (
+        contextList.find(
+          (ctx) => ctx.page_name === 'RedirectionPaymentSelectedPage'
+        )
+      ) {
+        dispatch(
+          apiEndpoints.setPaymentOption.initiate(preOrder.payment_option?.pk)
+        );
+        return;
+      }
+    }
+
+    dispatch(setPreOrder(preOrder));
+
+    if (!preOrder.delivery_option && deliveryOptions.length > 0) {
+      dispatch(
+        apiEndpoints.setDeliveryOption.initiate(
+          deliveryOptions.find((opt) => opt.delivery_option_type === 'customer')
+            ?.pk
+        )
+      );
+    }
+
+    if (
+      (!preOrder.shipping_address || !preOrder.billing_address) &&
+      addresses.length > 0 &&
+      preOrder.delivery_option?.delivery_option_type === 'customer'
+    ) {
+      dispatch(
+        apiEndpoints.setAddresses.initiate({
+          shippingAddressPk: addresses[0].pk,
+          billingAddressPk: addresses[0].pk
+        })
+      );
+    }
+
+    if (
+      shippingOptions.length > 0 &&
+      (!preOrder.shipping_option ||
+        !shippingOptions.find((opt) => opt.pk === preOrder.shipping_option?.pk))
+    ) {
+      dispatch(apiEndpoints.setShippingOption.initiate(shippingOptions[0].pk));
+    }
+
+    if (!preOrder.payment_option && paymentOptions.length > 0) {
+      dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
+    }
+
+    if (!preOrder.installment && installmentOptions.length > 0) {
+      dispatch(
+        apiEndpoints.setInstallmentOption.initiate(installmentOptions[0].pk)
+      );
+    }
+
+    dispatch(
+      setShippingStepCompleted(
+        [
+          preOrder.delivery_option?.delivery_option_type === 'retail_store'
+            ? true
+            : preOrder.shipping_address?.pk,
+          preOrder.billing_address?.pk,
+          preOrder.shipping_option?.pk,
+          addresses.length > 0
+        ].every(Boolean)
+      )
+    );
+
+    return result;
+  };
+};
+
+export const contextListMiddleware: Middleware = ({
+  dispatch,
+  getState
+}: MiddlewareParams) => {
+  return (next) => (action) => {
+    const { isMobileApp } = getState().root;
+    const result: CheckoutResult = next(action);
+
+    if (result?.payload?.context_list) {
+      result.payload.context_list.forEach((context) => {
+        const redirectUrl = context.page_context.redirect_url;
+
+        if (redirectUrl) {
+          const currentLocale = getCookie('pz-locale');
+
+          let url = redirectUrl;
+
+          if (currentLocale && !redirectUrl.includes('/orders/redirection')) {
+            const { defaultLocaleValue, localeUrlStrategy } =
+              settings.localization;
+
+            url =
+              currentLocale === defaultLocaleValue &&
+              localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales
+                ? redirectUrl
+                : `/${currentLocale}${redirectUrl}`;
+          }
+
+          const urlObj = new URL(url, window.location.origin);
+          urlObj.searchParams.set('t', new Date().getTime().toString());
+
+          if (
+            (isMobileApp ||
+              /iPad|iPhone|iPod|Android/i.test(navigator.userAgent)) &&
+            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
+              result.payload?.pre_order?.payment_option?.slug
+            )
+          ) {
+            showMobile3dIframe(urlObj.toString());
+          } else {
+            window.location.href = urlObj.toString();
+          }
+
+          return;
+        }
+
+        if (context.page_context.has_gift_box) {
+          dispatch(setHasGiftBox(context.page_context.has_gift_box));
+        }
+
+        if (typeof context.page_context.can_guest_purchase === 'boolean') {
+          dispatch(
+            setCanGuestPurchase(context.page_context.can_guest_purchase)
+          );
+        }
+
+        if (context.page_context.delivery_options) {
+          dispatch(setDeliveryOptions(context.page_context.delivery_options));
+        }
+
+        if (context.page_context.addresses) {
+          dispatch(setAddressList(context.page_context.addresses));
+        }
+
+        if (context.page_context.shipping_options) {
+          dispatch(setShippingOptions(context.page_context.shipping_options));
+        }
+
+        if (context.page_context.payment_options) {
+          dispatch(setPaymentOptions(context.page_context.payment_options));
+        }
+
+        if (context.page_context.credit_payment_options) {
+          dispatch(setCreditPaymentOptions(context.page_context.credit_payment_options));
+        }
+
+        if (context.page_context.payment_choices) {
+          dispatch(setPaymentChoices(context.page_context.payment_choices));
+        }
+
+        if (context.page_context.bank_accounts) {
+          dispatch(setBankAccounts(context.page_context.bank_accounts));
+        }
+
+        if (
+          !result.payload.context_list.find(
+            (ctx) => ctx.page_name === 'DeliveryOptionSelectionPage'
+          )
+        ) {
+          if (context.page_context.card_type) {
+            dispatch(setCardType(context.page_context.card_type));
+          }
+
+          if (context.page_context.installments) {
+            dispatch(setInstallmentOptions(context.page_context.installments));
+          }
+        }
+
+        if (context.page_context.balance) {
+          dispatch(setLoyaltyBalance(context.page_context.balance));
+        }
+
+        if (context.page_context.retail_stores) {
+          dispatch(setRetailStores(context.page_context.retail_stores));
+        }
+      });
+    }
+
+    return result;
+  };
+};

package/redux/reducers/index.ts

@@ -1,15 +1,15 @@
-import rootReducer from './root';
-import checkoutReducer from './checkout';
-import configReducer from './config';
-import headerReducer from './header';
-import { api } from '../../data/client/api';
-
-const reducers = {
-  [api.reducerPath]: api.reducer,
-  root: rootReducer,
-  checkout: checkoutReducer,
-  config: configReducer,
-  header: headerReducer
-};
-
+import rootReducer from './root';
+import checkoutReducer from './checkout';
+import configReducer from './config';
+import headerReducer from './header';
+import { api } from '../../data/client/api';
+
+const reducers = {
+  [api.reducerPath]: api.reducer,
+  root: rootReducer,
+  checkout: checkoutReducer,
+  config: configReducer,
+  header: headerReducer
+};
+
 export default reducers;