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

package/dist/index.js

@@ -1324,7 +1324,8 @@ const updatePayloadOfWSRestoration = function (data, type) {
     payload.processInstance = {
       ...payload.processInstance,
       businessService: type === "WATER" ? "WSReconnection" : "SWReconnection",
-      action: "SUBMIT_APPLICATION"
+      action: "SUBMIT_APPLICATION",
+      moduleName: "ws-services"
     };
     return payload;
   });
@@ -23367,10 +23368,11 @@ const WSRestorationForm = _ref => {
         var _event$target, _event$target$files;
         const file = event === null || event === void 0 ? void 0 : (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$files = _event$target.files) === null || _event$target$files === void 0 ? void 0 : _event$target$files[0];
         if (!file) return Promise.resolve();
-        if (file.size > 5242880 || file.type && file.type !== "application/pdf") {
+        const allowedMimeTypes = ["application/pdf", "image/jpeg", "image/jpg"];
+        if (file.size > 5242880 || file.type && !allowedMimeTypes.includes(file.type)) {
           setError({
             key: "error",
-            message: "Only PDF files up to 5MB are allowed"
+            message: "Only PDF, JPEG, or JPG files up to 5MB are allowed"
           });
           return Promise.resolve();
         }
@@ -23394,75 +23396,36 @@ const WSRestorationForm = _ref => {
         return Promise.reject(e);
       }
     };
-    const handleProceedToDemand = function () {
-      try {
-        setEstimateLoading(true);
-        return Promise.resolve(_finallyRethrows(function () {
-          return _catch(function () {
-            const serviceType = String((connection === null || connection === void 0 ? void 0 : connection.serviceType) || (connection === null || connection === void 0 ? void 0 : connection.service) || "WATER").toUpperCase() === "SEWERAGE" ? "SEWERAGE" : "WATER";
-            const connectionKey = serviceType === "WATER" ? "waterConnection" : "sewerageConnection";
-            const estimateConnection = {
-              ...connection,
-              applicationType: serviceType === "WATER" ? "WATER_RECONNECTION" : "SEWERAGE_RECONNECTION",
-              dateEffectiveFrom: Date.now(),
-              isdisconnection: false,
-              isDisconnectionTemporary: true,
-              reconnectionReason: "RECONNECTION",
-              disconnectionReason: "",
-              water: serviceType === "WATER",
-              sewerage: serviceType === "SEWERAGE",
-              service: serviceType === "WATER" ? "Water" : "Sewerage"
-            };
-            const estimatePayload = {
-              CalculationCriteria: [{
-                applicationNo: estimateConnection === null || estimateConnection === void 0 ? void 0 : estimateConnection.applicationNo,
-                tenantId: (estimateConnection === null || estimateConnection === void 0 ? void 0 : estimateConnection.tenantId) || tenantId,
-                [connectionKey]: estimateConnection
-              }],
-              isconnectionCalculation: false
-            };
-            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 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";
-              });
-              if (!reconnectionFee) throw new Error("Reconnection fee was not returned by the estimate service");
-              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)
-                }]
-              });
-              setShowDemandClearance(true);
-              Digit.SessionStorage.set("WS_DISCONNECTION", {
-                ...applicationData,
-                reconnectionValidation: {
-                  isAltered,
-                  isModified,
-                  dwellingUnits,
-                  extendedArea,
-                  ownershipProofFileStoreId: ownershipDocument === null || ownershipDocument === void 0 ? void 0 : ownershipDocument.fileStoreId
-                }
-              });
-            });
-          }, function (estimateError) {
-            var _estimateError$respon, _estimateError$respon2, _estimateError$respon3, _estimateError$respon4;
-            setError({
-              key: "error",
-              message: (estimateError === null || estimateError === void 0 ? void 0 : (_estimateError$respon = estimateError.response) === null || _estimateError$respon === void 0 ? void 0 : (_estimateError$respon2 = _estimateError$respon.data) === null || _estimateError$respon2 === void 0 ? void 0 : (_estimateError$respon3 = _estimateError$respon2.Errors) === null || _estimateError$respon3 === void 0 ? void 0 : (_estimateError$respon4 = _estimateError$respon3[0]) === null || _estimateError$respon4 === void 0 ? void 0 : _estimateError$respon4.message) || "Unable to calculate reconnection demand"
-            });
-          });
-        }, function (_wasThrown, _result3) {
-          setEstimateLoading(false);
-          if (_wasThrown) throw _result3;
-          return _result3;
-        }));
-      } catch (e) {
-        return Promise.reject(e);
+    const handleProceedToDemand = () => {
+      if (!ownershipDocument) {
+        setError({
+          key: "error",
+          message: "Please upload property ownership proof."
+        });
+        return;
       }
+      const staticFee = {
+        taxHeadCode: "WS_RECONNECTION_FEE",
+        estimateAmount: 250,
+        amount: 250
+      };
+      setEstimateData({
+        Calculation: [{
+          taxHeadEstimates: [staticFee],
+          totalAmount: 250
+        }]
+      });
+      setShowDemandClearance(true);
+      Digit.SessionStorage.set("WS_DISCONNECTION", {
+        ...applicationData,
+        reconnectionValidation: {
+          isAltered,
+          isModified,
+          dwellingUnits,
+          extendedArea,
+          ownershipProofFileStoreId: ownershipDocument === null || ownershipDocument === void 0 ? void 0 : ownershipDocument.fileStoreId
+        }
+      });
     };
     const executeMutation = (mutation, payload) => new Promise((resolve, reject) => mutation(payload, {
       onSuccess: resolve,
@@ -23499,10 +23462,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,19 +23494,12 @@ 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",
-                businessService: serviceType === "WATER" ? "WSReconnection" : "SWReconnection"
+                businessService: serviceType === "WATER" ? "WSReconnection" : "SWReconnection",
+                moduleName: "ws-services"
               },
               channel: (user === null || user === void 0 ? void 0 : user.toUpperCase()) === "CITIZEN" ? "CITIZEN" : "CFC_COUNTER"
             },
@@ -23660,8 +23629,8 @@ const WSRestorationForm = _ref => {
       flex: 1,
       padding: "12px 16px",
       borderRadius: "14px",
-      border: selected ? "1px solid #4b35f5" : "1px solid #d5deea",
-      background: selected ? "#4b35f5" : "#fff",
+      border: selected ? "1px solid linear-gradient(135deg,#1f5fa8,#0b2e5b)" : "1px solid #d5deea",
+      background: selected ? "linear-gradient(135deg,#1f5fa8,#0b2e5b)" : "#fff",
       color: selected ? "#fff" : "#172b4d",
       fontWeight: 700,
       cursor: "pointer"
@@ -23704,11 +23673,10 @@ const WSRestorationForm = _ref => {
       }
     }, "Upload Property Ownership Proof (Registry / Sale Deed)"), /*#__PURE__*/React__default.createElement(digitUiReactComponents.UploadFile, {
       id: "reconnection-ownership-proof",
-      accept: ".pdf",
       buttonType: "button",
       onUpload: handleOwnershipUpload,
       onDelete: () => setOwnershipDocument(null),
-      message: (ownershipDocument === null || ownershipDocument === void 0 ? void 0 : ownershipDocument.fileName) || "Drag & drop your property deed PDF here or click to browse from files (Max 5MB)"
+      message: (ownershipDocument === null || ownershipDocument === void 0 ? void 0 : ownershipDocument.fileName) || "Drag & drop your file here or click to browse (PDF, JPEG, JPG — Max 5MB)"
     }))), /*#__PURE__*/React__default.createElement("div", {
       style: {
         background: "#f7f9fc",
@@ -33025,8 +32993,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 +51169,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) {
@@ -57075,6 +57046,7 @@ const MutationApplication = () => {
             }
           }
           convertAppData.applicationType = resolvedServiceType === "WATER" ? "MUTATION_WATER_CONNECTION" : "MUTATION_SEWERAGE_CONNECTION";
+          delete convertAppData.dueVerification;
           if (isEditFlow) {
             var _applicationDetails$a6, _applicationDetails$a7, _updatePayload, _updatePayload$docume, _Digit, _Digit$Customizations, _Digit$Customizations2;
             let updatePayload = {