@djb25/digit-ui-module-ws 1.0.81 → 1.0.83

package/dist/index.js

@@ -33635,7 +33635,7 @@ const getConnectionDetailsPDF = function (application, property, tenantInfo, t)
 };
 
 const ConnectionDetails$5 = () => {
-  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Sewer, _data$WaterConnection3, _data$WaterConnection4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$SewerageConnect6, _state, _state$applicationNo, _state2, _state3, _state4, _state4$applicationTy, _state5, _state6, _state7, _state8, _state8$applicationTy, _state9, _state0, _state1, _state10, _state10$applicationT, _state11, _state12, _state13, _state14, _state15, _state15$applicationT, _state16, _state16$waterSource, _state16$waterSource$, _state17, _state18, _state18$waterSource, _state18$waterSource$, _state19, _state20, _state21, _state22, _state22$additionalDe, _state23, _state23$applicationT, _state24, _state24$additionalDe, _state24$additionalDe2, _state25, _state25$additionalDe, _state25$additionalDe2, _state26, _state26$additionalDe, _state27, _state27$additionalDe, _state28, _state28$additionalDe, _state28$additionalDe2, _state29, _state29$additionalDe, _state30, _state31, _state32, _state33, _state33$property, _state33$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _user$info2, _user$info2$userName, _user$info3, _user$info4, _state34, _state34$additionalDe, _state34$additionalDe2, _state35, _state35$additionalDe, _state35$additionalDe2, _state36, _state36$additionalDe, _state37, _state37$additionalDe, _state38, _state38$additionalDe, _state39, _state39$additionalDe, _state40, _state40$additionalDe, _state41, _state42, _state43, _state44, _state44$connectionHo, _state44$connectionHo2, _data$WaterConnection16, _data$WaterConnection17, _data$WaterConnection18, _data$WaterConnection19, _data$SewerageConnect0, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection20, _data$WaterConnection21, _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect16, _data$SewerageConnect17, _data$SewerageConnect18, _data$SewerageConnect19, _data$WaterConnection28, _data$WaterConnection29, _data$WaterConnection30, _data$WaterConnection31, _data$SewerageConnect20, _data$SewerageConnect21, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection32, _data$WaterConnection33, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect24, _data$SewerageConnect25, _data$SewerageConnect26, _data$SewerageConnect27, _data$WaterConnection36, _data$WaterConnection37, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect28, _data$SewerageConnect29, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect32, _data$SewerageConnect33, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect40, _data$SewerageConnect41, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect44, _data$SewerageConnect45, _data$SewerageConnect46, _data$SewerageConnect47, _state45, _state45$additionalDe, _state46, _state46$additionalDe, _state47, _state47$additionalDe, _state48, _state48$additionalDe, _state49, _state49$additionalDe, _state50, _state51, _state54, _state55, _state56, _state57, _state58, _state59, _paymentDetails$data17, _paymentDetails$data18;
+  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Water2, _connectionData$Sewer, _connectionData$Sewer2, _data$WaterConnection3, _data$WaterConnection4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$SewerageConnect6, _state, _state$applicationNo, _state2, _state3, _state4, _state4$applicationTy, _state5, _state6, _state7, _state8, _state8$applicationTy, _state9, _state0, _state1, _state10, _state10$applicationT, _state11, _state12, _state13, _state14, _state15, _state15$applicationT, _state16, _state16$waterSource, _state16$waterSource$, _state17, _state18, _state18$waterSource, _state18$waterSource$, _state19, _state20, _state21, _state22, _state22$additionalDe, _state23, _state23$applicationT, _state24, _state24$additionalDe, _state24$additionalDe2, _state25, _state25$additionalDe, _state25$additionalDe2, _state26, _state26$additionalDe, _state27, _state27$additionalDe, _state28, _state28$additionalDe, _state28$additionalDe2, _state29, _state29$additionalDe, _state30, _state31, _state32, _state33, _state33$property, _state33$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _user$info2, _user$info2$userName, _user$info3, _user$info4, _state34, _state34$additionalDe, _state34$additionalDe2, _state35, _state35$additionalDe, _state35$additionalDe2, _state36, _state36$additionalDe, _state37, _state37$additionalDe, _state38, _state38$additionalDe, _state39, _state39$additionalDe, _state40, _state40$additionalDe, _state41, _state42, _state43, _state44, _state44$connectionHo, _state44$connectionHo2, _data$WaterConnection16, _data$WaterConnection17, _data$WaterConnection18, _data$WaterConnection19, _data$SewerageConnect0, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection20, _data$WaterConnection21, _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect16, _data$SewerageConnect17, _data$SewerageConnect18, _data$SewerageConnect19, _data$WaterConnection28, _data$WaterConnection29, _data$WaterConnection30, _data$WaterConnection31, _data$SewerageConnect20, _data$SewerageConnect21, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection32, _data$WaterConnection33, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect24, _data$SewerageConnect25, _data$SewerageConnect26, _data$SewerageConnect27, _data$WaterConnection36, _data$WaterConnection37, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect28, _data$SewerageConnect29, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect32, _data$SewerageConnect33, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect40, _data$SewerageConnect41, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect44, _data$SewerageConnect45, _data$SewerageConnect46, _data$SewerageConnect47, _state45, _state45$additionalDe, _state46, _state46$additionalDe, _state47, _state47$additionalDe, _state48, _state48$additionalDe, _state49, _state49$additionalDe, _state50, _state51, _state54, _state55, _state56, _state57, _state58, _state59, _paymentDetails$data17, _paymentDetails$data18;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const menuRef = React.useRef();
@@ -33686,7 +33686,7 @@ const ConnectionDetails$5 = () => {
       enabled: filter2 !== null && filter2 !== void 0 && filter2.connectionNumber ? true : false
     }, true),
     connectionData = _Digit$Hooks$ws$useMy2.data;
-  state = ((_Object$keys = Object.keys(state)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0 ? state : applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Water = connectionData.WaterConnection) === null || _connectionData$Water === void 0 ? void 0 : _connectionData$Water[0] : connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Sewer = connectionData.SewerageConnections) === null || _connectionData$Sewer === void 0 ? void 0 : _connectionData$Sewer[0];
+  state = ((_Object$keys = Object.keys(state)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0 ? state : applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? (connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Water = connectionData.WaterConnection) === null || _connectionData$Water === void 0 ? void 0 : _connectionData$Water.find(c => c.applicationStatus === "CONNECTION_ACTIVATED")) || (connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Water2 = connectionData.WaterConnection) === null || _connectionData$Water2 === void 0 ? void 0 : _connectionData$Water2[0]) : (connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Sewer = connectionData.SewerageConnections) === null || _connectionData$Sewer === void 0 ? void 0 : _connectionData$Sewer.find(c => c.applicationStatus === "CONNECTION_ACTIVATED")) || (connectionData === null || connectionData === void 0 ? void 0 : (_connectionData$Sewer2 = connectionData.SewerageConnections) === null || _connectionData$Sewer2 === void 0 ? void 0 : _connectionData$Sewer2[0]);
   const closeModal = () => {
     setShowOptions(false);
   };
@@ -43648,6 +43648,7 @@ const ActionModal$5 = _ref => {
     }
     applicationData = _extends({}, applicationData, {
       action: action === null || action === void 0 ? void 0 : action.action,
+      oldApplication: isMutationApp ? (action === null || action === void 0 ? void 0 : action.action) === "REJECT" : false,
       comment: commentValue,
       assignee: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
       assignes: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? [] : [{
@@ -51356,7 +51357,8 @@ const EditModifyApplication = () => {
 };
 
 const Step1_SearchConnection = _ref => {
-  let defaultKNumber = _ref.defaultKNumber,
+  let t = _ref.t,
+    defaultKNumber = _ref.defaultKNumber,
     onNext = _ref.onNext,
     isEditFlow = _ref.isEditFlow;
   const _useState = React.useState(defaultKNumber || ""),
@@ -51365,9 +51367,55 @@ const Step1_SearchConnection = _ref => {
   const _useState2 = React.useState(false),
     isLoading = _useState2[0],
     setIsLoading = _useState2[1];
-  const _useState3 = React.useState(null),
-    showToast = _useState3[0],
-    setShowToast = _useState3[1];
+  const _useState3 = React.useState(false),
+    isConsenting = _useState3[0],
+    setIsConsenting = _useState3[1];
+  const _useState4 = React.useState(null),
+    showToast = _useState4[0],
+    setShowToast = _useState4[1];
+  const handleDigiLockerConsent = function (e) {
+    try {
+      if (e !== null && e !== void 0 && e.preventDefault) e.preventDefault();
+      if (e !== null && e !== void 0 && e.stopPropagation) e.stopPropagation();
+      setIsConsenting(true);
+      const _temp = _finallyRethrows(function () {
+        return _catch(function () {
+          const tenantId = Digit.ULBService.getCurrentTenantId() || "dl";
+          return Promise.resolve(Digit.DigiLockerService.authorization({
+            module: "WS",
+            tenantId
+          })).then(function (data) {
+            const redirectUrl = (data === null || data === void 0 ? void 0 : data.redirectURL) || (data === null || data === void 0 ? void 0 : data.redirectUrl);
+            const verifier = (data === null || data === void 0 ? void 0 : data.dlReqRef) || (data === null || data === void 0 ? void 0 : data.codeverifier) || (data === null || data === void 0 ? void 0 : data.codeVerifier) || (data === null || data === void 0 ? void 0 : data.code_verifier);
+            if (verifier) {
+              sessionStorage.setItem("code_verfier_register", verifier);
+            }
+            if (redirectUrl) {
+              window.location.href = redirectUrl;
+            } else {
+              setShowToast({
+                key: "error",
+                message: "No redirect URL returned from DigiLocker API"
+              });
+            }
+          });
+        }, function (err) {
+          var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
+          setShowToast({
+            key: "error",
+            message: (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$Er = _err$response$data.Errors) === null || _err$response$data$Er === void 0 ? void 0 : (_err$response$data$Er2 = _err$response$data$Er[0]) === null || _err$response$data$Er2 === void 0 ? void 0 : _err$response$data$Er2.message) || (err === null || err === void 0 ? void 0 : err.message) || "Error fetching DigiLocker authorization URL"
+          });
+        });
+      }, function (_wasThrown, _result) {
+        setIsConsenting(false);
+        if (_wasThrown) throw _result;
+        return _result;
+      });
+      return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   const handleSendOtp = function () {
     try {
       if (!kNumber) {
@@ -51391,7 +51439,7 @@ const Step1_SearchConnection = _ref => {
           businessService: "WS"
         }).catch(() => null)).then(function (wsResponse) {
           var _wsResponse$WaterConn;
-          function _temp2() {
+          function _temp3() {
             var _connection, _connection$connectio, _connection$connectio2, _connection2;
             if (!connection) {
               setIsLoading(false);
@@ -51410,6 +51458,16 @@ const Step1_SearchConnection = _ref => {
               });
               return;
             }
+            if (isEditFlow) {
+              setIsLoading(false);
+              onNext({
+                kNumber,
+                mobileNumber: fetchedMobileNumber,
+                serviceType: detectedServiceType,
+                activeConnection: connection
+              });
+              return;
+            }
             const userType = Digit.UserService.getType().toUpperCase();
             const payload = {
               otp: {
@@ -51430,7 +51488,7 @@ const Step1_SearchConnection = _ref => {
             });
           }
           let connection = wsResponse === null || wsResponse === void 0 ? void 0 : (_wsResponse$WaterConn = wsResponse.WaterConnection) === null || _wsResponse$WaterConn === void 0 ? void 0 : _wsResponse$WaterConn.find(c => c.applicationStatus === 'CONNECTION_ACTIVATED');
-          const _temp = function () {
+          const _temp2 = function () {
             if (!connection) {
               return Promise.resolve(Digit.WSService.search({
                 tenantId,
@@ -51443,14 +51501,14 @@ const Step1_SearchConnection = _ref => {
               });
             }
           }();
-          return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+          return _temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2);
         });
       }, function (err) {
-        var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
+        var _err$response2, _err$response2$data, _err$response2$data$E, _err$response2$data$E2;
         setIsLoading(false);
         setShowToast({
           key: "error",
-          message: (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$Er = _err$response$data.Errors) === null || _err$response$data$Er === void 0 ? void 0 : (_err$response$data$Er2 = _err$response$data$Er[0]) === null || _err$response$data$Er2 === void 0 ? void 0 : _err$response$data$Er2.message) || "Failed to send OTP"
+          message: (err === null || err === void 0 ? void 0 : (_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : (_err$response2$data$E = _err$response2$data.Errors) === null || _err$response2$data$E === void 0 ? void 0 : (_err$response2$data$E2 = _err$response2$data$E[0]) === null || _err$response2$data$E2 === void 0 ? void 0 : _err$response2$data$E2.message) || "Failed to send OTP"
         });
       }));
     } catch (e) {
@@ -51485,7 +51543,7 @@ const Step1_SearchConnection = _ref => {
     style: {
       fontSize: isMobileView ? "13px" : undefined
     }
-  }, "Please enter your K Number to proceed with the mutation application. An OTP will be sent to the registered mobile number."), /*#__PURE__*/React__default.createElement("div", {
+  }, isEditFlow ? "Please verify the K Number to proceed with the mutation edit." : "Please enter your K Number to proceed with the mutation application. An OTP will be sent to the registered mobile number."), /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginBottom: "24px",
       marginTop: "16px",
@@ -51512,6 +51570,11 @@ const Step1_SearchConnection = _ref => {
       width: "100%"
     },
     disabled: isEditFlow
+  })), !isEditFlow && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: t("WS_LOGIN_WITH_DIGILOCKER") || "Login with DigiLocker",
+    onSubmit: handleDigiLockerConsent,
+    disabled: isConsenting,
+    submit: true
   })), /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
@@ -51533,7 +51596,7 @@ const Step1_SearchConnection = _ref => {
       maxWidth: isMobileView ? "100%" : "200px",
       fontSize: isMobileView ? "14px" : undefined
     }
-  }, isLoading ? "Sending OTP..." : "Send OTP →"))), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
+  }, isLoading ? isEditFlow ? "Proceeding..." : "Sending OTP..." : isEditFlow ? "Proceed →" : "Send OTP →"))), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
     error: showToast.key === "error",
     warning: showToast.key === "warning",
     label: showToast.message,
@@ -53471,7 +53534,7 @@ const Step5_Submission = _ref => {
 };
 
 const MutationApplication = () => {
-  var _Digit$SessionStorage, _user$info, _state, _user$info2, _user$info2$userName, _user$info3, _user$info4, _details$applicationD, _applicationDetails$a, _applicationDetails$a2, _applicationDetails$a4, _applicationDetails$a8, _applicationDetails$a9;
+  var _state, _state2, _state3, _Digit$SessionStorage, _user$info, _state4, _user$info2, _user$info2$userName, _user$info3, _user$info4, _details$applicationD, _applicationDetails$a, _applicationDetails$a2, _applicationDetails$a4, _applicationDetails$a8, _applicationDetails$a9;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const _useRouteMatch = reactRouterDom.useRouteMatch(),
@@ -53522,14 +53585,45 @@ const MutationApplication = () => {
     authActiveConnection = _Digit$Hooks$useSessi6[0],
     setAuthActiveConnection = _Digit$Hooks$useSessi6[1],
     clearAuthActiveConnection = _Digit$Hooks$useSessi6[2];
+  const _Digit$Hooks$useSessi7 = Digit.Hooks.useSessionStorage("MUTATION_EDIT_PARAMS", {}),
+    persistedEditParams = _Digit$Hooks$useSessi7[0],
+    setPersistedEditParams = _Digit$Hooks$useSessi7[1];
   const user = Digit.UserService.getUser();
-  let tenantId = (filters === null || filters === void 0 ? void 0 : filters.tenantId) || ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.permanentCity) || Digit.ULBService.getCurrentTenantId();
-  const applicationNumber = filters === null || filters === void 0 ? void 0 : filters.applicationNumber;
-  const serviceType = filters === null || filters === void 0 ? void 0 : filters.service;
-  const details = cloneDeep_1((_state = state) === null || _state === void 0 ? void 0 : _state.data);
+  const urlParams = new URLSearchParams(location.search);
+  const urlAppNo = (filters === null || filters === void 0 ? void 0 : filters.applicationNumber) || urlParams.get("applicationNumber") || ((_state = state) === null || _state === void 0 ? void 0 : _state.id);
+  const urlTenantId = (filters === null || filters === void 0 ? void 0 : filters.tenantId) || urlParams.get("tenantId") || ((_state2 = state) === null || _state2 === void 0 ? void 0 : _state2.tenantId);
+  const urlService = (filters === null || filters === void 0 ? void 0 : filters.service) || urlParams.get("service") || ((_state3 = state) === null || _state3 === void 0 ? void 0 : _state3.service);
+  React.useEffect(() => {
+    if (location.pathname.endsWith("/search-connection") && !urlAppNo) {
+      setPersistedEditParams({});
+    } else if (urlAppNo || urlTenantId || urlService) {
+      setPersistedEditParams({
+        applicationNumber: urlAppNo || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.applicationNumber),
+        tenantId: urlTenantId || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.tenantId),
+        service: urlService || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.service)
+      });
+    }
+  }, [urlAppNo, urlTenantId, urlService, location.pathname]);
+  const applicationNumber = urlAppNo || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.applicationNumber);
+  const serviceType = urlService || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.service);
+  let tenantId = urlTenantId || (persistedEditParams === null || persistedEditParams === void 0 ? void 0 : persistedEditParams.tenantId) || ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.permanentCity) || Digit.ULBService.getCurrentTenantId();
+  const details = cloneDeep_1((_state4 = state) === null || _state4 === void 0 ? void 0 : _state4.data);
   const mobileNumber = user !== null && user !== void 0 && (_user$info2 = user.info) !== null && _user$info2 !== void 0 && (_user$info2$userName = _user$info2.userName) !== null && _user$info2$userName !== void 0 && _user$info2$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.userName : user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : _user$info4.mobileNumber;
   const hasStateData = !!(details !== null && details !== void 0 && (_details$applicationD = details.applicationData) !== null && _details$applicationD !== void 0 && _details$applicationD.id);
+  React.useEffect(() => {
+    if (location.pathname === path) {
+      if (typeof clearFormData === "function") clearFormData();
+      if (typeof clearSessionFormData === "function") clearSessionFormData();
+      if (typeof clearCompletedSteps === "function") clearCompletedSteps();
+      if (typeof clearAuthKNumber === "function") clearAuthKNumber();
+      if (typeof clearAuthMobileNumber === "function") clearAuthMobileNumber();
+      if (typeof clearAuthServiceType === "function") clearAuthServiceType();
+      if (typeof clearAuthActiveConnection === "function") clearAuthActiveConnection();
+      if (typeof setPersistedEditParams === "function") setPersistedEditParams({});
+    }
+  }, [location.pathname, path]);
   const editApplicationNumber = (details === null || details === void 0 ? void 0 : details.applicationNo) || applicationNumber;
+  console.log(editApplicationNumber, "editApplicationNumber");
   const _useQuery = reactQuery.useQuery(["WORKFLOW_SEARCH", editApplicationNumber, tenantId], function () {
       try {
         return Promise.resolve(Digit.WorkflowService.getByBusinessId(tenantId, editApplicationNumber)).then(function (res) {
@@ -53544,8 +53638,9 @@ const MutationApplication = () => {
     }),
     isWorkflowLoading = _useQuery.isLoading,
     workflowData = _useQuery.data;
+  console.log(workflowData, "workflowData");
   const isEmployee = window.location.href.includes("/employee/");
-  const isEditFlow = !!editApplicationNumber && (isEmployee || (workflowData === null || workflowData === void 0 ? void 0 : workflowData.action) === "SEND_BACK_TO_CITIZEN");
+  const isEditFlow = !!editApplicationNumber && (!!urlAppNo || (workflowData === null || workflowData === void 0 ? void 0 : workflowData.businessService) === "mutationWSConnection" || (workflowData === null || workflowData === void 0 ? void 0 : workflowData.action) === "SEND_BACK_TO_CITIZEN");
   const querySearchParam = isEditFlow ? editApplicationNumber : authKNumber;
   const fallbackServiceType = serviceType || authServiceType;
   const businessService = (fallbackServiceType === null || fallbackServiceType === void 0 ? void 0 : fallbackServiceType.toUpperCase()) === "SEWERAGE" ? "SW" : "WS";
@@ -53574,8 +53669,8 @@ const MutationApplication = () => {
           }
           return wsData ? {
             applicationData: wsData,
-            WaterConnection: rawData === null || rawData === void 0 ? void 0 : rawData.WaterConnection,
-            SewerageConnections: rawData === null || rawData === void 0 ? void 0 : rawData.SewerageConnections,
+            WaterConnection: [wsData],
+            SewerageConnections: [wsData],
             propertyDetails: null,
             processInstancesDetails: []
           } : null;
@@ -53606,10 +53701,10 @@ const MutationApplication = () => {
     }),
     propertyDetails = _Digit$Hooks$pt$usePr.data,
     isPropertyLoading = _Digit$Hooks$pt$usePr.isLoading;
-  const _Digit$Hooks$useSessi7 = Digit.Hooks.useSessionStorage("PT_CREATE_EMP_WS_NEW_FORM", {}),
-    sessionFormData = _Digit$Hooks$useSessi7[0],
-    setSessionFormData = _Digit$Hooks$useSessi7[1],
-    clearSessionFormData = _Digit$Hooks$useSessi7[2];
+  const _Digit$Hooks$useSessi8 = Digit.Hooks.useSessionStorage("PT_CREATE_EMP_WS_NEW_FORM", {}),
+    sessionFormData = _Digit$Hooks$useSessi8[0],
+    setSessionFormData = _Digit$Hooks$useSessi8[1],
+    clearSessionFormData = _Digit$Hooks$useSessi8[2];
   React.useEffect(() => {
     var _applicationDetails$a3;
     const fetchAppData = function () {
@@ -53807,6 +53902,7 @@ const MutationApplication = () => {
             let updatePayload = _extends({}, convertAppData, {
               id: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a6 = applicationDetails.applicationData) === null || _applicationDetails$a6 === void 0 ? void 0 : _applicationDetails$a6.id,
               applicationNo: editApplicationNumber,
+              action: "RESUBMIT_APPLICATION",
               processInstance: _extends({}, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a7 = applicationDetails.applicationData) === null || _applicationDetails$a7 === void 0 ? void 0 : _applicationDetails$a7.processInstance, convertAppData === null || convertAppData === void 0 ? void 0 : convertAppData.processInstance, {
                 action: "RESUBMIT_APPLICATION"
               })
@@ -54072,7 +54168,13 @@ const MutationApplication = () => {
     }
   }, /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: path + "/search-connection"
-  }, /*#__PURE__*/React__default.createElement(Step1_SearchConnection, {
+  }, isEditFlow ? /*#__PURE__*/React__default.createElement(reactRouterDom.Redirect, {
+    to: {
+      pathname: path + "/consumer-details",
+      search: location.search,
+      state: location.state
+    }
+  }) : /*#__PURE__*/React__default.createElement(Step1_SearchConnection, {
     t: t,
     defaultKNumber: isEditFlow ? applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a8 = applicationDetails.applicationData) === null || _applicationDetails$a8 === void 0 ? void 0 : _applicationDetails$a8.connectionNo : "",
     isEditFlow: isEditFlow,
@@ -54090,7 +54192,13 @@ const MutationApplication = () => {
     }
   })), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: path + "/existing-connection"
-  }, /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(Step1_ExistingConnection, {
+  }, isEditFlow ? /*#__PURE__*/React__default.createElement(reactRouterDom.Redirect, {
+    to: {
+      pathname: path + "/consumer-details",
+      search: location.search,
+      state: location.state
+    }
+  }) : /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(Step1_ExistingConnection, {
     t: t,
     applicationDetails: authActiveConnection ? {
       applicationData: authActiveConnection
@@ -54145,7 +54253,11 @@ const MutationApplication = () => {
     exact: true,
     path: path
   }, /*#__PURE__*/React__default.createElement(reactRouterDom.Redirect, {
-    to: path + "/search-connection"
+    to: {
+      pathname: isEditFlow ? path + "/consumer-details" : path + "/search-connection",
+      search: location.search,
+      state: location.state
+    }
   }))), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
     error: (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "error",
     warning: (showToast === null || showToast === void 0 ? void 0 : showToast.key) === "warning",