@bjsdistribution/dms-client-return 0.1.56-prod → 0.1.57-prod

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.56-prod",
+  "version": "0.1.57-prod",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/order-view/order-actions/actions/force-debrief/ForceDebriefModal.tsx

@@ -431,6 +431,22 @@ function ForceDebriefModal(props: IProps) {
       }
     }
 
+    // Validate escalation fields early – before any API calls
+    if (activeTab === 'failure' && isEscalationEnabled) {
+      if (
+        !escalationCategory?.value ||
+        !escalationLevel?.value ||
+        !escalationReason?.value
+      ) {
+        notification.error({
+          message: 'Error',
+          description:
+            'Escalation Category, Level and Reason are all mandatory',
+        });
+        return;
+      }
+    }
+
     if (isDifferent()) {
       await ordersUpdateApi();
     }

package/src/components/order-view/order-actions/actions/force-debrief/escalation/EscalationCategory.tsx

@@ -19,10 +19,11 @@ function EscalationCategory() {
   const faultNonFaultReasons = orderStaticData?.fault_non_fault_reasons;
   const escalationTypes = orderStaticData?.escalation_types;
 
-  const escalationCategoryOptions = orderStaticData?.escalation_category?.map(
-    (category: any) => ({
-      label: category?.type,
-      value: category?.id,
+  // Use escalation_types directly as category options (same as orders force-debrief)
+  const escalationCategoryOptions = escalationTypes?.map(
+    (type: any) => ({
+      label: type?.name,
+      value: type?.id,
     })
   );
 
@@ -30,10 +31,9 @@ function EscalationCategory() {
     const escTypeId = faultNonFaultReasons?.find(
       (x: any) => x?.order_reason_id === failureReason?.id
     )?.escalation_type_id;
-    const escCategoryId = escalationTypes?.find((x: any) => x?.id === escTypeId)
-      ?.escalation_category_id;
+    // escalationCategory.value is now escalation_type.id directly
     const selectedOption = escalationCategoryOptions?.find(
-      (option: any) => option?.value === escCategoryId
+      (option: any) => option?.value === escTypeId
     );
     setEscalationCategory(selectedOption);
   }, [failureReason]);

package/src/components/order-view/order-actions/actions/force-debrief/escalation/EscalationLevel.tsx

@@ -15,22 +15,20 @@ function EscalationLevel() {
   const [orderStaticData] = useOrderStaticData();
   const [escalationCategory] = useEscalationCategory();
   const [escalationLevel, setEscalationLevel] = useEscalationLevel();
-  const escalationLevelOptions = orderStaticData?.escalation_levels?.map(
-    (escalation: any) => {
-      return {
-        label: escalation?.type,
-        value: escalation?.id,
-      };
-    }
-  );
   const escalationTypes = orderStaticData?.escalation_types;
-  useEffect(() => {
-    const selectedEscalationLevelId = escalationTypes?.find(
-      (item: any) => item?.escalation_category_id === escalationCategory?.value
-    )?.escalation_level_id;
 
+  // Use escalation_types as level options (same as orders force-debrief)
+  const escalationLevelOptions = escalationTypes?.map(
+    (type: any) => ({
+      label: type?.level,
+      value: type?.id,
+    })
+  );
+
+  useEffect(() => {
+    // escalationCategory.value is now the escalation_type.id directly
     const defaultLevel = escalationLevelOptions?.find(
-      (item: any) => item.value === selectedEscalationLevelId
+      (item: any) => item.value === escalationCategory?.value
     );
 
     setEscalationLevel(defaultLevel);

package/src/components/order-view/order-actions/actions/force-debrief/escalation/EscalationReason.tsx

@@ -27,11 +27,8 @@ function EscalationReason() {
     setIsFailureReasonChanged,
   ] = useIsFailureReasonChanged();
 
-  const escalationTypes = orderStaticData?.escalation_types;
-
-  const escalationTypeId = escalationTypes?.find(
-    (item: any) => item?.escalation_category_id === escalationCategory?.value
-  )?.id;
+  // escalationCategory.value is now escalation_type.id directly (same as orders force-debrief)
+  const escalationTypeId = escalationCategory?.value;
 
   const escalationReasons = orderStaticData?.escalation_reasons?.filter(
     (x: any) => x?.escalation_type_id === escalationTypeId