@djb25/digit-ui-module-ekyc 1.0.56 → 1.0.58

package/dist/index.js

@@ -3792,7 +3792,7 @@ const ReviewSection = _ref2 => {
   })))));
 };
 const Review = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _newDataRaw$connectio, _newDataRaw$connectio2, _newDataRaw$connectio3, _newDataRaw$address, _newDataRaw$address2, _newDataRaw$address3, _newDataRaw$address4, _newDataRaw$address5, _newDataRaw$address6, _newDataRaw$address7, _newDataRaw$address8, _newDataRaw$address9, _newDataRaw$address0, _newDataRaw$address1, _newDataRaw$address10, _newDataRaw$address11, _newDataRaw$address12, _newDataRaw$address13, _newDataRaw$address14, _newDataRaw$property, _newDataRaw$property2, _editedProperty$conne, _newDataRaw$property3, _editedProperty$conne2, _newDataRaw$property4, _editedProperty$userT, _newDataRaw$property5, _editedProperty$noOfF, _newDataRaw$property6, _newDataRaw$property7, _newDataRaw$meter, _editedMeter$meterSta, _newDataRaw$meter2, _newDataRaw$meter3, _newDataRaw$meter4, _newDataRaw$meter5, _editedMeter$workingS, _newDataRaw$meter6, _editedMeter$lastBill, _newDataRaw$meter7, _newDataRaw$meter8, _Digit$UserService$ge, _supervisorData;
+  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _newDataRaw$connectio, _newDataRaw$connectio2, _newDataRaw$connectio3, _newDataRaw$address, _newDataRaw$address2, _newDataRaw$address3, _newDataRaw$address4, _newDataRaw$address5, _newDataRaw$address6, _newDataRaw$address7, _newDataRaw$address8, _newDataRaw$address9, _newDataRaw$address0, _newDataRaw$address1, _newDataRaw$address10, _newDataRaw$address11, _newDataRaw$address12, _newDataRaw$address13, _newDataRaw$address14, _newDataRaw$property, _newDataRaw$property2, _editedProperty$conne, _newDataRaw$property3, _editedProperty$conne2, _newDataRaw$property4, _editedProperty$userT, _newDataRaw$property5, _editedProperty$noOfF, _newDataRaw$property6, _newDataRaw$property7, _newDataRaw$meter, _editedMeter$meterSta, _newDataRaw$meter2, _newDataRaw$meter3, _newDataRaw$meter4, _newDataRaw$meter5, _editedMeter$workingS, _newDataRaw$meter6, _editedMeter$lastBill, _newDataRaw$meter7, _newDataRaw$meter8, _Digit$UserService$ge;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const history = reactRouterDom.useHistory();
@@ -3854,8 +3854,6 @@ const Review = () => {
   const userRoles = ((_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : (_Digit$SessionStorage2 = _Digit$SessionStorage.info) === null || _Digit$SessionStorage2 === void 0 ? void 0 : (_Digit$SessionStorage3 = _Digit$SessionStorage2.roles) === null || _Digit$SessionStorage3 === void 0 ? void 0 : _Digit$SessionStorage3.map(ele => ele.code)) || [];
   const isZRO = userRoles.includes("EKYC_ZRO") || userRoles.includes("ZRO");
   const isSupervisorOrSurveyorOrVendor = userRoles.includes("EKYC_SURVEYOR") || userRoles.includes("EKYC_VENDOR");
-  const EKYC_ROLE_PRIORITY = ["EKYC_ZRO", "ZRO", "EKYC_SUPERVISOR", "EKYC_SURVEYOR", "EKYC_VENDOR"];
-  const currentUserRole = EKYC_ROLE_PRIORITY.find(r => userRoles.includes(r)) || userRoles[0] || "EMPLOYEE";
   const isStatusView = location.pathname.includes("/status/");
   const hideEditButton = isSupervisorOrSurveyorOrVendor && !isZRO || isStatusView;
   const _extractReviewData = extractReviewData(searchData, flowState),
@@ -4290,7 +4288,14 @@ const Review = () => {
   }];
   const handleDeclaration = () => setAgree(!agree);
   const loggedInUserInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
-  const matchedSupervisor = (_supervisorData = supervisorData) === null || _supervisorData === void 0 ? void 0 : _supervisorData.find(s => (s === null || s === void 0 ? void 0 : s.uuid) === (loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.uuid) || (s === null || s === void 0 ? void 0 : s.userName) === (loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.userName));
+  const _Digit$Hooks$useUserS = Digit.Hooks.useUserSearch(tenantId, {
+      uuid: [loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.uuid]
+    }, {}, {
+      enabled: !!(loggedInUserInfo !== null && loggedInUserInfo !== void 0 && loggedInUserInfo.uuid)
+    }),
+    userData = _Digit$Hooks$useUserS.data;
+  const supervisorData = (userData === null || userData === void 0 ? void 0 : userData.user) || [];
+  const matchedSupervisor = supervisorData === null || supervisorData === void 0 ? void 0 : supervisorData.find(s => (s === null || s === void 0 ? void 0 : s.uuid) === (loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.uuid) || (s === null || s === void 0 ? void 0 : s.userName) === (loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.userName));
   const supervisorId = (matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.uuid) || (loggedInUserInfo === null || loggedInUserInfo === void 0 ? void 0 : loggedInUserInfo.uuid);
   const handleReject = function () {
     try {
@@ -4307,7 +4312,7 @@ const Review = () => {
         action: "REJECTED",
         remarks: "Application rejected by reviewer",
         reviewedBy: supervisorId,
-        role: currentUserRole
+        role: "ZRO"
       };
       const _temp = _catch(function () {
         return Promise.resolve(workflowMutation.mutateAsync(payload)).then(function (result) {
@@ -4352,7 +4357,7 @@ const Review = () => {
         action: "APPROVED",
         remarks: "All documents verified",
         reviewedBy: supervisorId,
-        role: currentUserRole
+        role: "ZRO"
       };
       const _temp2 = _catch(function () {
         return Promise.resolve(workflowMutation.mutateAsync(payload)).then(function (result) {