fixed validation logic

egovernments · Jun 12, 2024 · 54371bd · 54371bd
1 parent 666cfa9
commit 54371bd
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 17 deletions.
diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js
@@ -154,16 +154,16 @@ const UploadData = ({ formData, onSelect, ...props }) => {
       }
     }
     enrichSchema(data, properties, required, columns);
-    const newData=JSON.parse(JSON.stringify(data))
+    const newData = JSON.parse(JSON.stringify(data));
     delete newData.campaignType;
     return newData;
   }
 
-  useEffect(()=>{
-    if(uploadedFile.length == 0){
+  useEffect(() => {
+    if (uploadedFile.length == 0) {
       setErrorsType({});
     }
-  },[uploadedFile])
+  }, [uploadedFile]);
 
   useEffect(async () => {
     if (Schemas?.["HCM-ADMIN-CONSOLE"]?.adminSchema) {
@@ -184,9 +184,9 @@ const UploadData = ({ formData, onSelect, ...props }) => {
     }
   }, [Schemas?.["HCM-ADMIN-CONSOLE"]?.adminSchema]);
 
-  useEffect(async() =>{
-    if(convertedSchema && Object.keys(convertedSchema).length > 0){
-       const newFacilitySchema = await translateSchema(convertedSchema?.facilityWithBoundary);
+  useEffect(async () => {
+    if (convertedSchema && Object.keys(convertedSchema).length > 0) {
+      const newFacilitySchema = await translateSchema(convertedSchema?.facilityWithBoundary);
       const newBoundarySchema = await translateSchema(convertedSchema?.boundary);
       const newUserSchema = await translateSchema(convertedSchema?.userWithBoundary);
       const headers = {
@@ -204,7 +204,7 @@ const UploadData = ({ formData, onSelect, ...props }) => {
       setSheetHeaders(headers);
       setTranslatedSchema(schema);
     }
-  }, [convertedSchema])
+  }, [convertedSchema]);
 
   useEffect(async () => {
     if (readMe?.["HCM-ADMIN-CONSOLE"]) {
@@ -234,7 +234,7 @@ const UploadData = ({ formData, onSelect, ...props }) => {
       } else if (type === "facilityWithBoundary") {
         uploadType = "uploadFacility";
       }
-      onSelect(uploadType, { uploadedFile });
+      onSelect(uploadType, { uploadedFile, isError, isValidation: false, apiError: false, isSuccess: uploadedFile?.length > 0 ? true : false });
       setExecutionCount((prevCount) => prevCount + 1);
     }
   });
@@ -462,22 +462,57 @@ const UploadData = ({ formData, onSelect, ...props }) => {
 
       const jsonData = XLSX.utils.sheet_to_json(sheet, { blankrows: true });
 
+      //   const boundaryCodeIndex = headersToValidate.indexOf(t("HCM_ADMIN_CONSOLE_BOUNDARY_CODE"));
+      //   const headersBeforeBoundaryCode = headersToValidate.slice(0, boundaryCodeIndex);
+
+      //   const columnBeforeBoundaryCode = jsonData.map((row) => row[headersBeforeBoundaryCode[headersBeforeBoundaryCode.length - 1]]);
+
+      //   // Getting the length of data in the column before the boundary code
+      //   const lengthOfColumnBeforeBoundaryCode = columnBeforeBoundaryCode.filter((value) => value !== undefined && value !== "").length;
+
+      //   const filteredData = jsonData
+      //     .filter((e) => e[headersBeforeBoundaryCode[headersBeforeBoundaryCode?.length - 1]])
+      //     .filter((e) => e[t("HCM_ADMIN_CONSOLE_TARGET_AT_THE_SELECTED_BOUNDARY_LEVEL")]);
+      //   if (filteredData?.length == 0 || filteredData?.length != lengthOfColumnBeforeBoundaryCode) {
+      //     const errorMessage = t("HCM_MISSING_TARGET");
+      //     setErrorsType((prevErrors) => ({
+      //       ...prevErrors,
+      //       [type]: errorMessage,
+      //     }));
+      //     setIsError(true);
+      //     isValid = false;
+      //     break;
+      //   }
+
+      //   const targetValue = filteredData?.[0][t("HCM_ADMIN_CONSOLE_TARGET_AT_THE_SELECTED_BOUNDARY_LEVEL")];
+
+      //   if (targetValue <= 0 || targetValue >= 100000000) {
+      //     const errorMessage = t("HCM_TARGET_VALIDATION_ERROR");
+      //     setErrorsType((prevErrors) => ({
+      //       ...prevErrors,
+      //       [type]: errorMessage,
+      //     }));
+      //     setIsError(true);
+      //     isValid = false;
+      //     break;
+      //   }
+      // }
+
       if (!validateTargetData(jsonData, sheetName, targetError)) {
         // setShowInfoCard(true);
         // isValid = false;
         // break;
       }
     }
-    if(targetError.length >0){
+    if (targetError.length > 0) {
       const errorMessage = targetError.join(", ");
       setErrorsType((prevErrors) => ({
-          ...prevErrors,
-          [type]: errorMessage,
-        }));
+        ...prevErrors,
+        [type]: errorMessage,
+      }));
       setShowInfoCard(true);
-      isValid =false;
-    }
-    else{
+      isValid = false;
+    } else {
       setErrorsType((prevErrors) => ({
         ...prevErrors,
         [type]: "", // Clear the error message

diff --git a/.../micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js b/.../micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
@@ -1365,9 +1365,14 @@ const SetupCampaign = ({ hierarchyType }) => {
   // setting the current step when the key is changed on the basis of the config
   useEffect(() => {
     setCurrentStep(Number(filteredConfig?.[0]?.form?.[0]?.stepCount - 1));
-    setShowToast(null);
+    // setShowToast(null);
   }, [currentKey, filteredConfig]);
 
+  useEffect(() => {
+    // setCurrentStep(Number(filteredConfig?.[0]?.form?.[0]?.stepCount - 1));
+    setShowToast(null);
+  }, [currentKey]);
+
   const closeToast = () => {
     setShowToast(null);
   };