@djb25/digit-ui-module-ws 1.0.21 → 1.0.23

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 +84 -58
  4. package/dist/index.modern.js.map +1 -1
  5. package/package.json +1 -1
package/dist/index.modern.js CHANGED
@@ -441,12 +441,12 @@ const getFiles = async (filesArray, tenant) => {
441
441
  response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && (_response$data$fileSt = _response$data.fileStoreIds) !== null && _response$data$fileSt !== void 0 && (_response$data$fileSt2 = _response$data$fileSt[0]) !== null && _response$data$fileSt2 !== void 0 && _response$data$fileSt2.url ? window.open(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$fileS = _response$data2.fileStoreIds) === null || _response$data2$fileS === void 0 ? void 0 : (_response$data2$fileS2 = _response$data2$fileS[0]) === null || _response$data2$fileS2 === void 0 ? void 0 : _response$data2$fileS2.url) : null;
442
442
  };
443
443
  const createPayloadOfWS = async data => {
444
- var _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$applicationSele2, _data$ConnectionHolde, _data$useDetails, _data$useDetails2, _data$useDetails3, _data$useDetails3$pro, _connectionDetailsObj, _connectionDetailsObj2, _data$useDetails4, _data$useDetails4$pro, _connectionDetailsObj3, _connectionDetailsObj4, _data$useDetails5, _data$useDetails6, _data$useDetails7, _data$useDetails8, _connectionHolder$gen, _connectionHolder$own, _connectionHolder$rel, _data$propertyAddress, _data$applicant, _data$useDetails9, _data$useDetails9$gen, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$applicationSele3, _data$applicationSele4, _data$contact2, _data$cpt2, _data$cpt3, _data$cpt3$details, _data$zro, _data$propertyAddress2, _data$propertyAddress3, _data$cpt4, _data$cpt4$details, _data$cpt4$details$ad, _data$cpt4$details$ad2, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _data$applicationSele8, _connectionDetailsObj5, _data$applicationSele9, _data$applicationSele0, _connectionHolder$own2, _data$applicationSele1, _data$applicationSele10, _data$applicationSele11, _data$applicationSele12, _data$applicationSele13, _data$applicationSele14, _data$applicationSele15, _data$applicationSele16, _data$applicationSele17, _data$applicationSele18, _data$applicationSele19, _data$applicationSele20, _data$applicationSele21, _data$applicationSele22, _data$applicationSele23, _data$contact3, _data$documents, _data$documents2, _data$documents3, _data$cpt5, _data$cpt5$details, _data$cpt5$details$te, _data$propertyAddress4, _data$propertyAddress5, _data$propertyAddress6, _data$cpt6, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
444
+ var _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$applicationSele2, _data$ConnectionHolde, _data$useDetails, _data$useDetails2, _data$useDetails3, _data$useDetails3$pro, _connectionDetailsObj, _connectionDetailsObj2, _data$useDetails4, _data$useDetails4$pro, _connectionDetailsObj3, _connectionDetailsObj4, _data$useDetails5, _data$useDetails6, _data$useDetails7, _data$useDetails8, _connectionHolder$gen, _data$cpt2, _data$cpt2$details, _data$cpt2$details$ow, _data$cpt2$details$ow2, _connectionHolder$own, _connectionHolder$rel, _data$propertyAddress, _data$applicant, _data$useDetails9, _data$useDetails9$gen, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$applicationSele3, _data$applicationSele4, _data$contact2, _data$cpt3, _data$cpt4, _data$cpt4$details, _data$roadCuttingDeta, _data$plumberDetails, _data$zro, _data$propertyAddress2, _data$propertyAddress3, _data$cpt5, _data$cpt5$details, _data$cpt5$details$ad, _data$cpt5$details$ad2, _data$plumberDetails2, _data$plumberDetails3, _data$plumberDetails4, _data$plumberDetails5, _data$plumberDetails6, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _data$applicationSele8, _connectionDetailsObj5, _data$applicationSele9, _data$applicationSele0, _connectionHolder$own2, _data$applicationSele1, _data$applicationSele10, _data$applicationSele11, _data$applicationSele12, _data$applicationSele13, _data$applicationSele14, _data$applicationSele15, _data$applicationSele16, _data$applicationSele17, _data$applicationSele18, _data$applicationSele19, _data$applicationSele20, _data$applicationSele21, _data$applicationSele22, _data$applicationSele23, _data$contact3, _data$documents, _data$documents2, _data$documents3, _data$cpt6, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
445
445
  data === null || data === void 0 ? void 0 : (_data$cpt = data.cpt) === null || _data$cpt === void 0 ? void 0 : (_data$cpt$details = _data$cpt.details) === null || _data$cpt$details === void 0 ? void 0 : (_data$cpt$details$own = _data$cpt$details.owners) === null || _data$cpt$details$own === void 0 ? void 0 : _data$cpt$details$own.forEach(owner => {
446
446
  if (owner !== null && owner !== void 0 && owner.permanentAddress) owner.correspondenceAddress = owner === null || owner === void 0 ? void 0 : owner.permanentAddress;
447
447
  });
448
448
  const serviceType = data === null || data === void 0 ? void 0 : (_data$applicationSele = data.applicationSelection) === null || _data$applicationSele === void 0 ? void 0 : (_data$applicationSele2 = _data$applicationSele.serviceType) === null || _data$applicationSele2 === void 0 ? void 0 : _data$applicationSele2.code;
449
- const connectionDetailsArray = Array.isArray(data === null || data === void 0 ? void 0 : data.ConnectionDetails) ? data.ConnectionDetails : data !== null && data !== void 0 && data.ConnectionDetails ? Object.values(data.ConnectionDetails).filter(i => typeof i === 'object') : [];
449
+ const connectionDetailsArray = Array.isArray(data === null || data === void 0 ? void 0 : data.ConnectionDetails) ? data.ConnectionDetails : data !== null && data !== void 0 && data.ConnectionDetails ? Object.values(data.ConnectionDetails).filter(i => typeof i === "object") : [];
450
450
  const connectionDetail = (connectionDetailsArray === null || connectionDetailsArray === void 0 ? void 0 : connectionDetailsArray[0]) || (data === null || data === void 0 ? void 0 : data.ConnectionDetails) || {};
451
451
  const isWater = serviceType === "WATER" || serviceType === "BOTH" || (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.water);
452
452
  const isSewerage = serviceType === "SEWERAGE" || serviceType === "BOTH" || (connectionDetail === null || connectionDetail === void 0 ? void 0 : connectionDetail.sewerage);
@@ -464,7 +464,7 @@ const createPayloadOfWS = async data => {
464
464
  correspondenceAddress: (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.address) || (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.correspondenceAddress) || "",
465
465
  fatherOrHusbandName: (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.guardian) || (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.fatherOrHusbandName) || "",
466
466
  gender: (connectionHolder === null || connectionHolder === void 0 ? void 0 : (_connectionHolder$gen = connectionHolder.gender) === null || _connectionHolder$gen === void 0 ? void 0 : _connectionHolder$gen.code) || (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.gender) || "",
467
- mobileNumber: (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.mobileNumber) || "",
467
+ mobileNumber: (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.mobileNumber) || (data === null || data === void 0 ? void 0 : (_data$cpt2 = data.cpt) === null || _data$cpt2 === void 0 ? void 0 : (_data$cpt2$details = _data$cpt2.details) === null || _data$cpt2$details === void 0 ? void 0 : (_data$cpt2$details$ow = _data$cpt2$details.owners) === null || _data$cpt2$details$ow === void 0 ? void 0 : (_data$cpt2$details$ow2 = _data$cpt2$details$ow[0]) === null || _data$cpt2$details$ow2 === void 0 ? void 0 : _data$cpt2$details$ow2.mobileNumber) || "",
468
468
  name: (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.name) || "",
469
469
  ownerType: (connectionHolder === null || connectionHolder === void 0 ? void 0 : (_connectionHolder$own = connectionHolder.ownerType) === null || _connectionHolder$own === void 0 ? void 0 : _connectionHolder$own.code) || (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.ownerType) || "",
470
470
  relationship: (connectionHolder === null || connectionHolder === void 0 ? void 0 : (_connectionHolder$rel = connectionHolder.relationship) === null || _connectionHolder$rel === void 0 ? void 0 : _connectionHolder$rel.code) || (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.relationship) || "OTHERS",
@@ -482,18 +482,42 @@ const createPayloadOfWS = async data => {
482
482
  emailId: (data === null || data === void 0 ? void 0 : (_data$contact2 = data.contact) === null || _data$contact2 === void 0 ? void 0 : _data$contact2.emailId) || ""
483
483
  }],
484
484
  service: isWater && !isSewerage ? "Water" : !isWater && isSewerage ? "Sewerage" : "Water And Sewerage",
485
- property: data === null || data === void 0 ? void 0 : (_data$cpt2 = data.cpt) === null || _data$cpt2 === void 0 ? void 0 : _data$cpt2.details,
486
- propertyId: data === null || data === void 0 ? void 0 : (_data$cpt3 = data.cpt) === null || _data$cpt3 === void 0 ? void 0 : (_data$cpt3$details = _data$cpt3.details) === null || _data$cpt3$details === void 0 ? void 0 : _data$cpt3$details.propertyId,
485
+ property: data === null || data === void 0 ? void 0 : (_data$cpt3 = data.cpt) === null || _data$cpt3 === void 0 ? void 0 : _data$cpt3.details,
486
+ propertyId: data === null || data === void 0 ? void 0 : (_data$cpt4 = data.cpt) === null || _data$cpt4 === void 0 ? void 0 : (_data$cpt4$details = _data$cpt4.details) === null || _data$cpt4$details === void 0 ? void 0 : _data$cpt4$details.propertyId,
487
+ roadCuttingInfo: data === null || data === void 0 ? void 0 : (_data$roadCuttingDeta = data.roadCuttingDetails) === null || _data$roadCuttingDeta === void 0 ? void 0 : _data$roadCuttingDeta.filter(o => {
488
+ var _o$roadType;
489
+ return (o === null || o === void 0 ? void 0 : (_o$roadType = o.roadType) === null || _o$roadType === void 0 ? void 0 : _o$roadType.code) !== "";
490
+ }).map(details => {
491
+ var _details$roadType, _details$roadType2;
492
+ return details !== null && details !== void 0 && details.id && (details === null || details === void 0 ? void 0 : details.id) !== null ? {
493
+ id: details === null || details === void 0 ? void 0 : details.id,
494
+ roadType: details === null || details === void 0 ? void 0 : (_details$roadType = details.roadType) === null || _details$roadType === void 0 ? void 0 : _details$roadType.code,
495
+ roadCuttingArea: details === null || details === void 0 ? void 0 : details.area,
496
+ status: details === null || details === void 0 ? void 0 : details.status
497
+ } : {
498
+ roadType: details === null || details === void 0 ? void 0 : (_details$roadType2 = details.roadType) === null || _details$roadType2 === void 0 ? void 0 : _details$roadType2.code,
499
+ roadCuttingArea: details === null || details === void 0 ? void 0 : details.area
500
+ };
501
+ }),
487
502
  roadCuttingArea: null,
488
503
  noOfTaps: null,
489
504
  noOfWaterClosets: null,
490
505
  noOfToilets: null,
506
+ plumberInfo: data === null || data === void 0 ? void 0 : (_data$plumberDetails = data.plumberDetails) === null || _data$plumberDetails === void 0 ? void 0 : _data$plumberDetails.filter(o => {
507
+ var _o$detailsProvidedBy;
508
+ return (o === null || o === void 0 ? void 0 : (_o$detailsProvidedBy = o.detailsProvidedBy) === null || _o$detailsProvidedBy === void 0 ? void 0 : _o$detailsProvidedBy.code) === "ULB" || (o === null || o === void 0 ? void 0 : o.detailsProvidedBy) === "ULB";
509
+ }).map(details => ({
510
+ licenseNo: details === null || details === void 0 ? void 0 : details.plumberLicenseNo,
511
+ name: details === null || details === void 0 ? void 0 : details.plumberName,
512
+ mobileNumber: details === null || details === void 0 ? void 0 : details.plumberMobileNo
513
+ })),
491
514
  additionalDetails: {
492
515
  ...useDetailsObject,
493
516
  ...(data === null || data === void 0 ? void 0 : data.djbEmployee),
494
517
  ...(data === null || data === void 0 ? void 0 : data.bankDetails),
495
518
  zro: (data === null || data === void 0 ? void 0 : (_data$zro = data.zro) === null || _data$zro === void 0 ? void 0 : _data$zro.code) || (data === null || data === void 0 ? void 0 : data.zro),
496
- locality: (data === null || data === void 0 ? void 0 : (_data$propertyAddress2 = data.propertyAddress) === null || _data$propertyAddress2 === void 0 ? void 0 : (_data$propertyAddress3 = _data$propertyAddress2.locality) === null || _data$propertyAddress3 === void 0 ? void 0 : _data$propertyAddress3.code) || (data === null || data === void 0 ? void 0 : (_data$cpt4 = data.cpt) === null || _data$cpt4 === void 0 ? void 0 : (_data$cpt4$details = _data$cpt4.details) === null || _data$cpt4$details === void 0 ? void 0 : (_data$cpt4$details$ad = _data$cpt4$details.address) === null || _data$cpt4$details$ad === void 0 ? void 0 : (_data$cpt4$details$ad2 = _data$cpt4$details$ad.locality) === null || _data$cpt4$details$ad2 === void 0 ? void 0 : _data$cpt4$details$ad2.code),
519
+ locality: (data === null || data === void 0 ? void 0 : (_data$propertyAddress2 = data.propertyAddress) === null || _data$propertyAddress2 === void 0 ? void 0 : (_data$propertyAddress3 = _data$propertyAddress2.locality) === null || _data$propertyAddress3 === void 0 ? void 0 : _data$propertyAddress3.code) || (data === null || data === void 0 ? void 0 : (_data$cpt5 = data.cpt) === null || _data$cpt5 === void 0 ? void 0 : (_data$cpt5$details = _data$cpt5.details) === null || _data$cpt5$details === void 0 ? void 0 : (_data$cpt5$details$ad = _data$cpt5$details.address) === null || _data$cpt5$details$ad === void 0 ? void 0 : (_data$cpt5$details$ad2 = _data$cpt5$details$ad.locality) === null || _data$cpt5$details$ad2 === void 0 ? void 0 : _data$cpt5$details$ad2.code),
520
+ detailsProvidedBy: (data === null || data === void 0 ? void 0 : (_data$plumberDetails2 = data.plumberDetails) === null || _data$plumberDetails2 === void 0 ? void 0 : (_data$plumberDetails3 = _data$plumberDetails2[0]) === null || _data$plumberDetails3 === void 0 ? void 0 : (_data$plumberDetails4 = _data$plumberDetails3.detailsProvidedBy) === null || _data$plumberDetails4 === void 0 ? void 0 : _data$plumberDetails4.code) || (data === null || data === void 0 ? void 0 : (_data$plumberDetails5 = data.plumberDetails) === null || _data$plumberDetails5 === void 0 ? void 0 : (_data$plumberDetails6 = _data$plumberDetails5[0]) === null || _data$plumberDetails6 === void 0 ? void 0 : _data$plumberDetails6.detailsProvidedBy) || "",
497
521
  applicantType: data === null || data === void 0 ? void 0 : (_data$applicationSele5 = data.applicationSelection) === null || _data$applicationSele5 === void 0 ? void 0 : (_data$applicationSele6 = _data$applicationSele5.applicantType) === null || _data$applicationSele6 === void 0 ? void 0 : _data$applicationSele6.code,
498
522
  connectionType: (data === null || data === void 0 ? void 0 : (_data$applicationSele7 = data.applicationSelection) === null || _data$applicationSele7 === void 0 ? void 0 : (_data$applicationSele8 = _data$applicationSele7.connectionType) === null || _data$applicationSele8 === void 0 ? void 0 : _data$applicationSele8.code) || (connectionDetailsObject === null || connectionDetailsObject === void 0 ? void 0 : (_connectionDetailsObj5 = connectionDetailsObject.connectionType) === null || _connectionDetailsObj5 === void 0 ? void 0 : _connectionDetailsObj5.code) || (connectionDetailsObject === null || connectionDetailsObject === void 0 ? void 0 : connectionDetailsObject.connectionType) || "Metered",
499
523
  categoryType: (data === null || data === void 0 ? void 0 : (_data$applicationSele9 = data.applicationSelection) === null || _data$applicationSele9 === void 0 ? void 0 : (_data$applicationSele0 = _data$applicationSele9.categoryType) === null || _data$applicationSele0 === void 0 ? void 0 : _data$applicationSele0.code) || (connectionHolder === null || connectionHolder === void 0 ? void 0 : (_connectionHolder$own2 = connectionHolder.ownerType) === null || _connectionHolder$own2 === void 0 ? void 0 : _connectionHolder$own2.code) || (connectionHolder === null || connectionHolder === void 0 ? void 0 : connectionHolder.ownerType),
@@ -512,11 +536,11 @@ const createPayloadOfWS = async data => {
512
536
  otherDocumentNumber: data === null || data === void 0 ? void 0 : (_data$documents3 = data.documents) === null || _data$documents3 === void 0 ? void 0 : _data$documents3.otherDocumentNumber,
513
537
  detailsProvidedBy: ""
514
538
  },
515
- tenantId: (data === null || data === void 0 ? void 0 : (_data$cpt5 = data.cpt) === null || _data$cpt5 === void 0 ? void 0 : (_data$cpt5$details = _data$cpt5.details) === null || _data$cpt5$details === void 0 ? void 0 : (_data$cpt5$details$te = _data$cpt5$details.tenantId) === null || _data$cpt5$details$te === void 0 ? void 0 : _data$cpt5$details$te.split(".")[0]) || (data === null || data === void 0 ? void 0 : (_data$propertyAddress4 = data.propertyAddress) === null || _data$propertyAddress4 === void 0 ? void 0 : (_data$propertyAddress5 = _data$propertyAddress4.city) === null || _data$propertyAddress5 === void 0 ? void 0 : (_data$propertyAddress6 = _data$propertyAddress5.code) === null || _data$propertyAddress6 === void 0 ? void 0 : _data$propertyAddress6.split(".")[0]) || Digit.ULBService.getStateId(),
539
+ tenantId: Digit.ULBService.getCurrentTenantId(),
516
540
  processInstance: {
517
541
  action: "INITIATE"
518
542
  },
519
- channel: (data === null || data === void 0 ? void 0 : data.channel) || "CFC_COUNTER"
543
+ channel: Digit.UserService.getType() === "CITIZEN" ? "CITIZEN" : "CFC_COUNTER"
520
544
  };
521
545
  sessionStorage.setItem("WS_DOCUMENTS_INOF", JSON.stringify((data === null || data === void 0 ? void 0 : data.documents) || []));
522
546
  sessionStorage.setItem("WS_PROPERTY_INOF", JSON.stringify((data === null || data === void 0 ? void 0 : (_data$cpt6 = data.cpt) === null || _data$cpt6 === void 0 ? void 0 : _data$cpt6.details) || {}));
@@ -600,7 +624,7 @@ const convertToEditWSUpdate = data => {
600
624
  sameAsPropertyAddress: data === null || data === void 0 ? void 0 : (_data$ConnectionHolde12 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde12 === void 0 ? void 0 : _data$ConnectionHolde12.sameAsOwnerDetails
601
625
  }] : null : waterResult === null || waterResult === void 0 ? void 0 : waterResult.connectionHolders,
602
626
  oldApplication: false,
603
- channel: "CITIZEN",
627
+ channel: Digit.UserService.getType() === "CITIZEN" ? "CITIZEN" : "CFC_COUNTER",
604
628
  waterSource: (data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.waterSource : waterResult === null || waterResult === void 0 ? void 0 : waterResult.waterSource) || null,
605
629
  meterId: (data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.meterId : waterResult === null || waterResult === void 0 ? void 0 : waterResult.meterId) || null,
606
630
  meterInstallationDate: (data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.meterInstallationDate : waterResult === null || waterResult === void 0 ? void 0 : waterResult.meterInstallationDate) || null,
@@ -679,7 +703,7 @@ const convertToEditSWUpdate = data => {
679
703
  sameAsPropertyAddress: data === null || data === void 0 ? void 0 : (_data$ConnectionHolde25 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde25 === void 0 ? void 0 : _data$ConnectionHolde25.sameAsOwnerDetails
680
704
  }] : null : SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.connectionHolders,
681
705
  oldApplication: false,
682
- channel: "CITIZEN",
706
+ channel: Digit.UserService.getType() === "CITIZEN" ? "CITIZEN" : "CFC_COUNTER",
683
707
  waterSource: (data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.waterSource : SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.waterSource) || null,
684
708
  meterId: (data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.meterId : SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.meterId) || null,
685
709
  meterInstallationDate: (data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.meterInstallationDate : SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.meterInstallationDate) || null,
@@ -1525,7 +1549,7 @@ const convertDisonnectApplicationData = (data, serviceType, editByConfig = false
1525
1549
  return payload;
1526
1550
  };
1527
1551
  const convertDisonnectEditApplicationDetails = async (data, appData, actionData) => {
1528
- var _data$plumberDetails, _data$plumberDetails$, _data$plumberDetails2, _data$plumberDetails3, _data$plumberDetails4, _data$plumberDetails5, _appData$applicationD5, _appData$applicationD6, _appData$applicationD7, _data$DocumentsRequir2, _data$disConnectionDe, _data$disConnectionDe2, _data$disConnectionDe3, _data$disConnectionDe4, _data$disConnectionDe5, _data$disConnectionDe6, _data$plumberDetails6, _data$plumberDetails7, _data$plumberDetails8;
1552
+ var _data$plumberDetails7, _data$plumberDetails8, _data$plumberDetails9, _data$plumberDetails0, _data$plumberDetails1, _data$plumberDetails10, _appData$applicationD5, _appData$applicationD6, _appData$applicationD7, _data$DocumentsRequir2, _data$disConnectionDe, _data$disConnectionDe2, _data$disConnectionDe3, _data$disConnectionDe4, _data$disConnectionDe5, _data$disConnectionDe6, _data$plumberDetails11, _data$plumberDetails12, _data$plumberDetails13;
1529
1553
  const docs = sessionStorage.getItem("DISCONNECTION_EDIT_DOCS");
1530
1554
  const docsData = docs ? JSON.parse(docs) : "";
1531
1555
  const documentsData = [];
@@ -1546,9 +1570,9 @@ const convertDisonnectEditApplicationDetails = async (data, appData, actionData)
1546
1570
  documentsData.push(document);
1547
1571
  });
1548
1572
  const plumberInfo = [{
1549
- licenseNo: data === null || data === void 0 ? void 0 : (_data$plumberDetails = data.plumberDetails) === null || _data$plumberDetails === void 0 ? void 0 : (_data$plumberDetails$ = _data$plumberDetails[0]) === null || _data$plumberDetails$ === void 0 ? void 0 : _data$plumberDetails$.plumberLicenseNo,
1550
- mobileNumber: data === null || data === void 0 ? void 0 : (_data$plumberDetails2 = data.plumberDetails) === null || _data$plumberDetails2 === void 0 ? void 0 : (_data$plumberDetails3 = _data$plumberDetails2[0]) === null || _data$plumberDetails3 === void 0 ? void 0 : _data$plumberDetails3.plumberMobileNo,
1551
- name: data === null || data === void 0 ? void 0 : (_data$plumberDetails4 = data.plumberDetails) === null || _data$plumberDetails4 === void 0 ? void 0 : (_data$plumberDetails5 = _data$plumberDetails4[0]) === null || _data$plumberDetails5 === void 0 ? void 0 : _data$plumberDetails5.plumberName,
1573
+ licenseNo: data === null || data === void 0 ? void 0 : (_data$plumberDetails7 = data.plumberDetails) === null || _data$plumberDetails7 === void 0 ? void 0 : (_data$plumberDetails8 = _data$plumberDetails7[0]) === null || _data$plumberDetails8 === void 0 ? void 0 : _data$plumberDetails8.plumberLicenseNo,
1574
+ mobileNumber: data === null || data === void 0 ? void 0 : (_data$plumberDetails9 = data.plumberDetails) === null || _data$plumberDetails9 === void 0 ? void 0 : (_data$plumberDetails0 = _data$plumberDetails9[0]) === null || _data$plumberDetails0 === void 0 ? void 0 : _data$plumberDetails0.plumberMobileNo,
1575
+ name: data === null || data === void 0 ? void 0 : (_data$plumberDetails1 = data.plumberDetails) === null || _data$plumberDetails1 === void 0 ? void 0 : (_data$plumberDetails10 = _data$plumberDetails1[0]) === null || _data$plumberDetails10 === void 0 ? void 0 : _data$plumberDetails10.plumberName,
1552
1576
  id: appData === null || appData === void 0 ? void 0 : (_appData$applicationD5 = appData.applicationData) === null || _appData$applicationD5 === void 0 ? void 0 : (_appData$applicationD6 = _appData$applicationD5.plumberInfo) === null || _appData$applicationD6 === void 0 ? void 0 : (_appData$applicationD7 = _appData$applicationD6[0]) === null || _appData$applicationD7 === void 0 ? void 0 : _appData$applicationD7.id
1553
1577
  }];
1554
1578
  let payload = {
@@ -1562,10 +1586,10 @@ const convertDisonnectEditApplicationDetails = async (data, appData, actionData)
1562
1586
  },
1563
1587
  action: actionData ? actionData : "RESUBMIT_APPLICATION"
1564
1588
  };
1565
- if (data !== null && data !== void 0 && (_data$plumberDetails6 = data.plumberDetails) !== null && _data$plumberDetails6 !== void 0 && (_data$plumberDetails7 = _data$plumberDetails6[0]) !== null && _data$plumberDetails7 !== void 0 && (_data$plumberDetails8 = _data$plumberDetails7.detailsProvidedBy) !== null && _data$plumberDetails8 !== void 0 && _data$plumberDetails8.code) {
1566
- var _data$plumberDetails9, _data$plumberDetails0, _data$plumberDetails1, _data$plumberDetails10, _data$plumberDetails11, _data$plumberDetails12;
1567
- payload.additionalDetails.detailsProvidedBy = data === null || data === void 0 ? void 0 : (_data$plumberDetails9 = data.plumberDetails) === null || _data$plumberDetails9 === void 0 ? void 0 : (_data$plumberDetails0 = _data$plumberDetails9[0]) === null || _data$plumberDetails0 === void 0 ? void 0 : (_data$plumberDetails1 = _data$plumberDetails0.detailsProvidedBy) === null || _data$plumberDetails1 === void 0 ? void 0 : _data$plumberDetails1.code;
1568
- if ((data === null || data === void 0 ? void 0 : (_data$plumberDetails10 = data.plumberDetails) === null || _data$plumberDetails10 === void 0 ? void 0 : (_data$plumberDetails11 = _data$plumberDetails10[0]) === null || _data$plumberDetails11 === void 0 ? void 0 : (_data$plumberDetails12 = _data$plumberDetails11.detailsProvidedBy) === null || _data$plumberDetails12 === void 0 ? void 0 : _data$plumberDetails12.code) == "ULB") {
1589
+ if (data !== null && data !== void 0 && (_data$plumberDetails11 = data.plumberDetails) !== null && _data$plumberDetails11 !== void 0 && (_data$plumberDetails12 = _data$plumberDetails11[0]) !== null && _data$plumberDetails12 !== void 0 && (_data$plumberDetails13 = _data$plumberDetails12.detailsProvidedBy) !== null && _data$plumberDetails13 !== void 0 && _data$plumberDetails13.code) {
1590
+ var _data$plumberDetails14, _data$plumberDetails15, _data$plumberDetails16, _data$plumberDetails17, _data$plumberDetails18, _data$plumberDetails19;
1591
+ payload.additionalDetails.detailsProvidedBy = data === null || data === void 0 ? void 0 : (_data$plumberDetails14 = data.plumberDetails) === null || _data$plumberDetails14 === void 0 ? void 0 : (_data$plumberDetails15 = _data$plumberDetails14[0]) === null || _data$plumberDetails15 === void 0 ? void 0 : (_data$plumberDetails16 = _data$plumberDetails15.detailsProvidedBy) === null || _data$plumberDetails16 === void 0 ? void 0 : _data$plumberDetails16.code;
1592
+ if ((data === null || data === void 0 ? void 0 : (_data$plumberDetails17 = data.plumberDetails) === null || _data$plumberDetails17 === void 0 ? void 0 : (_data$plumberDetails18 = _data$plumberDetails17[0]) === null || _data$plumberDetails18 === void 0 ? void 0 : (_data$plumberDetails19 = _data$plumberDetails18.detailsProvidedBy) === null || _data$plumberDetails19 === void 0 ? void 0 : _data$plumberDetails19.code) == "ULB") {
1569
1593
  payload.plumberInfo = plumberInfo;
1570
1594
  }
1571
1595
  }
@@ -9724,7 +9748,7 @@ const WSWaterConnectionDetails = ({
9724
9748
  formData
9725
9749
  }) => {
9726
9750
  var _formData$waterConect, _formData$waterConect2;
9727
- const tenantId = Digit.ULBService.getStateId();
9751
+ const tenantId = Digit.ULBService.getCurrentTenantId();
9728
9752
  const [proposedTaps, setProposedTaps] = useState((formData === null || formData === void 0 ? void 0 : (_formData$waterConect = formData.waterConectionDetails) === null || _formData$waterConect === void 0 ? void 0 : _formData$waterConect.proposedTaps) || "");
9729
9753
  const [proposedPipeSize, setProposedPipeSize] = useState((formData === null || formData === void 0 ? void 0 : (_formData$waterConect2 = formData.waterConectionDetails) === null || _formData$waterConect2 === void 0 ? void 0 : _formData$waterConect2.proposedPipeSize) || "");
9730
9754
  const [isDisableForNext, setIsDisableForNext] = useState(false);
@@ -10967,6 +10991,7 @@ const WSConnectionDetails = ({
10967
10991
  type: ""
10968
10992
  });
10969
10993
  const stateCode = Digit.ULBService.getStateId();
10994
+ const tenantId = Digit.ULBService.getCurrentTenantId();
10970
10995
  const [isErrors, setIsErrors] = useState(false);
10971
10996
  const [waterSewarageSelection, setWaterSewarageSelection] = useState({
10972
10997
  water: true,
@@ -10976,7 +11001,7 @@ const WSConnectionDetails = ({
10976
11001
  const {
10977
11002
  isWSServicesCalculationLoading,
10978
11003
  data: wsServicesCalculationData
10979
- } = Digit.Hooks.ws.useMDMS(stateCode, "ws-services-calculation", ["PipeSize"]);
11004
+ } = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-calculation", ["PipeSize"]);
10980
11005
  useEffect(() => {
10981
11006
  const data = connectionDetails.map(e => {
10982
11007
  return e;
@@ -11724,6 +11749,7 @@ const WSPropertyDetails = ({
11724
11749
  clearErrors
11725
11750
  }) => {
11726
11751
  var _Digit$SessionStorage, _formData$cptId, _formData$cptId2, _propertyDetails$Prop2, _propertyDetails$Prop3, _propertyDetails$Prop4;
11752
+ const redirectBackUrl = `/digit-ui/${userType}/ws/new-application`;
11727
11753
  const [propertyId, setPropertyId] = React.useState("");
11728
11754
  const tenantId = (_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code;
11729
11755
  const {
@@ -11785,7 +11811,7 @@ const WSPropertyDetails = ({
11785
11811
  type: "button",
11786
11812
  onClick: () => setPropertyId(propertyId)
11787
11813
  }, `${t("PT_SEARCH")}`))), /*#__PURE__*/React.createElement(Link, {
11788
- to: `/digit-ui/employee/pt/search`
11814
+ to: `/digit-ui/${userType}/commonpt/search?redirectToUrl=${redirectBackUrl}`
11789
11815
  }, /*#__PURE__*/React.createElement(LinkButton, {
11790
11816
  label: t("CPT_SEARCH_PROPERTY"),
11791
11817
  style: {
@@ -11793,7 +11819,7 @@ const WSPropertyDetails = ({
11793
11819
  display: "inline-block"
11794
11820
  }
11795
11821
  })), "\xA0 | \xA0", /*#__PURE__*/React.createElement(Link, {
11796
- to: `/digit-ui/employee/pt/new-application`
11822
+ to: `/digit-ui/${userType}/commonpt/new-application?redirectToUrl=${redirectBackUrl}`
11797
11823
  }, /*#__PURE__*/React.createElement(LinkButton, {
11798
11824
  label: t("CPT_CREATE_PROPERTY"),
11799
11825
  style: {
@@ -11819,7 +11845,7 @@ const WSPropertyDetails = ({
11819
11845
  }, `${t(`PROPERTY_ADDRESS`)}`), /*#__PURE__*/React.createElement("div", {
11820
11846
  className: "field"
11821
11847
  }, /*#__PURE__*/React.createElement("p", null, getPropertyAddress()))), /*#__PURE__*/React.createElement(Link, {
11822
- to: `/digit-ui/employee/commonpt/view-property?propertyId=${propertyId}&tenantId=${tenantId}`
11848
+ to: `/digit-ui/${userType}/commonpt/view-property?propertyId=${propertyId}&tenantId=${tenantId}`
11823
11849
  }, /*#__PURE__*/React.createElement(LinkButton, {
11824
11850
  label: t("CPT_COMPLETE_PROPERTY_DETAILS"),
11825
11851
  style: {
@@ -12107,15 +12133,15 @@ const ConnectionDetails$1 = _props => {
12107
12133
  const errors = sessionStorage.getItem("FORMSTATE_ERRORS");
12108
12134
  let formStateErros = typeof errors === "string" ? JSON.parse(errors) : {};
12109
12135
  if (emailPattern.test(value)) {
12110
- var _formStateErros$Conne, _formStateErros$Conne2, _formStateErros$Conne3;
12136
+ var _formStateErros$Conne, _formStateErros$Conne2, _formStateErros$Conne3, _formStateErros$Conne4;
12111
12137
  clearErrors("emailId");
12112
12138
  if (formStateErros["ConnectionHolderDetails"] && (_formStateErros$Conne = formStateErros["ConnectionHolderDetails"]) !== null && _formStateErros$Conne !== void 0 && _formStateErros$Conne.type && (_formStateErros$Conne2 = formStateErros["ConnectionHolderDetails"]) !== null && _formStateErros$Conne2 !== void 0 && (_formStateErros$Conne3 = _formStateErros$Conne2.type) !== null && _formStateErros$Conne3 !== void 0 && _formStateErros$Conne3.emailId) {
12113
12139
  delete formStateErros["ConnectionHolderDetails"].type.emailId;
12114
12140
  }
12115
- if (Object.keys(formStateErros["ConnectionHolderDetails"].type).length === 0) {
12141
+ if ((_formStateErros$Conne4 = formStateErros["ConnectionHolderDetails"]) !== null && _formStateErros$Conne4 !== void 0 && _formStateErros$Conne4.type && Object.keys(formStateErros["ConnectionHolderDetails"].type).length === 0) {
12116
12142
  delete formStateErros["ConnectionHolderDetails"].type;
12117
12143
  }
12118
- if (Object.keys(formStateErros["ConnectionHolderDetails"]).length === 0) {
12144
+ if (formStateErros["ConnectionHolderDetails"] && Object.keys(formStateErros["ConnectionHolderDetails"]).length === 0) {
12119
12145
  delete formStateErros["ConnectionHolderDetails"];
12120
12146
  }
12121
12147
  sessionStorage.setItem("FORMSTATE_ERRORS", JSON.stringify(formStateErros));
@@ -12310,6 +12336,7 @@ const ConnectionDetails$1 = _props => {
12310
12336
  autoFocus: focusIndex.index === (connectionHolderDetail === null || connectionHolderDetail === void 0 ? void 0 : connectionHolderDetail.key) && focusIndex.type === "mobileNumber",
12311
12337
  errorStyle: localFormState.touched.mobileNumber && (errors === null || errors === void 0 ? void 0 : (_errors$mobileNumber = errors.mobileNumber) === null || _errors$mobileNumber === void 0 ? void 0 : _errors$mobileNumber.message),
12312
12338
  onChange: val => {
12339
+ setMobileNumber(val);
12313
12340
  props.onChange(val);
12314
12341
  setFocusIndex({
12315
12342
  index: connectionHolderDetail === null || connectionHolderDetail === void 0 ? void 0 : connectionHolderDetail.key,
@@ -13768,11 +13795,11 @@ const WSActivationConnectionDetails = ({
13768
13795
  const {
13769
13796
  isMdmsLoading,
13770
13797
  data: mdmsData
13771
- } = Digit.Hooks.ws.useMDMS(stateCode, "ws-services-masters", ["connectionType", "waterSource"]);
13798
+ } = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-masters", ["connectionType", "waterSource"]);
13772
13799
  const {
13773
13800
  isWSServicesCalculationLoading,
13774
13801
  data: wsServicesCalculationData
13775
- } = Digit.Hooks.ws.useMDMS(stateCode, "ws-services-calculation", ["PipeSize"]);
13802
+ } = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-calculation", ["PipeSize"]);
13776
13803
  useEffect(() => {
13777
13804
  const data = (connectionDetails === null || connectionDetails === void 0 ? void 0 : connectionDetails.length) && connectionDetails.map(e => {
13778
13805
  return e;
@@ -13823,14 +13850,6 @@ const WSActivationConnectionDetails = ({
13823
13850
  setWaterSubSourceList(listOfSubSource);
13824
13851
  }
13825
13852
  }, [mdmsData, wsServicesCalculationData]);
13826
- useEffect(() => {
13827
- if (userType === "employee") {
13828
- onSelect(config.key, {
13829
- ...formData[config.key],
13830
- ...connectionDetails
13831
- });
13832
- }
13833
- }, [connectionDetails]);
13834
13853
  if (isMdmsLoading || isWSServicesCalculationLoading) return /*#__PURE__*/React.createElement(Loader, null);
13835
13854
  const commonProps = {
13836
13855
  focusIndex,
@@ -14244,12 +14263,12 @@ const ConnectionDetails$2 = _props => {
14244
14263
  }, " ", errors === null || errors === void 0 ? void 0 : (_errors$noOfToilets2 = errors.noOfToilets) === null || _errors$noOfToilets2 === void 0 ? void 0 : _errors$noOfToilets2.message) : null)));
14245
14264
  };
14246
14265
 
14247
- const createPlumberDetails = () => [{
14266
+ const createPlumberDetails = () => ({
14248
14267
  plumberName: "",
14249
14268
  plumberMobileNo: "",
14250
14269
  plumberLicenseNo: "",
14251
14270
  detailsProvidedBy: ""
14252
- }];
14271
+ });
14253
14272
  const WSActivationPlumberDetails = ({
14254
14273
  config,
14255
14274
  onSelect,
@@ -14259,12 +14278,12 @@ const WSActivationPlumberDetails = ({
14259
14278
  formState,
14260
14279
  clearErrors
14261
14280
  }) => {
14262
- var _formData$connectionD, _formData$connectionD2;
14281
+ var _formData$plumberDeta, _formData$connectionD, _formData$connectionD2;
14263
14282
  const {
14264
14283
  t
14265
14284
  } = useTranslation();
14266
14285
  const filters = getQueryStringParams(location.search);
14267
- const [plumberDetails, setPlumberDetails] = useState((formData === null || formData === void 0 ? void 0 : formData.plumberDetails) || [createPlumberDetails()]);
14286
+ const [plumberDetails, setPlumberDetails] = useState((formData === null || formData === void 0 ? void 0 : (_formData$plumberDeta = formData.plumberDetails) === null || _formData$plumberDeta === void 0 ? void 0 : _formData$plumberDeta.length) > 0 ? formData === null || formData === void 0 ? void 0 : formData.plumberDetails : [createPlumberDetails()]);
14268
14287
  const [focusIndex, setFocusIndex] = useState({
14269
14288
  index: -1,
14270
14289
  type: ""
@@ -22866,6 +22885,7 @@ const newConfig = [{
22866
22885
  }, {
22867
22886
  head: "WS_COMMON_PLUMBER_DETAILS",
22868
22887
  isEditByConfigConnection: true,
22888
+ isCreateConnection: true,
22869
22889
  body: [{
22870
22890
  type: "component",
22871
22891
  key: "plumberDetails",
@@ -22875,6 +22895,7 @@ const newConfig = [{
22875
22895
  }, {
22876
22896
  head: "WS_COMMON_ROAD_CUTTING_DETAILS",
22877
22897
  isEditByConfigConnection: true,
22898
+ isCreateConnection: true,
22878
22899
  body: [{
22879
22900
  type: "component",
22880
22901
  key: "roadCuttingDetails",
@@ -22930,7 +22951,7 @@ const newConfig = [{
22930
22951
  isModifyConnection: true,
22931
22952
  isEditByConfigConnection: true,
22932
22953
  body: [{
22933
- component: "CPTPropertySearchNSummary",
22954
+ component: "WSPropertySearchNSummary",
22934
22955
  withoutLabel: true,
22935
22956
  key: "cpt",
22936
22957
  type: "component",
@@ -22992,6 +23013,7 @@ const newConfig = [{
22992
23013
  }, {
22993
23014
  head: "WS_COMMON_PLUMBER_DETAILS",
22994
23015
  isEditByConfigConnection: true,
23016
+ isCreateConnection: true,
22995
23017
  body: [{
22996
23018
  type: "component",
22997
23019
  key: "plumberDetails",
@@ -23001,6 +23023,7 @@ const newConfig = [{
23001
23023
  }, {
23002
23024
  head: "WS_COMMON_ROAD_CUTTING_DETAILS",
23003
23025
  isEditByConfigConnection: true,
23026
+ isCreateConnection: true,
23004
23027
  body: [{
23005
23028
  type: "component",
23006
23029
  key: "roadCuttingDetails",
@@ -23056,7 +23079,7 @@ const newConfig = [{
23056
23079
  isModifyConnection: true,
23057
23080
  isEditByConfigConnection: true,
23058
23081
  body: [{
23059
- component: "CPTPropertySearchNSummary",
23082
+ component: "WSPropertySearchNSummary",
23060
23083
  withoutLabel: true,
23061
23084
  key: "cpt",
23062
23085
  type: "component",
@@ -23118,6 +23141,7 @@ const newConfig = [{
23118
23141
  }, {
23119
23142
  head: "WS_COMMON_PLUMBER_DETAILS",
23120
23143
  isEditByConfigConnection: true,
23144
+ isCreateConnection: true,
23121
23145
  body: [{
23122
23146
  type: "component",
23123
23147
  key: "plumberDetails",
@@ -23127,6 +23151,7 @@ const newConfig = [{
23127
23151
  }, {
23128
23152
  head: "WS_COMMON_ROAD_CUTTING_DETAILS",
23129
23153
  isEditByConfigConnection: true,
23154
+ isCreateConnection: true,
23130
23155
  body: [{
23131
23156
  type: "component",
23132
23157
  key: "roadCuttingDetails",
@@ -23182,7 +23207,7 @@ const newConfig = [{
23182
23207
  isModifyConnection: true,
23183
23208
  isEditByConfigConnection: true,
23184
23209
  body: [{
23185
- component: "CPTPropertySearchNSummary",
23210
+ component: "WSPropertySearchNSummary",
23186
23211
  withoutLabel: true,
23187
23212
  key: "cpt",
23188
23213
  type: "component",
@@ -23244,6 +23269,7 @@ const newConfig = [{
23244
23269
  }, {
23245
23270
  head: "WS_COMMON_PLUMBER_DETAILS",
23246
23271
  isEditByConfigConnection: true,
23272
+ isCreateConnection: true,
23247
23273
  body: [{
23248
23274
  type: "component",
23249
23275
  key: "plumberDetails",
@@ -23253,6 +23279,7 @@ const newConfig = [{
23253
23279
  }, {
23254
23280
  head: "WS_COMMON_ROAD_CUTTING_DETAILS",
23255
23281
  isEditByConfigConnection: true,
23282
+ isCreateConnection: true,
23256
23283
  body: [{
23257
23284
  type: "component",
23258
23285
  key: "roadCuttingDetails",
@@ -25834,12 +25861,10 @@ const ChallanSearchResults = ({
25834
25861
  if (locality !== "undefined") filters.locality = locality;
25835
25862
  if (doorNumber) filters.doorNo = doorNumber;
25836
25863
  if (consumerName) filters.ownerName = consumerName;
25837
- if (locality || searchQuery && searchQuery.locality) {
25838
- filters.limit = filter1.limit;
25839
- filters.sortOrder = filter1.sortOrder;
25840
- filters.sortBy = filter1.sortBy;
25841
- filters.offset = filter1.offset;
25842
- }
25864
+ filters.limit = filter1.limit;
25865
+ filters.sortOrder = filter1.sortOrder;
25866
+ filters.sortBy = filter1.sortBy;
25867
+ filters.offset = filter1.offset;
25843
25868
  filters = {
25844
25869
  ...filters,
25845
25870
  searchType: "CONNECTION"
@@ -25895,7 +25920,7 @@ const ChallanSearchResults = ({
25895
25920
  marginLeft: "16px",
25896
25921
  marginTop: "16px"
25897
25922
  }
25898
- }, t("WS_NO_APP_FOUND_MSG")), (searchResults === null || searchResults === void 0 ? void 0 : searchResults.length) !== 0 && ((searchResults === null || searchResults === void 0 ? void 0 : searchResults.length) == 5 || (searchResults === null || searchResults === void 0 ? void 0 : searchResults.length) == 50) && (locality || searchQuery && searchQuery.locality) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", {
25923
+ }, t("WS_NO_APP_FOUND_MSG")), (searchResults === null || searchResults === void 0 ? void 0 : searchResults.length) !== 0 && ((searchResults === null || searchResults === void 0 ? void 0 : searchResults.length) == 5 || (searchResults === null || searchResults === void 0 ? void 0 : searchResults.length) == 50) && locality && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", {
25899
25924
  style: {
25900
25925
  marginLeft: "16px",
25901
25926
  marginTop: "16px"
@@ -40667,8 +40692,8 @@ const ApplicationDetails$1 = () => {
40667
40692
  const menuRef = useRef();
40668
40693
  sessionStorage.removeItem("Digit.PT_CREATE_EMP_WS_NEW_FORM");
40669
40694
  sessionStorage.removeItem("IsDetailsExists");
40670
- const [setSessionFormData, clearSessionFormData] = Digit.Hooks.useSessionStorage("ADHOC_ADD_REBATE_DATA", {});
40671
- const [setSessionBillFormData, clearBillSessionFormData] = Digit.Hooks.useSessionStorage("ADHOC_BILL_ADD_REBATE_DATA", {});
40695
+ const [sessionFormData, setSessionFormData, clearSessionFormData] = Digit.Hooks.useSessionStorage("ADHOC_ADD_REBATE_DATA", {});
40696
+ const [sessionBillFormData, setSessionBillFormData, clearBillSessionFormData] = Digit.Hooks.useSessionStorage("ADHOC_BILL_ADD_REBATE_DATA", {});
40672
40697
  const {
40673
40698
  isBillingServiceLoading
40674
40699
  } = Digit.Hooks.obps.useMDMS(stateCode, "BillingService", ["BusinessService"]);
@@ -43331,6 +43356,7 @@ const WSEditApplicationByConfig = () => {
43331
43356
  const [isAppDetailsPage, setIsAppDetailsPage] = useState(false);
43332
43357
  let tenantId = Digit.ULBService.getCurrentTenantId();
43333
43358
  tenantId ? tenantId : (_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code;
43359
+ const applicationNumber = filters === null || filters === void 0 ? void 0 : filters.applicationNumber;
43334
43360
  const editApplicationDetails = JSON.parse(sessionStorage.getItem("WS_EDIT_APPLICATION_DETAILS"));
43335
43361
  const serviceType = (filters === null || filters === void 0 ? void 0 : filters.service) || (editApplicationDetails === null || editApplicationDetails === void 0 ? void 0 : (_editApplicationDetai = editApplicationDetails.applicationData) === null || _editApplicationDetai === void 0 ? void 0 : _editApplicationDetai.serviceType);
43336
43362
  const stateId = Digit.ULBService.getStateId();
@@ -43367,7 +43393,6 @@ const WSEditApplicationByConfig = () => {
43367
43393
  enabled: propertyId && propertyId != "" ? true : false,
43368
43394
  privacy: Digit.Utils.getPrivacyObject()
43369
43395
  });
43370
- console.log(propertyDetails, "y78u");
43371
43396
  useEffect(() => {
43372
43397
  if (!isConfigLoading) {
43373
43398
  var _config$body;
@@ -43390,7 +43415,7 @@ const WSEditApplicationByConfig = () => {
43390
43415
  const IsDetailsExists = sessionStorage.getItem("IsDetailsExists") ? JSON.parse(sessionStorage.getItem("IsDetailsExists")) : false;
43391
43416
  if ((_details3 = details) !== null && _details3 !== void 0 && (_details3$application = _details3.applicationData) !== null && _details3$application !== void 0 && _details3$application.id && !IsDetailsExists) {
43392
43417
  sessionStorage.setItem("appData", JSON.stringify(appData));
43393
- const convertAppData = await convertApplicationData(details, serviceType, false, false, t);
43418
+ const convertAppData = await convertApplicationData(details, serviceType, false, true, t);
43394
43419
  setSessionFormData({
43395
43420
  ...sessionFormData,
43396
43421
  ...convertAppData
@@ -43466,7 +43491,7 @@ const WSEditApplicationByConfig = () => {
43466
43491
  setSubmitValve(false);
43467
43492
  sessionStorage.setItem("redirectedfromEDIT", true);
43468
43493
  sessionStorage.setItem("WS_SESSION_APPLICATION_DETAILS", JSON.stringify(convertAppData));
43469
- window.location.assign(`${window.location.origin}${(_state3 = state) === null || _state3 === void 0 ? void 0 : _state3.url}`);
43494
+ window.location.assign(`${window.location.origin}${((_state3 = state) === null || _state3 === void 0 ? void 0 : _state3.url) || `/digit-ui/employee/ws/application-details?applicationNumber=${applicationNumber}&service=${serviceType}`}`);
43470
43495
  }
43471
43496
  };
43472
43497
  if (enabledLoader || isConfigLoading) {
@@ -44887,7 +44912,7 @@ const OLDApplication = () => {
44887
44912
  config.head = "WS_APP_FOR_WATER_AND_SEWERAGE_LABEL";
44888
44913
  const allCreateSections = (config === null || config === void 0 ? void 0 : (_config$body = config.body) === null || _config$body === void 0 ? void 0 : _config$body.filter(section => section === null || section === void 0 ? void 0 : section.isCreateConnection)) || [];
44889
44914
  console.log("[WS] allCreateSections", allCreateSections);
44890
- const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionHolderDetails", "WSConnectionDetails", "WSDocumentsEmployee"];
44915
+ const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionHolderDetails", "WSConnectionDetails", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSDocumentsEmployee"];
44891
44916
  const reorderedBody = [];
44892
44917
  desiredComponentOrder.forEach(compName => {
44893
44918
  const section = allCreateSections.find(s => {
@@ -44980,7 +45005,7 @@ const OLDApplication = () => {
44980
45005
  setShowToast(null);
44981
45006
  };
44982
45007
  const onSubmit = async data => {
44983
- var _data$cpt, _propertyDetails$Prop2, _formStateErros$Conne, _Object$keys2, _formStateErros$Conne2, _data$cpt3, _data$ConnectionDetai, _data$ConnectionHolde, _data$ConnectionHolde2, _data$ConnectionHolde3, _data$ConnectionHolde4, _data$ConnectionHolde5, _propertyDetails$Prop4, _propertyDetails$Prop5, _propertyDetails$Prop6, _propertyDetails$Prop7, _data$ConnectionDetai2;
45008
+ var _data$cpt, _propertyDetails$Prop2, _formStateErros$Conne, _Object$keys2, _formStateErros$Conne2, _data$cpt3, _data$ConnectionDetai, _data$ConnectionHolde, _data$ConnectionHolde2, _data$ConnectionHolde3, _data$ConnectionHolde4, _data$ConnectionHolde5, _propertyDetails$Prop4, _propertyDetails$Prop5, _propertyDetails$Prop6, _propertyDetails$Prop7, _data$ConnectionHolde6, _data$ConnectionHolde7, _data$cpt4, _data$cpt4$details, _data$cpt4$details$ow, _data$cpt4$details$ow2, _data$ConnectionDetai2;
44984
45009
  console.log("[WS] onSubmit triggered", {
44985
45010
  data,
44986
45011
  propertyId,
@@ -45034,7 +45059,8 @@ const OLDApplication = () => {
45034
45059
  },
45035
45060
  categoryType: {
45036
45061
  code: (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde = data.ConnectionHolderDetails) === null || _data$ConnectionHolde === void 0 ? void 0 : (_data$ConnectionHolde2 = _data$ConnectionHolde[0]) === null || _data$ConnectionHolde2 === void 0 ? void 0 : (_data$ConnectionHolde3 = _data$ConnectionHolde2.ownerType) === null || _data$ConnectionHolde3 === void 0 ? void 0 : _data$ConnectionHolde3.code) || (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde4 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde4 === void 0 ? void 0 : (_data$ConnectionHolde5 = _data$ConnectionHolde4[0]) === null || _data$ConnectionHolde5 === void 0 ? void 0 : _data$ConnectionHolde5.ownerType) || (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop4 = propertyDetails.Properties) === null || _propertyDetails$Prop4 === void 0 ? void 0 : (_propertyDetails$Prop5 = _propertyDetails$Prop4[0]) === null || _propertyDetails$Prop5 === void 0 ? void 0 : (_propertyDetails$Prop6 = _propertyDetails$Prop5.owners) === null || _propertyDetails$Prop6 === void 0 ? void 0 : (_propertyDetails$Prop7 = _propertyDetails$Prop6[0]) === null || _propertyDetails$Prop7 === void 0 ? void 0 : _propertyDetails$Prop7.ownerType) || "NONE"
45037
- }
45062
+ },
45063
+ ownerContactNumber: (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde6 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde6 === void 0 ? void 0 : (_data$ConnectionHolde7 = _data$ConnectionHolde6[0]) === null || _data$ConnectionHolde7 === void 0 ? void 0 : _data$ConnectionHolde7.mobileNumber) || (data === null || data === void 0 ? void 0 : (_data$cpt4 = data.cpt) === null || _data$cpt4 === void 0 ? void 0 : (_data$cpt4$details = _data$cpt4.details) === null || _data$cpt4$details === void 0 ? void 0 : (_data$cpt4$details$ow = _data$cpt4$details.owners) === null || _data$cpt4$details$ow === void 0 ? void 0 : (_data$cpt4$details$ow2 = _data$cpt4$details$ow[0]) === null || _data$cpt4$details$ow2 === void 0 ? void 0 : _data$cpt4$details$ow2.mobileNumber)
45038
45064
  };
45039
45065
  if (data !== null && data !== void 0 && (_data$ConnectionDetai2 = data.ConnectionDetails) !== null && _data$ConnectionDetai2 !== void 0 && _data$ConnectionDetai2[0]) {
45040
45066
  data.ConnectionDetails[0].water = true;