@mseva/digit-ui-module-core 1.0.54 → 1.0.56

package/dist/index.modern.js

@@ -13837,7 +13837,7 @@ const UserProfile = ({
   userType,
   cityDetails
 }) => {
-  var _Digit$UserService$ge, _errors$userName, _errors$mobileNumber, _errors$emailAddress, _errors$currentPasswo, _errors$newPassword, _errors$confirmPasswo;
+  var _Digit$UserService$ge, _userInfo$roles, _errors$userName, _errors$mobileNumber, _errors$emailAddress, _errors$currentPasswo, _errors$newPassword, _errors$confirmPasswo;
   const history = useHistory();
   const {
     t
@@ -13877,6 +13877,7 @@ const UserProfile = ({
   const [selectedCorrespondentState, setSelectedCorrespondentState] = useState();
   const [selectedCorrespondentDistrict, setSelectedCorrespondentDistrict] = useState();
   const [pinCodeCorrespondent, setPinCodeCorrespondent] = useState();
+  const isUserArchitect = window.location.href.includes("citizen") && (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$roles = userInfo.roles) === null || _userInfo$roles === void 0 ? void 0 : _userInfo$roles.some(role => role.code.includes("BPA_ARCHITECT")));
   const getUserInfo = async () => {
     const uuid = userInfo === null || userInfo === void 0 ? void 0 : userInfo.uuid;
     if (uuid) {
@@ -13901,37 +13902,59 @@ const UserProfile = ({
   const {
     data: districtList,
     isLoading
-  } = Digit.Hooks.useCustomMDMS(selectedState === null || selectedState === void 0 ? void 0 : selectedState.code, "BPA", [{
-    name: "Ulb"
+  } = Digit.Hooks.useCustomMDMS(stateId, "common-masters", [{
+    name: "DistrictMaster"
   }]);
   const uniqueDistricts = useMemo(() => {
-    var _districtList$BPA, _districtList$BPA$Ulb;
-    if (isLoading || !(districtList !== null && districtList !== void 0 && (_districtList$BPA = districtList.BPA) !== null && _districtList$BPA !== void 0 && (_districtList$BPA$Ulb = _districtList$BPA.Ulb) !== null && _districtList$BPA$Ulb !== void 0 && _districtList$BPA$Ulb.length)) return [];
-    return [...new Set(districtList.BPA.Ulb.map(item => {
-      var _item$Districts;
-      return (_item$Districts = item.Districts) === null || _item$Districts === void 0 ? void 0 : _item$Districts.trim();
-    }))].filter(Boolean).sort((a, b) => a.localeCompare(b)).map(district => ({
-      name: district,
-      code: district
-    }));
-  }, [isLoading, districtList]);
+    var _districtList$common, _districtList$common$, _districtList$common2, _districtList$common3;
+    if (isLoading || !(districtList !== null && districtList !== void 0 && (_districtList$common = districtList["common-masters"]) !== null && _districtList$common !== void 0 && (_districtList$common$ = _districtList$common.DistrictMaster) !== null && _districtList$common$ !== void 0 && _districtList$common$.length)) return [];
+    return districtList === null || districtList === void 0 ? void 0 : (_districtList$common2 = districtList["common-masters"]) === null || _districtList$common2 === void 0 ? void 0 : (_districtList$common3 = _districtList$common2.DistrictMaster) === null || _districtList$common3 === void 0 ? void 0 : _districtList$common3.filter(district => district.state_code === (selectedState === null || selectedState === void 0 ? void 0 : selectedState.state_code));
+  }, [isLoading, districtList, selectedState]);
+  const uniqueDistrictsCorrespondent = useMemo(() => {
+    var _districtList$common4, _districtList$common5, _districtList$common6, _districtList$common7;
+    if (isLoading || !(districtList !== null && districtList !== void 0 && (_districtList$common4 = districtList["common-masters"]) !== null && _districtList$common4 !== void 0 && (_districtList$common5 = _districtList$common4.DistrictMaster) !== null && _districtList$common5 !== void 0 && _districtList$common5.length)) return [];
+    return districtList === null || districtList === void 0 ? void 0 : (_districtList$common6 = districtList["common-masters"]) === null || _districtList$common6 === void 0 ? void 0 : (_districtList$common7 = _districtList$common6.DistrictMaster) === null || _districtList$common7 === void 0 ? void 0 : _districtList$common7.filter(district => district.state_code === (selectedCorrespondentState === null || selectedCorrespondentState === void 0 ? void 0 : selectedCorrespondentState.state_code));
+  }, [isLoading, districtList, selectedCorrespondentState]);
   const {
-    data: districtListCorrespondent,
-    isLoading: isLoadingCorrespondent
-  } = Digit.Hooks.useCustomMDMS(selectedState === null || selectedState === void 0 ? void 0 : selectedState.code, "BPA", [{
-    name: "Ulb"
+    data: StateData,
+    isLoading: isStateLoading
+  } = Digit.Hooks.useCustomMDMS(stateId, "common-masters", [{
+    name: "StateMaster"
   }]);
-  const uniqueDistrictsCorrespondent = useMemo(() => {
-    var _districtListCorrespo, _districtListCorrespo2;
-    if (isLoadingCorrespondent || !(districtListCorrespondent !== null && districtListCorrespondent !== void 0 && (_districtListCorrespo = districtListCorrespondent.BPA) !== null && _districtListCorrespo !== void 0 && (_districtListCorrespo2 = _districtListCorrespo.Ulb) !== null && _districtListCorrespo2 !== void 0 && _districtListCorrespo2.length)) return [];
-    return [...new Set(districtListCorrespondent.BPA.Ulb.map(item => {
-      var _item$Districts2;
-      return (_item$Districts2 = item.Districts) === null || _item$Districts2 === void 0 ? void 0 : _item$Districts2.trim();
-    }))].filter(Boolean).sort((a, b) => a.localeCompare(b)).map(district => ({
-      name: district,
-      code: district
-    }));
-  }, [isLoadingCorrespondent, districtListCorrespondent]);
+  const stateOptions = useMemo(() => {
+    var _StateData$commonMas, _StateData$commonMas$;
+    if ((StateData === null || StateData === void 0 ? void 0 : (_StateData$commonMas = StateData["common-masters"]) === null || _StateData$commonMas === void 0 ? void 0 : (_StateData$commonMas$ = _StateData$commonMas.StateMaster) === null || _StateData$commonMas$ === void 0 ? void 0 : _StateData$commonMas$.length) > 0) {
+      return StateData === null || StateData === void 0 ? void 0 : StateData["common-masters"].StateMaster;
+    } else {
+      return [];
+    }
+  }, [StateData, isStateLoading]);
+  console.log("uniqueDistricts", uniqueDistrictsCorrespondent, selectedCorrespondentState);
+  useEffect(() => {
+    if (typeof selectedState === "string" && (stateOptions === null || stateOptions === void 0 ? void 0 : stateOptions.length) > 0) {
+      const state = stateOptions.find(state => state.state_name === selectedState);
+      console.log("stateData", stateOptions, state, selectedState);
+      setSelectedState(state);
+    }
+  }, [selectedState, stateOptions]);
+  useEffect(() => {
+    if (typeof selectedCorrespondentState === "string" && (stateOptions === null || stateOptions === void 0 ? void 0 : stateOptions.length) > 0) {
+      const state = stateOptions.find(state => state.state_name === selectedCorrespondentState);
+      setSelectedCorrespondentState(state);
+    }
+  }, [selectedCorrespondentState, stateOptions]);
+  useEffect(() => {
+    if (typeof selectedCorrespondentDistrict === "string" && (uniqueDistrictsCorrespondent === null || uniqueDistrictsCorrespondent === void 0 ? void 0 : uniqueDistrictsCorrespondent.length) > 0) {
+      const state = uniqueDistrictsCorrespondent.find(state => state.district_name_english === selectedCorrespondentDistrict);
+      setSelectedCorrespondentDistrict(state);
+    }
+  }, [selectedCorrespondentDistrict, uniqueDistrictsCorrespondent]);
+  useEffect(() => {
+    if (typeof selectedDistrict === "string" && (uniqueDistricts === null || uniqueDistricts === void 0 ? void 0 : uniqueDistricts.length) > 0) {
+      const state = uniqueDistricts.find(state => state.district_name_english === selectedDistrict);
+      setSelectedDistrict(state);
+    }
+  }, [selectedDistrict, uniqueDistricts]);
   useEffect(() => {
     var _userDetails$photo;
     setLoading(true);
@@ -13943,23 +13966,13 @@ const UserProfile = ({
     });
     setDob(userDetails === null || userDetails === void 0 ? void 0 : userDetails.dob);
     setPermanentAddress(userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentAddress);
-    setSelectedDistrict({
-      name: userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentCity,
-      code: userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentCity
-    });
+    setSelectedDistrict(userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentDistrict);
     setPinCode(userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentPinCode);
     setPinCodeCorrespondent(userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondencePinCode);
-    setSelectedCorrespondentDistrict({
-      name: userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceCity,
-      code: userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceCity
-    });
+    setSelectedCorrespondentDistrict(userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceDistrict);
     setCorrespondenceAddress(userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceAddress);
-    if (userDetails !== null && userDetails !== void 0 && userDetails.correspondenceState) {
-      setSelectedCorrespondentState(userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceState);
-    }
-    if (userDetails !== null && userDetails !== void 0 && userDetails.permanentState) {
-      setSelectedState(userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentState);
-    }
+    setSelectedCorrespondentState(userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceState);
+    setSelectedState(userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentState);
     if (userDetails !== null && userDetails !== void 0 && userDetails.isAddressSame) {
       setIsAddressSame(userDetails === null || userDetails === void 0 ? void 0 : userDetails.isAddressSame);
     }
@@ -14102,13 +14115,13 @@ const UserProfile = ({
         emailId: email,
         photo: profilePic,
         permanentAddress: PermanentAddress,
-        permanentCity: selectedDistrict === null || selectedDistrict === void 0 ? void 0 : selectedDistrict.name,
+        permanentDistrict: selectedDistrict === null || selectedDistrict === void 0 ? void 0 : selectedDistrict.district_name_english,
         permanentPinCode: pinCode,
         correspondencePinCode: isAddressSame ? pinCode : pinCodeCorrespondent,
-        correspondenceCity: isAddressSame ? selectedDistrict === null || selectedDistrict === void 0 ? void 0 : selectedDistrict.name : selectedCorrespondentDistrict === null || selectedCorrespondentDistrict === void 0 ? void 0 : selectedCorrespondentDistrict.name,
+        correspondenceDistrict: isAddressSame ? selectedDistrict === null || selectedDistrict === void 0 ? void 0 : selectedDistrict.district_name_english : selectedCorrespondentDistrict === null || selectedCorrespondentDistrict === void 0 ? void 0 : selectedCorrespondentDistrict.district_name_english,
         correspondenceAddress: isAddressSame ? PermanentAddress : correspondenceAddress,
-        correspondenceState: isAddressSame ? selectedState === null || selectedState === void 0 ? void 0 : selectedState.name : selectedCorrespondentState === null || selectedCorrespondentState === void 0 ? void 0 : selectedCorrespondentState.name,
-        permanentState: selectedState === null || selectedState === void 0 ? void 0 : selectedState.name,
+        correspondenceState: isAddressSame ? selectedState === null || selectedState === void 0 ? void 0 : selectedState.state_name : selectedCorrespondentState === null || selectedCorrespondentState === void 0 ? void 0 : selectedCorrespondentState.state_name,
+        permanentState: selectedState === null || selectedState === void 0 ? void 0 : selectedState.state_name,
         isAddressSame: isAddressSame
       };
       if (!new RegExp(/^([a-zA-Z ])*$/).test(name) || name === "" || name.length > 50 || name.length < 1) {
@@ -14173,7 +14186,7 @@ const UserProfile = ({
             message: t("CORE_COMMON_PERMANENT_ADDRESS_REQUIRED")
           });
         }
-        if (!requestData.permanentCity || typeof requestData.permanentCity !== "string") {
+        if (!requestData.permanentDistrict || typeof requestData.permanentDistrict !== "string") {
           throw JSON.stringify({
             type: "error",
             message: t("CORE_COMMON_PERMANENT_CITY_REQUIRED")
@@ -14203,7 +14216,7 @@ const UserProfile = ({
             message: t("CORE_COMMON_CORRESPONDENCE_PINCODE_INVALID")
           });
         }
-        if (!requestData.isAddressSame && (!requestData.correspondenceCity || typeof requestData.correspondenceCity !== "string")) {
+        if (!requestData.isAddressSame && (!requestData.correspondenceDistrict || typeof requestData.correspondenceDistrict !== "string")) {
           throw JSON.stringify({
             type: "error",
             message: t("CORE_COMMON_CORRESPONDENCE_CITY_REQUIRED")
@@ -14359,23 +14372,6 @@ const UserProfile = ({
       setPinCodeCorrespondent(value);
     }
   }
-  const stateOptions = useMemo(() => {
-    return [{
-      code: "pb",
-      name: "Punjab",
-      i18Code: "Punjab"
-    }];
-  }, []);
-  useEffect(() => {
-    if ((stateOptions === null || stateOptions === void 0 ? void 0 : stateOptions.length) > 0) {
-      setSelectedState(stateOptions === null || stateOptions === void 0 ? void 0 : stateOptions[0]);
-    }
-  }, [stateOptions]);
-  useEffect(() => {
-    if ((stateOptions === null || stateOptions === void 0 ? void 0 : stateOptions.length) > 0) {
-      setSelectedCorrespondentState(stateOptions === null || stateOptions === void 0 ? void 0 : stateOptions[0]);
-    }
-  }, [stateOptions]);
   const getThumbnails = async (ids, tenantId) => {
     const res = await Digit.UploadServices.Filefetch(ids, tenantId);
     if (res.data.fileStoreIds && res.data.fileStoreIds.length !== 0) {
@@ -14492,7 +14488,7 @@ const UserProfile = ({
     type: "tel",
     title: t("CORE_COMMON_PROFILE_NAME_ERROR_MESSAGE")
   }, {
-    disable: editScreen
+    disable:  isUserArchitect
   })))), /*#__PURE__*/React.createElement(LabelFieldPair$1, null, /*#__PURE__*/React.createElement(CardLabel$1, {
     style:  {}
   }, `${t("CORE_COMMON_PROFILE_GENDER")}`), /*#__PURE__*/React.createElement(Dropdown, {
@@ -14550,14 +14546,14 @@ const UserProfile = ({
     disable: editScreen
   })), /*#__PURE__*/React.createElement(LabelFieldPair$1, null, /*#__PURE__*/React.createElement(CardLabel$1, null, t("BPA_STATE_TYPE"), "*"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Dropdown, {
     t: t,
-    optionKey: "code",
+    optionKey: "state_name",
     option: stateOptions,
     selected: selectedState,
     select: SelectState,
     disable: editScreen
   }))), /*#__PURE__*/React.createElement("div", null, " ", /*#__PURE__*/React.createElement(CardLabel$1, null, t("BPA_DISTRICT_TYPE"), "*"), /*#__PURE__*/React.createElement(Dropdown, {
     t: t,
-    optionKey: "code",
+    optionKey: "district_name_english",
     option: uniqueDistricts,
     selected: selectedDistrict,
     select: SelectDistrict,
@@ -14596,14 +14592,14 @@ const UserProfile = ({
     disable:  isAddressSame
   }), /*#__PURE__*/React.createElement(CardLabel$1, null, t("BPA_STATE_TYPE"), "*"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Dropdown, {
     t: t,
-    optionKey: "code",
+    optionKey: "state_name",
     option: stateOptions,
     selected: isAddressSame ? selectedState : selectedCorrespondentState,
     select: SelectCorrespondentState,
     disable:  isAddressSame
   })), /*#__PURE__*/React.createElement("div", null, " ", /*#__PURE__*/React.createElement(CardLabel$1, null, t("BPA_DISTRICT_TYPE"), "*"), /*#__PURE__*/React.createElement(Dropdown, {
     t: t,
-    optionKey: "code",
+    optionKey: "district_name_english",
     option: uniqueDistrictsCorrespondent,
     selected: isAddressSame ? selectedDistrict : selectedCorrespondentDistrict,
     select: SelectCorrespondentDistrict,