Re render assumption fix, atleast one mdms check, blank custom name check,

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js

@@ -58,6 +58,7 @@ const FormulaConfigWrapper = ({ onSelect, props: customProps }) => {
     const curr = Digit.SessionStorage.get("MICROPLAN_DATA")?.FORMULA_CONFIGURATION?.formulaConfiguration?.formulaConfigValues;
     if (curr?.length > 0) {
       setFormulaParams(curr);
+      setFormulaConfigValues(curr);
     }
   }, []);
 
@@ -194,7 +195,14 @@ const FormulaConfigWrapper = ({ onSelect, props: customProps }) => {
 
   const handleNext = () => {
     //here just check formulConfigValues
-    if (formulaConfigValues.some((i) => i.operatorName === "SUBSTRACTION" && i.input === i.assumptionValue)) {
+    if (formulaConfigValues?.filter((row) => row?.category === currentCategory)?.filter((i) => i.source === "MDMS")?.length === 0) {
+      setShowToast({
+        key: "error",
+        label: t("ATLEAST_ONE_MDMS_FORMULA"),
+        transitionTime: 3000,
+      });
+      return;
+    } else if (formulaConfigValues.some((i) => i.operatorName === "SUBSTRACTION" && i.input === i.assumptionValue)) {
       setShowToast({
         key: "error",
         label: t("ERR_MANDATORY_FIELD_SAME_OPERAND"),

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js

@@ -480,6 +480,42 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi
                 variation={"secondary"}
                 label={t("YES")}
                 onClick={() => {
+                  if(selectedDeletedFormula?.code === "NEW_FORMULA" && !selectedDeletedFormula){
+                    setShowToast({
+                      key: "error",
+                      label: t("PLS_ENTER_FORMULA_NAME"),
+                      transitionTime: 3000,
+                      style:{
+                        zIndex:1000000
+                      }
+                    });
+                    return;
+                  }
+
+                  if(selectedDeletedFormula?.code === "NEW_FORMULA" && selectedDeletedFormula?.name?.trim()?.length === 0){
+                    setShowToast({
+                      key: "error",
+                      label: t("INVALID_FORMULA_NAME"),
+                      transitionTime: 3000,
+                      style:{
+                        zIndex:1000000
+                      }
+                    });
+                    return;
+                  }
+
+                  if(selectedDeletedFormula?.code === "NEW_FORMULA" && selectedDeletedFormula?.name?.length > 100){
+                    setShowToast({
+                      key: "error",
+                      label: t("SELECT_FORMULA_NAME_LONG_THAN_100"),
+                      transitionTime: 3000,
+                      style:{
+                        zIndex:1000000
+                      }
+                    });
+                    return;
+                  }
+
                   addNewFormula();
                 }}
               />,

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

@@ -6,7 +6,7 @@ import { PRIMARY_COLOR } from "../utils/utilities";
 import { useMyContext } from "../utils/context";
 import { useAssumptionContext } from "./HypothesisWrapper";
 
-const Hypothesis = ({ category, assumptions: initialAssumptions, setShowToast, allMdmsAssumptionsForThisCategory,campaignType }) => {
+const Hypothesis = ({ category, assumptions: initialAssumptions, setShowToast, allMdmsAssumptionsForThisCategory, campaignType }) => {
   const { state, dispatch } = useMyContext();
   const { t } = useTranslation();
   const [showPopUP, setShowPopUp] = useState(false);
@@ -322,27 +322,51 @@ const Hypothesis = ({ category, assumptions: initialAssumptions, setShowToast, a
                 variation={"primary"}
                 label={t("YES")}
                 onClick={() => {
-                  //here if assumption name is not given then show a toast message and return 
-                  if(!selectedDeletedAssumption){
+                  //here if assumption name is not given then show a toast message and return
+                  if (selectedDeletedAssumption?.name?.length > 100) {
+                    setShowToast({
+                      key: "error",
+                      label: t("SELECT_ASSUMPTION_NAME_LONG_THAN_100"),
+                      transitionTime: 3000,
+                      style: {
+                        zIndex: 1000000,
+                      },
+                    });
+                    return;
+                  }
+
+                  if (!selectedDeletedAssumption) {
                     setShowToast({
                       key: "error",
                       label: t("PLS_SELECT_ASSUMPTION"),
                       transitionTime: 3000,
-                      style:{
-                        zIndex:1000000
-                      }
+                      style: {
+                        zIndex: 1000000,
+                      },
                     });
                     return;
                   }
-
-                  if(selectedDeletedAssumption?.code === "NEW_ASSUMPTION" && !selectedDeletedAssumption?.name){
+
+                  if (selectedDeletedAssumption?.code === "NEW_ASSUMPTION" && selectedDeletedAssumption?.name?.trim()?.length === 0) {
+                    setShowToast({
+                      key: "error",
+                      label: t("INVALID_ASSUMPTION_NAME"),
+                      transitionTime: 3000,
+                      style: {
+                        zIndex: 1000000,
+                      },
+                    });
+                    return;
+                  }
+
+                  if (selectedDeletedAssumption?.code === "NEW_ASSUMPTION" && !selectedDeletedAssumption?.name) {
                     setShowToast({
                       key: "error",
                       label: t("PLS_ENTER_ASSUMPTION_NAME"),
                       transitionTime: 3000,
-                      style:{
-                        zIndex:1000000
-                      }
+                      style: {
+                        zIndex: 1000000,
+                      },
                     });
                     return;
                   }

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/HypothesisWrapper.js

@@ -77,6 +77,7 @@ const HypothesisWrapper = ({ onSelect, props: customProps }) => {
     const curr = Digit.SessionStorage.get("MICROPLAN_DATA")?.HYPOTHESIS?.Assumptions?.assumptionValues;
     if (curr?.length > 0) {
       setHypothesisParams(curr);
+      setAssumptionValues(curr);
     }
   }, []);
 
@@ -165,6 +166,15 @@ const HypothesisWrapper = ({ onSelect, props: customProps }) => {
     const visibleAssumptions = currentAssumptions.filter((item) => existingAssumptionKeys?.includes(item) && !deletedAssumptions?.includes(item));
 
     //Validate: Check if any value is empty for visible assumptions
+    const atleastOneMDMS = visibleAssumptions?.filter((i) => i?.source === "MDMS")?.length === 0;
+    if (atleastOneMDMS) {
+      setShowToast({
+        key: "error",
+        label: t("ATLEAST_ONE_MDMS_ASSUMPTION"),
+        transitionTime: 3000,
+      });
+      return; // Prevent moving to the next step
+    }
     const hasEmptyFields = visibleAssumptions.some((item) => {
       const value = assumptionValues.find((assumption) => assumption.key === item)?.value;
       return !value; // Check if any value is empty
@@ -324,12 +334,22 @@ const HypothesisWrapper = ({ onSelect, props: customProps }) => {
   }, [internalKey]);
 
   useEffect(() => {
-    const initialAssumptions = filteredAssumptions.map((item) => ({
-      source: "MDMS",
-      category: undefined,
-      key: item,
-      value: undefined,
-    }));
+    const result = assumptionValues?.filter((item) => filteredAssumptions?.includes(item?.key));
+
+    const initialAssumptions =
+      result.length > 0
+        ? result.map((item) => ({
+            source: item.source,
+            category: item.category,
+            key: item.key,
+            value: item.value,
+          }))
+        : filteredAssumptions.map((item) => ({
+            source: "MDMS",
+            category: undefined,
+            key: item,
+            value: undefined,
+          }));
 
     // Create a set of existing keys for quick lookup
     const existingKeys = new Set(assumptionValues.map((assumption) => assumption.key));
@@ -363,7 +383,7 @@ const HypothesisWrapper = ({ onSelect, props: customProps }) => {
         setDeletedAssumptions((prev) => [...prev, ...deletedAssumptionsForThisCategory]);
       }
     }
-  }, [planObject, isLoadingPlanObject, internalKey]);
+  }, [planObject, filteredAssumptions, isLoadingPlanObject, internalKey]);
 
   useEffect(() => {
     if (internalKey === assumptionCategories.length) {
@@ -413,7 +433,11 @@ const HypothesisWrapper = ({ onSelect, props: customProps }) => {
           >
             <Hypothesis
               category={assumptionCategories[internalKey - 1]?.category}
-              assumptions={[...filteredAssumptions.filter((item) => !deletedAssumptions?.includes(item)), ...customAssumption]}
+              assumptions={
+                filteredAssumptions?.filter((i) => assumptionValues?.some((j) => j.key === i))?.length > 0
+                  ? [...filteredAssumptions?.filter((i) => assumptionValues?.some((j) => j.key === i)), ...customAssumption]
+                  : [...filteredAssumptions.filter((item) => !deletedAssumptions?.includes(item)), ...customAssumption]
+              }
               onSelect={onSelect}
               customProps={customProps}
               setShowToast={setShowToast}

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js

@@ -582,6 +582,24 @@ const PlanInbox = () => {
     ...getSecurityDetailsColumns(),
     ...getAdditionalFieldsColumns(),
     ...getResourceColumns(),
+    {
+      name: t("INBOX_STATUSLOGS"),
+      cell: (row, index, column, id) => (
+        <Button
+          label={t(`VIEW_LOGS`)}
+          onClick={() => {
+            setSelectedBusinessId(row?.original?.id); // Set the row.id to state
+            setSelectedBoundaryCode(row.boundaryCode);
+            setShowTimelinePopup(true);
+          }}
+          variation="link"
+          style={{}}
+          size={"medium"}
+        />
+      ),
+      sortable: false,
+      width: "180px",
+    },
     // {
     //   name: t(`TOTAL_POPULATION`),
     //   cell: (row) => t(row?.totalPop) || "NA",

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js

@@ -43,8 +43,8 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
 
   const handleUrlChange = (event) => {
     const searchParams = new URLSearchParams(location.search);
-    setIsLastVerticalStep(searchParams.get("isLastVerticalStep"));
-    setIsFormulaLastVerticalStep(searchParams.get("isFormulaLastVerticalStep"));
+    setIsLastVerticalStep(searchParams.get("internalKey") === "6" || searchParams.get("internalKey") === "9"? true : searchParams.get("isLastVerticalStep"));
+    setIsFormulaLastVerticalStep(searchParams.get("internalKey") === "6" ? true : searchParams.get("isFormulaLastVerticalStep"));
   };
   useEffect(() => {
     // Add event listener for popstate to detect URL changes
@@ -225,7 +225,7 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
             },
           });
         }
-
+        refetchPlan();
         setLoader(false);
       },
       onError: (error, variables) => {