@djb25/digit-ui-module-commonpt 1.0.18 → 1.0.20

package/dist/index.modern.js

@@ -12207,12 +12207,17 @@ const ActionModal$5 = _ref => {
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat7 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat7 !== void 0 && _parsedAdhocRebateDat7.adhocRebate) applicationData.additionalDetails.adhocRebate = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat8 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat8 === void 0 ? void 0 : _parsedAdhocRebateDat8.adhocRebate) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat9 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat9 !== void 0 && _parsedAdhocRebateDat9.adhocRebateComment) applicationData.additionalDetails.adhocRebateComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat0 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat0 === void 0 ? void 0 : _parsedAdhocRebateDat0.adhocRebateComment) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat1 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat1 !== void 0 && _parsedAdhocRebateDat1.adhocRebateReason) applicationData.additionalDetails.adhocRebateReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat10 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat10 === void 0 ? void 0 : _parsedAdhocRebateDat10.adhocRebateReason) || "";
-      const dueVerificationData = sessionStorage.getItem("Digit.DUE_VERIFICATION_DATA");
-      if (dueVerificationData) {
+      const inspectionInformationData = sessionStorage.getItem("Digit.INSPECTION_INFORMATION_DATA");
+      if (inspectionInformationData) {
         try {
-          applicationData.dueVerification = JSON.parse(dueVerificationData);
+          const parsedInspectionData = JSON.parse(inspectionInformationData);
+          if (parsedInspectionData !== null && parsedInspectionData !== void 0 && parsedInspectionData.inspectionDate) {
+            const dateVal = parsedInspectionData.inspectionDate;
+            parsedInspectionData.inspectionDate = typeof dateVal === 'string' ? new Date(dateVal).getTime() : dateVal;
+          }
+          applicationData.inspectionInformation = parsedInspectionData;
         } catch (e) {
-          console.error("Error parsing due verification data", e);
+          console.error("Error parsing inspection information data", e);
         }
       }
       ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
@@ -15441,19 +15446,23 @@ const WSFeeEstimation = _ref => {
     var _wsAdditionalDetails$2, _wsAdditionalDetails$3, _sessionFormData$bill;
     const data = _extends({}, wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$2 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$2 === void 0 ? void 0 : (_wsAdditionalDetails$3 = _wsAdditionalDetails$2.appDetails) === null || _wsAdditionalDetails$3 === void 0 ? void 0 : _wsAdditionalDetails$3.additionalDetails);
     if ((sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill = sessionFormData.billDetails) === null || _sessionFormData$bill === void 0 ? void 0 : _sessionFormData$bill.length) > 0) {
-      var _sessionFormData$bill2, _sessionFormData$bill3, _sessionFormData$bill4, _sessionFormData$bill5, _sessionFormData$bill6, _sessionFormData$bill7, _sessionFormData$bill8;
-      const values = [{
+      var _sessionFormData$bill2, _sessionFormData$bill3, _sessionFormData$bill4, _sessionFormData$bill5, _sessionFormData$bill6, _sessionFormData$bill7, _sessionFormData$bill8, _sessionFormData$bill9, _sessionFormData$bill0;
+      const billAccountDetails = (sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill2 = sessionFormData.billDetails) === null || _sessionFormData$bill2 === void 0 ? void 0 : (_sessionFormData$bill3 = _sessionFormData$bill2[0]) === null || _sessionFormData$bill3 === void 0 ? void 0 : _sessionFormData$bill3.billAccountDetails) || [];
+      const values = billAccountDetails.length > 0 ? billAccountDetails.map(bill => ({
+        title: bill === null || bill === void 0 ? void 0 : bill.taxHeadCode,
+        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(bill === null || bill === void 0 ? void 0 : bill.amount).toFixed(2))
+      })) : [{
         title: "WS_APPLICATION_FEE_HEADER",
-        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill2 = sessionFormData.billDetails) === null || _sessionFormData$bill2 === void 0 ? void 0 : (_sessionFormData$bill3 = _sessionFormData$bill2[0]) === null || _sessionFormData$bill3 === void 0 ? void 0 : _sessionFormData$bill3.fee)
+        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill4 = sessionFormData.billDetails) === null || _sessionFormData$bill4 === void 0 ? void 0 : (_sessionFormData$bill5 = _sessionFormData$bill4[0]) === null || _sessionFormData$bill5 === void 0 ? void 0 : _sessionFormData$bill5.fee)
       }, {
         title: "WS_SERVICE_FEE_HEADER",
-        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill4 = sessionFormData.billDetails) === null || _sessionFormData$bill4 === void 0 ? void 0 : (_sessionFormData$bill5 = _sessionFormData$bill4[0]) === null || _sessionFormData$bill5 === void 0 ? void 0 : _sessionFormData$bill5.charge)
+        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill6 = sessionFormData.billDetails) === null || _sessionFormData$bill6 === void 0 ? void 0 : (_sessionFormData$bill7 = _sessionFormData$bill6[0]) === null || _sessionFormData$bill7 === void 0 ? void 0 : _sessionFormData$bill7.charge)
       }, {
         title: "WS_TAX_HEADER",
-        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill6 = sessionFormData.billDetails) === null || _sessionFormData$bill6 === void 0 ? void 0 : (_sessionFormData$bill7 = _sessionFormData$bill6[0]) === null || _sessionFormData$bill7 === void 0 ? void 0 : _sessionFormData$bill7.taxAmount)
+        value: /*#__PURE__*/React.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : (_sessionFormData$bill9 = _sessionFormData$bill8[0]) === null || _sessionFormData$bill9 === void 0 ? void 0 : _sessionFormData$bill9.taxAmount)
       }];
       setValues(values);
-      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : _sessionFormData$bill8[0]);
+      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill0 = sessionFormData.billDetails) === null || _sessionFormData$bill0 === void 0 ? void 0 : _sessionFormData$bill0[0]);
     } else {
       setSessionFormData(data);
       setFields(data);
@@ -15517,24 +15526,28 @@ const WSFeeEstimation = _ref => {
         };
         let businessService = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$16 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$16 === void 0 ? void 0 : (_wsAdditionalDetails$17 = _wsAdditionalDetails$16.appDetails) === null || _wsAdditionalDetails$17 === void 0 ? void 0 : _wsAdditionalDetails$17.service) == "WATER" ? "WS" : "SW";
         Digit.WSService.wsCalculationEstimate(data, businessService).then((result, err) => {
-          var _result$Calculation, _result$Calculation$, _result$Calculation$$, _result$Calculation3, _result$Calculation3$, _result$Calculation4, _result$Calculation4$, _result$Calculation5, _result$Calculation5$, _result$Calculation6, _result$Calculation6$, _result$Calculation7;
+          var _result$Calculation, _result$Calculation$, _result$Calculation$$, _result$Calculation3, _result$Calculation3$, _result$Calculation4, _result$Calculation4$, _result$Calculation5, _result$Calculation5$, _result$Calculation6, _result$Calculation6$, _result$Calculation7, _result$Calculation7$, _result$Calculation8;
           if ((result === null || result === void 0 ? void 0 : (_result$Calculation = result.Calculation) === null || _result$Calculation === void 0 ? void 0 : (_result$Calculation$ = _result$Calculation[0]) === null || _result$Calculation$ === void 0 ? void 0 : (_result$Calculation$$ = _result$Calculation$.taxHeadEstimates) === null || _result$Calculation$$ === void 0 ? void 0 : _result$Calculation$$.length) > 0) {
             var _result$Calculation2, _result$Calculation2$, _result$Calculation2$2;
             result === null || result === void 0 ? void 0 : (_result$Calculation2 = result.Calculation) === null || _result$Calculation2 === void 0 ? void 0 : (_result$Calculation2$ = _result$Calculation2[0]) === null || _result$Calculation2$ === void 0 ? void 0 : (_result$Calculation2$2 = _result$Calculation2$.taxHeadEstimates) === null || _result$Calculation2$2 === void 0 ? void 0 : _result$Calculation2$2.forEach(data => data.amount = data.estimateAmount);
           }
           result.Calculation[0].billSlabData = _.groupBy(result === null || result === void 0 ? void 0 : (_result$Calculation3 = result.Calculation) === null || _result$Calculation3 === void 0 ? void 0 : (_result$Calculation3$ = _result$Calculation3[0]) === null || _result$Calculation3$ === void 0 ? void 0 : _result$Calculation3$.taxHeadEstimates, "category");
-          const values = [{
+          const taxHeadEstimates = (result === null || result === void 0 ? void 0 : (_result$Calculation4 = result.Calculation) === null || _result$Calculation4 === void 0 ? void 0 : (_result$Calculation4$ = _result$Calculation4[0]) === null || _result$Calculation4$ === void 0 ? void 0 : _result$Calculation4$.taxHeadEstimates) || [];
+          const values = taxHeadEstimates.length > 0 ? taxHeadEstimates.map(data => ({
+            title: data === null || data === void 0 ? void 0 : data.taxHeadCode,
+            value: /*#__PURE__*/React.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.estimateAmount).toFixed(2))
+          })) : [{
             title: "WS_APPLICATION_FEE_HEADER",
-            value: (_result$Calculation4 = result.Calculation) === null || _result$Calculation4 === void 0 ? void 0 : (_result$Calculation4$ = _result$Calculation4[0]) === null || _result$Calculation4$ === void 0 ? void 0 : _result$Calculation4$.fee
+            value: (_result$Calculation5 = result.Calculation) === null || _result$Calculation5 === void 0 ? void 0 : (_result$Calculation5$ = _result$Calculation5[0]) === null || _result$Calculation5$ === void 0 ? void 0 : _result$Calculation5$.fee
           }, {
             title: "WS_SERVICE_FEE_HEADER",
-            value: (_result$Calculation5 = result.Calculation) === null || _result$Calculation5 === void 0 ? void 0 : (_result$Calculation5$ = _result$Calculation5[0]) === null || _result$Calculation5$ === void 0 ? void 0 : _result$Calculation5$.charge
+            value: (_result$Calculation6 = result.Calculation) === null || _result$Calculation6 === void 0 ? void 0 : (_result$Calculation6$ = _result$Calculation6[0]) === null || _result$Calculation6$ === void 0 ? void 0 : _result$Calculation6$.charge
           }, {
             title: "WS_TAX_HEADER",
-            value: (_result$Calculation6 = result.Calculation) === null || _result$Calculation6 === void 0 ? void 0 : (_result$Calculation6$ = _result$Calculation6[0]) === null || _result$Calculation6$ === void 0 ? void 0 : _result$Calculation6$.taxAmount
+            value: (_result$Calculation7 = result.Calculation) === null || _result$Calculation7 === void 0 ? void 0 : (_result$Calculation7$ = _result$Calculation7[0]) === null || _result$Calculation7$ === void 0 ? void 0 : _result$Calculation7$.taxAmount
           }];
           setSessionBillFormData(cloneDeep_1(result.Calculation[0]));
-          setBillDetails(result === null || result === void 0 ? void 0 : (_result$Calculation7 = result.Calculation) === null || _result$Calculation7 === void 0 ? void 0 : _result$Calculation7[0]);
+          setBillDetails(result === null || result === void 0 ? void 0 : (_result$Calculation8 = result.Calculation) === null || _result$Calculation8 === void 0 ? void 0 : _result$Calculation8[0]);
           setValues(values);
           fields.billDetails = result === null || result === void 0 ? void 0 : result.Calculation;
           setSessionFormData(fields);
@@ -15604,7 +15617,7 @@ const WSFeeEstimation = _ref => {
     className: "border-none",
     key: "WS_COMMON_TOTAL_AMT",
     label: "" + t("WS_COMMON_TOTAL_AMT"),
-    text: /*#__PURE__*/React.createElement("span", null, "\u20B9", (billDetails === null || billDetails === void 0 ? void 0 : billDetails.totalAmount) || 0),
+    text: /*#__PURE__*/React.createElement("span", null, "\u20B9", billDetails !== null && billDetails !== void 0 && billDetails.totalAmount ? Number(billDetails === null || billDetails === void 0 ? void 0 : billDetails.totalAmount).toFixed(2) : "0.00"),
     textStyle: {
       fontSize: "24px",
       fontWeight: "700"
@@ -16294,36 +16307,65 @@ const DueVerification = _ref => {
   const _useState = useState(""),
     kno = _useState[0],
     setKno = _useState[1];
-  const _useState2 = useState([]),
-    tableData = _useState2[0],
-    setTableData = _useState2[1];
-  const columns = useMemo(() => [{
-    Header: t("K No."),
-    accessor: "kno"
-  }, {
-    Header: t("Full Name"),
-    accessor: "fullName"
-  }, {
-    Header: t("Full Address"),
-    accessor: "fullAddress"
-  }, {
-    Header: t("Due Amount"),
-    accessor: "dueAmount"
-  }, {
-    Header: t("Total Amount"),
-    accessor: "totalAmount"
-  }], [t]);
-  useEffect(() => {
-    const savedData = sessionStorage.getItem("Digit.DUE_VERIFICATION_DATA");
-    if (savedData) {
-      try {
-        setTableData(JSON.parse(savedData));
-      } catch (e) {
-        console.error("Error parsing due verification data", e);
+  const _useState2 = useState(""),
+    remarks = _useState2[0],
+    setRemarks = _useState2[1];
+  const _useState3 = useState([]),
+    tableData = _useState3[0],
+    setTableData = _useState3[1];
+  const handleRemarkChange = React.useCallback((index, value) => {
+    setTableData(prevData => {
+      const newData = [...prevData];
+      newData[index] = _extends({}, newData[index], {
+        remarks: value
+      });
+      if (applicationData) {
+        applicationData.dueVerification = newData;
       }
-    } else if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
+      return newData;
+    });
+  }, [applicationData]);
+  const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION";
+  const columns = useMemo(() => {
+    const baseColumns = [{
+      Header: t("K No."),
+      accessor: "kno"
+    }, {
+      Header: t("Full Name"),
+      accessor: "fullName"
+    }, {
+      Header: t("Full Address"),
+      accessor: "fullAddress"
+    }, {
+      Header: t("Due Amount"),
+      accessor: "dueAmount"
+    }, {
+      Header: t("Total Amount"),
+      accessor: "totalAmount"
+    }];
+    if (isPendingApproval) {
+      baseColumns.push({
+        Header: t("Remarks"),
+        accessor: "remarks",
+        Cell: _ref2 => {
+          let row = _ref2.row,
+            value = _ref2.value;
+          return /*#__PURE__*/React.createElement(TextInput, {
+            style: {
+              marginBottom: "0px",
+              minWidth: "150px"
+            },
+            value: value || "",
+            onChange: e => handleRemarkChange(row.index, e.target.value)
+          });
+        }
+      });
+    }
+    return baseColumns;
+  }, [t, handleRemarkChange, isPendingApproval]);
+  useEffect(() => {
+    if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
       setTableData(applicationData.dueVerification);
-      sessionStorage.setItem("Digit.DUE_VERIFICATION_DATA", JSON.stringify(applicationData.dueVerification));
     }
   }, [applicationData]);
   const handleAdd = () => {
@@ -16333,12 +16375,16 @@ const DueVerification = _ref => {
         fullName: "John Doe",
         fullAddress: "123 Main St, New Delhi, Delhi 110001",
         dueAmount: "1500",
-        totalAmount: "1500"
+        totalAmount: "1500",
+        remarks: remarks
       };
       const newTableData = [...tableData, mockData];
       setTableData(newTableData);
-      sessionStorage.setItem("Digit.DUE_VERIFICATION_DATA", JSON.stringify(newTableData));
+      if (applicationData) {
+        applicationData.dueVerification = newTableData;
+      }
       setKno("");
+      setRemarks("");
     }
   };
   return /*#__PURE__*/React.createElement("div", {
@@ -16420,7 +16466,8 @@ const DueVerification = _ref => {
   })));
 };
 
-const InspectionInformation = () => {
+const InspectionInformation = _ref => {
+  let applicationData = _ref.applicationData;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const _useState = useState(null),
@@ -16432,9 +16479,37 @@ const InspectionInformation = () => {
   const _useState3 = useState(""),
     inspectorName = _useState3[0],
     setInspectorName = _useState3[1];
+  useEffect(() => {
+    const savedData = sessionStorage.getItem("Digit.INSPECTION_INFORMATION_DATA");
+    if (savedData) {
+      try {
+        const parsed = JSON.parse(savedData);
+        setInspectionType(parsed.inspectionType || null);
+        setInspectionDate(parsed.inspectionDate || "");
+        setInspectorName(parsed.inspectorName || "");
+      } catch (e) {
+        console.error("Error parsing inspection information data", e);
+      }
+    } else if (applicationData !== null && applicationData !== void 0 && applicationData.inspectionInformation) {
+      setInspectionType(applicationData.inspectionInformation.inspectionType || null);
+      setInspectionDate(applicationData.inspectionInformation.inspectionDate || "");
+      setInspectorName(applicationData.inspectionInformation.inspectorName || "");
+      sessionStorage.setItem("Digit.INSPECTION_INFORMATION_DATA", JSON.stringify(applicationData.inspectionInformation));
+    }
+  }, [applicationData]);
+  useEffect(() => {
+    sessionStorage.setItem("Digit.INSPECTION_INFORMATION_DATA", JSON.stringify({
+      inspectionType,
+      inspectionDate,
+      inspectorName
+    }));
+  }, [inspectionType, inspectionDate, inspectorName]);
   const inspectionTypeOptions = [{
-    name: "Select",
+    i18nKey: "ES_COMMON_SELECT",
     code: ""
+  }, {
+    i18nKey: "New Connection Visit",
+    code: "new_connection_visit"
   }];
   return /*#__PURE__*/React.createElement("div", {
     style: {
@@ -16470,7 +16545,7 @@ const InspectionInformation = () => {
     }
   }, "*")), /*#__PURE__*/React.createElement(Dropdown, {
     option: inspectionTypeOptions,
-    optionKey: "name",
+    optionKey: "i18nKey",
     id: "inspectionType",
     selected: inspectionType,
     select: setInspectionType,
@@ -17445,6 +17520,14 @@ const ApplicationDetails = props => {
   function onActionSelect(action) {
     sessionStorage.setItem("SELECTED_ACTION", action === null || action === void 0 ? void 0 : action.action);
     if (action) {
+      if ((action === null || action === void 0 ? void 0 : action.action) === "PAY" && !(action !== null && action !== void 0 && action.redirectionUrl) && !(action !== null && action !== void 0 && action.redirectionUrll)) {
+        if (window.location.href.includes("/employee")) {
+          history.push("/digit-ui/employee/payment/collect/" + businessService + "/" + applicationNumber + "?tenantId=" + tenantId);
+        } else {
+          history.push("/digit-ui/citizen/payment/my-bills/" + businessService + "/" + applicationNumber + "?tenantId=" + tenantId);
+        }
+        return;
+      }
       if (action !== null && action !== void 0 && action.isToast) {
         setShowToast({
           key: "error",
@@ -18313,7 +18396,6 @@ const PropertyLocationDetails = _ref => {
     isEdit = _ref.isEdit,
     onSelect = _ref.onSelect,
     config = _ref.config,
-    hideZRO = _ref.hideZRO,
     formDataProp = _ref.formData,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
   const _useTranslation = useTranslation(),
@@ -18447,7 +18529,6 @@ const PropertyLocationDetails = _ref => {
       isCollapsible: true
     }, config),
     isEdit: isEdit,
-    showZRO: hideZRO ? false : true,
     showMapActualLocation: true,
     disable: isPropertyFound,
     hideNextButton: true
@@ -18957,8 +19038,7 @@ const PropertyWaterConnection = _ref => {
     }),
     control = _useForm.control,
     register = _useForm.register,
-    _useForm$formState = _useForm.formState,
-    errors = _useForm$formState.errors,
+    errors = _useForm.formState.errors,
     watch = _useForm.watch,
     setValue = _useForm.setValue;
   const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -18987,6 +19067,7 @@ const PropertyWaterConnection = _ref => {
   const watchCategoryType = watch("useDetails.categoryType");
   const watchPropertyType = watch("useDetails.propertyType");
   const watchPropertyCategory = watch("useDetails.propertyCategory");
+  const watchWaterConnectionUsageType = watch("useDetails.WaterConnectionUsageType");
   const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
   const isHotelRestaurantProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOTEL_OR_RESTAURANT" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HotelOrRestaurant";
   const yearOptions = useMemo(() => {
@@ -19046,11 +19127,29 @@ const PropertyWaterConnection = _ref => {
   }, [watchPropertyCategory, propertyTypeOptions, setValue, watchPropertyType]);
   const usageTypeOptions = useMemo(() => {
     var _ptServicesMastersDat5, _ptServicesMastersDat6;
-    return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : (_ptServicesMastersDat6 = _ptServicesMastersDat5.PropertyNewUsageType) === null || _ptServicesMastersDat6 === void 0 ? void 0 : _ptServicesMastersDat6.filter(item => item.active).map(item => ({
+    let options = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : (_ptServicesMastersDat6 = _ptServicesMastersDat5.PropertyNewUsageType) === null || _ptServicesMastersDat6 === void 0 ? void 0 : _ptServicesMastersDat6.filter(item => item.active)) || [];
+    if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
+      var _watchPropertyCategor3;
+      if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor3 = watchPropertyCategory.code) === null || _watchPropertyCategor3 === void 0 ? void 0 : _watchPropertyCategor3.toUpperCase()) !== "MIXED") {
+        options = options.filter(item => {
+          var _item$type2, _watchPropertyCategor4;
+          return ((_item$type2 = item.type) === null || _item$type2 === void 0 ? void 0 : _item$type2.toUpperCase()) === ((_watchPropertyCategor4 = watchPropertyCategory.code) === null || _watchPropertyCategor4 === void 0 ? void 0 : _watchPropertyCategor4.toUpperCase());
+        });
+      }
+    }
+    return options.map(item => ({
       code: item.code,
       name: item.name
     }));
-  }, [ptServicesMastersData]);
+  }, [ptServicesMastersData, watchPropertyCategory]);
+  useEffect(() => {
+    if (watchPropertyType && watchWaterConnectionUsageType) {
+      const isUsageTypeValid = usageTypeOptions.some(opt => opt.code === watchWaterConnectionUsageType.code);
+      if (!isUsageTypeValid) {
+        setValue("useDetails.WaterConnectionUsageType", null);
+      }
+    }
+  }, [watchPropertyType, usageTypeOptions, setValue, watchWaterConnectionUsageType]);
   const floorOptions = useMemo(() => {
     var _ptServicesMastersDat7, _ptServicesMastersDat8;
     return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat7 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat7 === void 0 ? void 0 : (_ptServicesMastersDat8 = _ptServicesMastersDat7.NoOfFloors) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.filter(item => item.active).map(item => ({
@@ -19124,8 +19223,8 @@ const PropertyWaterConnection = _ref => {
     marginTop: "-21px"
   };
   return /*#__PURE__*/React.createElement(CollapsibleCardPage, {
-    title: t("WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS") + (config !== null && config !== void 0 && config.isAutomaticFill ? " (Automatic Fill by Property )" : ""),
-    defaultOpen: config !== null && config !== void 0 && config.isAutomaticFill ? false : true,
+    title: t("WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS") + (config !== null && config !== void 0 && config.isAutomaticFill ? " " + t("(Automatic Fill by Property)") : ""),
+    defaultOpen: false,
     style: props.style
   }, /*#__PURE__*/React.createElement("div", {
     className: "formcomposer-section-grid"