@mseva/digit-ui-module-rentandlease 1.0.18 → 1.0.20

package/dist/index.modern.js

@@ -6138,7 +6138,6 @@ const capitalize = text => text.substr(0, 1).toUpperCase() + text.substr(1);
 const ulbCamel = ulb => ulb.toLowerCase().split(" ").map(capitalize).join(" ");
 const getAcknowledgementData = async (application, tenantInfo, t) => {
   var _application$OwnerInf, _application$addition, _application$addition2, _application$addition3, _application$addition4, _application$addition5, _application$addition6, _application$addition7, _application$addition8, _application$addition9, _application$Document, _application$addition0, _tenantInfo$city;
-  console.log("application in getAcknowledgement", application);
   const details = [];
   application === null || application === void 0 ? void 0 : (_application$OwnerInf = application.OwnerInfo) === null || _application$OwnerInf === void 0 ? void 0 : _application$OwnerInf.forEach((owner, index) => {
     var _owner$permanentAddre, _owner$permanentAddre2, _owner$correspondence, _owner$correspondence2;
@@ -6157,7 +6156,7 @@ const getAcknowledgementData = async (application, tenantInfo, t) => {
         title: t("Permanent Address"),
         value: `${(owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.addressId) || t("CS_NA")} , ${(owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre2 = owner.permanentAddress) === null || _owner$permanentAddre2 === void 0 ? void 0 : _owner$permanentAddre2.pincode) || t("CS_NA")}`
       }, {
-        title: t("Corresspondence Address"),
+        title: t("Correspondence Address"),
         value: `${(owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.addressId) || t("CS_NA")} , ${(owner === null || owner === void 0 ? void 0 : (_owner$correspondence2 = owner.correspondenceAddress) === null || _owner$correspondence2 === void 0 ? void 0 : _owner$correspondence2.pincode) || t("CS_NA")}`
       }]
     });
@@ -7397,7 +7396,7 @@ function NewApplicationTimeline({
     }, t("Action")), /*#__PURE__*/React.createElement("div", {
       className: "custom-status-text"
     }, t((item === null || item === void 0 ? void 0 : item.performedAction) || "CS_COMMON_NA")))), (item === null || item === void 0 ? void 0 : item.wfComment) && (item === null || item === void 0 ? void 0 : (_item$wfComment = item.wfComment) === null || _item$wfComment === void 0 ? void 0 : _item$wfComment.length) > 0 && (item === null || item === void 0 ? void 0 : (_item$wfComment2 = item.wfComment) === null || _item$wfComment2 === void 0 ? void 0 : _item$wfComment2.some(c => c === null || c === void 0 ? void 0 : c.trim())) && /*#__PURE__*/React.createElement("div", {
-      className: "custom-assignee-section"
+      className: "custom-comments-section"
     }, /*#__PURE__*/React.createElement("div", {
       className: "custom-comment-text"
     }, /*#__PURE__*/React.createElement("h4", {
@@ -7405,13 +7404,13 @@ function NewApplicationTimeline({
     }, t("Officer Comments")), item === null || item === void 0 ? void 0 : (_item$wfComment3 = item.wfComment) === null || _item$wfComment3 === void 0 ? void 0 : _item$wfComment3.map((comment, idx) => /*#__PURE__*/React.createElement("p", {
       key: idx
     }, comment))), (item === null || item === void 0 ? void 0 : (_item$assignes = item.assignes) === null || _item$assignes === void 0 ? void 0 : _item$assignes.length) > 0 && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h3", {
-      className: "custom-action-title"
+      className: "custom-comments-title"
     }, t("Assigned To")), /*#__PURE__*/React.createElement("div", {
       className: "custom-officer-info"
     }, /*#__PURE__*/React.createElement("div", {
       className: "custom-officer-name"
     }, (_item$assignes$ = item.assignes[0]) === null || _item$assignes$ === void 0 ? void 0 : _item$assignes$.name)))), (item === null || item === void 0 ? void 0 : item.wfDocuments) && (item === null || item === void 0 ? void 0 : (_item$wfDocuments = item.wfDocuments) === null || _item$wfDocuments === void 0 ? void 0 : _item$wfDocuments.length) > 0 && /*#__PURE__*/React.createElement("div", {
-      className: "custom-comments-section custom-comments-section-no-border"
+      className: "custom-comments-section-no-border"
     }, /*#__PURE__*/React.createElement("h4", {
       className: "custom-comments-title"
     }, "Document Attached:"), /*#__PURE__*/React.createElement("div", {
@@ -7545,6 +7544,9 @@ const RALApplicationDetails = () => {
     moduleCode: "RENT_N_LEASE_NEW",
     role: "EMPLOYEE"
   });
+  const getDate = epoch => {
+    return Digit.DateUtils.ConvertEpochToDate(epoch);
+  };
   const propertyDetails = applicationData !== null && applicationData !== void 0 && applicationData.additionalDetails ? applicationData.additionalDetails : {};
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "cardHeaderWithOptions ral-app-details-header"
@@ -7615,6 +7617,15 @@ const RALApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_LOCATION_TYPE"),
     text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.locationType) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_START_DATE"),
+    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.startDate) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_END_DATE"),
+    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) || t("CS_NA")
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) && /*#__PURE__*/React.createElement(Row, {
+    label: t("RENT_LEASE_TRADE_LICENSE_NUMBER"),
+    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) || t("CS_NA")
   })), /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24-margin"
   }, t("CS_COMMON_DOCUMENTS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Card, {
@@ -8962,7 +8973,6 @@ const RALApplicationDetails$1 = () => {
   const [loader, setLoader] = useState(false);
   const state = tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0];
   const [applicationData, setApplicationData] = useState();
-  console.log("applicationData", applicationData);
   const [showToast, setShowToast] = useState(null);
   const [displayMenu, setDisplayMenu] = useState(false);
   const [selectedAction, setSelectedAction] = useState(null);
@@ -8970,6 +8980,8 @@ const RALApplicationDetails$1 = () => {
   const [getEmployees, setEmployees] = useState([]);
   const history = useHistory();
   const [getWorkflowService, setWorkflowService] = useState([]);
+  const menuRef = useRef();
+  Digit.Hooks.useClickOutside(menuRef, () => setDisplayMenu(false), displayMenu);
   const fetchApplications = async filters => {
     setLoader(true);
     try {
@@ -9002,9 +9014,14 @@ const RALApplicationDetails$1 = () => {
     moduleCode: "RENT_N_LEASE_NEW",
     role: "EMPLOYEE"
   });
+  const handleNavigation = () => {
+    const timer = setTimeout(() => {
+      history.push("/digit-ui/employee/rentandlease/inbox");
+    }, 2000);
+    return () => clearTimeout(timer);
+  };
   const propertyDetails = applicationData !== null && applicationData !== void 0 && applicationData.additionalDetails ? applicationData.additionalDetails : {};
   let user = Digit.UserService.getUser();
-  const menuRef = useRef();
   const userRoles = user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : (_user$info$roles = _user$info.roles) === null || _user$info$roles === void 0 ? void 0 : _user$info$roles.map(e => e.code);
   let actions = (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.actionState) === null || _workflowDetails$data2 === void 0 ? void 0 : (_workflowDetails$data3 = _workflowDetails$data2.nextActions) === null || _workflowDetails$data3 === void 0 ? void 0 : _workflowDetails$data3.filter(e => {
     return (userRoles === null || userRoles === void 0 ? void 0 : userRoles.some(role => {
@@ -9017,7 +9034,7 @@ const RALApplicationDetails$1 = () => {
       return (_e$roles2 = e.roles) === null || _e$roles2 === void 0 ? void 0 : _e$roles2.includes(role);
     })) || !e.roles;
   }));
-  if ((_actions = actions) !== null && _actions !== void 0 && _actions.some(action => action.action === "REQUEST_FOR_DISCONNECTION") && (applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) > Date.now()) {
+  if ((_actions = actions) !== null && _actions !== void 0 && _actions.some(action => action.action === "REQUEST_FOR_DISCONNECTION") && Date.now() >= (applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) - 15 * 24 * 60 * 60 * 1000) {
     actions = [...(actions || []), {
       action: "RENEWAL"
     }];
@@ -9030,6 +9047,9 @@ const RALApplicationDetails$1 = () => {
     setShowModal(false);
     setShowToast(false);
   };
+  const getDate = epoch => {
+    return Digit.DateUtils.ConvertEpochToDate(epoch);
+  };
   function onActionSelect(action) {
     var _ref, _action$state, _filterRoles$;
     const payload = {
@@ -9046,7 +9066,7 @@ const RALApplicationDetails$1 = () => {
     } else if ((action === null || action === void 0 ? void 0 : action.action) == "PAY") {
       const appNo = acknowledgementIds;
       history.push(`/digit-ui/employee/payment/collect/rl-services/${appNo}/${tenantId}`);
-    } else if ((action === null || action === void 0 ? void 0 : action.action) === "RENEWAL") {
+    } else if ((action === null || action === void 0 ? void 0 : action.action) === "RAL_RENEWAL") {
       setShowModal(true);
       setSelectedAction(action);
     } else {
@@ -9092,9 +9112,7 @@ const RALApplicationDetails$1 = () => {
           key: false,
           label: "Successfully updated the status"
         });
-        setTimeout(() => {
-          history.push("/digit-ui/employee/rentandlease/inbox");
-        }, 2000);
+        handleNavigation();
         setSelectedAction(null);
         setShowModal(false);
       }
@@ -9179,7 +9197,7 @@ const RALApplicationDetails$1 = () => {
         ...response,
         Document: sanitizedDocuments,
         workflow: {
-          action: "SAVEASDRAFT"
+          action: "APPLY"
         }
       }
     };
@@ -9196,6 +9214,7 @@ const RALApplicationDetails$1 = () => {
         key: false,
         label: "Renewal application submitted successfully"
       });
+      handleNavigation();
     } catch (error) {
       setLoader(false);
       setShowToast({
@@ -9235,7 +9254,10 @@ const RALApplicationDetails$1 = () => {
     text: t("CS_NA")
   })), /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24"
-  }, t("ES_TITILE_PROPERTY_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+  }, t("ES_TITILE_PROPERTY_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, (applicationData === null || applicationData === void 0 ? void 0 : applicationData.registrationNumber) && /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_REGISTRATION_NUMBER"),
+    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.registrationNumber) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
     label: t("APPLICATION_NUMBER"),
     text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNumber) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
@@ -9268,6 +9290,15 @@ const RALApplicationDetails$1 = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_LOCATION_TYPE"),
     text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.locationType) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_START_DATE"),
+    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.startDate) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_END_DATE"),
+    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) || t("CS_NA")
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) && /*#__PURE__*/React.createElement(Row, {
+    label: t("RENT_LEASE_TRADE_LICENSE_NUMBER"),
+    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) || t("CS_NA")
   })), /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24-margin"
   }, t("CS_COMMON_DOCUMENTS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Card, {
@@ -9281,17 +9312,18 @@ const RALApplicationDetails$1 = () => {
   }), t(doc === null || doc === void 0 ? void 0 : doc.documentType))) : /*#__PURE__*/React.createElement("h5", null, t("CS_NO_DOCUMENTS_UPLOADED"))))), /*#__PURE__*/React.createElement(NewApplicationTimeline, {
     workflowDetails: workflowDetails,
     t: t
-  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) != "INITIATED" && ((_actions2 = actions) === null || _actions2 === void 0 ? void 0 : _actions2.length) > 0 && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu ? /*#__PURE__*/React.createElement(Menu, {
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) != "INITIATED" && ((_actions2 = actions) === null || _actions2 === void 0 ? void 0 : _actions2.length) > 0 && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement("div", {
+    ref: menuRef
+  }, displayMenu ? /*#__PURE__*/React.createElement(Menu, {
     localeKeyPrefix: `WF_EMPLOYEE_${"PTR"}`,
     options: actions,
     optionKey: "action",
     t: t,
     onSelect: onActionSelect
   }) : null, /*#__PURE__*/React.createElement(SubmitBar, {
-    ref: menuRef,
     label: t("WF_TAKE_ACTION"),
     onSubmit: () => setDisplayMenu(!displayMenu)
-  })), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) == "INITIATED" && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
+  }))), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) == "INITIATED" && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("COMMON_EDIT"),
     onSubmit: () => {
       history.push(`/digit-ui/employee/rentandlease/allot-property/${acknowledgementIds}`);
@@ -10028,12 +10060,29 @@ const RentAndLeasePropertyDetails = ({
 }) => {
   const dispatch = useDispatch();
   const tenantId = window.location.href.includes("citizen") ? window.localStorage.getItem("CITIZEN.CITY") : window.localStorage.getItem("Employee.tenant-id");
+  const filters = {
+    tenantId,
+    searchType: "1"
+  };
   const {
-    data: mdmsPropertyData
-  } = Digit.Hooks.rentandlease.useRALPropertyMDMS(tenantId);
+    data,
+    isLoading,
+    isError
+  } = Digit.Hooks.rentandlease.useRentAndLeaseProperties(filters);
   const {
-    triggerLoader
+    triggerLoader,
+    triggerToast
   } = config === null || config === void 0 ? void 0 : config.currStepConfig[0];
+  useEffect(() => {
+    if (triggerLoader) {
+      triggerLoader(isLoading);
+    }
+  }, [isLoading, triggerLoader]);
+  useEffect(() => {
+    if (isError && triggerToast) {
+      triggerToast("ERROR_WHILE_FETCHING_PROPERTIES", true);
+    }
+  }, [isError, triggerToast]);
   const propertyTypeOptions = [{
     name: t("ON_RENT"),
     code: "rent",
@@ -10095,14 +10144,14 @@ const RentAndLeasePropertyDetails = ({
   const selectedLocationType = watch("locationType");
   const [filteredProperties, setFilteredProperties] = useState([]);
   useEffect(() => {
-    if (mdmsPropertyData) {
-      let properties = mdmsPropertyData;
+    if (data !== null && data !== void 0 && data.property) {
+      let properties = data === null || data === void 0 ? void 0 : data.property;
       if (selectedPropertyType && selectedPropertySpecific && selectedLocationType) {
         properties = properties.filter(p => p.allotmentType === (selectedPropertyType === null || selectedPropertyType === void 0 ? void 0 : selectedPropertyType.code) && p.propertyType === (selectedPropertySpecific === null || selectedPropertySpecific === void 0 ? void 0 : selectedPropertySpecific.code) && p.locationType === (selectedLocationType === null || selectedLocationType === void 0 ? void 0 : selectedLocationType.code));
       }
       setFilteredProperties(properties);
     }
-  }, [mdmsPropertyData, selectedPropertyType, selectedPropertySpecific, selectedLocationType]);
+  }, [data, selectedPropertyType, selectedPropertySpecific, selectedLocationType]);
   const todayISO = new Date().toISOString().split("T")[0];
   const getErrorMessage = fieldName => {
     var _errors$fieldName;
@@ -13325,7 +13374,10 @@ const MyProperties = ({
     var _property$additionalD, _property$additionalD2;
     return /*#__PURE__*/React.createElement(Card, {
       key: index
-    }, /*#__PURE__*/React.createElement(KeyNote, {
+    }, (property === null || property === void 0 ? void 0 : property.registrationNumber) && /*#__PURE__*/React.createElement(KeyNote, {
+      keyValue: t("RAL_REGISTRATION_NUMBER"),
+      note: (property === null || property === void 0 ? void 0 : property.registrationNumber) || t("CS_NA")
+    }), /*#__PURE__*/React.createElement(KeyNote, {
       keyValue: t("RAL_APPLICATION_NUMBER"),
       note: (property === null || property === void 0 ? void 0 : property.applicationNumber) || t("CS_NA")
     }), /*#__PURE__*/React.createElement(KeyNote, {