From 39e81d8d218b8ec4fd480368cd819845c6bade54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frane=20Poli=C4=87?=
 <16856471+fPolic@users.noreply.github.com>
Date: Tue, 19 Nov 2024 12:22:55 +0100
Subject: [PATCH] fix(dashboard): order edit - display item quantity change
 correctly (#10078)

**What**
- use a diff form change action details to display edit history
---
 .../order-activity-section/order-timeline.tsx | 39 +++++--------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/packages/admin/dashboard/src/routes/orders/order-detail/components/order-activity-section/order-timeline.tsx b/packages/admin/dashboard/src/routes/orders/order-detail/components/order-activity-section/order-timeline.tsx
index d4c4c6162b..15741b7c29 100644
--- a/packages/admin/dashboard/src/routes/orders/order-detail/components/order-activity-section/order-timeline.tsx
+++ b/packages/admin/dashboard/src/routes/orders/order-detail/components/order-activity-section/order-timeline.tsx
@@ -376,9 +376,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {
             : edit.status === "canceled"
             ? edit.canceled_at
             : edit.created_at,
-        children: isConfirmed ? (
-          <OrderEditBody edit={edit} itemsMap={itemsMap} />
-        ) : null,
+        children: isConfirmed ? <OrderEditBody edit={edit} /> : null,
       })
     }
 
@@ -839,18 +837,12 @@ const ExchangeBody = ({
   )
 }
 
-const OrderEditBody = ({
-  edit,
-  itemsMap,
-}: {
-  edit: AdminOrderChange
-  itemsMap: Map<string, AdminOrderLineItem>
-}) => {
+const OrderEditBody = ({ edit }: { edit: AdminOrderChange }) => {
   const { t } = useTranslation()
 
   const [itemsAdded, itemsRemoved] = useMemo(
-    () => countItemsChange(edit.actions, itemsMap),
-    [edit, itemsMap]
+    () => countItemsChange(edit.actions),
+    [edit]
   )
 
   return (
@@ -873,10 +865,7 @@ const OrderEditBody = ({
 /**
  * Returns count of added and removed item quantity
  */
-function countItemsChange(
-  actions: AdminOrderChange["actions"],
-  itemsMap: Map<string, AdminOrderLineItem>
-) {
+function countItemsChange(actions: AdminOrderChange["actions"]) {
   let added = 0
   let removed = 0
 
@@ -885,20 +874,12 @@ function countItemsChange(
       added += action.details!.quantity as number
     }
     if (action.action === "ITEM_UPDATE") {
-      const newQuantity = action.details!.quantity as number
-      const originalQuantity: number | undefined = itemsMap.get(
-        action.details!.reference_id as string
-      )?.quantity
+      const quantityDiff = action.details!.quantity_diff as number
 
-      if (typeof originalQuantity === "number") {
-        const diff = Math.abs(newQuantity - originalQuantity)
-
-        if (newQuantity > originalQuantity) {
-          added += diff
-        }
-        if (newQuantity < originalQuantity) {
-          removed += diff
-        }
+      if (quantityDiff > 0) {
+        added += quantityDiff
+      } else {
+        removed += Math.abs(quantityDiff)
       }
     }
   })