@djb25/digit-ui-module-wt 1.0.13 → 1.0.15

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 +1 -1
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.modern.js +183 -128
  4. package/dist/index.modern.js.map +1 -1
  5. package/package.json +1 -1
package/dist/index.modern.js CHANGED
@@ -614,34 +614,38 @@ const fillingPointPayload = data => {
614
614
  };
615
615
  };
616
616
  const fixedPointPayload = data => {
617
- var _data$owner22, _data$owner23, _data$owner24, _data$owner25, _data$owner26, _data$address52, _data$address52$addre, _data$address53, _data$address54, _data$address54$city, _data$address55, _data$address56, _data$address56$city, _data$address57, _data$address58, _data$address58$local, _data$address59, _data$address59$local, _data$address60, _data$address61, _data$address61$local, _data$address62, _data$address63, _data$address64, _data$address65, _data$address66, _data$address67, _data$address68, _data$address69, _data$address70;
617
+ var _data$owner22, _data$owner23, _data$owner24, _data$owner25, _data$owner26, _data$owner27, _data$owner28, _data$address52, _data$address53, _data$address54, _data$address55, _data$address56, _data$address57, _data$address58, _data$address59, _data$address59$city, _data$address60, _data$address61, _data$address62, _data$address62$city, _data$address63, _data$address63$local, _data$address64, _data$address64$local, _data$address65, _data$address66, _data$address66$local, _data$address67, _data$address68, _data$address69, _data$address70;
618
618
  return {
619
619
  waterTankerBookingDetail: {
620
- tenantId: data === null || data === void 0 ? void 0 : data.tenantId,
621
620
  bookingId: (data === null || data === void 0 ? void 0 : data.bookingId) || "",
622
- auditDetails: (data === null || data === void 0 ? void 0 : data.auditDetails) || null,
621
+ bookingNo: (data === null || data === void 0 ? void 0 : data.bookingNo) || null,
622
+ tenantId: data === null || data === void 0 ? void 0 : data.tenantId,
623
+ mobileNumber: (data === null || data === void 0 ? void 0 : (_data$owner22 = data.owner) === null || _data$owner22 === void 0 ? void 0 : _data$owner22.mobileNumber) || "",
623
624
  applicantDetail: {
624
- name: (data === null || data === void 0 ? void 0 : (_data$owner22 = data.owner) === null || _data$owner22 === void 0 ? void 0 : _data$owner22.name) || (data === null || data === void 0 ? void 0 : (_data$owner23 = data.owner) === null || _data$owner23 === void 0 ? void 0 : _data$owner23.applicantName) || "",
625
- mobileNumber: (data === null || data === void 0 ? void 0 : (_data$owner24 = data.owner) === null || _data$owner24 === void 0 ? void 0 : _data$owner24.mobileNumber) || "",
626
- alternateNumber: (data === null || data === void 0 ? void 0 : (_data$owner25 = data.owner) === null || _data$owner25 === void 0 ? void 0 : _data$owner25.alternateNumber) || "",
627
- emailId: (data === null || data === void 0 ? void 0 : (_data$owner26 = data.owner) === null || _data$owner26 === void 0 ? void 0 : _data$owner26.emailId) || "",
625
+ applicantId: (data === null || data === void 0 ? void 0 : (_data$owner23 = data.owner) === null || _data$owner23 === void 0 ? void 0 : _data$owner23.applicantId) || null,
626
+ bookingId: (data === null || data === void 0 ? void 0 : data.bookingId) || "",
627
+ name: (data === null || data === void 0 ? void 0 : (_data$owner24 = data.owner) === null || _data$owner24 === void 0 ? void 0 : _data$owner24.name) || (data === null || data === void 0 ? void 0 : (_data$owner25 = data.owner) === null || _data$owner25 === void 0 ? void 0 : _data$owner25.applicantName) || "",
628
+ mobileNumber: (data === null || data === void 0 ? void 0 : (_data$owner26 = data.owner) === null || _data$owner26 === void 0 ? void 0 : _data$owner26.mobileNumber) || "",
629
+ alternateNumber: (data === null || data === void 0 ? void 0 : (_data$owner27 = data.owner) === null || _data$owner27 === void 0 ? void 0 : _data$owner27.alternateNumber) || "",
630
+ emailId: (data === null || data === void 0 ? void 0 : (_data$owner28 = data.owner) === null || _data$owner28 === void 0 ? void 0 : _data$owner28.emailId) || "",
628
631
  type: "FIXED-POINT"
629
632
  },
630
633
  address: {
631
- type: "FIXED-POINT",
632
- addressType: (data === null || data === void 0 ? void 0 : (_data$address52 = data.address) === null || _data$address52 === void 0 ? void 0 : (_data$address52$addre = _data$address52.addressType) === null || _data$address52$addre === void 0 ? void 0 : _data$address52$addre.code) || (data === null || data === void 0 ? void 0 : (_data$address53 = data.address) === null || _data$address53 === void 0 ? void 0 : _data$address53.addressType) || "",
633
- city: (data === null || data === void 0 ? void 0 : (_data$address54 = data.address) === null || _data$address54 === void 0 ? void 0 : (_data$address54$city = _data$address54.city) === null || _data$address54$city === void 0 ? void 0 : _data$address54$city.name) || (data === null || data === void 0 ? void 0 : (_data$address55 = data.address) === null || _data$address55 === void 0 ? void 0 : _data$address55.city) || "",
634
- cityCode: (data === null || data === void 0 ? void 0 : (_data$address56 = data.address) === null || _data$address56 === void 0 ? void 0 : (_data$address56$city = _data$address56.city) === null || _data$address56$city === void 0 ? void 0 : _data$address56$city.code) || (data === null || data === void 0 ? void 0 : (_data$address57 = data.address) === null || _data$address57 === void 0 ? void 0 : _data$address57.cityCode) || "",
635
- locality: (data === null || data === void 0 ? void 0 : (_data$address58 = data.address) === null || _data$address58 === void 0 ? void 0 : (_data$address58$local = _data$address58.locality) === null || _data$address58$local === void 0 ? void 0 : _data$address58$local.label) || (data === null || data === void 0 ? void 0 : (_data$address59 = data.address) === null || _data$address59 === void 0 ? void 0 : (_data$address59$local = _data$address59.locality) === null || _data$address59$local === void 0 ? void 0 : _data$address59$local.name) || (data === null || data === void 0 ? void 0 : (_data$address60 = data.address) === null || _data$address60 === void 0 ? void 0 : _data$address60.locality) || "",
636
- localityCode: (data === null || data === void 0 ? void 0 : (_data$address61 = data.address) === null || _data$address61 === void 0 ? void 0 : (_data$address61$local = _data$address61.locality) === null || _data$address61$local === void 0 ? void 0 : _data$address61$local.code) || (data === null || data === void 0 ? void 0 : (_data$address62 = data.address) === null || _data$address62 === void 0 ? void 0 : _data$address62.localityCode) || "",
637
- houseNo: (data === null || data === void 0 ? void 0 : (_data$address63 = data.address) === null || _data$address63 === void 0 ? void 0 : _data$address63.houseNo) || "",
638
- streetName: (data === null || data === void 0 ? void 0 : (_data$address64 = data.address) === null || _data$address64 === void 0 ? void 0 : _data$address64.streetName) || "",
639
- addressLine1: (data === null || data === void 0 ? void 0 : (_data$address65 = data.address) === null || _data$address65 === void 0 ? void 0 : _data$address65.addressLine1) || "",
640
- addressLine2: (data === null || data === void 0 ? void 0 : (_data$address66 = data.address) === null || _data$address66 === void 0 ? void 0 : _data$address66.addressLine2) || "",
641
- landmark: (data === null || data === void 0 ? void 0 : (_data$address67 = data.address) === null || _data$address67 === void 0 ? void 0 : _data$address67.landmark) || "",
642
- pincode: (data === null || data === void 0 ? void 0 : (_data$address68 = data.address) === null || _data$address68 === void 0 ? void 0 : _data$address68.pincode) || "",
643
- latitude: (data === null || data === void 0 ? void 0 : (_data$address69 = data.address) === null || _data$address69 === void 0 ? void 0 : _data$address69.latitude) || "",
644
- longitude: (data === null || data === void 0 ? void 0 : (_data$address70 = data.address) === null || _data$address70 === void 0 ? void 0 : _data$address70.longitude) || ""
634
+ addressId: (data === null || data === void 0 ? void 0 : (_data$address52 = data.address) === null || _data$address52 === void 0 ? void 0 : _data$address52.addressId) || null,
635
+ applicantId: (data === null || data === void 0 ? void 0 : (_data$address53 = data.address) === null || _data$address53 === void 0 ? void 0 : _data$address53.applicantId) || null,
636
+ houseNo: (data === null || data === void 0 ? void 0 : (_data$address54 = data.address) === null || _data$address54 === void 0 ? void 0 : _data$address54.houseNo) || "",
637
+ streetName: (data === null || data === void 0 ? void 0 : (_data$address55 = data.address) === null || _data$address55 === void 0 ? void 0 : _data$address55.streetName) || "",
638
+ addressLine1: (data === null || data === void 0 ? void 0 : (_data$address56 = data.address) === null || _data$address56 === void 0 ? void 0 : _data$address56.addressLine1) || "",
639
+ addressLine2: (data === null || data === void 0 ? void 0 : (_data$address57 = data.address) === null || _data$address57 === void 0 ? void 0 : _data$address57.addressLine2) || "",
640
+ landmark: (data === null || data === void 0 ? void 0 : (_data$address58 = data.address) === null || _data$address58 === void 0 ? void 0 : _data$address58.landmark) || "",
641
+ city: (data === null || data === void 0 ? void 0 : (_data$address59 = data.address) === null || _data$address59 === void 0 ? void 0 : (_data$address59$city = _data$address59.city) === null || _data$address59$city === void 0 ? void 0 : _data$address59$city.name) || (data === null || data === void 0 ? void 0 : (_data$address60 = data.address) === null || _data$address60 === void 0 ? void 0 : _data$address60.city) || "",
642
+ cityCode: (data === null || data === void 0 ? void 0 : (_data$address61 = data.address) === null || _data$address61 === void 0 ? void 0 : _data$address61.cityCode) || (data === null || data === void 0 ? void 0 : (_data$address62 = data.address) === null || _data$address62 === void 0 ? void 0 : (_data$address62$city = _data$address62.city) === null || _data$address62$city === void 0 ? void 0 : _data$address62$city.code) || "DJB",
643
+ locality: (data === null || data === void 0 ? void 0 : (_data$address63 = data.address) === null || _data$address63 === void 0 ? void 0 : (_data$address63$local = _data$address63.locality) === null || _data$address63$local === void 0 ? void 0 : _data$address63$local.label) || (data === null || data === void 0 ? void 0 : (_data$address64 = data.address) === null || _data$address64 === void 0 ? void 0 : (_data$address64$local = _data$address64.locality) === null || _data$address64$local === void 0 ? void 0 : _data$address64$local.name) || (data === null || data === void 0 ? void 0 : (_data$address65 = data.address) === null || _data$address65 === void 0 ? void 0 : _data$address65.locality) || "",
644
+ localityCode: (data === null || data === void 0 ? void 0 : (_data$address66 = data.address) === null || _data$address66 === void 0 ? void 0 : (_data$address66$local = _data$address66.locality) === null || _data$address66$local === void 0 ? void 0 : _data$address66$local.code) || (data === null || data === void 0 ? void 0 : (_data$address67 = data.address) === null || _data$address67 === void 0 ? void 0 : _data$address67.localityCode) || "",
645
+ latitude: (data === null || data === void 0 ? void 0 : (_data$address68 = data.address) === null || _data$address68 === void 0 ? void 0 : _data$address68.latitude) || "",
646
+ longitude: (data === null || data === void 0 ? void 0 : (_data$address69 = data.address) === null || _data$address69 === void 0 ? void 0 : _data$address69.longitude) || "",
647
+ pincode: (data === null || data === void 0 ? void 0 : (_data$address70 = data.address) === null || _data$address70 === void 0 ? void 0 : _data$address70.pincode) || "",
648
+ type: "FIXED-POINT"
645
649
  }
646
650
  }
647
651
  };
@@ -3423,7 +3427,9 @@ const FixedPointScheduleManagement = () => {
3423
3427
  const {
3424
3428
  t
3425
3429
  } = useTranslation();
3430
+ const tenantId = Digit.ULBService.getCurrentTenantId();
3426
3431
  const [showModal, setShowModal] = useState(false);
3432
+ const [toast, setToast] = useState(null);
3427
3433
  const [selectedDay, setSelectedDay] = useState("Mon");
3428
3434
  const [year, setYear] = useState({
3429
3435
  label: "Year 2026",
@@ -3446,6 +3452,12 @@ const FixedPointScheduleManagement = () => {
3446
3452
  value: "DL1LAG7729"
3447
3453
  });
3448
3454
  const [editingRowIndex, setEditingRowIndex] = useState(null);
3455
+ const {
3456
+ mutate: createSchedule
3457
+ } = Digit.Hooks.wt.useCreateFixedPointSchedule(tenantId);
3458
+ const closeToast = () => {
3459
+ setToast(null);
3460
+ };
3449
3461
  const handleDelete = index => {
3450
3462
  const updatedData = data.filter((_, i) => i !== index);
3451
3463
  setData(updatedData);
@@ -3833,7 +3845,7 @@ const FixedPointScheduleManagement = () => {
3833
3845
  scheduleId: data[editingRowIndex].scheduleId,
3834
3846
  fixedPointCode: data[editingRowIndex].fixedPoint,
3835
3847
  day: {
3836
- label: t(data[editingRowIndex].day.toUpperCase()),
3848
+ label: t(data[editingRowIndex].day),
3837
3849
  value: data[editingRowIndex].day
3838
3850
  },
3839
3851
  frequencyNo: data[editingRowIndex].freq,
@@ -3850,31 +3862,48 @@ const FixedPointScheduleManagement = () => {
3850
3862
  }
3851
3863
  } : null,
3852
3864
  onSubmit: formData => {
3853
- var _formData$day, _formData$active;
3854
- const rowData = {
3855
- scheduleId: formData.scheduleId || `SASID-000${data.length + 1}`,
3856
- fixedPoint: formData.fixedPointCode || "FP01",
3857
- day: ((_formData$day = formData.day) === null || _formData$day === void 0 ? void 0 : _formData$day.value) || "Mon",
3858
- freq: formData.frequencyNo || "1",
3859
- arrToFpl: formData.arrivalTimeFpl || "--:--",
3860
- depFromFpl: formData.departureTimeFpl || "--:--",
3861
- arrAtFixedPoint: formData.arrivalFixedPoint || "--:--",
3862
- depAtFixedPoint: formData.departureFixedPoint || "--:--",
3863
- returnToFpl: formData.returnFpl || "--:--",
3864
- volume: formData.volume || "0 KL",
3865
- vehicle: formData.vehicleId || "NA",
3866
- active: ((_formData$active = formData.active) === null || _formData$active === void 0 ? void 0 : _formData$active.value) === "Yes" ? "Y" : "N"
3865
+ var _formData$day, _formData$day$value, _formData$active, _formData$active2;
3866
+ const payload = {
3867
+ fixedPointDetails: {
3868
+ system_assigned_schedule_id: formData.scheduleId,
3869
+ fixed_point_code: formData.fixedPointCode,
3870
+ day: (_formData$day = formData.day) === null || _formData$day === void 0 ? void 0 : (_formData$day$value = _formData$day.value) === null || _formData$day$value === void 0 ? void 0 : _formData$day$value.toUpperCase(),
3871
+ trip_no: formData.frequencyNo,
3872
+ arrival_time_to_fpl: formData.arrivalTimeFpl,
3873
+ departure_time_from_fpl: formData.departureTimeFpl,
3874
+ arrival_time_delivery_point: formData.arrivalFixedPoint,
3875
+ departure_time_delivery_point: formData.departureFixedPoint,
3876
+ time_of_arriving_back_fpl_after_delivery: formData.returnFpl,
3877
+ volume_water_tobe_delivery: formData.volume,
3878
+ active: ((_formData$active = formData.active) === null || _formData$active === void 0 ? void 0 : _formData$active.value) === "Yes",
3879
+ is_enable: ((_formData$active2 = formData.active) === null || _formData$active2 === void 0 ? void 0 : _formData$active2.value) === "Yes",
3880
+ remarks: formData.remarks,
3881
+ vehicle_id: formData.vehicleId
3882
+ }
3867
3883
  };
3868
- if (editingRowIndex !== null) {
3869
- const updatedData = [...data];
3870
- updatedData[editingRowIndex] = rowData;
3871
- setData(updatedData);
3872
- } else {
3873
- setData([...data, rowData]);
3874
- }
3875
- setShowModal(false);
3876
- setEditingRowIndex(null);
3884
+ createSchedule(payload, {
3885
+ onError: (error, variables) => {
3886
+ var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
3887
+ setToast({
3888
+ key: "error",
3889
+ label: (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || "ERROR_WHILE_CREATING_SCHEDULE"
3890
+ });
3891
+ setTimeout(closeToast, 5000);
3892
+ },
3893
+ onSuccess: (data, variables) => {
3894
+ setToast({
3895
+ label: t("WT_SCHEDULE_CREATE_SUCCESS")
3896
+ });
3897
+ setTimeout(closeToast, 5000);
3898
+ setShowModal(false);
3899
+ setEditingRowIndex(null);
3900
+ }
3901
+ });
3877
3902
  }
3903
+ }), toast && /*#__PURE__*/React.createElement(Toast, {
3904
+ error: toast.key === "error",
3905
+ label: toast.label,
3906
+ onClose: closeToast
3878
3907
  }));
3879
3908
  };
3880
3909
 
@@ -5186,7 +5215,7 @@ const AddFixFillAddress = ({
5186
5215
  const [latitude, setLatitude] = useState((formData === null || formData === void 0 ? void 0 : (_formData$address0 = formData.address) === null || _formData$address0 === void 0 ? void 0 : _formData$address0.latitude) || "");
5187
5216
  const [longitude, setLongitude] = useState((formData === null || formData === void 0 ? void 0 : (_formData$address1 = formData.address) === null || _formData$address1 === void 0 ? void 0 : _formData$address1.longitude) || "");
5188
5217
  const [selectedAddress, setSelectedAddress] = useState("");
5189
- const isInitialized = useRef(false);
5218
+ const isInitialized = useRef(!isEdit);
5190
5219
  const lastSyncedAddress = useRef(null);
5191
5220
  const lastBookingId = useRef(null);
5192
5221
  const availableAddressTypeOptions = useMemo(() => {
@@ -5210,11 +5239,13 @@ const AddFixFillAddress = ({
5210
5239
  isInitialized.current = false;
5211
5240
  lastBookingId.current = formData.bookingId;
5212
5241
  }
5213
- if (formData !== null && formData !== void 0 && formData.address && !isInitialized.current && allCities && (fetchedLocalities || !formData.address.cityCode)) {
5242
+ if (formData !== null && formData !== void 0 && formData.address && !isInitialized.current && allCities) {
5214
5243
  const addressData = formData.address;
5215
5244
  const cityObj = allCities.find(c => c.code === addressData.cityCode || c.code === addressData.city || c.name === addressData.city) || addressData.city;
5245
+ if (cityObj && (!city || city.code !== cityObj.code && city !== cityObj)) {
5246
+ setCity(cityObj || null);
5247
+ }
5216
5248
  setPincode(addressData.pincode || "");
5217
- setCity(cityObj || null);
5218
5249
  setHouseNo(addressData.houseNo || "");
5219
5250
  setStreetName(addressData.streetName || "");
5220
5251
  setLandmark(addressData.landmark || "");
@@ -5223,16 +5254,25 @@ const AddFixFillAddress = ({
5223
5254
  setAddressType(allOptions.find(a => a.code === addressData.addressType) || addressData.addressType || null);
5224
5255
  setLatitude(addressData.latitude || "");
5225
5256
  setLongitude(addressData.longitude || "");
5226
- if (fetchedLocalities) {
5227
- const localityObj = fetchedLocalities.find(l => l.code === addressData.localityCode || l.code === addressData.locality || l.i18nkey === addressData.locality);
5228
- setLocality(localityObj || addressData.locality || null);
5257
+ if (fetchedLocalities || !addressData.cityCode) {
5258
+ console.log("AddFixFillAddress: Initialization Phase 2 - Setting locality", {
5259
+ cityCode: addressData.cityCode,
5260
+ fetched: !!fetchedLocalities
5261
+ });
5262
+ if (fetchedLocalities) {
5263
+ const localityObj = fetchedLocalities.find(l => l.code === addressData.localityCode || l.code === addressData.locality || l.i18nkey === addressData.locality);
5264
+ setLocality(localityObj || addressData.locality || null);
5265
+ } else {
5266
+ setLocality(addressData.locality || null);
5267
+ }
5268
+ isInitialized.current = true;
5269
+ lastSyncedAddress.current = JSON.stringify(addressData);
5270
+ console.log("AddFixFillAddress: Fully Initialized");
5229
5271
  } else {
5230
- setLocality(addressData.locality || null);
5272
+ console.log("AddFixFillAddress: Waiting for localities to load for city:", cityObj === null || cityObj === void 0 ? void 0 : cityObj.code);
5231
5273
  }
5232
- isInitialized.current = true;
5233
- lastSyncedAddress.current = JSON.stringify(addressData);
5234
5274
  }
5235
- }, [formData === null || formData === void 0 ? void 0 : formData.address, allCities, fetchedLocalities]);
5275
+ }, [formData === null || formData === void 0 ? void 0 : formData.address, city, allCities, fetchedLocalities]);
5236
5276
  useEffect(() => {
5237
5277
  if (!navigator.geolocation) return;
5238
5278
  navigator.geolocation.getCurrentPosition(pos => {
@@ -5256,7 +5296,7 @@ const AddFixFillAddress = ({
5256
5296
  }
5257
5297
  }, [selectedAddress]);
5258
5298
  useEffect(() => {
5259
- if (!onSelect) return;
5299
+ if (!onSelect || !isInitialized.current) return;
5260
5300
  const currentAddress = {
5261
5301
  pincode: pincode || "",
5262
5302
  city: (city === null || city === void 0 ? void 0 : city.code) || city || null,
@@ -5276,10 +5316,13 @@ const AddFixFillAddress = ({
5276
5316
  onSelect((config === null || config === void 0 ? void 0 : config.key) || "address", currentAddress);
5277
5317
  }
5278
5318
  }, [pincode, city, locality, houseNo, landmark, addressLine1, addressLine2, streetName, addressType, latitude, longitude]);
5279
- return /*#__PURE__*/React.createElement(FormStep, {
5280
- config: config,
5281
- t: t,
5282
- isDisabled: !houseNo || !city || !locality || !pincode || !addressLine1 || !streetName || !addressLine2
5319
+ return /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
5320
+ style: {
5321
+ display: "grid",
5322
+ gridTemplateColumns: "1fr 1fr",
5323
+ columnGap: "32px",
5324
+ rowGap: "8px"
5325
+ }
5283
5326
  }, (userDetails === null || userDetails === void 0 ? void 0 : (_userDetails$addresse = userDetails.addresses) === null || _userDetails$addresse === void 0 ? void 0 : _userDetails$addresse.length) > 0 && /*#__PURE__*/React.createElement("div", {
5284
5327
  style: {
5285
5328
  gridColumn: "span 2"
@@ -5347,7 +5390,7 @@ const AddFixFillAddress = ({
5347
5390
  value: pincode,
5348
5391
  onChange: e => setPincode(e.target.value),
5349
5392
  maxLength: 6
5350
- })));
5393
+ }))));
5351
5394
  };
5352
5395
 
5353
5396
  const AddFillingPointAddress = () => {
@@ -5421,16 +5464,13 @@ const AddFillingPointAddress = () => {
5421
5464
  const {
5422
5465
  mutate: createFillingPoint
5423
5466
  } = Digit.Hooks.wt.useCreateFillPoint(tenantId);
5424
- const {
5425
- mutate: updateFillingPoint
5426
- } = Digit.Hooks.wt.useUpdateFillPoint(tenantId);
5427
5467
  const handleSubmit = e => {
5428
5468
  if (e && e.preventDefault) e.preventDefault();
5429
5469
  const payload = fillingPointPayload({
5430
5470
  ...formData,
5431
5471
  tenantId
5432
5472
  });
5433
- const mutation = editId ? updateFillingPoint : createFillingPoint;
5473
+ const mutation = createFillingPoint;
5434
5474
  mutation(payload, {
5435
5475
  onSuccess: () => {
5436
5476
  setShowToast({
@@ -5453,7 +5493,6 @@ const AddFillingPointAddress = () => {
5453
5493
  return /*#__PURE__*/React.createElement("div", {
5454
5494
  style: {
5455
5495
  display: "flex",
5456
- gap: "24px",
5457
5496
  flexDirection: isMobile ? "column" : "row"
5458
5497
  }
5459
5498
  }, /*#__PURE__*/React.createElement(Timeline, {
@@ -5506,44 +5545,50 @@ const AddFixPointAddress = () => {
5506
5545
  const [formData, setFormData] = useState({});
5507
5546
  const [showToast, setShowToast] = useState(null);
5508
5547
  const tenantId = Digit.ULBService.getCurrentTenantId();
5509
- const {
5510
- isLoading: isEditLoading,
5511
- data: editData
5512
- } = Digit.Hooks.wt.useFixedPointSearchAPI({
5548
+ const searchFilters = React.useMemo(() => ({
5513
5549
  tenantId,
5514
5550
  filters: {
5515
5551
  bookingId: editId
5516
5552
  }
5517
- }, {
5553
+ }), [tenantId, editId]);
5554
+ const searchConfig = React.useMemo(() => ({
5518
5555
  enabled: !!editId
5519
- });
5556
+ }), [editId]);
5557
+ const {
5558
+ isLoading: isEditLoading,
5559
+ data: editData
5560
+ } = Digit.Hooks.wt.useFixedPointSearchAPI(searchFilters, searchConfig);
5561
+ const [isDataFetched, setIsDataFetched] = useState(false);
5520
5562
  useEffect(() => {
5521
- console.log("Edit ID:", editId);
5522
- console.log("Search Result:", editData);
5523
- if (editId && editData !== null && editData !== void 0 && editData.waterTankerBookingDetail) {
5563
+ if (editId && editData !== null && editData !== void 0 && editData.waterTankerBookingDetail && !isDataFetched) {
5524
5564
  const data = editData.waterTankerBookingDetail.find(item => item.bookingId === editId);
5525
5565
  if (data) {
5526
- var _data$applicantDetail, _data$applicantDetail2, _data$applicantDetail3, _data$applicantDetail4;
5566
+ var _data$applicantDetail, _data$applicantDetail2, _data$applicantDetail3, _data$applicantDetail4, _data$applicantDetail5, _data$address, _data$address2;
5527
5567
  setFormData({
5528
5568
  owner: {
5529
5569
  name: (_data$applicantDetail = data.applicantDetail) === null || _data$applicantDetail === void 0 ? void 0 : _data$applicantDetail.name,
5530
5570
  mobileNumber: (_data$applicantDetail2 = data.applicantDetail) === null || _data$applicantDetail2 === void 0 ? void 0 : _data$applicantDetail2.mobileNumber,
5531
5571
  alternateNumber: (_data$applicantDetail3 = data.applicantDetail) === null || _data$applicantDetail3 === void 0 ? void 0 : _data$applicantDetail3.alternateNumber,
5532
- emailId: (_data$applicantDetail4 = data.applicantDetail) === null || _data$applicantDetail4 === void 0 ? void 0 : _data$applicantDetail4.emailId
5572
+ emailId: (_data$applicantDetail4 = data.applicantDetail) === null || _data$applicantDetail4 === void 0 ? void 0 : _data$applicantDetail4.emailId,
5573
+ applicantId: (_data$applicantDetail5 = data.applicantDetail) === null || _data$applicantDetail5 === void 0 ? void 0 : _data$applicantDetail5.applicantId
5533
5574
  },
5534
5575
  address: {
5535
- ...data.address
5576
+ ...data.address,
5577
+ addressId: (_data$address = data.address) === null || _data$address === void 0 ? void 0 : _data$address.addressId,
5578
+ applicantId: (_data$address2 = data.address) === null || _data$address2 === void 0 ? void 0 : _data$address2.applicantId
5536
5579
  },
5537
5580
  bookingId: data.bookingId,
5581
+ bookingNo: data.bookingNo,
5538
5582
  auditDetails: data.auditDetails
5539
5583
  });
5584
+ setIsDataFetched(true);
5540
5585
  }
5541
5586
  }
5542
- }, [editData, editId]);
5543
- const addressConfig = {
5587
+ }, [editData, editId, isDataFetched]);
5588
+ const addressConfig = React.useMemo(() => ({
5544
5589
  key: "address"
5545
- };
5546
- const handleSelect = (key, data) => {
5590
+ }), []);
5591
+ const handleSelect = React.useCallback((key, data) => {
5547
5592
  setFormData(prev => ({
5548
5593
  ...prev,
5549
5594
  [key]: {
@@ -5551,7 +5596,7 @@ const AddFixPointAddress = () => {
5551
5596
  ...data
5552
5597
  }
5553
5598
  }));
5554
- };
5599
+ }, []);
5555
5600
  const {
5556
5601
  mutate: createFixedPoint
5557
5602
  } = Digit.Hooks.wt.useCreateFixedPoint(tenantId);
@@ -5559,10 +5604,12 @@ const AddFixPointAddress = () => {
5559
5604
  mutate: updateFixedPoint
5560
5605
  } = Digit.Hooks.wt.useUpdateFixedPoint(tenantId);
5561
5606
  const handleSubmit = e => {
5607
+ console.log("Submitting Form Data:", formData);
5562
5608
  const payload = fixedPointPayload({
5563
5609
  ...formData,
5564
5610
  tenantId
5565
5611
  });
5612
+ console.log("Generated Payload:", payload);
5566
5613
  const mutation = editId ? updateFixedPoint : createFixedPoint;
5567
5614
  mutation(payload, {
5568
5615
  onSuccess: () => {
@@ -5577,6 +5624,7 @@ const AddFixPointAddress = () => {
5577
5624
  },
5578
5625
  onError: error => {
5579
5626
  var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
5627
+ console.error("Mutation Error:", error);
5580
5628
  setShowToast({
5581
5629
  label: (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || (editId ? t("WT_FILLING_POINT_UPDATED_ERROR") : t("WT_FILLING_POINT_CREATED_ERROR")),
5582
5630
  isError: true
@@ -5647,20 +5695,6 @@ const AddFixPointAddress = () => {
5647
5695
  display: "flex",
5648
5696
  flexDirection: "column"
5649
5697
  }
5650
- }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_ALT_MOBILE_NUMBER")}`), /*#__PURE__*/React.createElement(MobileNumber, {
5651
- value: formData === null || formData === void 0 ? void 0 : (_formData$owner3 = formData.owner) === null || _formData$owner3 === void 0 ? void 0 : _formData$owner3.alternateNumber,
5652
- name: "alternateNumber",
5653
- onChange: value => handleSelect("owner", {
5654
- alternateNumber: value
5655
- }),
5656
- style: {
5657
- width: "100%"
5658
- }
5659
- })), /*#__PURE__*/React.createElement("div", {
5660
- style: {
5661
- display: "flex",
5662
- flexDirection: "column"
5663
- }
5664
5698
  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_EMAIL_ID")}`, " ", /*#__PURE__*/React.createElement("span", {
5665
5699
  className: "astericColor"
5666
5700
  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
@@ -5668,18 +5702,33 @@ const AddFixPointAddress = () => {
5668
5702
  type: "email",
5669
5703
  isMandatory: true,
5670
5704
  name: "emailId",
5671
- value: formData === null || formData === void 0 ? void 0 : (_formData$owner4 = formData.owner) === null || _formData$owner4 === void 0 ? void 0 : _formData$owner4.emailId,
5705
+ value: formData === null || formData === void 0 ? void 0 : (_formData$owner3 = formData.owner) === null || _formData$owner3 === void 0 ? void 0 : _formData$owner3.emailId,
5672
5706
  style: {
5673
5707
  width: "100%"
5674
5708
  },
5675
5709
  onChange: e => handleSelect("owner", {
5676
5710
  emailId: e.target.value
5677
5711
  })
5712
+ })), /*#__PURE__*/React.createElement("div", {
5713
+ style: {
5714
+ display: "flex",
5715
+ flexDirection: "column"
5716
+ }
5717
+ }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_ALT_MOBILE_NUMBER")}`), /*#__PURE__*/React.createElement(MobileNumber, {
5718
+ value: formData === null || formData === void 0 ? void 0 : (_formData$owner4 = formData.owner) === null || _formData$owner4 === void 0 ? void 0 : _formData$owner4.alternateNumber,
5719
+ name: "alternateNumber",
5720
+ onChange: value => handleSelect("owner", {
5721
+ alternateNumber: value
5722
+ }),
5723
+ style: {
5724
+ width: "100%"
5725
+ }
5678
5726
  })))), /*#__PURE__*/React.createElement(AddFixFillAddress, {
5679
5727
  t: t,
5680
5728
  config: addressConfig,
5681
5729
  onSelect: handleSelect,
5682
- formData: formData
5730
+ formData: formData,
5731
+ isEdit: !!editId
5683
5732
  }), /*#__PURE__*/React.createElement("div", {
5684
5733
  style: {
5685
5734
  display: "flex",
@@ -5722,14 +5771,14 @@ const SearchFillingPointAddress = () => {
5722
5771
  isLoading: isFillingLoading,
5723
5772
  data: fillingPointData,
5724
5773
  refetch: refetchFilling
5725
- } = Digit.Hooks.wt.useTankerSearchAPI({
5774
+ } = Digit.Hooks.wt.useFillPointSearch({
5726
5775
  tenantId,
5727
5776
  filters: searchParams
5728
5777
  }, {
5729
5778
  enabled: selectedTab === "FILLING_POINT"
5730
5779
  });
5731
5780
  const isLoading = selectedTab === "FIXED_POINT" ? isFixedLoading : isFillingLoading;
5732
- const tableData = (selectedTab === "FIXED_POINT" ? fixedPointData === null || fixedPointData === void 0 ? void 0 : fixedPointData.waterTankerBookingDetail : fillingPointData === null || fillingPointData === void 0 ? void 0 : fillingPointData.waterTankerBookingDetail) || [];
5781
+ const tableData = (selectedTab === "FIXED_POINT" ? fixedPointData === null || fixedPointData === void 0 ? void 0 : fixedPointData.waterTankerBookingDetail : fillingPointData === null || fillingPointData === void 0 ? void 0 : fillingPointData.fillingPoints) || [];
5733
5782
  const searchConfig = {
5734
5783
  FIXED_POINT: {
5735
5784
  label: "WT_FIXED_POINT_NAME",
@@ -5769,6 +5818,7 @@ const SearchFillingPointAddress = () => {
5769
5818
  const onTabChange = tab => {
5770
5819
  setSelectedTab(tab);
5771
5820
  clearSearch();
5821
+ setSearchParams({});
5772
5822
  };
5773
5823
  const onAddClick = () => {
5774
5824
  setShowAddMenu(prev => !prev);
@@ -5782,11 +5832,16 @@ const SearchFillingPointAddress = () => {
5782
5832
  setShowAddMenu(false);
5783
5833
  };
5784
5834
  const onSearch = () => {
5785
- setSearchParams({
5835
+ const filters = {
5786
5836
  name: searchValue,
5787
- mobileNumber: mobileNumber,
5837
+ ...(selectedTab === "FILLING_POINT" ? {
5838
+ mobileNo: mobileNumber
5839
+ } : {
5840
+ mobileNumber: mobileNumber
5841
+ }),
5788
5842
  status: status === null || status === void 0 ? void 0 : status.code
5789
- });
5843
+ };
5844
+ setSearchParams(filters);
5790
5845
  };
5791
5846
  const columns = React.useMemo(() => {
5792
5847
  if (selectedTab === "FIXED_POINT") {
@@ -5825,27 +5880,18 @@ const SearchFillingPointAddress = () => {
5825
5880
  } else {
5826
5881
  return [{
5827
5882
  Header: t("WT_FILLING_POINT_NAME"),
5828
- accessor: row => {
5829
- var _row$fillingpointmeta;
5830
- return (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta = row.fillingpointmetadata) === null || _row$fillingpointmeta === void 0 ? void 0 : _row$fillingpointmeta.name) || "NA";
5831
- },
5883
+ accessor: row => (row === null || row === void 0 ? void 0 : row.fillingPointName) || "NA",
5832
5884
  id: "fillingPointName",
5833
5885
  Cell: ({
5834
5886
  row
5835
- }) => {
5836
- var _row$original$filling;
5837
- return /*#__PURE__*/React.createElement("span", {
5838
- className: "link"
5839
- }, /*#__PURE__*/React.createElement(Link, {
5840
- to: `/digit-ui/employee/wt/add-filling-point-address?id=${row.original.bookingId}`
5841
- }, ((_row$original$filling = row.original.fillingpointmetadata) === null || _row$original$filling === void 0 ? void 0 : _row$original$filling.name) || "NA"));
5842
- }
5887
+ }) => /*#__PURE__*/React.createElement("span", {
5888
+ className: "link"
5889
+ }, /*#__PURE__*/React.createElement(Link, {
5890
+ to: `/digit-ui/employee/wt/add-filling-point-address?id=${row.original.id}`
5891
+ }, row.original.fillingPointName || "NA"))
5843
5892
  }, {
5844
5893
  Header: t("WT_JE_NAME"),
5845
- accessor: row => {
5846
- var _row$fillingpointmeta2;
5847
- return (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta2 = row.fillingpointmetadata) === null || _row$fillingpointmeta2 === void 0 ? void 0 : _row$fillingpointmeta2.jeName) || "NA";
5848
- },
5894
+ accessor: row => (row === null || row === void 0 ? void 0 : row.jeName) || "NA",
5849
5895
  id: "jeName"
5850
5896
  }, {
5851
5897
  Header: t("WT_LOCALITY"),
@@ -17274,7 +17320,7 @@ const configWTApproverApplication = ({
17274
17320
  required: true
17275
17321
  }
17276
17322
  }
17277
- }, (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" ? {
17323
+ }, (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" && (action === null || action === void 0 ? void 0 : action.action) !== "ASSIGN_VEHICLE_DRIVER" ? {
17278
17324
  label: t("RS_ASSIGN"),
17279
17325
  type: "dropdown",
17280
17326
  populators: /*#__PURE__*/React.createElement(Dropdown, {
@@ -17284,7 +17330,7 @@ const configWTApproverApplication = ({
17284
17330
  select: setSelectedVendor,
17285
17331
  selected: selectedVendor
17286
17332
  })
17287
- } : "null", (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" ? {
17333
+ } : "null", (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER" ? {
17288
17334
  label: t("RS_REGISTRATION_NUMBER"),
17289
17335
  type: "dropdown",
17290
17336
  populators: /*#__PURE__*/React.createElement(Dropdown, {
@@ -17347,7 +17393,7 @@ const ActionModal$b = ({
17347
17393
  cardFormClassName,
17348
17394
  formClassName
17349
17395
  }) => {
17350
- var _action$assigneeRoles, _action$assigneeRoles2, _dsoData$vendor, _vehicleData$vehicle;
17396
+ var _action$assigneeRoles, _action$assigneeRoles2, _dsoData$vendor, _vehicleData$vehicle, _vehicleData$vehicle$;
17351
17397
  const {
17352
17398
  data: approverData,
17353
17399
  isLoading: PTALoading
@@ -17368,7 +17414,7 @@ const ActionModal$b = ({
17368
17414
  } = Digit.Hooks.fsm.useVendorSearch({
17369
17415
  tenantId,
17370
17416
  config: {
17371
- enabled: (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN"
17417
+ enabled: (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER"
17372
17418
  }
17373
17419
  });
17374
17420
  let vendorDescription = [];
@@ -17391,17 +17437,22 @@ const ActionModal$b = ({
17391
17437
  } = Digit.Hooks.fsm.useVehiclesSearch({
17392
17438
  tenantId,
17393
17439
  config: {
17394
- enabled: (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING"
17440
+ enabled: (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER"
17395
17441
  }
17396
17442
  });
17397
17443
  let vehicleDescription = [];
17398
- vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$vehicle = vehicleData.vehicle) === null || _vehicleData$vehicle === void 0 ? void 0 : _vehicleData$vehicle.map(item => {
17444
+ vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$vehicle = vehicleData.vehicle) === null || _vehicleData$vehicle === void 0 ? void 0 : (_vehicleData$vehicle$ = _vehicleData$vehicle.filter(item => {
17445
+ var _item$driverData, _item$driver;
17446
+ return (item === null || item === void 0 ? void 0 : (_item$driverData = item.driverData) === null || _item$driverData === void 0 ? void 0 : _item$driverData.id) || (item === null || item === void 0 ? void 0 : (_item$driver = item.driver) === null || _item$driver === void 0 ? void 0 : _item$driver.id);
17447
+ })) === null || _vehicleData$vehicle$ === void 0 ? void 0 : _vehicleData$vehicle$.map(item => {
17448
+ var _item$driverData2, _item$driver2;
17399
17449
  vehicleDescription.push({
17400
17450
  code: item === null || item === void 0 ? void 0 : item.registrationNumber,
17401
17451
  name: item === null || item === void 0 ? void 0 : item.registrationNumber,
17402
17452
  i18nKey: item === null || item === void 0 ? void 0 : item.registrationNumber,
17403
17453
  tankerCapacity: item === null || item === void 0 ? void 0 : item.tankCapacity,
17404
- vehicleId: item === null || item === void 0 ? void 0 : item.id
17454
+ vehicleId: item === null || item === void 0 ? void 0 : item.id,
17455
+ driverId: (item === null || item === void 0 ? void 0 : (_item$driverData2 = item.driverData) === null || _item$driverData2 === void 0 ? void 0 : _item$driverData2.ownerId) || (item === null || item === void 0 ? void 0 : (_item$driver2 = item.driver) === null || _item$driver2 === void 0 ? void 0 : _item$driver2.ownerId)
17405
17456
  });
17406
17457
  });
17407
17458
  const [config, setConfig] = useState({});
@@ -17466,6 +17517,10 @@ const ActionModal$b = ({
17466
17517
  if ((action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING") {
17467
17518
  applicationData.vehicleId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.vehicleId;
17468
17519
  }
17520
+ if ((action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER") {
17521
+ applicationData.vehicleId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.vehicleId;
17522
+ applicationData.driverId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.driverId;
17523
+ }
17469
17524
  let requestPayload = businessService === "watertanker" ? {
17470
17525
  waterTankerBookingDetail: {
17471
17526
  ...applicationData,
@@ -17490,7 +17545,7 @@ const ActionModal$b = ({
17490
17545
  selectedVendor,
17491
17546
  setSelectedVendor,
17492
17547
  vendorDescription: dsoData ? vendorDescription : undefined,
17493
- vehicleDescription: vehicleData ? vehicleDescription : undefined,
17548
+ vehicleDescription: vehicleData || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER" ? vehicleDescription : undefined,
17494
17549
  selectVehicle,
17495
17550
  setSelectVehicle
17496
17551
  }));