@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.js CHANGED
@@ -1872,11 +1872,12 @@ const WSCalculationPayload = (data, tenantId) => {
1872
1872
  farArea: useDetails !== null && useDetails !== void 0 && useDetails.farArea ? Number(useDetails.farArea) : 0,
1873
1873
  numberOfFloors: useDetails !== null && useDetails !== void 0 && (_useDetails$noOfFloor = useDetails.noOfFloors) !== null && _useDetails$noOfFloor !== void 0 && _useDetails$noOfFloor.code ? Number(useDetails.noOfFloors.code) : 0,
1874
1874
  numberOfStudents: useDetails !== null && useDetails !== void 0 && useDetails.numberOfStudents ? Number(useDetails.numberOfStudents) : 0,
1875
- numberOfBeds: useDetails !== null && useDetails !== void 0 && useDetails.numberOfBeds ? Number(useDetails.numberOfBeds) : 0
1875
+ numberOfBeds: useDetails !== null && useDetails !== void 0 && useDetails.numberOfBeds ? Number(useDetails.numberOfBeds) : 0,
1876
+ servantQuarterArea: useDetails !== null && useDetails !== void 0 && useDetails.servantQuarterArea ? Number(useDetails.servantQuarterArea) : 0
1876
1877
  };
1877
1878
  if (useDetails !== null && useDetails !== void 0 && useDetails.NumberofRooms) payload.numberOfRooms = Number(useDetails.NumberofRooms);
1878
1879
  if (useDetails !== null && useDetails !== void 0 && useDetails.NumberofDwellingUnits) payload.numberOfDwellingUnits = Number(useDetails.NumberofDwellingUnits);
1879
- if (useDetails !== null && useDetails !== void 0 && useDetails.ServantQuartersRoom) payload.servantQuartersRoom = Number(useDetails.ServantQuartersRoom);
1880
+ if (useDetails !== null && useDetails !== void 0 && useDetails.servantQuarterArea) payload.servantQuarterArea = Number(useDetails.servantQuarterArea);
1880
1881
  return payload;
1881
1882
  };
1882
1883
 
@@ -9667,7 +9668,7 @@ const WSCalculation = _ref => {
9667
9668
  NumberofRooms: "",
9668
9669
  numberOfBeds: "",
9669
9670
  numberOfStudents: "",
9670
- ServantQuartersRoom: "",
9671
+ servantQuarterArea: "",
9671
9672
  colonyName: ""
9672
9673
  }
9673
9674
  }
@@ -9684,8 +9685,9 @@ const WSCalculation = _ref => {
9684
9685
  const _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSCalculater({
9685
9686
  tenantId
9686
9687
  }),
9687
- calculateCharges = _Digit$Hooks$ws$useWS.mutate;
9688
- const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "PropertyNewUsageType"]),
9688
+ calculateCharges = _Digit$Hooks$ws$useWS.mutate,
9689
+ isLoading = _Digit$Hooks$ws$useWS.isLoading;
9690
+ const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "PropertyNewUsageType", "PropertyToUsageMapping"]),
9689
9691
  ptServicesMastersData = _Digit$Hooks$pt$usePr.data;
9690
9692
  const _Digit$Hooks$ws$useMD = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-masters", ["WsCategoryType"]),
9691
9693
  wsServicesMastersData = _Digit$Hooks$ws$useMD.data;
@@ -9715,17 +9717,16 @@ const WSCalculation = _ref => {
9715
9717
  const watchWaterConnectionUsageType = watch("useDetails.WaterConnectionUsageType");
9716
9718
  const watchColonyName = watch("useDetails.colonyName");
9717
9719
  const isCalculateButtonEnabled = watchCategoryType && watchPropertyCategory && watchPropertyType && watchWaterConnectionUsageType && watchColonyName;
9718
- const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
9720
+ 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";
9719
9721
  const isHotelRestaurantProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOTEL_OR_RESTAURANT" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HotelOrRestaurant";
9720
9722
  const isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
9721
9723
  const isDwellingUnit = (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL" || (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL";
9722
9724
  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";
9723
9725
  const categoryOptions = React.useMemo(() => {
9724
9726
  var _ptServicesMastersDat, _ptServicesMastersDat2;
9727
+ if (!(watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code)) return [];
9725
9728
  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)) || [];
9726
- if (watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code) {
9727
- options = options.filter(item => item.type === watchCategoryType.code);
9728
- }
9729
+ options = options.filter(item => item.type === watchCategoryType.code);
9729
9730
  return options.map(item => ({
9730
9731
  code: item.code,
9731
9732
  name: item.name
@@ -9740,16 +9741,18 @@ const WSCalculation = _ref => {
9740
9741
  }
9741
9742
  }, [watchCategoryType, categoryOptions, setValue, watchPropertyCategory]);
9742
9743
  const propertyTypeOptions = React.useMemo(() => {
9743
- var _ptServicesMastersDat3, _ptServicesMastersDat4;
9744
+ var _ptServicesMastersDat3, _ptServicesMastersDat4, _ptServicesMastersDat5, _watchPropertyCategor;
9745
+ if (!(watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code)) return [];
9744
9746
  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)) || [];
9745
- if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
9746
- var _watchPropertyCategor;
9747
- if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
9748
- options = options.filter(item => {
9749
- var _item$type, _watchPropertyCategor2;
9750
- 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());
9751
- });
9752
- }
9747
+ let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : _ptServicesMastersDat5.PropertyToUsageMapping) || [];
9748
+ if (mapping.length > 0) {
9749
+ options = options.filter(item => mapping.some(m => m.propertyTypeCode === item.code));
9750
+ }
9751
+ if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
9752
+ options = options.filter(item => {
9753
+ var _item$type, _watchPropertyCategor2;
9754
+ 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());
9755
+ });
9753
9756
  }
9754
9757
  return options.map(item => ({
9755
9758
  code: item.code,
@@ -9765,22 +9768,21 @@ const WSCalculation = _ref => {
9765
9768
  }
9766
9769
  }, [watchPropertyCategory, propertyTypeOptions, setValue, watchPropertyType]);
9767
9770
  const usageTypeOptions = React.useMemo(() => {
9768
- var _ptServicesMastersDat5, _ptServicesMastersDat6;
9769
- 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)) || [];
9770
- if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
9771
- var _watchPropertyCategor3;
9772
- if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor3 = watchPropertyCategory.code) === null || _watchPropertyCategor3 === void 0 ? void 0 : _watchPropertyCategor3.toUpperCase()) !== "MIXED") {
9773
- options = options.filter(item => {
9774
- var _item$type2, _watchPropertyCategor4;
9775
- 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());
9776
- });
9777
- }
9771
+ var _ptServicesMastersDat6, _ptServicesMastersDat7, _ptServicesMastersDat8;
9772
+ if (!(watchPropertyType !== null && watchPropertyType !== void 0 && watchPropertyType.code)) return [];
9773
+ 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)) || [];
9774
+ let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat8 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.PropertyToUsageMapping) || [];
9775
+ const selectedMapping = mapping.find(m => m.propertyTypeCode === watchPropertyType.code);
9776
+ if (selectedMapping && selectedMapping.allowedUsages) {
9777
+ options = options.filter(item => selectedMapping.allowedUsages.includes(item.code));
9778
+ } else {
9779
+ options = [];
9778
9780
  }
9779
9781
  return options.map(item => ({
9780
9782
  code: item.code,
9781
9783
  name: item.name
9782
9784
  }));
9783
- }, [ptServicesMastersData, watchPropertyCategory]);
9785
+ }, [ptServicesMastersData, watchPropertyCategory, watchPropertyType]);
9784
9786
  React.useEffect(() => {
9785
9787
  if (watchPropertyType && watchWaterConnectionUsageType) {
9786
9788
  const isUsageTypeValid = usageTypeOptions.some(opt => opt.code === watchWaterConnectionUsageType.code);
@@ -9824,7 +9826,7 @@ const WSCalculation = _ref => {
9824
9826
  setValue("useDetails.NumberofRooms", "");
9825
9827
  setValue("useDetails.numberOfBeds", "");
9826
9828
  setValue("useDetails.numberOfStudents", "");
9827
- setValue("useDetails.ServantQuartersRoom", "");
9829
+ setValue("useDetails.servantQuarterArea", "");
9828
9830
  setValue("useDetails.colonyName", "");
9829
9831
  }
9830
9832
  }, [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]);
@@ -10355,10 +10357,10 @@ const WSCalculation = _ref => {
10355
10357
  message: t("ERR_INVALID_NUMBER")
10356
10358
  }
10357
10359
  }),
10358
- name: "useDetails.ServantQuartersRoom"
10359
- }))) : 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__default.createElement(digitUiReactComponents.CardLabelError, {
10360
+ name: "useDetails.servantQuarterArea"
10361
+ }))) : 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__default.createElement(digitUiReactComponents.CardLabelError, {
10360
10362
  style: errorStyle
10361
- }, errors.useDetails.ServantQuartersRoom.message))), /*#__PURE__*/React__default.createElement("div", {
10363
+ }, errors.useDetails.servantQuarterArea.message))), /*#__PURE__*/React__default.createElement("div", {
10362
10364
  style: {
10363
10365
  display: "flex",
10364
10366
  marginTop: "24px",
@@ -10376,7 +10378,7 @@ const WSCalculation = _ref => {
10376
10378
  reset();
10377
10379
  setCalculationData(null);
10378
10380
  }
10379
- }, t("CS_COMMON_CLEAR_SEARCH")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
10381
+ }, t("CS_COMMON_CLEAR_SEARCH")), isLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
10380
10382
  label: t("ES_COMMON_CALCULATE"),
10381
10383
  onSubmit: handleSubmit,
10382
10384
  disabled: !isCalculateButtonEnabled
@@ -21456,7 +21458,7 @@ const PropertyWaterConnection = _ref => {
21456
21458
  NumberofRooms: "",
21457
21459
  numberOfBeds: "",
21458
21460
  numberOfStudents: "",
21459
- ServantQuartersRoom: ""
21461
+ servantQuarterArea: ""
21460
21462
  }
21461
21463
  }
21462
21464
  }),
@@ -21466,7 +21468,7 @@ const PropertyWaterConnection = _ref => {
21466
21468
  watch = _useForm.watch,
21467
21469
  setValue = _useForm.setValue;
21468
21470
  const tenantId = Digit.ULBService.getCurrentTenantId();
21469
- const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType"]),
21471
+ const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType", "PropertyToUsageMapping"]),
21470
21472
  ptServicesMastersData = _Digit$Hooks$pt$usePr.data;
21471
21473
  const _Digit$Hooks$ws$useMD = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-masters", ["WsCategoryType"]),
21472
21474
  wsServicesMastersData = _Digit$Hooks$ws$useMD.data;
@@ -21492,7 +21494,7 @@ const PropertyWaterConnection = _ref => {
21492
21494
  const watchPropertyType = watch("useDetails.propertyType");
21493
21495
  const watchPropertyCategory = watch("useDetails.propertyCategory");
21494
21496
  const watchWaterConnectionUsageType = watch("useDetails.WaterConnectionUsageType");
21495
- const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
21497
+ 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";
21496
21498
  const isHotelRestaurantProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOTEL_OR_RESTAURANT" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HotelOrRestaurant";
21497
21499
  const isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
21498
21500
  const isDwellingUnit = (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL" || (watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : watchPropertyCategory.code) === "RESIDENTIAL";
@@ -21510,10 +21512,9 @@ const PropertyWaterConnection = _ref => {
21510
21512
  }, []);
21511
21513
  const categoryOptions = React.useMemo(() => {
21512
21514
  var _ptServicesMastersDat, _ptServicesMastersDat2;
21515
+ if (!(watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code)) return [];
21513
21516
  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)) || [];
21514
- if (watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code) {
21515
- options = options.filter(item => item.type === watchCategoryType.code);
21516
- }
21517
+ options = options.filter(item => item.type === watchCategoryType.code);
21517
21518
  return options.map(item => ({
21518
21519
  code: item.code,
21519
21520
  name: item.name
@@ -21528,16 +21529,18 @@ const PropertyWaterConnection = _ref => {
21528
21529
  }
21529
21530
  }, [watchCategoryType, categoryOptions, setValue, watchPropertyCategory]);
21530
21531
  const propertyTypeOptions = React.useMemo(() => {
21531
- var _ptServicesMastersDat3, _ptServicesMastersDat4;
21532
+ var _ptServicesMastersDat3, _ptServicesMastersDat4, _ptServicesMastersDat5, _watchPropertyCategor;
21533
+ if (!(watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code)) return [];
21532
21534
  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)) || [];
21533
- if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
21534
- var _watchPropertyCategor;
21535
- if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
21536
- options = options.filter(item => {
21537
- var _item$type, _watchPropertyCategor2;
21538
- 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());
21539
- });
21540
- }
21535
+ let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : _ptServicesMastersDat5.PropertyToUsageMapping) || [];
21536
+ if (mapping.length > 0) {
21537
+ options = options.filter(item => mapping.some(m => m.propertyTypeCode === item.code));
21538
+ }
21539
+ if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
21540
+ options = options.filter(item => {
21541
+ var _item$type, _watchPropertyCategor2;
21542
+ 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());
21543
+ });
21541
21544
  }
21542
21545
  return options.map(item => ({
21543
21546
  code: item.code,
@@ -21553,22 +21556,21 @@ const PropertyWaterConnection = _ref => {
21553
21556
  }
21554
21557
  }, [watchPropertyCategory, propertyTypeOptions, setValue, watchPropertyType]);
21555
21558
  const usageTypeOptions = React.useMemo(() => {
21556
- var _ptServicesMastersDat5, _ptServicesMastersDat6;
21557
- 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)) || [];
21558
- if (watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code) {
21559
- var _watchPropertyCategor3;
21560
- if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor3 = watchPropertyCategory.code) === null || _watchPropertyCategor3 === void 0 ? void 0 : _watchPropertyCategor3.toUpperCase()) !== "MIXED") {
21561
- options = options.filter(item => {
21562
- var _item$type2, _watchPropertyCategor4;
21563
- 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());
21564
- });
21565
- }
21559
+ var _ptServicesMastersDat6, _ptServicesMastersDat7, _ptServicesMastersDat8;
21560
+ if (!(watchPropertyType !== null && watchPropertyType !== void 0 && watchPropertyType.code)) return [];
21561
+ 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)) || [];
21562
+ let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat8 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.PropertyToUsageMapping) || [];
21563
+ const selectedMapping = mapping.find(m => m.propertyTypeCode === watchPropertyType.code);
21564
+ if (selectedMapping && selectedMapping.allowedUsages) {
21565
+ options = options.filter(item => selectedMapping.allowedUsages.includes(item.code));
21566
+ } else {
21567
+ options = [];
21566
21568
  }
21567
21569
  return options.map(item => ({
21568
21570
  code: item.code,
21569
21571
  name: item.name
21570
21572
  }));
21571
- }, [ptServicesMastersData, watchPropertyCategory]);
21573
+ }, [ptServicesMastersData, watchPropertyCategory, watchPropertyType]);
21572
21574
  React.useEffect(() => {
21573
21575
  if (watchPropertyType && watchWaterConnectionUsageType) {
21574
21576
  const isUsageTypeValid = usageTypeOptions.some(opt => opt.code === watchWaterConnectionUsageType.code);
@@ -21578,8 +21580,8 @@ const PropertyWaterConnection = _ref => {
21578
21580
  }
21579
21581
  }, [watchPropertyType, usageTypeOptions, setValue, watchWaterConnectionUsageType]);
21580
21582
  const floorOptions = React.useMemo(() => {
21581
- var _ptServicesMastersDat7, _ptServicesMastersDat8;
21582
- 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 => ({
21583
+ var _ptServicesMastersDat9, _ptServicesMastersDat0;
21584
+ 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 => ({
21583
21585
  code: item.code,
21584
21586
  name: item.name
21585
21587
  }));
@@ -21628,7 +21630,7 @@ const PropertyWaterConnection = _ref => {
21628
21630
  setValue("useDetails.NumberofRooms", "");
21629
21631
  setValue("useDetails.numberOfBeds", "");
21630
21632
  setValue("useDetails.numberOfStudents", "");
21631
- setValue("useDetails.ServantQuartersRoom", "");
21633
+ setValue("useDetails.servantQuarterArea", "");
21632
21634
  }
21633
21635
  }, [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]);
21634
21636
  const lastErrorState = React__default.useRef(null);
@@ -21879,11 +21881,11 @@ const PropertyWaterConnection = _ref => {
21879
21881
  message: t("ERR_INVALID_NUMBER")
21880
21882
  }
21881
21883
  }),
21882
- name: "useDetails.ServantQuartersRoom",
21884
+ name: "useDetails.servantQuarterArea",
21883
21885
  disabled: isPropertyFound
21884
- }))) : 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, {
21886
+ }))) : 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, {
21885
21887
  style: errorStyle
21886
- }, errors.useDetails.ServantQuartersRoom.message)));
21888
+ }, errors.useDetails.servantQuarterArea.message)));
21887
21889
  };
21888
21890
 
21889
21891
  const WSPropertyWaterConnection = props => {
@@ -44537,8 +44539,8 @@ const DueVerification = _ref => {
44537
44539
  return newData;
44538
44540
  });
44539
44541
  }, [applicationData]);
44540
- 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";
44541
- const isActivation = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
44542
+ const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION";
44543
+ 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);
44542
44544
  const columns = React.useMemo(() => {
44543
44545
  const baseColumns = [{
44544
44546
  Header: t("K No."),
@@ -44556,7 +44558,7 @@ const DueVerification = _ref => {
44556
44558
  Header: t("Total Amount"),
44557
44559
  accessor: "totalAmount"
44558
44560
  }];
44559
- if (isPendingApproval) {
44561
+ if (isPendingApproval || isActivation) {
44560
44562
  baseColumns.push({
44561
44563
  Header: t("Remarks"),
44562
44564
  accessor: "remarks",
@@ -44575,7 +44577,7 @@ const DueVerification = _ref => {
44575
44577
  });
44576
44578
  }
44577
44579
  return baseColumns;
44578
- }, [t, handleRemarkChange, isPendingApproval]);
44580
+ }, [t, handleRemarkChange, isPendingApproval, isActivation]);
44579
44581
  React.useEffect(() => {
44580
44582
  if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
44581
44583
  setTableData(applicationData.dueVerification);
@@ -44677,7 +44679,11 @@ const InspectionInformation = _ref => {
44677
44679
  let applicationData = _ref.applicationData;
44678
44680
  const _useTranslation = reactI18next.useTranslation(),
44679
44681
  t = _useTranslation.t;
44680
- const _useState = React.useState(null),
44682
+ const defaultInspectionType = {
44683
+ i18nKey: "New Connection Visit",
44684
+ code: "new_connection_visit"
44685
+ };
44686
+ const _useState = React.useState(defaultInspectionType),
44681
44687
  inspectionType = _useState[0],
44682
44688
  setInspectionType = _useState[1];
44683
44689
  const _useState2 = React.useState(""),
@@ -44687,20 +44693,23 @@ const InspectionInformation = _ref => {
44687
44693
  inspectorName = _useState3[0],
44688
44694
  setInspectorName = _useState3[1];
44689
44695
  React.useEffect(() => {
44690
- if (applicationData !== null && applicationData !== void 0 && applicationData.inspectionInformation) {
44696
+ if (applicationData) {
44697
+ if (!applicationData.inspectionInformation) {
44698
+ applicationData.inspectionInformation = {};
44699
+ }
44700
+ if (!applicationData.inspectionInformation.inspectionType) {
44701
+ applicationData.inspectionInformation.inspectionType = defaultInspectionType;
44702
+ }
44691
44703
  const apiInspectionType = applicationData.inspectionInformation.inspectionType;
44692
44704
  let matchedType = null;
44693
44705
  const inspectionCode = typeof apiInspectionType === "object" && apiInspectionType !== null ? apiInspectionType.code : apiInspectionType;
44694
44706
  if (inspectionCode) {
44695
44707
  matchedType = [{
44696
- i18nKey: "ES_COMMON_SELECT",
44697
- code: ""
44698
- }, {
44699
44708
  i18nKey: "New Connection Visit",
44700
44709
  code: "new_connection_visit"
44701
44710
  }].find(opt => opt.code === inspectionCode || opt.i18nKey === inspectionCode);
44702
44711
  }
44703
- setInspectionType(matchedType || null);
44712
+ setInspectionType(matchedType || defaultInspectionType);
44704
44713
  let dateValue = applicationData.inspectionInformation.inspectionDate || "";
44705
44714
  if (dateValue && typeof dateValue === 'number') {
44706
44715
  const d = new Date(dateValue);
@@ -44717,9 +44726,6 @@ const InspectionInformation = _ref => {
44717
44726
  }
44718
44727
  }, [applicationData]);
44719
44728
  const inspectionTypeOptions = [{
44720
- i18nKey: "ES_COMMON_SELECT",
44721
- code: ""
44722
- }, {
44723
44729
  i18nKey: "New Connection Visit",
44724
44730
  code: "new_connection_visit"
44725
44731
  }];
@@ -44739,7 +44745,7 @@ const InspectionInformation = _ref => {
44739
44745
  if (!applicationData.inspectionInformation) applicationData.inspectionInformation = {};
44740
44746
  applicationData.inspectionInformation.inspectorName = val;
44741
44747
  };
44742
- const readOnly = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
44748
+ 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);
44743
44749
  return /*#__PURE__*/React__default.createElement("div", {
44744
44750
  style: {
44745
44751
  marginBottom: "20px"
@@ -45321,9 +45327,9 @@ function ApplicationDetailsContent(_ref) {
45321
45327
  }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documents) && /*#__PURE__*/React__default.createElement(PropertyDocuments, {
45322
45328
  documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents,
45323
45329
  applicationStatus: applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus
45324
- }), (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__default.createElement(DueVerification, {
45330
+ }), (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__default.createElement(DueVerification, {
45325
45331
  applicationData: applicationData
45326
- }), " ", (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__default.createElement(InspectionInformation, {
45332
+ }), " ", (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__default.createElement(InspectionInformation, {
45327
45333
  applicationData: applicationData
45328
45334
  }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React__default.createElement(PropertyEstimates, {
45329
45335
  taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation