@djb25/digit-ui-module-wt 1.0.26 → 1.0.27

package/dist/index.modern.js

@@ -267,9 +267,11 @@ const WTCreate = () => {
     if (!isNaN(lastchar)) {
       isMultiple = true;
     }
+    let routeObj = config.find(routeObj => key ? routeObj.key === key : routeObj.route === currentPath);
+    if (!routeObj) routeObj = config.find(routeObj => routeObj.route === currentPath);
     let {
       nextStep = {}
-    } = config.find(routeObj => routeObj.route === currentPath);
+    } = routeObj || {};
     let redirectWithHistory = history.push;
     if (skipStep) {
       redirectWithHistory = history.replace;
@@ -1981,6 +1983,9 @@ const WTCheckPage = ({
   const {
     t
   } = useTranslation();
+  const {
+    pathname
+  } = useLocation();
   const {
     owner,
     requestDetails,
@@ -1992,6 +1997,7 @@ const WTCheckPage = ({
   const [agree, setAgree] = useState(false);
   const immediateRequired = requestDetails !== null && requestDetails !== void 0 && requestDetails.extraCharge ? "YES" : "NO";
   const [fileUrl, setFileUrl] = useState(null);
+  const baseUrl = pathname.includes("citizen") ? `${APPLICATION_PATH}/citizen/wt/request-service` : `${APPLICATION_PATH}/employee/wt/request-service`;
   const setdeclarationhandler = () => {
     setAgree(!agree);
   };
@@ -2015,7 +2021,7 @@ const WTCheckPage = ({
     label: t("COMMON_APPLICANT_NAME"),
     text: `${t(checkForNA(owner === null || owner === void 0 ? void 0 : owner.applicantName))}`,
     actionButton: /*#__PURE__*/React.createElement(ActionButton, {
-      jumpTo: `${APPLICATION_PATH}/citizen/wt/request-service/applicant-details`
+      jumpTo: `${baseUrl}/applicant-details`
     })
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("COMMON_MOBILE_NUMBER"),
@@ -2035,7 +2041,7 @@ const WTCheckPage = ({
     label: t("HOUSE_NO"),
     text: `${t(checkForNA(address === null || address === void 0 ? void 0 : address.houseNo))}`,
     actionButton: /*#__PURE__*/React.createElement(ActionButton, {
-      jumpTo: `${APPLICATION_PATH}/citizen/wt/request-service/address-details`
+      jumpTo: `${baseUrl}/address-details`
     })
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("ADDRESS_LINE1"),
@@ -2067,7 +2073,7 @@ const WTCheckPage = ({
     label: t("WT_TANKER_TYPE"),
     text: `${t(checkForNA(requestDetails === null || requestDetails === void 0 ? void 0 : (_requestDetails$tanke = requestDetails.tankerType) === null || _requestDetails$tanke === void 0 ? void 0 : _requestDetails$tanke.value))}`,
     actionButton: /*#__PURE__*/React.createElement(ActionButton, {
-      jumpTo: `${APPLICATION_PATH}/citizen/wt/request-service/request-details`
+      jumpTo: `${baseUrl}/request-details`
     })
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WT_WATER_TYPE"),
@@ -2110,7 +2116,7 @@ const WTCheckPage = ({
     label: t("MT_NUMBER_OF_MOBILE_TOILETS"),
     text: `${t(checkForNA(toiletRequestDetails === null || toiletRequestDetails === void 0 ? void 0 : (_toiletRequestDetails = toiletRequestDetails.mobileToilet) === null || _toiletRequestDetails === void 0 ? void 0 : _toiletRequestDetails.code))}`,
     actionButton: /*#__PURE__*/React.createElement(ActionButton, {
-      jumpTo: `${APPLICATION_PATH}/citizen/wt/request-service/toiletRequest-details`
+      jumpTo: `${baseUrl}/toiletRequest-details`
     })
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("MT_DELIVERY_FROM_DATE"),
@@ -2136,7 +2142,7 @@ const WTCheckPage = ({
     label: t("REASON_FOR_PRUNING"),
     text: `${t(checkForNA(treePruningRequestDetails === null || treePruningRequestDetails === void 0 ? void 0 : (_treePruningRequestDe = treePruningRequestDetails.reasonOfPruning) === null || _treePruningRequestDe === void 0 ? void 0 : _treePruningRequestDe.code))}`,
     actionButton: /*#__PURE__*/React.createElement(ActionButton, {
-      jumpTo: `${APPLICATION_PATH}/citizen/wt/request-service/treePruningRequest-details`
+      jumpTo: `${baseUrl}/treePruningRequest-details`
     })
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("LOCATION_GEOTAG"),
@@ -6026,7 +6032,8 @@ const AddFixFillAddress = ({
       var _item$hierarchyType;
       return (item === null || item === void 0 ? void 0 : (_item$hierarchyType = item.hierarchyType) === null || _item$hierarchyType === void 0 ? void 0 : _item$hierarchyType.code) === "REVENUE";
     });
-    return (revenueData === null || revenueData === void 0 ? void 0 : revenueData.boundary) || [];
+    const boundary = (revenueData === null || revenueData === void 0 ? void 0 : revenueData.boundary) || [];
+    return Array.isArray(boundary) ? boundary : [boundary];
   }, [egovLocationData]);
   const structuredLocality = useMemo(() => {
     let localities = [];
@@ -6062,12 +6069,22 @@ const AddFixFillAddress = ({
     structuredLocality.forEach(loc => {
       if (loc.pincode) {
         const pins = Array.isArray(loc.pincode) ? loc.pincode : [loc.pincode];
-        pins.forEach(p => pinSet.add(p.toString()));
+        pins.forEach(p => {
+          if (p) {
+            const sanitizedPin = p.toString().split(".")[0];
+            pinSet.add(sanitizedPin);
+          }
+        });
       }
     });
     if (pinSet.size === 0 && city !== null && city !== void 0 && city.pincode) {
       const pins = Array.isArray(city.pincode) ? city.pincode : [city.pincode];
-      pins.forEach(p => pinSet.add(p.toString()));
+      pins.forEach(p => {
+        if (p) {
+          const sanitizedPin = p.toString().split(".")[0];
+          pinSet.add(sanitizedPin);
+        }
+      });
     }
     return Array.from(pinSet).sort().map(pin => ({
       code: pin,
@@ -6091,12 +6108,13 @@ const AddFixFillAddress = ({
       lastBookingId.current = currentId;
     }
     if (formData !== null && formData !== void 0 && formData.address && !isInitialized.current && allCities) {
+      var _addressData$pincode;
       const addressData = formData.address;
       const cityObj = allCities.find(c => c.code === addressData.cityCode || c.code === addressData.city || c.name === addressData.city) || addressData.city;
       if (cityObj && (!city || city.code !== cityObj.code && city !== cityObj)) {
         setCity(cityObj || null);
       }
-      setPincode(addressData.pincode || "");
+      setPincode(((_addressData$pincode = addressData.pincode) === null || _addressData$pincode === void 0 ? void 0 : _addressData$pincode.toString().split(".")[0]) || "");
       setHouseNo(addressData.houseNo || "");
       setStreetName(addressData.streetName || "");
       setLandmark(addressData.landmark || "");
@@ -6108,9 +6126,12 @@ const AddFixFillAddress = ({
       setLatitude(addressData.latitude || "");
       setLongitude(addressData.longitude || "");
       if (boundaryData || !addressData.cityCode) {
-        if (boundaryData) {
+        if (Array.isArray(boundaryData)) {
           const localityObj = boundaryData.find(l => l.code === addressData.localityCode || l.code === addressData.locality || l.i18nkey === addressData.locality);
           setLocality(localityObj || addressData.locality || null);
+        } else if (boundaryData && typeof boundaryData === "object") {
+          const match = boundaryData.code === addressData.localityCode || boundaryData.code === addressData.locality || boundaryData.i18nkey === addressData.locality;
+          setLocality(match ? boundaryData : addressData.locality || null);
         } else {
           setLocality(addressData.locality || null);
         }
@@ -6130,7 +6151,7 @@ const AddFixFillAddress = ({
     if (selectedAddress && Object.keys(selectedAddress).length) {
       setPincode(selectedAddress.pinCode);
       setCity(allCities === null || allCities === void 0 ? void 0 : allCities.find(c => c.name === selectedAddress.city));
-      setLocality(boundaryData === null || boundaryData === void 0 ? void 0 : boundaryData.find(l => l.i18nkey === selectedAddress.locality));
+      setLocality(Array.isArray(boundaryData) ? boundaryData.find(l => l.i18nkey === selectedAddress.locality) : null);
       setHouseNo(selectedAddress.houseNumber);
       setStreetName(selectedAddress.streetName);
       setLandmark(selectedAddress.landmark);
@@ -6239,7 +6260,10 @@ const AddFixFillAddress = ({
       if (val !== null && val !== void 0 && val.ward) setBlock(val.ward);
       if (val !== null && val !== void 0 && val.pincode) {
         const p = Array.isArray(val.pincode) ? val.pincode[0] : val.pincode;
-        if (p) setPincode(p.toString());
+        if (p) {
+          const sanitizedPin = p.toString().split(".")[0];
+          setPincode(sanitizedPin);
+        }
       }
     },
     option: filteredLocalities,
@@ -6708,7 +6732,7 @@ const LocalityModal = ({
     data: mdmsData,
     isLoading: isMdmsLoading
   } = Digit.Hooks.hrms.useHrmsMDMS(tenantId, "egov-location", "HRMSRolesandDesignation");
-  const gethierarchylistdata = () => {
+  const hierarchyOptions = useMemo(() => {
     var _ref, _ref$egovLocation;
     const tenantBoundary = ((_ref = (mdmsData === null || mdmsData === void 0 ? void 0 : mdmsData.MdmsRes) || mdmsData) === null || _ref === void 0 ? void 0 : (_ref$egovLocation = _ref["egov-location"]) === null || _ref$egovLocation === void 0 ? void 0 : _ref$egovLocation["TenantBoundary"]) || [];
     return tenantBoundary.map(ele => ({
@@ -6716,8 +6740,7 @@ const LocalityModal = ({
       code: ele.hierarchyType.code || ele.hierarchyType,
       boundary: ele.boundary
     }));
-  };
-  const hierarchyOptions = gethierarchylistdata();
+  }, [mdmsData]);
   React.useEffect(() => {
     if (hierarchyOptions.length > 0 && !selectedHierarchy) {
       setSelectedHierarchy(hierarchyOptions[0]);
@@ -6743,17 +6766,19 @@ const LocalityModal = ({
   }, [selectedHierarchy]);
   React.useEffect(() => {
     var _initialValues$fillin, _initialValues$addres;
-    if (structuredLocalities.length > 0 && ((initialValues === null || initialValues === void 0 ? void 0 : (_initialValues$fillin = initialValues.fillingPointLocalityCodes) === null || _initialValues$fillin === void 0 ? void 0 : _initialValues$fillin.length) > 0 || initialValues !== null && initialValues !== void 0 && (_initialValues$addres = initialValues.address) !== null && _initialValues$addres !== void 0 && _initialValues$addres.locality) && (isView || isUpdate)) {
+    if (structuredLocalities.length > 0 && selectedLocality.length === 0 && ((initialValues === null || initialValues === void 0 ? void 0 : (_initialValues$fillin = initialValues.fillingPointLocalityCodes) === null || _initialValues$fillin === void 0 ? void 0 : _initialValues$fillin.length) > 0 || initialValues !== null && initialValues !== void 0 && (_initialValues$addres = initialValues.address) !== null && _initialValues$addres !== void 0 && _initialValues$addres.locality) && (isView || isUpdate)) {
       var _initialValues$fillin2;
-      const currentLocalityCodes = (initialValues === null || initialValues === void 0 ? void 0 : (_initialValues$fillin2 = initialValues.fillingPointLocalityCodes) === null || _initialValues$fillin2 === void 0 ? void 0 : _initialValues$fillin2.length) > 0 ? initialValues.fillingPointLocalityCodes : initialValues.address.locality.split(",").map(s => s.trim());
-      const preSelected = structuredLocalities.filter(loc => currentLocalityCodes.includes(loc.code)).map(loc => [loc.i18nKey, loc]);
-      setSelectedLocality(preSelected);
+      const currentLocalityCodes = (initialValues === null || initialValues === void 0 ? void 0 : (_initialValues$fillin2 = initialValues.fillingPointLocalityCodes) === null || _initialValues$fillin2 === void 0 ? void 0 : _initialValues$fillin2.length) > 0 ? initialValues.fillingPointLocalityCodes : typeof initialValues.address.locality === "string" ? initialValues.address.locality.split(",").map(s => s.trim()) : [];
+      const preSelected = structuredLocalities.filter(loc => currentLocalityCodes.some(c => c === loc.code || c.toLowerCase() === (loc.name || "").toLowerCase()));
+      if (preSelected.length > 0) {
+        setSelectedLocality(preSelected);
+      }
     }
-  }, [structuredLocalities, initialValues, isView, isUpdate]);
+  }, [structuredLocalities, initialValues, isView, isUpdate, selectedLocality]);
   const onFormSubmit = () => {
     onSubmit({
       hierarchyType: selectedHierarchy,
-      locality: selectedLocality.map(l => l[1])
+      locality: selectedLocality
     });
   };
   if (isMdmsLoading) return /*#__PURE__*/React.createElement(Loader, null);
@@ -6828,7 +6853,7 @@ const LocalityModal = ({
       fontWeight: "600",
       marginBottom: "8px"
     }
-  }, (initialValues === null || initialValues === void 0 ? void 0 : (_initialValues$fillin3 = initialValues.fillingPointLocalityCodes) === null || _initialValues$fillin3 === void 0 ? void 0 : _initialValues$fillin3.length) > 0 ? initialValues.fillingPointLocalityCodes.join(", ") : (initialValues === null || initialValues === void 0 ? void 0 : (_initialValues$addres2 = initialValues.address) === null || _initialValues$addres2 === void 0 ? void 0 : _initialValues$addres2.locality) || "NA")), !isView ? /*#__PURE__*/React.createElement("div", {
+  }, (initialValues === null || initialValues === void 0 ? void 0 : (_initialValues$fillin3 = initialValues.fillingPointLocalityCodes) === null || _initialValues$fillin3 === void 0 ? void 0 : _initialValues$fillin3.length) > 0 ? initialValues.fillingPointLocalityCodes.join(", ") : (initialValues === null || initialValues === void 0 ? void 0 : (_initialValues$addres2 = initialValues.address) === null || _initialValues$addres2 === void 0 ? void 0 : _initialValues$addres2.locality) || "NA")), !isView && /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "16px"
     }
@@ -6837,7 +6862,10 @@ const LocalityModal = ({
     optionsKey: "i18nKey",
     selected: selectedLocality,
     onSelect: val => {
-      if (!isView) setSelectedLocality(val);
+      if (!isView) {
+        const unwrappedSelections = val.map(v => v[1]);
+        setSelectedLocality(unwrappedSelections);
+      }
     },
     t: t,
     disabled: !selectedHierarchy || isView
@@ -6847,28 +6875,7 @@ const LocalityModal = ({
       fontSize: "14px",
       color: "#666"
     }
-  }, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY_CODES"), ":"), " ", selectedLocality.map(l => l[1].code).join(", "))) : /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: "16px"
-    }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, t("WT_SELECTED_LOCALITIES")), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      flexWrap: "wrap",
-      gap: "8px",
-      marginTop: "8px"
-    }
-  }, (selectedLocality === null || selectedLocality === void 0 ? void 0 : selectedLocality.length) > 0 ? selectedLocality.map((l, index) => /*#__PURE__*/React.createElement("span", {
-    key: index,
-    style: {
-      background: "#f4f4f4",
-      border: "1px solid #ddd",
-      borderRadius: "20px",
-      padding: "4px 12px",
-      fontSize: "14px",
-      color: "#333"
-    }
-  }, t(l[1].i18nKey), " (", l[1].code, ")")) : null))), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY_CODES"), ":"), " ", selectedLocality.map(l => l.code).join(", ")))), /*#__PURE__*/React.createElement("div", {
     className: "custom-modal-footer",
     style: {
       padding: "16px 24px",
@@ -7088,7 +7095,7 @@ const SearchFillingPointAddress = () => {
   } = Digit.Hooks.wt.useUpdateFillingPointLocality(tenantId);
   const onLocalityModalSubmit = data => {
     const payload = {
-      FillingPointLocality: data.locality.map(loc => ({
+      FillingPointLocality: data.locality.filter(loc => loc.code).map(loc => ({
         fillingPointId: selectedLocalityRow.bookingId || selectedLocalityRow.id,
         localityCode: loc.code
       }))