FEATURE/HCMPRE-1704 : Removing current validation from assumptions an… (

#2122) * FEATURE/HCMPRE-1704 : Removing current validation from assumptions and making sure the flow works as expected( for mixed strat, regis and dist can be same) * FEATURE/HCMPRE-1704 : Review updates
egovernments · Jan 15, 2025 · a9deaad · a9deaad
1 parent bd7920c
commit a9deaad
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssumptionsForm.js b/...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssumptionsForm.js
@@ -74,9 +74,6 @@ const AssumptionsForm = ({ onSelect, ...props }) => {
         setSelectedRegistrationProcess(props?.props?.sessionData?.ASSUMPTIONS_FORM?.assumptionsForm?.selectedRegistrationProcess);
     },[props?.props?.sessionData?.ASSUMPTIONS_FORM?.assumptionsForm])
 
-    const filteredOptions = resourceDistributionStrategyCode === "MIXED"
-        ? optionsForProcesses.filter(option => option.resourceDistributionStrategyName !== "Fixed post & House-to-House")
-        : optionsForProcesses;
 
     if (isLoadingPlanObject) {
         return <Loader />
@@ -102,7 +99,7 @@ const AssumptionsForm = ({ onSelect, ...props }) => {
                                 variant="select-dropdown"
                                 t={t}
                                 isMandatory={true}
-                                option={filteredOptions.map(item => ({
+                                option={optionsForProcesses.map(item => ({
                                     code: item.resourceDistributionStrategyCode,
                                     value: item.resourceDistributionStrategyName,
                                 }))}
@@ -128,7 +125,7 @@ const AssumptionsForm = ({ onSelect, ...props }) => {
                                 variant="select-dropdown"
                                 t={t}
                                 isMandatory={true}
-                                option={filteredOptions.map(item => ({
+                                option={optionsForProcesses.map(item => ({
                                     code: item.resourceDistributionStrategyCode,
                                     value: item.resourceDistributionStrategyName,
                                 }))}

diff --git a/...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/BoundarySelection.js b/...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/BoundarySelection.js
@@ -18,6 +18,7 @@ const BoundarySelection = ({ onSelect, props: customProps, ...props }) => {
   const [statusMap, setStatusMap] = useState({});
   const [executionCount, setExecutionCount] = useState(0);
   const [updateBoundary, setUpdateBoundary] = useState(true);
+  const [isStatusMapLoading, setIsStatusMapLoading] = useState(false); 
   const handleBoundaryChange = (value) => {
     setBoundaryOptions(value?.boundaryOptions);
     setSelectedData(value?.selectedData);
@@ -58,10 +59,19 @@ const BoundarySelection = ({ onSelect, props: customProps, ...props }) => {
 
 
   useEffect(() => {
+    // Show loader before updating statusMap
+    setIsStatusMapLoading(true);
     if (selectedData && selectedData.length >= 0) {
-      setStatusMap(() => Digit.Utils.microplanv1.createStatusMap(selectedData, boundaryHierarchy))
+      const newStatusMap = Digit.Utils.microplanv1.createStatusMap(selectedData, boundaryHierarchy);
+      setStatusMap(newStatusMap);
+      // Hide loader after updating statusMap
+      setIsStatusMapLoading(false);
     }
-  }, [selectedData, boundaryHierarchy])
+    return () => {
+      // Cleanup function to prevent state updates if component unmounts during loading
+      setIsStatusMapLoading(false);
+    };
+  }, [selectedData, boundaryHierarchy]);
 
 
   useEffect(() => {
@@ -94,7 +104,7 @@ const BoundarySelection = ({ onSelect, props: customProps, ...props }) => {
 
   return (
     <>
-      <BoundaryKpi data={statusMap} />
+      {isStatusMapLoading ? <Loader /> : <BoundaryKpi data={statusMap} />}
       <CardNew className={"selecting-boundary-card"}>
         <Header styles={{ margin: "0rem" }}>{t(`MICROPLAN_SELECT_BOUNDARY`)}</Header>
         <p className="boundary-selection-description">{t(`MICROPLAN_SELECT_BOUNDARIES_DESCRIPTION`)}</p>

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/utils/utilities.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/utils/utilities.js
@@ -163,7 +163,7 @@ const formValidator = (formData, key, state, t) => {
     }
 
     const processesAreValid = formData?.selectedRegistrationProcess?.code && formData?.selectedDistributionProcess?.code;
-    if (processesAreValid && (formData?.selectedRegistrationProcess.code === formData?.selectedDistributionProcess.code)) {
+    if (processesAreValid && (formData?.selectedRegistrationProcess.code === formData?.selectedDistributionProcess.code) && (formData?.selectedRegistrationProcess.code !== "MIXED")) {
       return { key: "error", label: "ERROR_REGISTRATION_AND_DISTRIBUTION_ARE_SAME" }; // Customize as needed
     }