@djb25/digit-ui-module-ws 1.0.53 → 1.0.55

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/index.js +88 -82
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.modern.js +88 -82
  4. package/dist/index.modern.js.map +1 -1
  5. package/package.json +1 -1
package/dist/index.modern.js CHANGED
@@ -1869,11 +1869,12 @@ const WSCalculationPayload = (data, tenantId) => {
1869
1869
  farArea: useDetails !== null && useDetails !== void 0 && useDetails.farArea ? Number(useDetails.farArea) : 0,
1870
1870
  numberOfFloors: useDetails !== null && useDetails !== void 0 && (_useDetails$noOfFloor = useDetails.noOfFloors) !== null && _useDetails$noOfFloor !== void 0 && _useDetails$noOfFloor.code ? Number(useDetails.noOfFloors.code) : 0,
1871
1871
  numberOfStudents: useDetails !== null && useDetails !== void 0 && useDetails.numberOfStudents ? Number(useDetails.numberOfStudents) : 0,
1872
- numberOfBeds: useDetails !== null && useDetails !== void 0 && useDetails.numberOfBeds ? Number(useDetails.numberOfBeds) : 0
1872
+ numberOfBeds: useDetails !== null && useDetails !== void 0 && useDetails.numberOfBeds ? Number(useDetails.numberOfBeds) : 0,
1873
+ servantQuarterArea: useDetails !== null && useDetails !== void 0 && useDetails.servantQuarterArea ? Number(useDetails.servantQuarterArea) : 0
1873
1874
  };
1874
1875
  if (useDetails !== null && useDetails !== void 0 && useDetails.NumberofRooms) payload.numberOfRooms = Number(useDetails.NumberofRooms);
1875
1876
  if (useDetails !== null && useDetails !== void 0 && useDetails.NumberofDwellingUnits) payload.numberOfDwellingUnits = Number(useDetails.NumberofDwellingUnits);
1876
- if (useDetails !== null && useDetails !== void 0 && useDetails.ServantQuartersRoom) payload.servantQuartersRoom = Number(useDetails.ServantQuartersRoom);
1877
+ if (useDetails !== null && useDetails !== void 0 && useDetails.servantQuarterArea) payload.servantQuarterArea = Number(useDetails.servantQuarterArea);
1877
1878
  return payload;
1878
1879
  };
1879
1880
 
@@ -9664,7 +9665,7 @@ const WSCalculation = _ref => {
9664
9665
  NumberofRooms: "",
9665
9666
  numberOfBeds: "",
9666
9667
  numberOfStudents: "",
9667
- ServantQuartersRoom: "",
9668
+ servantQuarterArea: "",
9668
9669
  colonyName: ""
9669
9670
  }
9670
9671
  }
@@ -9681,8 +9682,9 @@ const WSCalculation = _ref => {
9681
9682
  const _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSCalculater({
9682
9683
  tenantId
9683
9684
  }),
9684
- calculateCharges = _Digit$Hooks$ws$useWS.mutate;
9685
- const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "PropertyNewUsageType"]),
9685
+ calculateCharges = _Digit$Hooks$ws$useWS.mutate,
9686
+ isLoading = _Digit$Hooks$ws$useWS.isLoading;
9687
+ const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "PropertyNewUsageType", "PropertyToUsageMapping"]),
9686
9688
  ptServicesMastersData = _Digit$Hooks$pt$usePr.data;
9687
9689
  const _Digit$Hooks$ws$useMD = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-masters", ["WsCategoryType"]),
9688
9690
  wsServicesMastersData = _Digit$Hooks$ws$useMD.data;
@@ -9712,17 +9714,16 @@ const WSCalculation = _ref => {
9712
9714
  const watchWaterConnectionUsageType = watch("useDetails.WaterConnectionUsageType");
9713
9715
  const watchColonyName = watch("useDetails.colonyName");
9714
9716
  const isCalculateButtonEnabled = watchCategoryType && watchPropertyCategory && watchPropertyType && watchWaterConnectionUsageType && watchColonyName;
9715
- const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
9717
+ 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";
9716
9718
  const isHotelRestaurantProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOTEL_OR_RESTAURANT" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HotelOrRestaurant";
9717
9719
  const isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
9718
9720
  const isDwellingUnit = (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL" || (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL";
9719
9721
  const isServentHouse = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "Apartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "FlatOrApartment" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "IndividualHouse";
9720
9722
  const categoryOptions = useMemo(() => {
9721
9723
  var _ptServicesMastersDat, _ptServicesMastersDat2;
9724
+ if (!(watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code)) return [];
9722
9725
  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)) || [];
9723
- if (watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code) {
9724
- options = options.filter(item => item.type === watchCategoryType.code);
9725
- }
9726
+ options = options.filter(item => item.type === watchCategoryType.code);
9726
9727
  return options.map(item => ({
9727
9728
  code: item.code,
9728
9729
  name: item.name
@@ -9737,16 +9738,18 @@ const WSCalculation = _ref => {
9737
9738
  }
9738
9739
  }, [watchCategoryType, categoryOptions, setValue, watchPropertyCategory]);
9739
9740
  const propertyTypeOptions = useMemo(() => {
9740
- var _ptServicesMastersDat3, _ptServicesMastersDat4;
9741
+ var _ptServicesMastersDat3, _ptServicesMastersDat4, _ptServicesMastersDat5, _watchPropertyCategor;
9742
+ if (!(watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code)) return [];
9741
9743
  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)) || [];
9742
- if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
9743
- var _watchPropertyCategor;
9744
- if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
9745
- options = options.filter(item => {
9746
- var _item$type, _watchPropertyCategor2;
9747
- 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());
9748
- });
9749
- }
9744
+ let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : _ptServicesMastersDat5.PropertyToUsageMapping) || [];
9745
+ if (mapping.length > 0) {
9746
+ options = options.filter(item => mapping.some(m => m.propertyTypeCode === item.code));
9747
+ }
9748
+ if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
9749
+ options = options.filter(item => {
9750
+ var _item$type, _watchPropertyCategor2;
9751
+ 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());
9752
+ });
9750
9753
  }
9751
9754
  return options.map(item => ({
9752
9755
  code: item.code,
@@ -9762,22 +9765,21 @@ const WSCalculation = _ref => {
9762
9765
  }
9763
9766
  }, [watchPropertyCategory, propertyTypeOptions, setValue, watchPropertyType]);
9764
9767
  const usageTypeOptions = useMemo(() => {
9765
- var _ptServicesMastersDat5, _ptServicesMastersDat6;
9766
- 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)) || [];
9767
- if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
9768
- var _watchPropertyCategor3;
9769
- if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor3 = watchPropertyCategory.code) === null || _watchPropertyCategor3 === void 0 ? void 0 : _watchPropertyCategor3.toUpperCase()) !== "MIXED") {
9770
- options = options.filter(item => {
9771
- var _item$type2, _watchPropertyCategor4;
9772
- 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());
9773
- });
9774
- }
9768
+ var _ptServicesMastersDat6, _ptServicesMastersDat7, _ptServicesMastersDat8;
9769
+ if (!(watchPropertyType !== null && watchPropertyType !== void 0 && watchPropertyType.code)) return [];
9770
+ 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)) || [];
9771
+ let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat8 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.PropertyToUsageMapping) || [];
9772
+ const selectedMapping = mapping.find(m => m.propertyTypeCode === watchPropertyType.code);
9773
+ if (selectedMapping && selectedMapping.allowedUsages) {
9774
+ options = options.filter(item => selectedMapping.allowedUsages.includes(item.code));
9775
+ } else {
9776
+ options = [];
9775
9777
  }
9776
9778
  return options.map(item => ({
9777
9779
  code: item.code,
9778
9780
  name: item.name
9779
9781
  }));
9780
- }, [ptServicesMastersData, watchPropertyCategory]);
9782
+ }, [ptServicesMastersData, watchPropertyCategory, watchPropertyType]);
9781
9783
  useEffect(() => {
9782
9784
  if (watchPropertyType && watchWaterConnectionUsageType) {
9783
9785
  const isUsageTypeValid = usageTypeOptions.some(opt => opt.code === watchWaterConnectionUsageType.code);
@@ -9821,7 +9823,7 @@ const WSCalculation = _ref => {
9821
9823
  setValue("useDetails.NumberofRooms", "");
9822
9824
  setValue("useDetails.numberOfBeds", "");
9823
9825
  setValue("useDetails.numberOfStudents", "");
9824
- setValue("useDetails.ServantQuartersRoom", "");
9826
+ setValue("useDetails.servantQuarterArea", "");
9825
9827
  setValue("useDetails.colonyName", "");
9826
9828
  }
9827
9829
  }, [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, categoryTypeList, setValue]);
@@ -10352,10 +10354,10 @@ const WSCalculation = _ref => {
10352
10354
  message: t("ERR_INVALID_NUMBER")
10353
10355
  }
10354
10356
  }),
10355
- name: "useDetails.ServantQuartersRoom"
10356
- }))) : null, isServentHouse && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails11 = errors.useDetails) === null || _errors$useDetails11 === void 0 ? void 0 : _errors$useDetails11.ServantQuartersRoom) && /*#__PURE__*/React.createElement(CardLabelError, {
10357
+ name: "useDetails.servantQuarterArea"
10358
+ }))) : null, isServentHouse && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails11 = errors.useDetails) === null || _errors$useDetails11 === void 0 ? void 0 : _errors$useDetails11.servantQuarterArea) && /*#__PURE__*/React.createElement(CardLabelError, {
10357
10359
  style: errorStyle
10358
- }, errors.useDetails.ServantQuartersRoom.message))), /*#__PURE__*/React.createElement("div", {
10360
+ }, errors.useDetails.servantQuarterArea.message))), /*#__PURE__*/React.createElement("div", {
10359
10361
  style: {
10360
10362
  display: "flex",
10361
10363
  marginTop: "24px",
@@ -10373,7 +10375,7 @@ const WSCalculation = _ref => {
10373
10375
  reset();
10374
10376
  setCalculationData(null);
10375
10377
  }
10376
- }, t("CS_COMMON_CLEAR_SEARCH")), /*#__PURE__*/React.createElement(SubmitBar, {
10378
+ }, t("CS_COMMON_CLEAR_SEARCH")), isLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(SubmitBar, {
10377
10379
  label: t("ES_COMMON_CALCULATE"),
10378
10380
  onSubmit: handleSubmit,
10379
10381
  disabled: !isCalculateButtonEnabled
@@ -21453,7 +21455,7 @@ const PropertyWaterConnection = _ref => {
21453
21455
  NumberofRooms: "",
21454
21456
  numberOfBeds: "",
21455
21457
  numberOfStudents: "",
21456
- ServantQuartersRoom: ""
21458
+ servantQuarterArea: ""
21457
21459
  }
21458
21460
  }
21459
21461
  }),
@@ -21463,7 +21465,7 @@ const PropertyWaterConnection = _ref => {
21463
21465
  watch = _useForm.watch,
21464
21466
  setValue = _useForm.setValue;
21465
21467
  const tenantId = Digit.ULBService.getCurrentTenantId();
21466
- const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType"]),
21468
+ const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType", "PropertyToUsageMapping"]),
21467
21469
  ptServicesMastersData = _Digit$Hooks$pt$usePr.data;
21468
21470
  const _Digit$Hooks$ws$useMD = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-masters", ["WsCategoryType"]),
21469
21471
  wsServicesMastersData = _Digit$Hooks$ws$useMD.data;
@@ -21489,7 +21491,7 @@ const PropertyWaterConnection = _ref => {
21489
21491
  const watchPropertyType = watch("useDetails.propertyType");
21490
21492
  const watchPropertyCategory = watch("useDetails.propertyCategory");
21491
21493
  const watchWaterConnectionUsageType = watch("useDetails.WaterConnectionUsageType");
21492
- const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
21494
+ 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";
21493
21495
  const isHotelRestaurantProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOTEL_OR_RESTAURANT" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HotelOrRestaurant";
21494
21496
  const isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
21495
21497
  const isDwellingUnit = (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL" || (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL";
@@ -21507,10 +21509,9 @@ const PropertyWaterConnection = _ref => {
21507
21509
  }, []);
21508
21510
  const categoryOptions = useMemo(() => {
21509
21511
  var _ptServicesMastersDat, _ptServicesMastersDat2;
21512
+ if (!(watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code)) return [];
21510
21513
  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)) || [];
21511
- if (watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code) {
21512
- options = options.filter(item => item.type === watchCategoryType.code);
21513
- }
21514
+ options = options.filter(item => item.type === watchCategoryType.code);
21514
21515
  return options.map(item => ({
21515
21516
  code: item.code,
21516
21517
  name: item.name
@@ -21525,16 +21526,18 @@ const PropertyWaterConnection = _ref => {
21525
21526
  }
21526
21527
  }, [watchCategoryType, categoryOptions, setValue, watchPropertyCategory]);
21527
21528
  const propertyTypeOptions = useMemo(() => {
21528
- var _ptServicesMastersDat3, _ptServicesMastersDat4;
21529
+ var _ptServicesMastersDat3, _ptServicesMastersDat4, _ptServicesMastersDat5, _watchPropertyCategor;
21530
+ if (!(watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code)) return [];
21529
21531
  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)) || [];
21530
- if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
21531
- var _watchPropertyCategor;
21532
- if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
21533
- options = options.filter(item => {
21534
- var _item$type, _watchPropertyCategor2;
21535
- 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());
21536
- });
21537
- }
21532
+ let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : _ptServicesMastersDat5.PropertyToUsageMapping) || [];
21533
+ if (mapping.length > 0) {
21534
+ options = options.filter(item => mapping.some(m => m.propertyTypeCode === item.code));
21535
+ }
21536
+ if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
21537
+ options = options.filter(item => {
21538
+ var _item$type, _watchPropertyCategor2;
21539
+ 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());
21540
+ });
21538
21541
  }
21539
21542
  return options.map(item => ({
21540
21543
  code: item.code,
@@ -21550,22 +21553,21 @@ const PropertyWaterConnection = _ref => {
21550
21553
  }
21551
21554
  }, [watchPropertyCategory, propertyTypeOptions, setValue, watchPropertyType]);
21552
21555
  const usageTypeOptions = useMemo(() => {
21553
- var _ptServicesMastersDat5, _ptServicesMastersDat6;
21554
- 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)) || [];
21555
- if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
21556
- var _watchPropertyCategor3;
21557
- if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor3 = watchPropertyCategory.code) === null || _watchPropertyCategor3 === void 0 ? void 0 : _watchPropertyCategor3.toUpperCase()) !== "MIXED") {
21558
- options = options.filter(item => {
21559
- var _item$type2, _watchPropertyCategor4;
21560
- 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());
21561
- });
21562
- }
21556
+ var _ptServicesMastersDat6, _ptServicesMastersDat7, _ptServicesMastersDat8;
21557
+ if (!(watchPropertyType !== null && watchPropertyType !== void 0 && watchPropertyType.code)) return [];
21558
+ 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)) || [];
21559
+ let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat8 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.PropertyToUsageMapping) || [];
21560
+ const selectedMapping = mapping.find(m => m.propertyTypeCode === watchPropertyType.code);
21561
+ if (selectedMapping && selectedMapping.allowedUsages) {
21562
+ options = options.filter(item => selectedMapping.allowedUsages.includes(item.code));
21563
+ } else {
21564
+ options = [];
21563
21565
  }
21564
21566
  return options.map(item => ({
21565
21567
  code: item.code,
21566
21568
  name: item.name
21567
21569
  }));
21568
- }, [ptServicesMastersData, watchPropertyCategory]);
21570
+ }, [ptServicesMastersData, watchPropertyCategory, watchPropertyType]);
21569
21571
  useEffect(() => {
21570
21572
  if (watchPropertyType && watchWaterConnectionUsageType) {
21571
21573
  const isUsageTypeValid = usageTypeOptions.some(opt => opt.code === watchWaterConnectionUsageType.code);
@@ -21575,8 +21577,8 @@ const PropertyWaterConnection = _ref => {
21575
21577
  }
21576
21578
  }, [watchPropertyType, usageTypeOptions, setValue, watchWaterConnectionUsageType]);
21577
21579
  const floorOptions = useMemo(() => {
21578
- var _ptServicesMastersDat7, _ptServicesMastersDat8;
21579
- 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 => ({
21580
+ var _ptServicesMastersDat9, _ptServicesMastersDat0;
21581
+ 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 => ({
21580
21582
  code: item.code,
21581
21583
  name: item.name
21582
21584
  }));
@@ -21625,7 +21627,7 @@ const PropertyWaterConnection = _ref => {
21625
21627
  setValue("useDetails.NumberofRooms", "");
21626
21628
  setValue("useDetails.numberOfBeds", "");
21627
21629
  setValue("useDetails.numberOfStudents", "");
21628
- setValue("useDetails.ServantQuartersRoom", "");
21630
+ setValue("useDetails.servantQuarterArea", "");
21629
21631
  }
21630
21632
  }, [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]);
21631
21633
  const lastErrorState = React.useRef(null);
@@ -21876,11 +21878,11 @@ const PropertyWaterConnection = _ref => {
21876
21878
  message: t("ERR_INVALID_NUMBER")
21877
21879
  }
21878
21880
  }),
21879
- name: "useDetails.ServantQuartersRoom",
21881
+ name: "useDetails.servantQuarterArea",
21880
21882
  disabled: isPropertyFound
21881
- }))) : 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.createElement(CardLabelError, {
21883
+ }))) : 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.createElement(CardLabelError, {
21882
21884
  style: errorStyle
21883
- }, errors.useDetails.ServantQuartersRoom.message)));
21885
+ }, errors.useDetails.servantQuarterArea.message)));
21884
21886
  };
21885
21887
 
21886
21888
  const WSPropertyWaterConnection = props => {
@@ -44534,8 +44536,8 @@ const DueVerification = _ref => {
44534
44536
  return newData;
44535
44537
  });
44536
44538
  }, [applicationData]);
44537
- const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
44538
- const isActivation = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
44539
+ const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION";
44540
+ const isActivation = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
44539
44541
  const columns = useMemo(() => {
44540
44542
  const baseColumns = [{
44541
44543
  Header: t("K No."),
@@ -44553,7 +44555,7 @@ const DueVerification = _ref => {
44553
44555
  Header: t("Total Amount"),
44554
44556
  accessor: "totalAmount"
44555
44557
  }];
44556
- if (isPendingApproval) {
44558
+ if (isPendingApproval || isActivation) {
44557
44559
  baseColumns.push({
44558
44560
  Header: t("Remarks"),
44559
44561
  accessor: "remarks",
@@ -44572,7 +44574,7 @@ const DueVerification = _ref => {
44572
44574
  });
44573
44575
  }
44574
44576
  return baseColumns;
44575
- }, [t, handleRemarkChange, isPendingApproval]);
44577
+ }, [t, handleRemarkChange, isPendingApproval, isActivation]);
44576
44578
  useEffect(() => {
44577
44579
  if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
44578
44580
  setTableData(applicationData.dueVerification);
@@ -44674,7 +44676,11 @@ const InspectionInformation = _ref => {
44674
44676
  let applicationData = _ref.applicationData;
44675
44677
  const _useTranslation = useTranslation(),
44676
44678
  t = _useTranslation.t;
44677
- const _useState = useState(null),
44679
+ const defaultInspectionType = {
44680
+ i18nKey: "New Connection Visit",
44681
+ code: "new_connection_visit"
44682
+ };
44683
+ const _useState = useState(defaultInspectionType),
44678
44684
  inspectionType = _useState[0],
44679
44685
  setInspectionType = _useState[1];
44680
44686
  const _useState2 = useState(""),
@@ -44684,20 +44690,23 @@ const InspectionInformation = _ref => {
44684
44690
  inspectorName = _useState3[0],
44685
44691
  setInspectorName = _useState3[1];
44686
44692
  useEffect(() => {
44687
- if (applicationData !== null && applicationData !== void 0 && applicationData.inspectionInformation) {
44693
+ if (applicationData) {
44694
+ if (!applicationData.inspectionInformation) {
44695
+ applicationData.inspectionInformation = {};
44696
+ }
44697
+ if (!applicationData.inspectionInformation.inspectionType) {
44698
+ applicationData.inspectionInformation.inspectionType = defaultInspectionType;
44699
+ }
44688
44700
  const apiInspectionType = applicationData.inspectionInformation.inspectionType;
44689
44701
  let matchedType = null;
44690
44702
  const inspectionCode = typeof apiInspectionType === "object" && apiInspectionType !== null ? apiInspectionType.code : apiInspectionType;
44691
44703
  if (inspectionCode) {
44692
44704
  matchedType = [{
44693
- i18nKey: "ES_COMMON_SELECT",
44694
- code: ""
44695
- }, {
44696
44705
  i18nKey: "New Connection Visit",
44697
44706
  code: "new_connection_visit"
44698
44707
  }].find(opt => opt.code === inspectionCode || opt.i18nKey === inspectionCode);
44699
44708
  }
44700
- setInspectionType(matchedType || null);
44709
+ setInspectionType(matchedType || defaultInspectionType);
44701
44710
  let dateValue = applicationData.inspectionInformation.inspectionDate || "";
44702
44711
  if (dateValue && typeof dateValue === 'number') {
44703
44712
  const d = new Date(dateValue);
@@ -44714,9 +44723,6 @@ const InspectionInformation = _ref => {
44714
44723
  }
44715
44724
  }, [applicationData]);
44716
44725
  const inspectionTypeOptions = [{
44717
- i18nKey: "ES_COMMON_SELECT",
44718
- code: ""
44719
- }, {
44720
44726
  i18nKey: "New Connection Visit",
44721
44727
  code: "new_connection_visit"
44722
44728
  }];
@@ -44736,7 +44742,7 @@ const InspectionInformation = _ref => {
44736
44742
  if (!applicationData.inspectionInformation) applicationData.inspectionInformation = {};
44737
44743
  applicationData.inspectionInformation.inspectorName = val;
44738
44744
  };
44739
- const readOnly = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
44745
+ const readOnly = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
44740
44746
  return /*#__PURE__*/React.createElement("div", {
44741
44747
  style: {
44742
44748
  marginBottom: "20px"
@@ -45318,9 +45324,9 @@ function ApplicationDetailsContent(_ref) {
45318
45324
  }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documents) && /*#__PURE__*/React.createElement(PropertyDocuments, {
45319
45325
  documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents,
45320
45326
  applicationStatus: applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus
45321
- }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_RECONNECTION") && /*#__PURE__*/React.createElement(DueVerification, {
45327
+ }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_APPROVAL_FOR_CONNECTION", "PENDING_FOR_CONNECTION_ACTIVATION", "PENDING_FOR_RECONNECTION", "PENDING_FOR_DUE_VERIFICATION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React.createElement(DueVerification, {
45322
45328
  applicationData: applicationData
45323
- }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION") && /*#__PURE__*/React.createElement(InspectionInformation, {
45329
+ }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React.createElement(InspectionInformation, {
45324
45330
  applicationData: applicationData
45325
45331
  }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React.createElement(PropertyEstimates, {
45326
45332
  taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation