@akinon/next 1.82.0-rc.5 → 1.82.0-rc.6

package/.eslintrc.js

@@ -24,6 +24,18 @@ module.exports = {
       parserOptions: {
         sourceType: 'script'
       }
+    },
+    {
+      env: {
+        node: true
+      },
+      files: ['redux/middlewares/pre-order/index.ts'],
+      rules: {
+        '@akinon/projectzero/check-pre-order-middleware-order': 'error'
+      },
+      parserOptions: {
+        sourceType: 'script'
+      }
     }
   ],
   parser: '@typescript-eslint/parser',

package/CHANGELOG.md

@@ -1,10 +1,18 @@
 # @akinon/next
 
+## 1.82.0-rc.6
+
+### Minor Changes
+
+- 0b1bd07f: ZERO-3240: Remove unused preOrderMiddleware
+
 ## 1.82.0-rc.5
 
 ### Minor Changes
 
+- 6f506afc: ZERO-3229: Implement mini basket query for basket total quantity
 - c0c19629: ZERO-3258: Add new API endpoints for fetching Bukalemun image URL and bundle product data
+- 9be2c081: ZERO-3243: Improve basket update query handling with optimistic updates
 
 ## 1.82.0-rc.4
 

package/data/client/basket.ts

@@ -24,6 +24,26 @@ export const basketApi = api.injectEndpoints({
       transformResponse: (response: { basket: Basket }) => response.basket,
       providesTags: ['Basket']
     }),
+    getMiniBasket: build.query<
+      { pk: number | null; total_quantity: number },
+      void
+    >({
+      query: () =>
+        buildClientRequestUrl(basket.getMiniBasket, {
+          contentType: 'application/json'
+        }),
+      providesTags: ['Basket']
+    }),
+    getMiniBasketDetail: build.query<
+      { pk: number | null; total_quantity: number },
+      { namespace: string }
+    >({
+      query: ({ namespace }) =>
+        buildClientRequestUrl(basket.getMiniBasketDetail(namespace), {
+          contentType: 'application/json'
+        }),
+      providesTags: ['MultiBasket']
+    }),
     getBasketDetail: build.query<Basket, { namespace: string }>({
       query: ({ namespace }) =>
         buildClientRequestUrl(basket.getBasketDetail(namespace)),
@@ -84,23 +104,45 @@ export const basketApi = api.injectEndpoints({
         method: 'PUT',
         body
       }),
-      // TODO: It doesn't work with namespaced baskets. Fix it and remove invalidatesTags.
-      invalidatesTags: ['MultiBasket', 'Basket']
+      async onQueryStarted(_, { dispatch, queryFulfilled }) {
+        try {
+          const { data } = await queryFulfilled;
+
+          dispatch(
+            basketApi.util.updateQueryData(
+              'getBasket',
+              undefined,
+              () => data.basket
+            )
+          );
 
-      // async onQueryStarted(_, { dispatch, queryFulfilled }) {
-      //   try {
-      //     const { data } = await queryFulfilled;
-      //     dispatch(
-      //       basketApi.util.updateQueryData(
-      //         'getBasket',
-      //         undefined,
-      //         () => data.basket
-      //       )
-      //     );
-      //   } catch {
-      //     dispatch(basketApi.util.invalidateTags(['MultiBasket', 'Basket']));
-      //   }
-      // }
+          if (data.basket.namespace) {
+            dispatch(
+              basketApi.util.updateQueryData(
+                'getBasketDetail',
+                { namespace: data.basket.namespace },
+                () => data.basket
+              )
+            );
+          }
+
+          dispatch(
+            basketApi.util.updateQueryData(
+              'getAllBaskets',
+              undefined,
+              (baskets) => {
+                if (!baskets) return baskets;
+
+                return baskets.map((basket) =>
+                  basket.pk === data.basket.pk ? data.basket : basket
+                );
+              }
+            )
+          );
+        } catch (error) {
+          console.error('Error updating quantity:', error);
+        }
+      }
     }),
     clearBasket: build.mutation<Basket, void>({
       query: (body) => ({
@@ -141,6 +183,8 @@ export const basketApi = api.injectEndpoints({
 
 export const {
   useGetBasketQuery,
+  useGetMiniBasketQuery,
+  useGetMiniBasketDetailQuery,
   useLazyGetBasketDetailQuery,
   useGetAllBasketsQuery,
   useRemoveBasketMutation,

package/data/urls.ts

@@ -74,7 +74,10 @@ export const address = {
 
 export const basket = {
   getBasket: '/baskets/basket/',
+  getMiniBasket: '/baskets/basket/mini/',
   getBasketDetail: (namespace: string) => `/baskets/basket/${namespace}/`,
+  getMiniBasketDetail: (namespace: string) =>
+    `/baskets/basket/${namespace}/mini/`,
   getAllBaskets: '/baskets/basket-list/',
   removeBasket: (pk: number) => `/baskets/basket-list/${pk}/`,
   selectMainBasket: (pk: number) => `/baskets/basket-list/id/${pk}/main/`,

package/package.json

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

package/redux/middlewares/checkout.ts

@@ -16,10 +16,8 @@ import {
   setLoyaltyBalance,
   setPaymentChoices,
   setPaymentOptions,
-  setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setShippingStepCompleted,
   setHepsipayAvailability,
   setWalletPaymentData,
   setPayOnDeliveryOtpModalActive
@@ -59,146 +57,6 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
   };
 };
 
-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,
-      dataSourceShippingOptions,
-      paymentOptions,
-      installmentOptions,
-      attributeBasedShippingOptions
-    } = 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 ||
-        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 (
-      dataSourceShippingOptions.length > 0 &&
-      !preOrder.data_source_shipping_options
-    ) {
-      const selectedDataSourceShippingOptionsPks =
-        dataSourceShippingOptions.map(
-          (opt) => opt.data_source_shipping_options[0].pk
-        );
-
-      dispatch(
-        apiEndpoints.setDataSourceShippingOptions.initiate(
-          selectedDataSourceShippingOptionsPks
-        )
-      );
-    }
-
-    if (
-      Object.keys(attributeBasedShippingOptions).length > 0 &&
-      !preOrder.attribute_based_shipping_options
-    ) {
-      const initialSelectedOptions: Record<string, number> = Object.fromEntries(
-        Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
-          key,
-          options.attribute_based_shipping_options[0].pk
-        ])
-      );
-
-      dispatch(
-        apiEndpoints.setAttributeBasedShippingOptions.initiate(
-          initialSelectedOptions
-        )
-      );
-    }
-
-    if (!preOrder.payment_option && paymentOptions.length > 0) {
-      dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
-    }
-
-    if (
-      !preOrder.installment &&
-      preOrder.payment_option?.payment_type !== 'saved_card' &&
-      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

package/redux/middlewares/pre-order/address.ts

@@ -37,6 +37,8 @@ export const setAddressMiddleware: Middleware = ({
           billingAddressPk: firstAddressPk
         })
       );
+
+      return null;
     }
 
     return result;

package/redux/middlewares/pre-order/attribute-based-shipping-option.ts

@@ -33,6 +33,8 @@ export const attributeBasedShippingOptionMiddleware: Middleware = ({
           initialSelectedOptions
         )
       );
+
+      return null;
     }
 
     return result;

package/redux/middlewares/pre-order/data-source-shipping-option.ts

@@ -29,6 +29,8 @@ export const dataSourceShippingOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setDataSourceShippingOptions.initiate(selectedPks)
         );
+
+        return null;
       }
     }
 

package/redux/middlewares/pre-order/delivery-option.ts

@@ -26,6 +26,8 @@ export const deliveryOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setDeliveryOption.initiate(customerDeliveryOption)
         );
+
+        return null;
       }
     }
 

package/redux/middlewares/pre-order/index.ts

@@ -10,16 +10,20 @@ import { paymentOptionMiddleware } from './payment-option';
 import { installmentOptionMiddleware } from './installment-option';
 import { shippingStepMiddleware } from './shipping-step';
 
+// ⚠️ WARNING: Redux Toolkit applies middlewares in reverse order (from last to first).
+// This list is written **in reverse execution order** to ensure they run in the correct sequence.  
+// If you add a new middleware, make sure to insert it **in reverse order** based on execution priority.
+
 export const preOrderMiddlewares = [
-  preOrderValidationMiddleware,
-  redirectionMiddleware,
-  setPreOrderMiddleware,
-  deliveryOptionMiddleware,
-  setAddressMiddleware,
-  shippingOptionMiddleware,
-  dataSourceShippingOptionMiddleware,
-  attributeBasedShippingOptionMiddleware,
-  paymentOptionMiddleware,
+  shippingStepMiddleware,
   installmentOptionMiddleware,
-  shippingStepMiddleware
+  paymentOptionMiddleware,
+  attributeBasedShippingOptionMiddleware,
+  dataSourceShippingOptionMiddleware,
+  shippingOptionMiddleware,
+  setAddressMiddleware,
+  deliveryOptionMiddleware,
+  setPreOrderMiddleware,
+  redirectionMiddleware,
+  preOrderValidationMiddleware
 ];

package/redux/middlewares/pre-order/installment-option.ts

@@ -28,6 +28,8 @@ export const installmentOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setInstallmentOption.initiate(firstInstallmentOptionPk)
         );
+
+        return null;
       }
     }
 

package/redux/middlewares/pre-order/payment-option.ts

@@ -21,6 +21,8 @@ export const paymentOptionMiddleware: Middleware = ({
       const firstPaymentOptionPk = paymentOptions[0]?.pk;
 
       dispatch(apiEndpoints.setPaymentOption.initiate(firstPaymentOptionPk));
+
+      return null;
     }
 
     return result;

package/redux/middlewares/pre-order/redirection.ts

@@ -26,6 +26,8 @@ export const redirectionMiddleware: Middleware = ({
             preOrder.payment_option?.pk
           )
         );
+
+        return null;
       }
     }
 

package/redux/middlewares/pre-order/shipping-option.ts

@@ -30,6 +30,8 @@ export const shippingOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setShippingOption.initiate(defaultShippingOption)
         );
+
+        return null;
       }
     }