@djb25/digit-ui-module-ws 1.0.98 → 1.0.99

package/dist/index.js

@@ -23396,6 +23396,13 @@ const WSRestorationForm = _ref => {
     };
     const handleProceedToDemand = function () {
       try {
+        if (!ownershipDocument) {
+          setError({
+            key: "error",
+            message: "Please upload property ownership proof."
+          });
+          return Promise.resolve();
+        }
         setEstimateLoading(true);
         return Promise.resolve(_finallyRethrows(function () {
           return _catch(function () {
@@ -23424,16 +23431,18 @@ const WSRestorationForm = _ref => {
             return Promise.resolve(Digit.WSService.wsCalculationEstimate(estimatePayload, serviceType === "WATER" ? "WS" : "SW")).then(function (estimateResponse) {
               var _estimateResponse$Cal, _estimateResponse$Cal2;
               const taxHeadEstimates = (estimateResponse === null || estimateResponse === void 0 ? void 0 : (_estimateResponse$Cal = estimateResponse.Calculation) === null || _estimateResponse$Cal === void 0 ? void 0 : (_estimateResponse$Cal2 = _estimateResponse$Cal[0]) === null || _estimateResponse$Cal2 === void 0 ? void 0 : _estimateResponse$Cal2.taxHeadEstimates) || [];
-              const reconnectionFee = taxHeadEstimates.find(item => {
+              const allowedFees = ["WS_RECONNECTION_FEE", "SW_RECONNECTION_FEE", "WS_DISCONNECTION_FEE", "SW_DISCONNECTION_FEE"];
+              const validFees = taxHeadEstimates.filter(item => {
                 const code = String((item === null || item === void 0 ? void 0 : item.taxHeadCode) || "").toUpperCase();
-                return code === "WS_RECONNECTION_FEE" || code === "SW_RECONNECTION_FEE" || code === "WS_REOPENING_FEE" || code === "SW_REOPENING_FEE";
+                return allowedFees.includes(code);
               });
-              if (!reconnectionFee) throw new Error("Reconnection fee was not returned by the estimate service");
+              if (validFees.length === 0) throw new Error("Reconnection fee was not returned by the estimate service");
+              const totalAmt = validFees.reduce((acc, curr) => acc + Number((curr === null || curr === void 0 ? void 0 : curr.estimateAmount) ?? (curr === null || curr === void 0 ? void 0 : curr.amount) ?? 0), 0);
               setEstimateData({
                 Calculation: [{
                   ...estimateResponse.Calculation[0],
-                  taxHeadEstimates: [reconnectionFee],
-                  totalAmount: Number((reconnectionFee === null || reconnectionFee === void 0 ? void 0 : reconnectionFee.estimateAmount) ?? (reconnectionFee === null || reconnectionFee === void 0 ? void 0 : reconnectionFee.amount) ?? 0)
+                  taxHeadEstimates: validFees,
+                  totalAmount: totalAmt
                 }]
               });
               setShowDemandClearance(true);
@@ -23499,10 +23508,23 @@ const WSRestorationForm = _ref => {
           const ownershipProof = ownershipDocument ? [{
             fileStoreId: ownershipDocument.fileStoreId,
             documentUid: ownershipDocument.fileStoreId,
-            documentType: "PROPERTY_OWNERSHIP_PROOF"
+            documentType: "PROPERTY_OWNERSHIP_PROOF",
+            status: "ACTIVE",
+            id: null
           }] : [];
           const docs = [...existingDocuments, ...ownershipProof];
           const reconnectionValidation = (latestApplicationData === null || latestApplicationData === void 0 ? void 0 : latestApplicationData.reconnectionValidation) || {};
+          const baseAdditionalDetails = {
+            ...(submittedConnection === null || submittedConnection === void 0 ? void 0 : submittedConnection.additionalDetails),
+            ...reconnectionValidation,
+            isAltered: reconnectionValidation.isAltered ?? isAltered,
+            isModified: reconnectionValidation.isModified ?? isModified,
+            ownershipProofFileStoreId: reconnectionValidation.ownershipProofFileStoreId || (ownershipDocument === null || ownershipDocument === void 0 ? void 0 : ownershipDocument.fileStoreId)
+          };
+          const finalDwellingUnits = reconnectionValidation.dwellingUnits ?? dwellingUnits;
+          if (finalDwellingUnits) baseAdditionalDetails.dwellingUnits = finalDwellingUnits;
+          const finalExtendedArea = reconnectionValidation.extendedArea ?? extendedArea;
+          if (finalExtendedArea) baseAdditionalDetails.extendedArea = finalExtendedArea;
           const createPayload = {
             [connectionKey]: {
               ...submittedConnection,
@@ -23518,15 +23540,7 @@ const WSRestorationForm = _ref => {
               water: serviceType === "WATER",
               sewerage: serviceType === "SEWERAGE",
               service: serviceType === "WATER" ? "Water" : "Sewerage",
-              additionalDetails: {
-                ...(submittedConnection === null || submittedConnection === void 0 ? void 0 : submittedConnection.additionalDetails),
-                ...reconnectionValidation,
-                isAltered: reconnectionValidation.isAltered ?? isAltered,
-                isModified: reconnectionValidation.isModified ?? isModified,
-                dwellingUnits: reconnectionValidation.dwellingUnits ?? dwellingUnits,
-                extendedArea: reconnectionValidation.extendedArea ?? extendedArea,
-                ownershipProofFileStoreId: reconnectionValidation.ownershipProofFileStoreId || (ownershipDocument === null || ownershipDocument === void 0 ? void 0 : ownershipDocument.fileStoreId)
-              },
+              additionalDetails: baseAdditionalDetails,
               processInstance: {
                 ...(connection === null || connection === void 0 ? void 0 : connection.processInstance),
                 action: "INITIATE",
@@ -33025,8 +33039,8 @@ const WSFeeEstimation = _ref => {
   const [values, setValues] = React.useState(wsAdditionalDetails.additionalDetails.values ? wsAdditionalDetails.additionalDetails.values : []);
   const isDisconnectionExecuted = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$2 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$2 === void 0 ? void 0 : (_wsAdditionalDetails$3 = _wsAdditionalDetails$2.appDetails) === null || _wsAdditionalDetails$3 === void 0 ? void 0 : _wsAdditionalDetails$3.applicationStatus) === "DISCONNECTION_EXECUTED";
   const billRows = (billDetails === null || billDetails === void 0 ? void 0 : (_billDetails$billDeta = billDetails.billDetails) === null || _billDetails$billDeta === void 0 ? void 0 : (_billDetails$billDeta2 = _billDetails$billDeta[0]) === null || _billDetails$billDeta2 === void 0 ? void 0 : _billDetails$billDeta2.billAccountDetails) || (billDetails === null || billDetails === void 0 ? void 0 : billDetails.taxHeadEstimates) || [];
-  const disconnectionFee = billRows.find(row => (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "WS_DISCONNECTION_FEE");
-  const displayedValues = onlyDisconnectionFee || isDisconnectionExecuted ? values.filter(value => (value === null || value === void 0 ? void 0 : value.title) === "WS_DISCONNECTION_FEE") : values;
+  const disconnectionFee = billRows.find(row => (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "WS_DISCONNECTION_FEE" || (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "SW_DISCONNECTION_FEE");
+  const displayedValues = onlyDisconnectionFee || isDisconnectionExecuted ? values.filter(value => (value === null || value === void 0 ? void 0 : value.title) === "WS_DISCONNECTION_FEE" || (value === null || value === void 0 ? void 0 : value.title) === "SW_DISCONNECTION_FEE") : values;
   const displayedTotalAmount = onlyDisconnectionFee || isDisconnectionExecuted ? (disconnectionFee === null || disconnectionFee === void 0 ? void 0 : disconnectionFee.amount) ?? (disconnectionFee === null || disconnectionFee === void 0 ? void 0 : disconnectionFee.estimateAmount) ?? 0 : billDetails === null || billDetails === void 0 ? void 0 : billDetails.totalAmount;
   const displayedIsPaid = isDisconnectionExecuted ? (disconnectionFee === null || disconnectionFee === void 0 ? void 0 : disconnectionFee.status) === "PAID" : isPaid;
   const stateCode = Digit.ULBService.getStateId();
@@ -51201,12 +51215,15 @@ const ApplicationDetails = props => {
     }
     try {
       if (moduleCode !== null && moduleCode !== void 0 && moduleCode.includes("WS")) {
-        setShowConfirmation({
-          data,
-          nocData,
-          isOBPS
-        });
-        return Promise.resolve();
+        const actionStr = (selectedAction === null || selectedAction === void 0 ? void 0 : selectedAction.action) || "";
+        if (actionStr === "INITIATE" || actionStr === "EXECUTE_DISCONNECTION") {
+          setShowConfirmation({
+            data,
+            nocData,
+            isOBPS
+          });
+          return Promise.resolve();
+        }
       }
       return executeSubmitAction(data, nocData, isOBPS);
     } catch (e) {