@djb25/digit-ui-module-commonpt 1.0.23 → 1.0.24

package/dist/index.js

@@ -6034,7 +6034,7 @@ const setPropertyDetailsLW = data => {
     numberOfRooms: useDetails === null || useDetails === void 0 ? void 0 : useDetails.NumberofRooms,
     numberOfBeds: useDetails === null || useDetails === void 0 ? void 0 : useDetails.numberOfBeds,
     numberOfStudents: useDetails === null || useDetails === void 0 ? void 0 : useDetails.numberOfStudents,
-    ServantQuartersRoom: useDetails === null || useDetails === void 0 ? void 0 : useDetails.ServantQuartersRoom
+    servantQuarterArea: useDetails === null || useDetails === void 0 ? void 0 : useDetails.servantQuarterArea
   };
   data.propertyDetails = propertyDetails;
   return data;
@@ -6095,7 +6095,7 @@ const convertToPropertyLightWeight = function (data) {
         plotArea: ((_data$waterConnection15 = data.waterConnection) === null || _data$waterConnection15 === void 0 ? void 0 : (_data$waterConnection16 = _data$waterConnection15.useDetails) === null || _data$waterConnection16 === void 0 ? void 0 : _data$waterConnection16.plotArea) || ((_data$useDetails7 = data.useDetails) === null || _data$useDetails7 === void 0 ? void 0 : _data$useDetails7.plotArea),
         builtUpArea: ((_data$waterConnection17 = data.waterConnection) === null || _data$waterConnection17 === void 0 ? void 0 : (_data$waterConnection18 = _data$waterConnection17.useDetails) === null || _data$waterConnection18 === void 0 ? void 0 : _data$waterConnection18.builtUpArea) || ((_data$useDetails8 = data.useDetails) === null || _data$useDetails8 === void 0 ? void 0 : _data$useDetails8.builtUpArea),
         farArea: ((_data$waterConnection19 = data.waterConnection) === null || _data$waterConnection19 === void 0 ? void 0 : (_data$waterConnection20 = _data$waterConnection19.useDetails) === null || _data$waterConnection20 === void 0 ? void 0 : _data$waterConnection20.farArea) || ((_data$useDetails9 = data.useDetails) === null || _data$useDetails9 === void 0 ? void 0 : _data$useDetails9.farArea),
-        ServantQuartersRoom: ((_data$waterConnection21 = data.waterConnection) === null || _data$waterConnection21 === void 0 ? void 0 : (_data$waterConnection22 = _data$waterConnection21.useDetails) === null || _data$waterConnection22 === void 0 ? void 0 : _data$waterConnection22.ServantQuartersRoom) || ((_data$useDetails0 = data.useDetails) === null || _data$useDetails0 === void 0 ? void 0 : _data$useDetails0.ServantQuartersRoom),
+        servantQuarterArea: ((_data$waterConnection21 = data.waterConnection) === null || _data$waterConnection21 === void 0 ? void 0 : (_data$waterConnection22 = _data$waterConnection21.useDetails) === null || _data$waterConnection22 === void 0 ? void 0 : _data$waterConnection22.servantQuarterArea) || ((_data$useDetails0 = data.useDetails) === null || _data$useDetails0 === void 0 ? void 0 : _data$useDetails0.servantQuarterArea),
         numberOfStudents: ((_data$waterConnection23 = data.waterConnection) === null || _data$waterConnection23 === void 0 ? void 0 : (_data$waterConnection24 = _data$waterConnection23.useDetails) === null || _data$waterConnection24 === void 0 ? void 0 : _data$waterConnection24.numberOfStudents) || ((_data$useDetails1 = data.useDetails) === null || _data$useDetails1 === void 0 ? void 0 : _data$useDetails1.numberOfStudents),
         numberOfBeds: ((_data$waterConnection25 = data.waterConnection) === null || _data$waterConnection25 === void 0 ? void 0 : (_data$waterConnection26 = _data$waterConnection25.useDetails) === null || _data$waterConnection26 === void 0 ? void 0 : _data$waterConnection26.numberOfBeds) || ((_data$useDetails10 = data.useDetails) === null || _data$useDetails10 === void 0 ? void 0 : _data$useDetails10.numberOfBeds),
         owners: [...(data.owners || []).map((owner, index) => {
@@ -6191,7 +6191,7 @@ const convertToUpdatePropertyLightWeight = function (data) {
         plotArea: ((_data$waterConnection43 = data.waterConnection) === null || _data$waterConnection43 === void 0 ? void 0 : (_data$waterConnection44 = _data$waterConnection43.useDetails) === null || _data$waterConnection44 === void 0 ? void 0 : _data$waterConnection44.plotArea) || ((_data$useDetails17 = data.useDetails) === null || _data$useDetails17 === void 0 ? void 0 : _data$useDetails17.plotArea),
         builtUpArea: ((_data$waterConnection45 = data.waterConnection) === null || _data$waterConnection45 === void 0 ? void 0 : (_data$waterConnection46 = _data$waterConnection45.useDetails) === null || _data$waterConnection46 === void 0 ? void 0 : _data$waterConnection46.builtUpArea) || ((_data$useDetails18 = data.useDetails) === null || _data$useDetails18 === void 0 ? void 0 : _data$useDetails18.builtUpArea),
         farArea: ((_data$waterConnection47 = data.waterConnection) === null || _data$waterConnection47 === void 0 ? void 0 : (_data$waterConnection48 = _data$waterConnection47.useDetails) === null || _data$waterConnection48 === void 0 ? void 0 : _data$waterConnection48.farArea) || ((_data$useDetails19 = data.useDetails) === null || _data$useDetails19 === void 0 ? void 0 : _data$useDetails19.farArea),
-        numberOfServantQuarters: ((_data$waterConnection49 = data.waterConnection) === null || _data$waterConnection49 === void 0 ? void 0 : (_data$waterConnection50 = _data$waterConnection49.useDetails) === null || _data$waterConnection50 === void 0 ? void 0 : _data$waterConnection50.ServantQuartersRoom) || ((_data$useDetails20 = data.useDetails) === null || _data$useDetails20 === void 0 ? void 0 : _data$useDetails20.ServantQuartersRoom),
+        numberOfServantQuarters: ((_data$waterConnection49 = data.waterConnection) === null || _data$waterConnection49 === void 0 ? void 0 : (_data$waterConnection50 = _data$waterConnection49.useDetails) === null || _data$waterConnection50 === void 0 ? void 0 : _data$waterConnection50.servantQuarterArea) || ((_data$useDetails20 = data.useDetails) === null || _data$useDetails20 === void 0 ? void 0 : _data$useDetails20.servantQuarterArea),
         numberOfStudents: ((_data$waterConnection51 = data.waterConnection) === null || _data$waterConnection51 === void 0 ? void 0 : (_data$waterConnection52 = _data$waterConnection51.useDetails) === null || _data$waterConnection52 === void 0 ? void 0 : _data$waterConnection52.numberOfStudents) || ((_data$useDetails21 = data.useDetails) === null || _data$useDetails21 === void 0 ? void 0 : _data$useDetails21.numberOfStudents),
         numberOfBeds: ((_data$waterConnection53 = data.waterConnection) === null || _data$waterConnection53 === void 0 ? void 0 : (_data$waterConnection54 = _data$waterConnection53.useDetails) === null || _data$waterConnection54 === void 0 ? void 0 : _data$waterConnection54.numberOfBeds) || ((_data$useDetails22 = data.useDetails) === null || _data$useDetails22 === void 0 ? void 0 : _data$useDetails22.numberOfBeds),
         owners: [...data.owners.map((owner, index) => {
@@ -15837,7 +15837,7 @@ const InfoDetails = _ref2 => {
 };
 
 const ViewBreakup = _ref => {
-  var _breakUpData$calculat, _breakUpData$calculat2, _wsAdditionalDetails$8, _breakUpData$billSlab4, _breakUpData$billSlab5, _breakUpData$billSlab6, _breakUpData$billSlab7, _breakUpData$billSlab8, _breakUpData$billSlab9;
+  var _breakUpData$calculat, _breakUpData$calculat2, _breakUpData$calculat3, _wsAdditionalDetails$8, _breakUpData$billSlab4, _breakUpData$billSlab5, _breakUpData$billSlab6, _breakUpData$billSlab7, _breakUpData$billSlab8, _breakUpData$billSlab9;
   let wsAdditionalDetails = _ref.wsAdditionalDetails,
     print = _ref.print,
     download = _ref.download;
@@ -15948,11 +15948,8 @@ const ViewBreakup = _ref => {
       title: t("WS_APPLICATION_FEE_HEADER"),
       values: amountRows([...((breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab = breakUpData.billSlabData) === null || _breakUpData$billSlab === void 0 ? void 0 : _breakUpData$billSlab.FEE) || []), ...((breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab2 = breakUpData.billSlabData) === null || _breakUpData$billSlab2 === void 0 ? void 0 : _breakUpData$billSlab2.CHARGES) || [])])
     }, {
-      title: "Taxes",
-      values: amountRows(breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab3 = breakUpData.billSlabData) === null || _breakUpData$billSlab3 === void 0 ? void 0 : _breakUpData$billSlab3.TAX)
-    }, {
-      title: "Water demand details",
-      values: waterDemandRows.map(_ref4 => {
+      title: "Property details",
+      values: propertyRows.map(_ref4 => {
         let label = _ref4.label,
           value = _ref4.value,
           currency = _ref4.currency,
@@ -15964,8 +15961,11 @@ const ViewBreakup = _ref => {
         };
       })
     }, {
-      title: "Infrastructure charge details",
-      values: infrastructureChargeRows.map(_ref5 => {
+      title: "Taxes",
+      values: amountRows(breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab3 = breakUpData.billSlabData) === null || _breakUpData$billSlab3 === void 0 ? void 0 : _breakUpData$billSlab3.TAX)
+    }, {
+      title: "Water demand details",
+      values: waterDemandRows.map(_ref5 => {
         let label = _ref5.label,
           value = _ref5.value,
           currency = _ref5.currency,
@@ -15976,6 +15976,19 @@ const ViewBreakup = _ref => {
           value: currency ? "\u20B9" + formatNumber(value) : isText ? value || "-" : "" + formatNumber(value) + unit
         };
       })
+    }, {
+      title: "Infrastructure charge details",
+      values: infrastructureChargeRows.map(_ref6 => {
+        let label = _ref6.label,
+          value = _ref6.value,
+          currency = _ref6.currency,
+          unit = _ref6.unit,
+          isText = _ref6.isText;
+        return {
+          title: label,
+          value: currency ? "\u20B9" + formatNumber(value) : isText ? value || "-" : "" + formatNumber(value) + unit
+        };
+      })
     }, {
       title: "Total",
       values: [{
@@ -16017,8 +16030,58 @@ const ViewBreakup = _ref => {
     printWindow.focus();
     printWindow.print();
   };
-  const waterDemandDetail = breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$calculat = breakUpData.calculationDetail) === null || _breakUpData$calculat === void 0 ? void 0 : _breakUpData$calculat.waterDemandDetail;
-  const infrastructureChargeDetail = breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$calculat2 = breakUpData.calculationDetail) === null || _breakUpData$calculat2 === void 0 ? void 0 : _breakUpData$calculat2.infrastructureChargeDetail;
+  const propertyDetail = breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$calculat = breakUpData.calculationDetail) === null || _breakUpData$calculat === void 0 ? void 0 : _breakUpData$calculat.propertyDetail;
+  const waterDemandDetail = breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$calculat2 = breakUpData.calculationDetail) === null || _breakUpData$calculat2 === void 0 ? void 0 : _breakUpData$calculat2.waterDemandDetail;
+  const infrastructureChargeDetail = breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$calculat3 = breakUpData.calculationDetail) === null || _breakUpData$calculat3 === void 0 ? void 0 : _breakUpData$calculat3.infrastructureChargeDetail;
+  const propertyRows = propertyDetail ? [{
+    label: "Property ID",
+    value: propertyDetail.propertyId,
+    isText: true
+  }, {
+    label: "Property type",
+    value: propertyDetail.propertyType,
+    isText: true
+  }, {
+    label: "Plot area",
+    value: propertyDetail.landArea,
+    unit: " (sq. meter.)"
+  }, {
+    label: "Built-up area",
+    value: propertyDetail.superBuiltUpArea,
+    unit: " (sq. meter.)"
+  }, {
+    label: "farArea",
+    value: propertyDetail.farArea,
+    isText: true
+  }, {
+    label: "coveredArea",
+    value: propertyDetail.coveredArea,
+    isText: true
+  }, {
+    label: "numberOfDwellingUnits",
+    value: propertyDetail.numberOfDwellingUnits,
+    isText: true
+  }, {
+    label: "numberOfBeds",
+    value: propertyDetail.numberOfBeds,
+    isText: true
+  }, {
+    label: "numberOfRooms",
+    value: propertyDetail.numberOfRooms,
+    isText: true
+  }, {
+    label: "numberOfStudents",
+    value: propertyDetail.numberOfStudents,
+    isText: true
+  }, {
+    label: "numberOfStaff",
+    value: propertyDetail.numberOfStaff,
+    isText: true
+  }, {
+    label: "Usage category",
+    value: propertyDetail.usageCategory,
+    isText: true
+  }] : [];
   const waterDemandRows = waterDemandDetail ? [{
     label: "Calculated occupancy",
     value: waterDemandDetail.calculatedOccupancy,
@@ -16160,6 +16223,12 @@ const ViewBreakup = _ref => {
     textStyle: {
       textAlign: "right"
     }
+  })), propertyRows.length > 0 && /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, {
+    style: {
+      margin: "10px 0px"
+    }
+  }, "Property details"), /*#__PURE__*/React__default.createElement(DetailRows, {
+    rows: propertyRows
   })), waterDemandRows.length > 0 && /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, {
     style: {
       margin: "10px 0px"
@@ -19193,7 +19262,7 @@ const PropertyWaterConnection = _ref => {
           NumberofRooms: "",
           numberOfBeds: "",
           numberOfStudents: "",
-          ServantQuartersRoom: ""
+          servantQuarterArea: ""
         }
       }
     }),
@@ -19203,7 +19272,7 @@ const PropertyWaterConnection = _ref => {
     watch = _useForm.watch,
     setValue = _useForm.setValue;
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType"]),
+  const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType", "PropertyToUsageMapping"]),
     ptServicesMastersData = _Digit$Hooks$pt$usePr.data;
   const _Digit$Hooks$ws$useMD = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-masters", ["WsCategoryType"]),
     wsServicesMastersData = _Digit$Hooks$ws$useMD.data;
@@ -19229,7 +19298,7 @@ const PropertyWaterConnection = _ref => {
   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 isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "DharamshalasOrHostels" || (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 isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
   const isDwellingUnit = (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL" || (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL";
@@ -19247,10 +19316,9 @@ const PropertyWaterConnection = _ref => {
   }, []);
   const categoryOptions = React.useMemo(() => {
     var _ptServicesMastersDat, _ptServicesMastersDat2;
+    if (!(watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code)) return [];
     let options = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat === void 0 ? void 0 : (_ptServicesMastersDat2 = _ptServicesMastersDat.PropertyCategory) === null || _ptServicesMastersDat2 === void 0 ? void 0 : _ptServicesMastersDat2.filter(item => item.active)) || [];
-    if (watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code) {
-      options = options.filter(item => item.type === watchCategoryType.code);
-    }
+    options = options.filter(item => item.type === watchCategoryType.code);
     return options.map(item => ({
       code: item.code,
       name: item.name
@@ -19265,16 +19333,18 @@ const PropertyWaterConnection = _ref => {
     }
   }, [watchCategoryType, categoryOptions, setValue, watchPropertyCategory]);
   const propertyTypeOptions = React.useMemo(() => {
-    var _ptServicesMastersDat3, _ptServicesMastersDat4;
+    var _ptServicesMastersDat3, _ptServicesMastersDat4, _ptServicesMastersDat5, _watchPropertyCategor;
+    if (!(watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code)) return [];
     let options = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat3 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat3 === void 0 ? void 0 : (_ptServicesMastersDat4 = _ptServicesMastersDat3.PropertyType) === null || _ptServicesMastersDat4 === void 0 ? void 0 : _ptServicesMastersDat4.filter(item => item.active)) || [];
-    if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
-      var _watchPropertyCategor;
-      if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
-        options = options.filter(item => {
-          var _item$type, _watchPropertyCategor2;
-          return ((_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.toUpperCase()) === ((_watchPropertyCategor2 = watchPropertyCategory.code) === null || _watchPropertyCategor2 === void 0 ? void 0 : _watchPropertyCategor2.toUpperCase());
-        });
-      }
+    let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : _ptServicesMastersDat5.PropertyToUsageMapping) || [];
+    if (mapping.length > 0) {
+      options = options.filter(item => mapping.some(m => m.propertyTypeCode === item.code));
+    }
+    if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
+      options = options.filter(item => {
+        var _item$type, _watchPropertyCategor2;
+        return ((_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.toUpperCase()) === ((_watchPropertyCategor2 = watchPropertyCategory.code) === null || _watchPropertyCategor2 === void 0 ? void 0 : _watchPropertyCategor2.toUpperCase());
+      });
     }
     return options.map(item => ({
       code: item.code,
@@ -19290,22 +19360,21 @@ const PropertyWaterConnection = _ref => {
     }
   }, [watchPropertyCategory, propertyTypeOptions, setValue, watchPropertyType]);
   const usageTypeOptions = React.useMemo(() => {
-    var _ptServicesMastersDat5, _ptServicesMastersDat6;
-    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());
-        });
-      }
+    var _ptServicesMastersDat6, _ptServicesMastersDat7, _ptServicesMastersDat8;
+    if (!(watchPropertyType !== null && watchPropertyType !== void 0 && watchPropertyType.code)) return [];
+    let options = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat6 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat6 === void 0 ? void 0 : (_ptServicesMastersDat7 = _ptServicesMastersDat6.PropertyNewUsageType) === null || _ptServicesMastersDat7 === void 0 ? void 0 : _ptServicesMastersDat7.filter(item => item.active)) || [];
+    let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat8 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.PropertyToUsageMapping) || [];
+    const selectedMapping = mapping.find(m => m.propertyTypeCode === watchPropertyType.code);
+    if (selectedMapping && selectedMapping.allowedUsages) {
+      options = options.filter(item => selectedMapping.allowedUsages.includes(item.code));
+    } else {
+      options = [];
     }
     return options.map(item => ({
       code: item.code,
       name: item.name
     }));
-  }, [ptServicesMastersData, watchPropertyCategory]);
+  }, [ptServicesMastersData, watchPropertyCategory, watchPropertyType]);
   React.useEffect(() => {
     if (watchPropertyType && watchWaterConnectionUsageType) {
       const isUsageTypeValid = usageTypeOptions.some(opt => opt.code === watchWaterConnectionUsageType.code);
@@ -19315,8 +19384,8 @@ const PropertyWaterConnection = _ref => {
     }
   }, [watchPropertyType, usageTypeOptions, setValue, watchWaterConnectionUsageType]);
   const floorOptions = React.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 => ({
+    var _ptServicesMastersDat9, _ptServicesMastersDat0;
+    return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat9 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat9 === void 0 ? void 0 : (_ptServicesMastersDat0 = _ptServicesMastersDat9.NoOfFloors) === null || _ptServicesMastersDat0 === void 0 ? void 0 : _ptServicesMastersDat0.filter(item => item.active).map(item => ({
       code: item.code,
       name: item.name
     }));
@@ -19365,7 +19434,7 @@ const PropertyWaterConnection = _ref => {
       setValue("useDetails.NumberofRooms", "");
       setValue("useDetails.numberOfBeds", "");
       setValue("useDetails.numberOfStudents", "");
-      setValue("useDetails.ServantQuartersRoom", "");
+      setValue("useDetails.servantQuarterArea", "");
     }
   }, [formData === null || formData === void 0 ? void 0 : (_formData$cpt2 = formData.cpt) === null || _formData$cpt2 === void 0 ? void 0 : _formData$cpt2.details, formData === null || formData === void 0 ? void 0 : formData.cpt, categoryOptions, propertyTypeOptions, usageTypeOptions, floorOptions, yearOptions, categoryTypeList, setValue]);
   const lastErrorState = React__default.useRef(null);
@@ -19616,11 +19685,11 @@ const PropertyWaterConnection = _ref => {
         message: t("ERR_INVALID_NUMBER")
       }
     }),
-    name: "useDetails.ServantQuartersRoom",
+    name: "useDetails.servantQuarterArea",
     disabled: isPropertyFound
-  }))) : null, isServentHouse && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails12 = errors.useDetails) === null || _errors$useDetails12 === void 0 ? void 0 : _errors$useDetails12.ServantQuartersRoom) && /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabelError, {
+  }))) : null, isServentHouse && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails12 = errors.useDetails) === null || _errors$useDetails12 === void 0 ? void 0 : _errors$useDetails12.servantQuarterArea) && /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.ServantQuartersRoom.message)));
+  }, errors.useDetails.servantQuarterArea.message)));
 };
 
 const SwitchComponent = props => {