@djb25/digit-ui-module-ekyc 1.0.46 → 1.0.47

package/dist/index.js

@@ -143,13 +143,14 @@ const StatusCards = _ref => {
   }
   const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
   const fullName = (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.name) || "Admin";
+  const hasExternalData = countData && typeof countData.total === "number" && typeof countData.submittedCount === "number";
   const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycSurveyorDashboard({}, {
       tenantId,
       offset: 0,
       limit: 10,
       ekycStatus: "submitted"
     }, {
-      enabled: !!tenantId
+      enabled: !!tenantId && !hasExternalData
     }),
     dashboardData = _Digit$Hooks$ekyc$use.data;
   const apiCountData = React__default.useMemo(() => {
@@ -246,12 +247,12 @@ const StatusCards = _ref => {
   };
   const chartRef1 = React.useRef(null);
   const chartInstance1 = React.useRef(null);
-  const total = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.total) || (countData === null || countData === void 0 ? void 0 : countData.total) || (countData === null || countData === void 0 ? void 0 : countData.totalCount) || 0;
-  const pending = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.pending) || (countData === null || countData === void 0 ? void 0 : countData.pending) || 0;
-  const active = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.active) || (countData === null || countData === void 0 ? void 0 : countData.active) || 0;
-  const completed = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.completed) || (countData === null || countData === void 0 ? void 0 : countData.completed) || 0;
-  const inprocess = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.inProgressCount) || (countData === null || countData === void 0 ? void 0 : countData.inProgressCount) || 0;
-  const submitted = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.submittedCount) || (countData === null || countData === void 0 ? void 0 : countData.submittedCount) || 0;
+  const total = hasExternalData ? countData.total : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.total) || (countData === null || countData === void 0 ? void 0 : countData.total) || (countData === null || countData === void 0 ? void 0 : countData.totalCount) || 0;
+  const pending = hasExternalData ? countData.pending : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.pending) || (countData === null || countData === void 0 ? void 0 : countData.pending) || 0;
+  const active = hasExternalData ? countData.active : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.active) || (countData === null || countData === void 0 ? void 0 : countData.active) || 0;
+  const completed = hasExternalData ? countData.completed : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.completed) || (countData === null || countData === void 0 ? void 0 : countData.completed) || 0;
+  const inprocess = hasExternalData ? countData.inProgressCount : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.inProgressCount) || (countData === null || countData === void 0 ? void 0 : countData.inProgressCount) || 0;
+  const submitted = hasExternalData ? countData.submittedCount : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.submittedCount) || (countData === null || countData === void 0 ? void 0 : countData.submittedCount) || 0;
   const actualCompleted = completed;
   const approved = actualCompleted;
   const efficiency = total > 0 ? Math.round((submitted + completed) / total * 100) : 0;
@@ -439,7 +440,9 @@ const Dashboard = () => {
       completed: info.completed || 0,
       pending: info.pending || 0,
       rejected: info.rejected || 0,
-      active: info.active || 0
+      active: info.active || 0,
+      submittedCount: info.submittedCount || 0,
+      inProgressCount: info.inProgressCount || 0
     };
   }, [dashboardData]);
   return isLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
@@ -2142,14 +2145,16 @@ const VendorDetailsCard = () => {
   const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
       status: "ACTIVE"
     }, {
-      enabled: !!tenantId
+      enabled: !!tenantId,
+      staleTime: 300000
     }),
     vendorSearchResponse = _Digit$Hooks$fsm$useD.data,
     isVendorSearchLoading = _Digit$Hooks$fsm$useD.isLoading;
   const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
       status: "ACTIVE"
     }, {
-      enabled: !!tenantId
+      enabled: !!tenantId,
+      staleTime: 300000
     }),
     supervisorSearchResponse = _Digit$Hooks$fsm$useS.data,
     isSupervisorSearchLoading = _Digit$Hooks$fsm$useS.isLoading;
@@ -2237,7 +2242,7 @@ const VendorDetailsCard = () => {
   }, [vendor]);
   const zoneIds = React.useMemo(() => {
     var _vendor$zoneIds;
-    return vendor !== null && vendor !== void 0 && (_vendor$zoneIds = vendor.zoneIds) !== null && _vendor$zoneIds !== void 0 && _vendor$zoneIds.length ? vendor.zoneIds.map(zone => zone.toUpperCase().replace("", " ")).join(", ") : "N/A";
+    return vendor !== null && vendor !== void 0 && (_vendor$zoneIds = vendor.zoneIds) !== null && _vendor$zoneIds !== void 0 && _vendor$zoneIds.length ? vendor.zoneIds.filter(Boolean).map(zone => String(zone).toUpperCase().replace("", " ")).join(", ") : "N/A";
   }, [vendor]);
   const cards = React.useMemo(() => {
     const hasRealData = vendorSupervisors.some(s => s.totalKnos > 0);
@@ -6333,21 +6338,24 @@ const SupervisorDetailsCard = () => {
   const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
       status: "ACTIVE"
     }, {
-      enabled: !!tenantId
+      enabled: !!tenantId,
+      staleTime: 300000
     }),
     supervisorSearchResponse = _Digit$Hooks$fsm$useS.data,
     isSupervisorSearchLoading = _Digit$Hooks$fsm$useS.isLoading;
   const _Digit$Hooks$fsm$useS2 = Digit.Hooks.fsm.useSurveyorSearch(tenantId, {
       status: "ACTIVE"
     }, {
-      enabled: !!tenantId
+      enabled: !!tenantId,
+      staleTime: 300000
     }),
     surveyorSearchResponse = _Digit$Hooks$fsm$useS2.data,
     isSurveyorSearchLoading = _Digit$Hooks$fsm$useS2.isLoading;
   const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
       status: "ACTIVE"
     }, {
-      enabled: !!tenantId
+      enabled: !!tenantId,
+      staleTime: 300000
     }),
     vendorSearchResponse = _Digit$Hooks$fsm$useD.data,
     isVendorSearchLoading = _Digit$Hooks$fsm$useD.isLoading;
@@ -7383,7 +7391,7 @@ const AssignEkycModal = _ref => {
 };
 
 const SurveyorDetailsDashboard = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _fullName$charAt, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _surveyor$owner8, _surveyor$owner9, _surveyor$owner0, _dashboardData$dashbo5, _dashboardData$dashbo6;
+  var _Digit$SessionStorage, _Digit$SessionStorage2, _surveyorSearchById$s, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _fullName$charAt, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _surveyor$owner8, _surveyor$owner9, _surveyor$owner0, _dashboardData$dashbo5, _dashboardData$dashbo6;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useState = React.useState(false),
     showModal = _useState[0],
@@ -7407,24 +7415,24 @@ const SurveyorDetailsDashboard = () => {
     }),
     surveyorSearchById = _Digit$Hooks$fsm$useS.data,
     isLoadingId = _Digit$Hooks$fsm$useS.isLoading;
+  const hasFoundById = !!(surveyorSearchById !== null && surveyorSearchById !== void 0 && (_surveyorSearchById$s = surveyorSearchById.surveyors) !== null && _surveyorSearchById$s !== void 0 && _surveyorSearchById$s.length);
   const _Digit$Hooks$fsm$useS2 = Digit.Hooks.fsm.useSurveyorSearch(tenantId, surveyorId ? {
       ownerIds: surveyorId
     } : {
       ownerIds
     }, {
-      enabled: true,
+      enabled: !surveyorId || !isLoadingId && !hasFoundById,
       staleTime: Infinity
     }),
     surveyorSearchByOwner = _Digit$Hooks$fsm$useS2.data,
     isLoadingOwner = _Digit$Hooks$fsm$useS2.isLoading;
   const surveyorSearchResponse = React.useMemo(() => {
-    if (surveyorId) {
-      var _surveyorSearchById$s;
-      return surveyorSearchById !== null && surveyorSearchById !== void 0 && (_surveyorSearchById$s = surveyorSearchById.surveyors) !== null && _surveyorSearchById$s !== void 0 && _surveyorSearchById$s.length ? surveyorSearchById : surveyorSearchByOwner;
+    if (surveyorId && hasFoundById) {
+      return surveyorSearchById;
     }
     return surveyorSearchByOwner;
-  }, [surveyorId, surveyorSearchById, surveyorSearchByOwner]);
-  const isLoading = surveyorId ? isLoadingId || isLoadingOwner : isLoadingOwner;
+  }, [surveyorId, hasFoundById, surveyorSearchById, surveyorSearchByOwner]);
+  const isLoading = surveyorId ? isLoadingId || isLoadingOwner && !hasFoundById : isLoadingOwner;
   const roles = (_Digit$SessionStorage3 = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage3 === void 0 ? void 0 : (_Digit$SessionStorage4 = _Digit$SessionStorage3.info) === null || _Digit$SessionStorage4 === void 0 ? void 0 : _Digit$SessionStorage4.roles.map(ele => ele.code);
   const surveyor = React.useMemo(() => {
     var _surveyorSearchRespon;
@@ -7433,14 +7441,16 @@ const SurveyorDetailsDashboard = () => {
   const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
       status: "ACTIVE"
     }, {
-      enabled: !!tenantId
+      enabled: !!tenantId,
+      staleTime: 300000
     }),
     vendorData = _Digit$Hooks$fsm$useD.data,
     isVendorLoading = _Digit$Hooks$fsm$useD.isLoading;
   const _Digit$Hooks$fsm$useS3 = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
       status: "ACTIVE"
     }, {
-      enabled: !!tenantId
+      enabled: !!tenantId,
+      staleTime: 300000
     }),
     supervisorSearchResponse = _Digit$Hooks$fsm$useS3.data,
     isSupervisorSearchLoading = _Digit$Hooks$fsm$useS3.isLoading;