fix: donorOrganizationIds auto populate on edit mode (#1533)

folio-org · Dec 7, 2023 · 5855e83 · 5855e83
1 parent c711751
commit 5855e83
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/components/POLine/POLineForm.js b/src/components/POLine/POLineForm.js
@@ -133,13 +133,23 @@ function POLineForm({
     initialDonorOrganizationIds,
   });
 
-  useEffect(() => {
-    const hasChanged = !isEqual(donorOrganizationIds, formValues.donorOrganizationIds);
+  const shouldUpdateDonorOrganizationIds = useMemo(() => {
+    const hasChanged = !isEqual(donorOrganizationIds, formValues?.donorOrganizationIds);
+    const isFundDistributionChanged = !isEqual(fundDistribution, initialValues?.fundDistribution);
+
+    return hasChanged && isFundDistributionChanged;
+  }, [
+    donorOrganizationIds,
+    formValues?.donorOrganizationIds,
+    fundDistribution,
+    initialValues?.fundDistribution,
+  ]);
 
-    if (hasChanged) {
+  useEffect(() => {
+    if (shouldUpdateDonorOrganizationIds) {
       change('donorOrganizationIds', donorOrganizationIds);
     }
-  }, [change, donorOrganizationIds, formValues.donorOrganizationIds, setDonorIds]);
+  }, [change, donorOrganizationIds, shouldUpdateDonorOrganizationIds]);
 
   const templateValue = useMemo(() => getOrderTemplateValue(parentResources, order?.template, {
     locations,