[ENG-887] Fix internal and external delivery batch failure and refine supply delivery limit UI

.example.env

@@ -190,5 +190,9 @@ REACT_DECIMAL_ROUNDING_METHOD=ROUND_HALF_UP
 # Maximum number of forms that can be favorited in the forms dialog (default: 5)
 REACT_MAX_FORM_DIALOG_FAVORITES=5
 
+# Maximum number of datapoints allowed in a single upsert request (default: 100)
+# Must not exceed the backend limit
+REACT_MAX_DATAPOINTS_PER_UPSERT=100
+
 # Default tab for medication selector. Valid values: product, valueset
 REACT_MEDICATION_VALUE_SET_SELECT_DEFAULT_TAB=product

care.config.ts

@@ -79,8 +79,7 @@ const careConfig = {
       : undefined),
 
   defaultDischargeDisposition: env.REACT_DEFAULT_DISCHARGE_DISPOSITION as
-    | EncounterDischargeDisposition
-    | undefined,
+    EncounterDischargeDisposition | undefined,
 
   mapFallbackUrlTemplate:
     env.REACT_MAPS_FALLBACK_URL_TEMPLATE ||
@@ -407,6 +406,14 @@ const careConfig = {
   maxFormDialogFavorites: env.REACT_MAX_FORM_DIALOG_FAVORITES
     ? parseInt(env.REACT_MAX_FORM_DIALOG_FAVORITES, 10)
     : 5,
+
+  /**
+   * Maximum number of datapoints allowed in a single upsert request.
+   * Must not exceed the backend limit (defaults to 100).
+   */
+  maxDatapointsPerUpsert: env.REACT_MAX_DATAPOINTS_PER_UPSERT
+    ? parseInt(env.REACT_MAX_DATAPOINTS_PER_UPSERT, 10)
+    : 100,
 } as const;
 
 export default careConfig;

scripts/validate-env.ts

@@ -170,6 +170,7 @@ const envSchema = z
       })
       .optional(),
     REACT_MAX_FORM_DIALOG_FAVORITES: numberAsString.optional(),
+    REACT_MAX_DATAPOINTS_PER_UPSERT: numberAsString.optional(),
   })
   .superRefine(async (data, ctx) => {
     // Ensure at least one API URL configuration is provided

src/pages/Facility/services/inventory/externalSupply/deliveryOrder/DeliveryOrderShow.tsx

@@ -14,6 +14,8 @@ import { useMemo, useState } from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { toast } from "sonner";
 
+import careConfig from "@careConfig";
+
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import ConfirmActionDialog from "@/components/Common/ConfirmActionDialog";
 import Page from "@/components/Common/Page";
@@ -252,6 +254,9 @@ export function DeliveryOrderShow({
   });
   const { open: isSidebarOpen } = useSidebar();
 
+  const exceedsUpsertLimit =
+    selectedDeliveries.length > careConfig.maxDatapointsPerUpsert;
+
   const { data: deliveryOrder, isLoading } = useQuery({
     queryKey: ["deliveryOrders", deliveryOrderId],
     queryFn: query(deliveryOrderApi.retrieveDeliveryOrder, {
@@ -288,6 +293,7 @@ export function DeliveryOrderShow({
         queryClient.invalidateQueries({
           queryKey: ["supplyDeliveries", deliveryOrderId],
         });
+        setSelectedDeliveries([]);
         toast.success(t("supply_deliveries_updated_successfully"));
       },
       onError: (_error) => {
@@ -362,7 +368,6 @@ export function DeliveryOrderShow({
     upsertSupplyDeliveries({
       datapoints: selectedSupplyDeliveries,
     });
-    setSelectedDeliveries([]);
   }
 
   function handleMarkAsDamaged() {
@@ -388,7 +393,6 @@ export function DeliveryOrderShow({
     upsertSupplyDeliveries({
       datapoints: selectedSupplyDeliveries,
     });
-    setSelectedDeliveries([]);
   }
 
   function handleSubmitDialog() {
@@ -411,7 +415,6 @@ export function DeliveryOrderShow({
     upsertSupplyDeliveries({
       datapoints: selectedSupplyDeliveries,
     });
-    setSelectedDeliveries([]);
     setConfirmDialog((prev) => ({ ...prev, open: false }));
   }
 
@@ -578,7 +581,8 @@ export function DeliveryOrderShow({
                   disabled={
                     isUpsertingDeliveries ||
                     isUpdating ||
-                    selectedDeliveries.length !== 0
+                    selectedDeliveries.length !== 0 ||
+                    exceedsUpsertLimit
                   }
                 >
                   {isUpdating ? t("updating") : t("mark_as_completed")}

src/vite-env.d.ts

@@ -46,6 +46,7 @@ interface ImportMetaEnv {
   readonly REACT_ACCOUNTING_PRECISION?: string;
   readonly REACT_DECIMAL_ROUNDING_METHOD?: string;
   readonly REACT_MAX_FORM_DIALOG_FAVORITES?: string;
+  readonly REACT_MAX_DATAPOINTS_PER_UPSERT?: string;
   readonly REACT_MEDICATION_VALUE_SET_SELECT_DEFAULT_TAB?: string;
 
   // Plugins related envs...