@djb25/digit-ui-module-vendor 1.0.70 → 1.0.71

package/dist/index.js

@@ -97,7 +97,7 @@ const SurveyorConfig = function (t, agencies, reportingManagers, disabled) {
       isMandatory: true,
       type: "component",
       key: "gender",
-      component: "SelectGender"
+      component: "SelectEkycDropdown"
     }, {
       label: t("ES_FSM_REGISTRY_NEW_DOB"),
       isMandatory: true,
@@ -3520,7 +3520,7 @@ const SupervisorConfig = function (t, agencies, reportingManagers, disabled) {
       isMandatory: true,
       type: "component",
       key: "gender",
-      component: "SelectGender"
+      component: "SelectEkycDropdown"
     }, {
       label: t("ES_FSM_REGISTRY_NEW_DOB"),
       isMandatory: true,
@@ -4678,7 +4678,7 @@ const VendorConfig = function (t, module, genderMenu, update) {
       }
     }, {
       label: "ES_FSM_REGISTRY_NEW_EMAIL",
-      isMandatory: false,
+      isMandatory: true,
       type: "text",
       key: "emailId",
       populators: {
@@ -5939,7 +5939,7 @@ const VENDORCreate = _ref => {
 };
 
 const EditVendor = () => {
-  var _Digit$UserService$ge, _defaultValues$servic2;
+  var _Digit$UserService$ge, _dsoDetails$owner1, _defaultValues$servic2;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
@@ -6101,6 +6101,16 @@ const EditVendor = () => {
       })
     }));
   }, [dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.zoneIds, zones]);
+  React.useEffect(() => {
+    var _dsoDetails$owner0;
+    if (!genderMenu.length || !(dsoDetails !== null && dsoDetails !== void 0 && (_dsoDetails$owner0 = dsoDetails.owner) !== null && _dsoDetails$owner0 !== void 0 && _dsoDetails$owner0.gender)) return;
+    const matchedGender = genderMenu.find(ele => ele.code === dsoDetails.owner.gender);
+    if (matchedGender) {
+      setDefaultValues(prev => _extends({}, prev, {
+        gender: matchedGender
+      }));
+    }
+  }, [genderMenu, dsoDetails === null || dsoDetails === void 0 ? void 0 : (_dsoDetails$owner1 = dsoDetails.owner) === null || _dsoDetails$owner1 === void 0 ? void 0 : _dsoDetails$owner1.gender]);
   const onFormValueChange = (setValue, data) => {
     var _data$serviceType, _data$serviceType2, _data$serviceType2$co, _data$serviceType3, _data$serviceType3$i;
     const isVendorDetailsFilled = (data === null || data === void 0 ? void 0 : data.vendorName) && (data === null || data === void 0 ? void 0 : data.phone) && (data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code);
@@ -6120,7 +6130,7 @@ const EditVendor = () => {
     setShowToast(null);
   };
   const onSubmit = data => {
-    var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$serviceTy2, _mergedData$serviceTy3, _mergedData$serviceTy4, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$gender, _mergedData$serviceTy5;
+    var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$serviceTy2, _mergedData$serviceTy3, _mergedData$serviceTy4, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$serviceTy5;
     const mergedData = data;
     const address = mergedData === null || mergedData === void 0 ? void 0 : mergedData.propertyAddress;
     const pincode = address === null || address === void 0 ? void 0 : address.pincode;
@@ -6180,7 +6190,7 @@ const EditVendor = () => {
         name: (mergedData === null || mergedData === void 0 ? void 0 : mergedData.ownerName) || name,
         fatherOrHusbandName: (mergedData === null || mergedData === void 0 ? void 0 : mergedData.fatherOrHusbandName) || name,
         relationship: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$relations = mergedData.relationship) === null || _mergedData$relations === void 0 ? void 0 : _mergedData$relations.code) || "OTHER",
-        gender: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$gender = mergedData.gender) === null || _mergedData$gender === void 0 ? void 0 : _mergedData$gender.code) || "MALE",
+        gender: mergedData === null || mergedData === void 0 ? void 0 : mergedData.gender,
         dob: mergedData !== null && mergedData !== void 0 && mergedData.dob ? new Date(mergedData.dob).getTime() : new Date("1/1/1970").getTime(),
         emailId: emailId || "",
         mobileNumber: phone
@@ -6486,17 +6496,58 @@ const EmployeeApp = _ref => {
 };
 
 const VENDORCard = () => {
+  var _vendorCountData$tota;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const history = reactRouterDom.useHistory();
   const isCitizen = window.location.pathname.toLowerCase().includes("citizen");
+  const tenantId = Digit.ULBService.getStateId();
+  const _useQuery = reactQuery.useQuery(["VENDOR_CARD_VENDOR_COUNT", tenantId], () => Digit.FSMService.vendorSearch(tenantId, {
+      status: "ACTIVE",
+      limit: 1,
+      offset: 0
+    }), {
+      enabled: true,
+      staleTime: 30000
+    }),
+    vendorCountData = _useQuery.data;
+  const _useQuery2 = reactQuery.useQuery(["VENDOR_CARD_DRIVER_COUNT", tenantId], () => Digit.FSMService.driverSearch(tenantId, {
+      status: "ACTIVE",
+      limit: 1,
+      offset: 0
+    }), {
+      enabled: true,
+      staleTime: 30000
+    });
+  const _useQuery3 = reactQuery.useQuery(["VENDOR_CARD_VEHICLE_COUNT", tenantId], () => Digit.FSMService.vehiclesSearch(tenantId, {
+      status: "ACTIVE",
+      limit: 1,
+      offset: 0
+    }), {
+      enabled: true,
+      staleTime: 30000
+    });
+  const _useQuery4 = reactQuery.useQuery(["VENDOR_CARD_SUPERVISOR_COUNT", tenantId], () => Digit.FSMService.supervisorSearch(tenantId, {
+      status: "ACTIVE,DISABLED",
+      limit: 1,
+      offset: 0
+    }), {
+      enabled: true,
+      staleTime: 30000
+    });
+  const _useQuery5 = reactQuery.useQuery(["VENDOR_CARD_SURVEYOR_COUNT", tenantId], () => Digit.FSMService.surveyorSearch(tenantId, {
+      status: "ACTIVE,DISABLED",
+      limit: 1,
+      offset: 0
+    }), {
+      enabled: true,
+      staleTime: 30000
+    });
   let hasAccess = Digit.Utils.vendorAccess() || Digit.UserService.hasAccess(["WT_VENDOR", "MT_VENDOR"]);
   if (isCitizen) {
     hasAccess = Digit.UserService.hasAccess(["WT_VENDOR", "EKYC_VENDOR", "EKYC_SUPERVISOR"]);
   }
-  if (!hasAccess) {
-    return null;
-  }
+  if (!hasAccess) return null;
   const links = [{
     label: t("VENDOR_NEW_REGISTERATION"),
     link: isCitizen ? "/digit-ui/citizen/vendor/registry/new-vendor" : "/digit-ui/employee/vendor/registry/new-vendor"
@@ -6509,7 +6560,7 @@ const VENDORCard = () => {
     Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.PropertyHouse, null),
     moduleName: t("TITLE_VENDOR_MANAGEMENT"),
     kpis: [{
-      count: 0,
+      count: (_vendorCountData$tota = vendorCountData === null || vendorCountData === void 0 ? void 0 : vendorCountData.totalCount) != null ? _vendorCountData$tota : 0,
       label: t("Inbox"),
       link: isCitizen ? "/digit-ui/citizen/vendor/search-vendor" : "/digit-ui/employee/vendor/search-vendor"
     }],
@@ -9657,12 +9708,21 @@ const SelectEkycZones = _ref => {
         } else {
           let vendorZoneCodes = [];
           if (Array.isArray(matchedVendor === null || matchedVendor === void 0 ? void 0 : matchedVendor.zoneIds) && matchedVendor.zoneIds.length > 0) {
-            vendorZoneCodes = matchedVendor.zoneIds.map(z => z.trim().toUpperCase()).filter(Boolean);
+            vendorZoneCodes = matchedVendor.zoneIds.map(z => typeof z === "object" ? (z === null || z === void 0 ? void 0 : z.code) || (z === null || z === void 0 ? void 0 : z.name) : z).filter(Boolean);
           } else if (matchedVendor !== null && matchedVendor !== void 0 && matchedVendor.assignedZoneId) {
-            vendorZoneCodes = matchedVendor.assignedZoneId.split(",").map(z => z.trim().toUpperCase()).filter(Boolean);
+            vendorZoneCodes = matchedVendor.assignedZoneId.split(",").map(z => z.trim()).filter(Boolean);
           }
           if (vendorZoneCodes.length > 0) {
-            activeZros = activeZros.filter(zro => vendorZoneCodes.includes(zro.code.trim().toUpperCase()));
+            const upperVendorCodes = vendorZoneCodes.map(z => z.toString().trim().toUpperCase());
+            const matchedMdmsZros = activeZros.filter(zro => upperVendorCodes.includes(zro.code.trim().toUpperCase()));
+            if (matchedMdmsZros.length > 0) {
+              activeZros = matchedMdmsZros;
+            } else {
+              activeZros = vendorZoneCodes.map(z => ({
+                code: String(z).trim(),
+                name: t(String(z).trim()) || String(z).trim()
+              }));
+            }
           } else {
             activeZros = [];
           }
@@ -9674,12 +9734,21 @@ const SelectEkycZones = _ref => {
         } else {
           let supervisorZoneCodes = [];
           if (Array.isArray(matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.zoneIds) && matchedSupervisor.zoneIds.length > 0) {
-            supervisorZoneCodes = matchedSupervisor.zoneIds.map(z => z.trim().toUpperCase()).filter(Boolean);
+            supervisorZoneCodes = matchedSupervisor.zoneIds.map(z => typeof z === "object" ? (z === null || z === void 0 ? void 0 : z.code) || (z === null || z === void 0 ? void 0 : z.name) : z).filter(Boolean);
           } else if (matchedSupervisor !== null && matchedSupervisor !== void 0 && matchedSupervisor.assignedZoneId) {
-            supervisorZoneCodes = matchedSupervisor.assignedZoneId.split(",").map(z => z.trim().toUpperCase()).filter(Boolean);
+            supervisorZoneCodes = matchedSupervisor.assignedZoneId.split(",").map(z => z.trim()).filter(Boolean);
           }
           if (supervisorZoneCodes.length > 0) {
-            activeZros = activeZros.filter(zro => supervisorZoneCodes.includes(zro.code.trim().toUpperCase()));
+            const upperSupCodes = supervisorZoneCodes.map(z => z.toString().trim().toUpperCase());
+            const matchedMdmsZros = activeZros.filter(zro => upperSupCodes.includes(zro.code.trim().toUpperCase()));
+            if (matchedMdmsZros.length > 0) {
+              activeZros = matchedMdmsZros;
+            } else {
+              activeZros = supervisorZoneCodes.map(z => ({
+                code: String(z).trim(),
+                name: t(String(z).trim()) || String(z).trim()
+              }));
+            }
           } else {
             activeZros = [];
           }
@@ -10581,7 +10650,8 @@ const VENDORLinks = _ref3 => {
 const VENDORComponents = {
   VENDORCard,
   VENDORModule,
-  VENDORLinks
+  VENDORLinks,
+  SelectEkycZones
 };
 
 exports.VENDORComponents = VENDORComponents;