@mseva/digit-ui-module-engagement 1.1.12 → 1.1.13

package/dist/index.js

@@ -19896,6 +19896,7 @@ const FillQuestions = props => {
     isLoading
   } = Digit.Hooks.useTenants();
   const [city, setCity] = React.useState(null);
+  const [loading, setLoading] = React.useState(false);
   const [submitted, setSubmitted] = React.useState(false);
   const [localityList, setLocalityList] = React.useState(null);
   const [openQuesDetailsDialog, setOpenQuesDetailsDialog] = React.useState(false);
@@ -19903,6 +19904,7 @@ const FillQuestions = props => {
     latitude: null,
     longitude: null
   });
+  const [getFetchAnswers, setFetchAnswers] = React.useState();
   const [pincode, setPincode] = React.useState("");
   const [isgeoLoc, setIsGeoLoc] = React.useState(false);
   const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -19910,10 +19912,14 @@ const FillQuestions = props => {
   const [hasCitizenDetails, setHasCitizenDetails] = React.useState(null);
   React.useEffect(() => {
     try {
+      setLoading(true);
       return Promise.resolve(Digit.LocationService.getLocalities(city)).then(function (response) {
+        setLoading(false);
         let __localityList = [];
         if (response && response.TenantBoundary.length > 0) {
+          setLoading(true);
           __localityList = Digit.LocalityService.get(response.TenantBoundary[0]);
+          setLoading(false);
         }
         setLocalityList(__localityList);
       });
@@ -19927,10 +19933,14 @@ const FillQuestions = props => {
         const _temp = function () {
           if ((prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE") {
             var _prevProps$citizenDat;
+            setLoading(true);
             return Promise.resolve(Digit.LocationService.getLocalities((_prevProps$citizenDat = prevProps.citizenData.city) === null || _prevProps$citizenDat === void 0 ? void 0 : _prevProps$citizenDat.code)).then(function (response) {
+              setLoading(false);
               let __localityList = [];
               if (response && response.TenantBoundary.length > 0) {
+                setLoading(true);
                 __localityList = Digit.LocalityService.get(response.TenantBoundary[0]);
+                setLoading(false);
               }
               setLocalityList(__localityList);
             });
@@ -19996,12 +20006,14 @@ const FillQuestions = props => {
   const data = prevProps.surveyDetails;
   const fetchAnswer = function (status) {
     try {
+      setLoading(true);
       let payload = {
         surveyUuid: data.uuid,
         citizenId: prevProps.userInfo.uuid
       };
       try {
         Digit.Surveys.getAnswers(payload).then(response => {
+          setLoading(false);
           if ((response === null || response === void 0 ? void 0 : response.sectionResponses.length) > 0) {
             let result = {};
             response.sectionResponses.forEach(section => {
@@ -20015,7 +20027,6 @@ const FillQuestions = props => {
               result[section.sectionUuid] = sectionObj;
             });
             setFormData(result);
-            console.log("status======", status);
             if (status === "draft") {
               handleAutoSave();
             } else {
@@ -20031,6 +20042,7 @@ const FillQuestions = props => {
           }
         });
       } catch (error) {
+        setLoading(false);
         return Promise.resolve(error);
       }
       return Promise.resolve();
@@ -20040,14 +20052,16 @@ const FillQuestions = props => {
   };
   const fetchSurveyAnswers = function () {
     try {
+      setLoading(true);
       let payload = {
         surveyUuid: data.uuid,
         citizenId: prevProps.userInfo.uuid
       };
       try {
         Digit.Surveys.getAnswers(payload).then(response => {
+          setFetchAnswers(response);
+          setLoading(false);
           if ((response === null || response === void 0 ? void 0 : response.sectionResponses.length) > 0) {
-            console.log("response.status", response.status);
             if (response.status == "Draft") {
               setSubmitted(false);
               if ((prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "CITIZEN") {
@@ -20085,6 +20099,7 @@ const FillQuestions = props => {
           }
         });
       } catch (error) {
+        setLoading(false);
         return Promise.resolve(error);
       }
       return Promise.resolve();
@@ -20121,6 +20136,7 @@ const FillQuestions = props => {
   const fetchUserDetails = function () {
     try {
       var _prevProps$userInfo, _prevProps$userInfo2, _prevProps$userInfo3;
+      setLoading(true);
       const data = {
         userName: prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$userInfo = prevProps.userInfo) === null || _prevProps$userInfo === void 0 ? void 0 : _prevProps$userInfo.mobileNumber,
         tenantId: prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$userInfo2 = prevProps.userInfo) === null || _prevProps$userInfo2 === void 0 ? void 0 : _prevProps$userInfo2.tenantId
@@ -20130,6 +20146,7 @@ const FillQuestions = props => {
       };
       Digit.Surveys.userSearch(data, filters).then(response => {
         var _response$responseInf, _response$responseInf2;
+        setLoading(false);
         if (((response === null || response === void 0 ? void 0 : (_response$responseInf = response.responseInfo) === null || _response$responseInf === void 0 ? void 0 : _response$responseInf.status) === "200" || (response === null || response === void 0 ? void 0 : (_response$responseInf2 = response.responseInfo) === null || _response$responseInf2 === void 0 ? void 0 : _response$responseInf2.status) === "201") && (response === null || response === void 0 ? void 0 : response.user.length) > 0) {
           var _response$user$, _response$user$2, _response$user$3, _response$user$4, _response$user$5, _response$user$6;
           if ((response === null || response === void 0 ? void 0 : (_response$user$ = response.user[0]) === null || _response$user$ === void 0 ? void 0 : _response$user$.gender) === null || (response === null || response === void 0 ? void 0 : (_response$user$2 = response.user[0]) === null || _response$user$2 === void 0 ? void 0 : _response$user$2.emailId) === null || (response === null || response === void 0 ? void 0 : (_response$user$3 = response.user[0]) === null || _response$user$3 === void 0 ? void 0 : _response$user$3.dob) === null || (response === null || response === void 0 ? void 0 : (_response$user$4 = response.user[0]) === null || _response$user$4 === void 0 ? void 0 : _response$user$4.gender) === "" || (response === null || response === void 0 ? void 0 : (_response$user$5 = response.user[0]) === null || _response$user$5 === void 0 ? void 0 : _response$user$5.emailId) === "" || (response === null || response === void 0 ? void 0 : (_response$user$6 = response.user[0]) === null || _response$user$6 === void 0 ? void 0 : _response$user$6.dob) === "") {
@@ -20160,6 +20177,7 @@ const FillQuestions = props => {
           });
         }
       }).catch(error => {
+        setLoading(false);
         return error;
       });
       return Promise.resolve();
@@ -20206,7 +20224,7 @@ const FillQuestions = props => {
       if (JSON.stringify(prevFormDataRef.current) !== JSON.stringify(formData)) {
         if (prevProps.citizenFill && userType.toLowerCase() === "employee" || userType.toLowerCase() === "citizen") {
           prevFormDataRef.current = formData;
-          fetchAnswer("draft");
+          if (locality) fetchAnswer("draft");
         }
       }
     }, 10000);
@@ -20214,7 +20232,8 @@ const FillQuestions = props => {
   }, [formData]);
   const handleAutoSave = function () {
     try {
-      var _prevProps$citizenDat2, _prevProps$citizenDat3, _prevProps$citizenDat4, _prevProps$citizenDat5, _prevProps$citizenDat6;
+      var _prevProps$citizenDat2, _prevProps$citizenDat3, _prevProps$citizenDat4;
+      setLoading(true);
       let answerArr = [];
       for (const sectionId in formData) {
         for (const questionId in formData[sectionId]) {
@@ -20243,15 +20262,16 @@ const FillQuestions = props => {
         },
         SurveyResponse: {
           surveyUuid: data.uuid,
-          tenantId: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE" ? prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$citizenDat5 = prevProps.citizenData) === null || _prevProps$citizenDat5 === void 0 ? void 0 : (_prevProps$citizenDat6 = _prevProps$citizenDat5.city) === null || _prevProps$citizenDat6 === void 0 ? void 0 : _prevProps$citizenDat6.code : city === null || city === void 0 ? void 0 : city.code,
+          tenantId: city,
+          locality: locality,
           status: "Draft",
-          locality: locality || null,
           coordinates: `${geoLocation.latitude},${geoLocation.longitude}`,
           answers: answerArr
         }
       };
       try {
         Digit.Surveys.submitSurvey(payload).then(response => {
+          setLoading(false);
           if ((response === null || response === void 0 ? void 0 : response.SubmitResponse) !== undefined) {} else {
             var _response$Errors;
             setShowToast({
@@ -20262,6 +20282,7 @@ const FillQuestions = props => {
           }
         });
       } catch (error) {
+        setLoading(false);
         return Promise.resolve(error);
       }
       return Promise.resolve();
@@ -20321,7 +20342,8 @@ const FillQuestions = props => {
     return Object.keys(newErrors).length === 0;
   };
   const handleSubmitSurvey = () => {
-    var _prevProps$citizenDat7, _prevProps$citizenDat8, _prevProps$citizenDat9, _prevProps$citizenDat10, _prevProps$citizenDat11;
+    var _prevProps$citizenDat5, _prevProps$citizenDat6, _prevProps$citizenDat7;
+    setLoading(true);
     let answerArr = [];
     for (const sectionId in formData) {
       for (const questionId in formData[sectionId]) {
@@ -20332,6 +20354,7 @@ const FillQuestions = props => {
           questionUuid: questionId,
           sectionUuid: sectionId,
           comments: ((_formData$sectionId$q2 = formData[sectionId][questionId]) === null || _formData$sectionId$q2 === void 0 ? void 0 : _formData$sectionId$q2.comments) || "",
+          tenantId: localStorage.getItem("CITIZEN.CITY"),
           answerDetails: [{
             answerType: formData[sectionId][questionId].answerType,
             answerContent: formData[sectionId][questionId].answerType === "CHECKBOX_ANSWER_TYPE" ? formData[sectionId][questionId].answer.join(",") : formData[sectionId][questionId].answer,
@@ -20344,21 +20367,23 @@ const FillQuestions = props => {
       User: {
         type: prevProps.userInfo.type,
         uuid: prevProps.userInfo.uuid,
-        gender: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE" ? prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$citizenDat7 = prevProps.citizenData) === null || _prevProps$citizenDat7 === void 0 ? void 0 : _prevProps$citizenDat7.gender : prevProps.userInfo.gender,
-        emailId: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE" ? prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$citizenDat8 = prevProps.citizenData) === null || _prevProps$citizenDat8 === void 0 ? void 0 : _prevProps$citizenDat8.email : prevProps.userInfo.emailId,
-        dob: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE" ? prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$citizenDat9 = prevProps.citizenData) === null || _prevProps$citizenDat9 === void 0 ? void 0 : _prevProps$citizenDat9.dob : prevProps.userInfo.dob
+        gender: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE" ? prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$citizenDat5 = prevProps.citizenData) === null || _prevProps$citizenDat5 === void 0 ? void 0 : _prevProps$citizenDat5.gender : prevProps.userInfo.gender,
+        emailId: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE" ? prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$citizenDat6 = prevProps.citizenData) === null || _prevProps$citizenDat6 === void 0 ? void 0 : _prevProps$citizenDat6.email : prevProps.userInfo.emailId,
+        dob: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE" ? prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$citizenDat7 = prevProps.citizenData) === null || _prevProps$citizenDat7 === void 0 ? void 0 : _prevProps$citizenDat7.dob : prevProps.userInfo.dob
       },
       SurveyResponse: {
         surveyUuid: data.uuid,
-        tenantId: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.userType).toUpperCase() === "EMPLOYEE" ? prevProps === null || prevProps === void 0 ? void 0 : (_prevProps$citizenDat10 = prevProps.citizenData) === null || _prevProps$citizenDat10 === void 0 ? void 0 : (_prevProps$citizenDat11 = _prevProps$citizenDat10.city) === null || _prevProps$citizenDat11 === void 0 ? void 0 : _prevProps$citizenDat11.code : city === null || city === void 0 ? void 0 : city.code,
+        tenantId: city,
         status: "Submit",
-        locality: locality || null,
+        locality: locality,
         coordinates: `${geoLocation.latitude},${geoLocation.longitude}`,
+        tenantId: localStorage.getItem("CITIZEN.CITY"),
         answers: answerArr
       }
     };
     try {
       Digit.Surveys.submitSurvey(payload).then(response => {
+        setLoading(false);
         if ((response === null || response === void 0 ? void 0 : response.SubmitResponse) !== undefined) {
           userType.toUpperCase() === "EMPLOYEE" ? history.push("/digit-ui/employee/engagement/surveys/submit-response", {
             message: "SURVEY FORM SUBMITTED SUCCESSFULLY",
@@ -20380,6 +20405,7 @@ const FillQuestions = props => {
         }
       });
     } catch (error) {
+      setLoading(false);
       return error;
     }
   };
@@ -20827,7 +20853,6 @@ const FillQuestions = props => {
         });
     }
   };
-  data.sections.map(s => console.log("data sec", s.title));
   const closeToast = () => {
     setShowToast(null);
   };
@@ -20836,11 +20861,25 @@ const FillQuestions = props => {
     longitude: null
   });
   const handleCityChange = e => {
-    setCity(e.target.value);
+    const selectedCity = e.target.value;
+    setCity(selectedCity);
   };
+  React.useEffect(() => {
+    if (getFetchAnswers) {
+      const storedCity = getFetchAnswers !== null && getFetchAnswers !== void 0 && getFetchAnswers.tenantId ? getFetchAnswers === null || getFetchAnswers === void 0 ? void 0 : getFetchAnswers.tenantId : localStorage.getItem("CITIZEN.CITY");
+      if (storedCity) {
+        setCity(storedCity);
+      }
+    }
+  }, [getFetchAnswers]);
   const handleLocalityChangeCitizen = e => {
     setLocality(e.target.value);
   };
+  React.useEffect(() => {
+    if (getFetchAnswers) {
+      setLocality(getFetchAnswers === null || getFetchAnswers === void 0 ? void 0 : getFetchAnswers.locality);
+    }
+  }, [getFetchAnswers]);
   function handleOnSubmitDialog() {
     setOpenQuesDetailsDialog(false);
   }
@@ -20996,7 +21035,7 @@ const FillQuestions = props => {
         color: "white",
         marginTop: "10px"
       }
-    }, "Fill your details : Name, Gender, DOB and Email are required")) : null
+    }, "Fill your details : Name, Gender, DOB and Email are required"), loading && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null)) : null
   );
 };
 
@@ -22494,6 +22533,10 @@ const SearchFormFieldsComponents = _ref => {
     t
   } = reactI18next.useTranslation();
   const ulbs = Digit.SessionStorage.get("ENGAGEMENT_TENANTS");
+  const {
+    data: cities,
+    isLoading
+  } = Digit.Hooks.useTenants();
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const userInfo = Digit.SessionStorage.get("citizen.userRequestObject");
   const userUlbs = ulbs.filter(ulb => {
@@ -22512,10 +22555,10 @@ const SearchFormFieldsComponents = _ref => {
     rules: {
       required: t("REQUIRED_FIELD")
     },
-    defaultValue: selectedTenat === null || selectedTenat === void 0 ? void 0 : selectedTenat[0],
+    defaultValue: tenantId,
     render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
-      option: userUlbs,
-      optionKey: "i18nKey",
+      option: cities,
+      optionKey: "name",
       selected: props.value,
       select: e => props.onChange(e),
       t: t