@mseva/digit-ui-module-noc 1.0.84 → 1.0.85

package/dist/index.modern.js

@@ -2,6 +2,7 @@ import { SearchField, TextInput, CardLabelError, SubmitBar, Loader as Loader$2,
 import React, { Fragment, useMemo, useReducer, useCallback, useState, useEffect as useEffect$1, useRef } from 'react';
 import { Link, useLocation, useHistory, Switch, useParams, useRouteMatch } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
+import CryptoJS from 'crypto-js';
 import { useFormContext, useForm, FormProvider, Controller, useFieldArray } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
 import EXIF from 'exif-js';
@@ -304,18 +305,30 @@ const downloadPdfFromURL = async receiptUrl => {
     window.open(downloadUrl, "_blank");
   }
 };
-function encodeURIComponentCustom(str) {
-  return str.split("").map(char => {
-    const code = char.charCodeAt(0);
-    if (code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122 || ["-", "_", ".", "~"].includes(char)) {
-      return char;
-    }
-    return "%" + code.toString(16).toUpperCase();
-  }).join("");
-}
-function decodeURIComponentCustom(str) {
-  return str.replace(/%([0-9A-F]{2})/gi, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
-}
+const encodeURIComponentCustom = text => {
+  const SECRET_KEY = localStorage.getItem("token");
+  if (!SECRET_KEY) {
+    console.error("SECRET_KEY (token) not found in localStorage");
+    return null;
+  }
+  const encrypted = CryptoJS.AES.encrypt(text, SECRET_KEY).toString();
+  return encrypted.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+};
+const decodeURIComponentCustom = cipherText => {
+  try {
+    const SECRET_KEY = localStorage.getItem("token");
+    if (!SECRET_KEY) {
+      console.error("SECRET_KEY (token) not found in localStorage");
+      return null;
+    }
+    const base64 = cipherText.replace(/-/g, "+").replace(/_/g, "/");
+    const bytes = CryptoJS.AES.decrypt(base64, SECRET_KEY);
+    return bytes.toString(CryptoJS.enc.Utf8);
+  } catch (e) {
+    console.error("Error decrypting ID:", e);
+    return null;
+  }
+};
 
 function listCacheClear() {
   this.__data__ = [];
@@ -7802,10 +7815,10 @@ const EmployeeApp = ({
   }, /*#__PURE__*/React.createElement(NOCBreadCrumbs, {
     location: location
   })) : null, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/inbox/application-overview/:id`,
+    path: `${path}/inbox/application-overview/:nocid`,
     component: NOCEmployeeApplicationOverview
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/search/application-overview/:id`,
+    path: `${path}/search/application-overview/:nocid`,
     component: ApplicationOverview
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/inbox`,
@@ -8294,10 +8307,13 @@ const configBPAApproverApplication = ({
 }) => {
   var _action$assigneeRoles;
   let isRejectOrRevocate = false;
-  if ((action === null || action === void 0 ? void 0 : action.action) == "REVOCATE" || (action === null || action === void 0 ? void 0 : action.action) == "REJECT" || action.action == "SKIP_PAYMENT" || (action === null || action === void 0 ? void 0 : action.action) == "SEND_BACK_TO_CITIZEN" || (action === null || action === void 0 ? void 0 : action.action) == "APPROVE") {
+  if ((action === null || action === void 0 ? void 0 : action.action) == "REVOCATE" || (action === null || action === void 0 ? void 0 : action.action) == "REJECT" || action.action == "SKIP_PAYMENT" || (action === null || action === void 0 ? void 0 : action.action) == "SEND_BACK_TO_CITIZEN" || (action === null || action === void 0 ? void 0 : action.action) == "APPROVE" || (action === null || action === void 0 ? void 0 : action.action) == "PULLBACK") {
     isRejectOrRevocate = true;
   }
-  console.log("actionInModal", action);
+  let isCondittionalComentsRequired = false;
+  if ((action === null || action === void 0 ? void 0 : action.action) == "APPROVE") {
+    isCondittionalComentsRequired = true;
+  }
   return {
     label: {
       heading: `WF_${action === null || action === void 0 ? void 0 : action.action}_APPLICATION`,
@@ -8329,7 +8345,13 @@ const configBPAApproverApplication = ({
           selected: selectedBlockReason,
           isMandatory: true
         }) : null
-      }, {
+      }, ...(isCondittionalComentsRequired ? [{
+        label: t("WF_CONDITIONAL_COMMENTS_LABEL"),
+        type: "textarea",
+        populators: {
+          name: "conditionalComments"
+        }
+      }] : []), {
         label: t("WF_COMMON_COMMENTS"),
         type: "textarea",
         isMandatory: true,
@@ -9511,7 +9533,13 @@ const ActionModal$3 = ({
     return result;
   };
   async function submit(data) {
-    var _applicationData7, _applicationData8, _data$comments, _data$comments2, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19, _applicationData9, _applicationData9$add, _workflowDetails$data20, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _applicationData0, _applicationData0$add, _applicationData0$add2, _applicationData1, _applicationData1$add, _applicationData1$add2, _applicationData10, _applicationData10$ad, _applicationData10$ad2, _applicationData11, _applicationData11$ad, _applicationData11$ad2;
+    var _data$comments, _data$conditionalComm, _applicationData7, _applicationData8, _data$comments2, _data$comments3, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19, _applicationData9, _applicationData9$add, _workflowDetails$data20, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _applicationData0, _applicationData0$add, _applicationData0$add2, _applicationData1, _applicationData1$add, _applicationData1$add2, _applicationData10, _applicationData10$ad, _applicationData10$ad2, _applicationData11, _applicationData11$ad, _applicationData11$ad2;
+    const commentsText = data === null || data === void 0 ? void 0 : (_data$comments = data.comments) === null || _data$comments === void 0 ? void 0 : _data$comments.toString().trim();
+    const conditionalText = data === null || data === void 0 ? void 0 : (_data$conditionalComm = data.conditionalComments) === null || _data$conditionalComm === void 0 ? void 0 : _data$conditionalComm.trim();
+    let finalComments = commentsText;
+    if ((action === null || action === void 0 ? void 0 : action.action) === "APPROVE" && conditionalText) {
+      finalComments = `${commentsText}[#?..**]${conditionalText || ""}`;
+    }
     applicationData = {
       ...applicationData,
       documents: (_applicationData7 = applicationData) === null || _applicationData7 === void 0 ? void 0 : _applicationData7.documents,
@@ -9523,8 +9551,8 @@ const ActionModal$3 = ({
       },
       workflow: {
         action: action === null || action === void 0 ? void 0 : action.action,
-        comment: (data === null || data === void 0 ? void 0 : (_data$comments = data.comments) === null || _data$comments === void 0 ? void 0 : _data$comments.length) > 0 ? selectedBlockReason !== null && selectedBlockReason !== void 0 && selectedBlockReason.name ? (selectedBlockReason === null || selectedBlockReason === void 0 ? void 0 : selectedBlockReason.name) + " - " + (data === null || data === void 0 ? void 0 : data.comments) : data === null || data === void 0 ? void 0 : data.comments : null,
-        comments: (data === null || data === void 0 ? void 0 : (_data$comments2 = data.comments) === null || _data$comments2 === void 0 ? void 0 : _data$comments2.length) > 0 ? selectedBlockReason !== null && selectedBlockReason !== void 0 && selectedBlockReason.name ? (selectedBlockReason === null || selectedBlockReason === void 0 ? void 0 : selectedBlockReason.name) + " - " + (data === null || data === void 0 ? void 0 : data.comments) : data === null || data === void 0 ? void 0 : data.comments : null,
+        comment: (data === null || data === void 0 ? void 0 : (_data$comments2 = data.comments) === null || _data$comments2 === void 0 ? void 0 : _data$comments2.length) > 0 ? selectedBlockReason !== null && selectedBlockReason !== void 0 && selectedBlockReason.name ? (selectedBlockReason === null || selectedBlockReason === void 0 ? void 0 : selectedBlockReason.name) + " - " + finalComments : finalComments : null,
+        comments: (data === null || data === void 0 ? void 0 : (_data$comments3 = data.comments) === null || _data$comments3 === void 0 ? void 0 : _data$comments3.length) > 0 ? selectedBlockReason !== null && selectedBlockReason !== void 0 && selectedBlockReason.name ? (selectedBlockReason === null || selectedBlockReason === void 0 ? void 0 : selectedBlockReason.name) + " - " + finalComments : finalComments : null,
         assignee: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data6 = workflowDetails.data) === null || _workflowDetails$data6 === void 0 ? void 0 : (_workflowDetails$data7 = _workflowDetails$data6.processInstances) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7[0]) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8.state) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data0 = workflowDetails.data) === null || _workflowDetails$data0 === void 0 ? void 0 : (_workflowDetails$data1 = _workflowDetails$data0.processInstances) === null || _workflowDetails$data1 === void 0 ? void 0 : (_workflowDetails$data10 = _workflowDetails$data1[0]) === null || _workflowDetails$data10 === void 0 ? void 0 : (_workflowDetails$data11 = _workflowDetails$data10.assigner) === null || _workflowDetails$data11 === void 0 ? void 0 : _workflowDetails$data11.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
         assignes: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data12 = workflowDetails.data) === null || _workflowDetails$data12 === void 0 ? void 0 : (_workflowDetails$data13 = _workflowDetails$data12.processInstances) === null || _workflowDetails$data13 === void 0 ? void 0 : (_workflowDetails$data14 = _workflowDetails$data13[0]) === null || _workflowDetails$data14 === void 0 ? void 0 : (_workflowDetails$data15 = _workflowDetails$data14.state) === null || _workflowDetails$data15 === void 0 ? void 0 : _workflowDetails$data15.applicationStatus) === "FIELDINSPECTION_INPROGRESS" ? [workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data16 = workflowDetails.data) === null || _workflowDetails$data16 === void 0 ? void 0 : (_workflowDetails$data17 = _workflowDetails$data16.processInstances) === null || _workflowDetails$data17 === void 0 ? void 0 : (_workflowDetails$data18 = _workflowDetails$data17[0]) === null || _workflowDetails$data18 === void 0 ? void 0 : (_workflowDetails$data19 = _workflowDetails$data18.assigner) === null || _workflowDetails$data19 === void 0 ? void 0 : _workflowDetails$data19.uuid] : !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
         varificationDocuments: uploadedFile ? [{
@@ -15560,8 +15588,9 @@ const ApplicationDetails = props => {
 const ApplicationOverview = () => {
   var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _nocDatils$2, _workflowDetails$data8, _workflowDetails$data9, _applicationDetails$a, _applicationDetails$a2, _applicationDetails$a3;
   const {
-    id
+    nocid
   } = useParams();
+  const id = decodeURIComponentCustom(nocid);
   const {
     t
   } = useTranslation();
@@ -15594,6 +15623,8 @@ const ApplicationOverview = () => {
     data: applicationDetails
   } = Digit.Hooks.noc.useNOCDetails(t, tenantId, {
     applicationNo: id
+  }, {
+    enabled: !!id
   });
   const {
     isLoading: updatingApplication,
@@ -15620,6 +15651,12 @@ const ApplicationOverview = () => {
   const closeToast = () => {
     setShowToast(null);
   };
+  React.useEffect(() => {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
+  }, []);
   useEffect$1(() => {
     setNocDetails([applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData]);
   }, [applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData]);
@@ -19456,8 +19493,14 @@ const PdfPreviewModal = ({
     headerBarEnd: /*#__PURE__*/React.createElement(CloseBtn$e, {
       onClick: onClose
     }),
-    className: className || "noc-popupStyles",
-    hideSubmit: true
+    hideSubmit: true,
+    popupStyles: {
+      backgroundColor: "#fff",
+      position: 'relative',
+      maxHeight: '90vh',
+      width: '80%',
+      overflowY: 'auto'
+    }
   }, url ? /*#__PURE__*/React.createElement("div", {
     style: {
       height: "80vh",
@@ -20961,8 +21004,9 @@ function cleanEscapedString(input) {
 const NOCEmployeeApplicationOverview = () => {
   var _window, _window$Digit, _window$Digit$Utils, _window$Digit$Utils$b, _applicationDetails$N, _applicationDetails$N2, _applicationDetails$N3, _applicationDetails$N4, _applicationDetails$N5, _applicationDetails$N6, _applicationDetails$N7, _applicationDetails$N8, _applicationDetails$N9, _applicationDetails$N0, _applicationDetails$N1, _applicationDetails$N10, _applicationDetails$N11, _applicationDetails$N12, _applicationDetails$N13, _applicationDetails$N14, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _applicationDetails$N23, _applicationDetails$N24, _applicationDetails$N25, _applicationDetails$N26, _applicationDetails$N27, _displayData$Document, _displayData$Document2, _displayData$Document3, _applicationDetails$N28, _applicationDetails$N29, _applicationDetails$N30, _applicationDetails$N31, _applicationDetails$N37, _applicationDetails$N38, _user3, _user3$info, _user4, _user4$info, _user4$info$roles, _user5, _user5$info, _user5$info$roles, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _applicationDetails$N48, _applicationDetails$N49, _applicationDetails$N50, _applicationDetails$N51, _applicationDetails$N67, _applicationDetails$N68, _applicationDetails$N69, _applicationDetails$N70, _applicationDetails$N71, _applicationDetails$N72, _applicationDetails$N73, _applicationDetails$N74, _applicationDetails$N75, _applicationDetails$N76, _applicationDetails$N77, _applicationDetails$N78, _applicationDetails$N79, _applicationDetails$N80, _applicationDetails$N81, _applicationDetails$N82, _applicationDetails$N83, _applicationDetails$N84, _displayData$applican, _displayData$applican2, _displayData$applican3, _displayData$applican4, _displayData$applican5, _displayData$applican6, _displayData$applican7, _displayData$ownerPho, _displayData$ownerPho2, _displayData$applican8, _displayData$applican9, _displayData$applican0, _displayData$applican1, _displayData$applican10, _displayData$applican11, _displayData$applican12, _displayData$applican13, _displayData$applican14, _displayData$siteDeta, _displayData$siteDeta2, _applicationDetails$N85, _applicationDetails$N86, _applicationDetails$N87, _applicationDetails$N88, _siteImages$documents5, _applicationDetails$N89, _applicationDetails$N90, _applicationDetails$N91, _applicationDetails$N92, _applicationDetails$N93, _applicationDetails$N94, _applicationDetails$N95, _applicationDetails$N96, _applicationDetails$N97, _applicationDetails$N98, _applicationDetails$N99, _applicationDetails$N100, _applicationDetails$N101, _applicationDetails$N102, _applicationDetails$N103, _applicationDetails$N104, _applicationDetails$N105, _applicationDetails$N106, _applicationDetails$N107, _applicationDetails$N108, _applicationDetails$N109, _applicationDetails$N110, _applicationDetails$N111, _applicationDetails$N112, _applicationDetails$N113, _applicationDetails$N114, _applicationDetails$N115, _applicationDetails$N116, _applicationDetails$N117, _applicationDetails$N118, _applicationDetails$N119, _applicationDetails$N120, _applicationDetails$N121, _applicationDetails$N122, _applicationDetails$N123, _applicationDetails$N124, _applicationDetails$N125, _applicationDetails$N126, _applicationDetails$N127, _applicationDetails$N128, _applicationDetails$N129, _applicationDetails$N130, _applicationDetails$N131, _applicationDetails$N132, _applicationDetails$N133, _applicationDetails$N134, _applicationDetails$N135, _applicationDetails$N136, _applicationDetails$N137, _applicationDetails$N138, _applicationDetails$N139, _applicationDetails$N140, _applicationDetails$N141, _applicationDetails$N142, _applicationDetails$N143, _applicationDetails$N144, _applicationDetails$N145, _applicationDetails$N146, _applicationDetails$N147, _applicationDetails$N148, _applicationDetails$N149, _applicationDetails$N150, _applicationDetails$N151, _applicationDetails$N152, _applicationDetails$N153, _applicationDetails$N154, _applicationDetails$N155, _applicationDetails$N156, _applicationDetails$N157, _applicationDetails$N158, _applicationDetails$N159, _applicationDetails$N160, _applicationDetails$N161, _applicationDetails$N162, _applicationDetails$N163, _applicationDetails$N164, _applicationDetails$N165, _applicationDetails$N166, _applicationDetails$N167, _applicationDetails$N168, _applicationDetails$N169, _applicationDetails$N170, _applicationDetails$N171, _applicationDetails$N172, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14;
   const {
-    id
+    nocid
   } = useParams();
+  const id = decodeURIComponentCustom(nocid);
   const {
     t
   } = useTranslation();
@@ -20991,7 +21035,9 @@ const NOCEmployeeApplicationOverview = () => {
     refetch
   } = Digit.Hooks.noc.useNOCSearchApplication({
     applicationNo: id
-  }, tenantId);
+  }, tenantId, {
+    enabled: !!id
+  });
   const loading = isLoading || getLoader;
   const applicationDetails = data === null || data === void 0 ? void 0 : data.resData;
   console.log("applicationDetails", applicationDetails);
@@ -21334,12 +21380,8 @@ const NOCEmployeeApplicationOverview = () => {
   }
   const userRoles = (_user5 = user) === null || _user5 === void 0 ? void 0 : (_user5$info = _user5.info) === null || _user5$info === void 0 ? void 0 : (_user5$info$roles = _user5$info.roles) === null || _user5$info$roles === void 0 ? void 0 : _user5$info$roles.map(e => e.code);
   useEffect$1(() => {
-    if (workflowDetails) {
-      workflowDetails.revalidate();
-    }
-    if (data) {
-      data.revalidate();
-    }
+    refetch();
+    workflowDetails.revalidate();
   }, []);
   let actions = (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data8 = workflowDetails.data) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8.actionState) === null || _workflowDetails$data9 === void 0 ? void 0 : (_workflowDetails$data0 = _workflowDetails$data9.nextActions) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.filter(e => {
     return (userRoles === null || userRoles === void 0 ? void 0 : userRoles.some(role => {
@@ -22431,7 +22473,7 @@ const useInboxTableConfig = ({
       }) => {
         console.log('row in inbox', row);
         return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Link, {
-          to: `${parentRoute}/inbox/application-overview/${row.original["applicationId"]}`
+          to: `${parentRoute}/inbox/application-overview/${encodeURIComponentCustom(row.original["applicationId"])}`
         }, /*#__PURE__*/React.createElement("span", {
           className: "link"
         }, row.original["applicationId"])));
@@ -22540,7 +22582,11 @@ const useInboxMobileCardsData = ({
     [t("NOC_APPLICATION_NUMBER")]: applicationId,
     [t("TL_COMMON_TABLE_COL_APP_DATE")]: format(new Date(date), 'dd/MM/yyyy'),
     [t("NOC_PRIMARY_OWNER_NAME_LABEL")]: t(owner),
-    [t("PT_COMMON_TABLE_COL_STATUS_LABEL")]: t(status)
+    [t("PT_COMMON_TABLE_COL_STATUS_LABEL")]: t(status),
+    "Vehicle Log": {
+      id: encodeURIComponentCustom(applicationId),
+      hidden: true
+    }
   }));
   const MobileSortFormValues = () => {
     const sortOrderOptions = [{
@@ -22570,10 +22616,14 @@ const useInboxMobileCardsData = ({
       })
     }));
   };
+  const serviceRequestIdKeyFunction = object => {
+    var _object$VehicleLog;
+    return (_object$VehicleLog = object["Vehicle Log"]) === null || _object$VehicleLog === void 0 ? void 0 : _object$VehicleLog.id;
+  };
   return {
     data: dataForMobileInboxCards,
     linkPrefix: `${parentRoute}/inbox/application-overview/`,
-    serviceRequestIdKey: t("NOC_APPLICATION_NUMBER"),
+    serviceRequestIdKey: serviceRequestIdKeyFunction,
     MobileSortFormValues
   };
 };
@@ -22740,7 +22790,8 @@ const Inbox = ({
   console.log('employeeName, employeeRole', employeeName, employeeRole);
   const {
     isLoading: isInboxLoading,
-    data
+    data,
+    refetch
   } = Digit.Hooks.noc.useInbox({
     tenantId,
     filters: {
@@ -22748,9 +22799,7 @@ const Inbox = ({
     }
   });
   useEffect$1(() => {
-    if (data) {
-      data.revalidate();
-    }
+    refetch();
   }, []);
   const [table, setTable] = useState([]);
   const [statuses, setStatuses] = useState([]);
@@ -22945,6 +22994,13 @@ const NOCBreadCrumbs$1 = ({
     t
   } = useTranslation();
   const getBreadcrumbs = () => {
+    var _Digit$UserService, _user$info, _user$info$roles, _user$info2, _user$info2$roles;
+    const tenantId = localStorage.getItem("CITIZEN.CITY");
+    const user = (_Digit$UserService = Digit.UserService) === null || _Digit$UserService === void 0 ? void 0 : _Digit$UserService.getUser();
+    const isUserRegistered = (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : (_user$info$roles = _user$info.roles) === null || _user$info$roles === void 0 ? void 0 : _user$info$roles.some(role => (role === null || role === void 0 ? void 0 : role.code) === "BPA_ARCHITECT")) || (user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : (_user$info2$roles = _user$info2.roles) === null || _user$info2$roles === void 0 ? void 0 : _user$info2$roles.some(role => {
+      var _role$code;
+      return (role === null || role === void 0 ? void 0 : (_role$code = role.code) === null || _role$code === void 0 ? void 0 : _role$code.includes("BPA")) && (role === null || role === void 0 ? void 0 : role.tenantId) === tenantId;
+    }));
     const breadcrumbs = [];
     const hasSecondBreadcrumb = location.pathname.includes("/noc/new-application") || location.pathname.includes("noc/my-application") || location.pathname.includes("noc/search/application-overview/") || location.pathname.includes("noc/search-application");
     breadcrumbs.push(/*#__PURE__*/React.createElement("span", {
@@ -22964,7 +23020,7 @@ const NOCBreadCrumbs$1 = ({
       breadcrumbs.push(/*#__PURE__*/React.createElement("span", {
         key: "noc"
       }, /*#__PURE__*/React.createElement(Link, {
-        to: "/digit-ui/citizen/noc-home",
+        to: isUserRegistered ? "/digit-ui/citizen/obps/home" : "/digit-ui/citizen/noc-home",
         style: {
           textDecoration: "none"
         }
@@ -23021,7 +23077,7 @@ const App = () => {
     path: `${path}/my-application`,
     component: NOCCitizenMyApplications
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/edit-application/:id`,
+    path: `${path}/edit-application/:nocid`,
     component: NewNOCEditApplication
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/search/application-overview/:nocid`,
@@ -25976,6 +26032,12 @@ const NewNOCStepFormOne = ({
   });
   console.log("ownerIds", ownerIds);
   console.log("ownerPhotos", ownerPhotos);
+  React.useEffect(() => {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
+  }, []);
   useEffect$1(() => {
     console.log("useffect 8");
     if (!lodash.isEqual(ownerIdList, ownerIds)) setOwnerIdList(ownerIds === null || ownerIds === void 0 ? void 0 : ownerIds.ownerIdList);
@@ -27497,6 +27559,12 @@ const NewNOCStepFormTwo = ({
   const ownerIds = useSelector(function (state) {
     return state.noc.NOCNewApplicationFormReducer.ownerIds;
   });
+  React.useEffect(() => {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
+  }, []);
   const handleBack = () => {
     const data = getValues();
     dispatch(UPDATE_NOCNewApplication_FORM(config.key, data));
@@ -27771,6 +27839,12 @@ const NewNOCStepFormThree = ({
     return (state === null || state === void 0 ? void 0 : (_state$noc = state.noc) === null || _state$noc === void 0 ? void 0 : (_state$noc$NOCNewAppl = _state$noc.NOCNewApplicationFormReducer) === null || _state$noc$NOCNewAppl === void 0 ? void 0 : _state$noc$NOCNewAppl.coordinates) || {};
   });
   console.log("coordinates from redux", coordinates);
+  React.useEffect(() => {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
+  }, []);
   function goNext(finaldata) {
     var _coordinates$Latitude, _coordinates$Latitude2, _coordinates$Longitud, _coordinates$Longitud2;
     const missingFields = validation(finaldata);
@@ -28140,6 +28214,12 @@ const NewNOCStepFormFour = ({
   }, {
     enabled: !!calculatorPayload
   });
+  React.useEffect(() => {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
+  }, []);
   useEffect$1(() => {
     revalidate();
   }, [currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.siteDetails, currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.applicationDetails]);
@@ -29302,8 +29382,9 @@ const updatedCreateEmployeeconfig$1 = createEmployeeConfig$1.map(item => {
 const EditApplication = () => {
   var _applicationDetails$N, _nocObject$nocDetails, _nocObject$nocDetails2, _nocObject$nocDetails3, _nocObject$nocDetails4, _nocObject$documents, _nocObject$nocDetails5, _nocObject$nocDetails6, _nocObject$nocDetails7, _nocObject$nocDetails8, _nocObject$nocDetails9, _nocObject$nocDetails0, _genderTypeData$commo, _genderTypeData$commo2, _genderTypeData$commo3, _zoneList$tenant, _zoneList$tenant$zone, _zoneList$tenant$zone2, _applicationDetails$N2;
   const {
-    id
+    nocid
   } = useParams();
+  const id = decodeURIComponentCustom(nocid);
   const history = useHistory();
   const {
     t
@@ -29324,7 +29405,9 @@ const EditApplication = () => {
     data
   } = Digit.Hooks.noc.useNOCSearchApplication({
     applicationNo: id
-  }, tenantId);
+  }, tenantId, {
+    enabled: !!id
+  });
   const applicationDetails = data === null || data === void 0 ? void 0 : data.resData;
   console.log("applicationDetails here==>", applicationDetails);
   const nocObject = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$N = applicationDetails.Noc) === null || _applicationDetails$N === void 0 ? void 0 : _applicationDetails$N[0]) || {};
@@ -29668,7 +29751,7 @@ const MyApplications = ({
       label: t("TL_VIEW_DETAILS"),
       onSubmit: () => {
         var _application$Applicat0;
-        return history.push(`/digit-ui/citizen/noc/search/application-overview/${application === null || application === void 0 ? void 0 : (_application$Applicat0 = application.Applications) === null || _application$Applicat0 === void 0 ? void 0 : _application$Applicat0.applicationNo}`);
+        return history.push(`/digit-ui/citizen/noc/search/application-overview/${encodeURIComponentCustom(application === null || application === void 0 ? void 0 : (_application$Applicat0 = application.Applications) === null || _application$Applicat0 === void 0 ? void 0 : _application$Applicat0.applicationNo)}`);
       }
     }));
   })) : /*#__PURE__*/React.createElement("div", {
@@ -29721,7 +29804,9 @@ const CitizenApplicationOverview = () => {
     refetch
   } = Digit.Hooks.noc.useNOCSearchApplication({
     applicationNo: id
-  }, tenantId);
+  }, tenantId, {
+    enabled: !!id
+  });
   const applicationDetails = data === null || data === void 0 ? void 0 : data.resData;
   const [timeObj, setTimeObj] = useState(null);
   const [appDate, setAppDate] = useState(null);
@@ -29763,6 +29848,14 @@ const CitizenApplicationOverview = () => {
       longitude: value === null || value === void 0 ? void 0 : value.longitude
     }));
   }, [siteImages]);
+  React.useEffect(() => {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
+    refetch();
+    workflowDetails.revalidate();
+  }, []);
   useEffect$1(() => {
     var _applicationDetails$N9;
     const nocObject = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$N9 = applicationDetails.Noc) === null || _applicationDetails$N9 === void 0 ? void 0 : _applicationDetails$N9[0];
@@ -30103,7 +30196,8 @@ const CitizenApplicationOverview = () => {
       Licenses: [action]
     };
     if ((action === null || action === void 0 ? void 0 : action.action) == "EDIT") {
-      history.push(`/digit-ui/citizen/noc/edit-application/${appNo}`);
+      const encyptedID = encodeURIComponentCustom(appNo);
+      history.push(`/digit-ui/citizen/noc/edit-application/${encyptedID}`);
     } else if ((action === null || action === void 0 ? void 0 : action.action) == "DRAFT") {
       setShowToast({
         key: "true",
@@ -30705,7 +30799,7 @@ const SearchApplicationMobileView$1 = ({
     data: propsMobileInboxCards,
     isTwoDynamicPrefix: false,
     linkPrefix: `/digit-ui/citizen/noc/search/application-overview/`,
-    serviceRequestIdKey: t("NOC_APPLICATION_NUMBER")
+    serviceRequestIdKey: "Generated ID"
   }));
 };
 
@@ -30837,7 +30931,8 @@ const SearchApplication$1 = ({
   const propsMobileInboxCards = useMemo(() => data === null || data === void 0 ? void 0 : data.map(data => ({
     [t("NOC_APPLICATION_NUMBER")]: (data === null || data === void 0 ? void 0 : data.applicationNo) || "-",
     [t("TL_COMMON_TABLE_COL_APP_DATE")]: (data === null || data === void 0 ? void 0 : data.date) || "-",
-    [t("PT_COMMON_TABLE_COL_STATUS_LABEL")]: data !== null && data !== void 0 && data.applicationStatus ? t(`${data.applicationStatus}`) : "-"
+    [t("PT_COMMON_TABLE_COL_STATUS_LABEL")]: data !== null && data !== void 0 && data.applicationStatus ? t(`${data.applicationStatus}`) : "-",
+    "Generated ID": encodeURIComponentCustom(data === null || data === void 0 ? void 0 : data.applicationNo)
   })), [data]);
   if (isMobile) return /*#__PURE__*/React.createElement(FormProvider, methods, /*#__PURE__*/React.createElement(SearchApplicationMobileView$1, {
     SearchFormFieldsComponent: SearchFormFieldsComponent$1,