changes in the delivery type and selection of boundary (#1816)

egovernments · Nov 13, 2024 · 0539c64 · 0539c64
1 parent 938a25c
commit 0539c64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...-internals/packages/modules/campaign-manager/src/components/SelectingBoundaryComponent.js b/...-internals/packages/modules/campaign-manager/src/components/SelectingBoundaryComponent.js
@@ -217,10 +217,10 @@ const SelectingBoundaryComponent = ({
   }, [boundaryData]);
 
   useEffect(() => {
-    if (isBoundaryDataValid && hierarchy && selectedData1?.length > 0) {
+    if (isBoundaryDataValid && hierarchy && selectedData1?.length > 0 && boundaryOptions[parentRoot]) {
       updateBoundaryOptions(selectedData1, boundaryData, hierarchy);
     }
-  }, [hierarchy, isBoundaryDataValid]);
+  }, [hierarchy, isBoundaryDataValid ,boundaryOptions[parentRoot] ]);
 
   function createHierarchyStructure(hierarchy) {
     const hierarchyStructure = {};

diff --git a/...eb/micro-ui-internals/packages/modules/campaign-manager/src/utils/setupCampaignHelpers.js b/...eb/micro-ui-internals/packages/modules/campaign-manager/src/utils/setupCampaignHelpers.js
@@ -161,7 +161,7 @@ export const cycleDataRemap=(data)=> {
 
     return {
       id: parseInt(delivery.deliveryIndex, 10),
-      deliveryType: delivery.deliveryStrategy || "DIRECT",
+      deliveryStrategy: delivery.deliveryStrategy || "DIRECT",
       mandatoryWaitSinceLastDeliveryInDays: null,
       doseCriteria: delivery.deliveryRules.map(rule => {
         const doseCriteriaResult = processDoseCriteria(rule, resourcesMap);