@djb25/digit-ui-module-vendor 1.0.83 → 1.0.85

package/dist/index.js

@@ -2680,7 +2680,7 @@ const VendorInbox = props => {
 };
 
 const SearchVendor = () => {
-  var _Digit$UserService$ge, _Digit$UserService$ge2, _Digit$UserService$ge3, _userInfo$info, _userInfo$info2, _sortParams$, _sortParams$2, _searchParams$vendor, _searchParams$filling, _searchParams$vendor2, _allFillingPoints$fil;
+  var _Digit$UserService$ge, _Digit$UserService$ge2, _Digit$UserService$ge3, _userInfo$info, _userInfo$info2, _sortParams$, _sortParams$2, _searchParams$vendor, _searchParams$filling, _searchParams$vendor2, _searchParams$vendor3, _searchParams$vendor4, _allFillingPoints$fil;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -2722,6 +2722,21 @@ const SearchVendor = () => {
     setShowToast = _useState9[1];
   const _Digit$Hooks$useToast = Digit.Hooks.useToast(),
     consumeToast = _Digit$Hooks$useToast.consumeToast;
+  const _Digit$Hooks$useCusto = Digit.Hooks.useCustomMDMS(tenantId, "tenant", [{
+      name: "citymodule"
+    }], {
+      select: data => {
+        var _data$tenant;
+        return data === null || data === void 0 ? void 0 : (_data$tenant = data.tenant) === null || _data$tenant === void 0 ? void 0 : _data$tenant.citymodule;
+      }
+    }),
+    serviceTypes = _Digit$Hooks$useCusto.data,
+    isServiceTypeLoading = _Digit$Hooks$useCusto.isLoading;
+  const formattedServiceTypes = (serviceTypes === null || serviceTypes === void 0 ? void 0 : serviceTypes.map(service => ({
+    i18nKey: service.code,
+    code: service.code,
+    value: service.name
+  }))) || [];
   React.useEffect(() => {
     const message = consumeToast();
     if (message) {
@@ -2788,7 +2803,8 @@ const SearchVendor = () => {
       tenantId,
       filters: _extends({}, paginationParms, {
         name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name,
-        status: "ACTIVE,DISABLED"
+        status: "ACTIVE,DISABLED",
+        serviceType: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor3 = searchParams.vendor) === null || _searchParams$vendor3 === void 0 ? void 0 : (_searchParams$vendor4 = _searchParams$vendor3.code) === null || _searchParams$vendor4 === void 0 ? void 0 : _searchParams$vendor4.toLowerCase()
       }),
       config: {
         enabled: false
@@ -2797,16 +2813,6 @@ const SearchVendor = () => {
     dsoData = _ref.data,
     isLoading = _ref.isLoading,
     refetch = _ref.refetch;
-  Digit.Hooks.fsm.useVendorSearch({
-    tenantId,
-    filters: _extends({}, paginationParms, {
-      name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name,
-      status: "ACTIVE,DISABLED"
-    }),
-    config: {
-      enabled: false
-    }
-  });
   const _Digit$Hooks$fsm$useD2 = Digit.Hooks.fsm.useDsoSearch(tenantId, {
       vehicleIds: vehicleIds,
       driverIds: driverIds,
@@ -2821,16 +2827,12 @@ const SearchVendor = () => {
     var _ele$dsoDetails, _ele$dsoDetails$addit, _ele$dsoDetails$addit2;
     return (ele === null || ele === void 0 ? void 0 : (_ele$dsoDetails = ele.dsoDetails) === null || _ele$dsoDetails === void 0 ? void 0 : (_ele$dsoDetails$addit = _ele$dsoDetails.additionalDetails) === null || _ele$dsoDetails$addit === void 0 ? void 0 : (_ele$dsoDetails$addit2 = _ele$dsoDetails$addit.serviceType) === null || _ele$dsoDetails$addit2 === void 0 ? void 0 : _ele$dsoDetails$addit2.toLowerCase()) === "ekyc";
   }).length;
-  console.log(ekycVendorCount);
   const inboxTotalCount = (dsoData === null || dsoData === void 0 ? void 0 : dsoData.totalCount) || 50;
   React.useEffect(() => {
-    var _location$state;
+    var _location$state, _location$state2;
     refetch();
     refetchVendor();
-    if ((_location$state = location.state) !== null && _location$state !== void 0 && _location$state.showSuccessToast) {
-      var _location$state2;
-      setShowToast((_location$state2 = location.state) === null || _location$state2 === void 0 ? void 0 : _location$state2.message);
-    }
+    if ((_location$state = location.state) !== null && _location$state !== void 0 && _location$state.showSuccessToast) setShowToast((_location$state2 = location.state) === null || _location$state2 === void 0 ? void 0 : _location$state2.message);
   }, []);
   React.useEffect(() => {
     refetch();
@@ -2995,6 +2997,15 @@ const SearchVendor = () => {
     pattern: "[0-9]{10}",
     maxLength: 10,
     title: t("ES_FSM_MOBILE_NUMBER_FORMAT_TIP") || "Enter 10-digit mobile number"
+  }] : tab === "VENDOR" ? [{
+    label: t("ES_VENDOR_SEARCH_VENDOR_NAME"),
+    name: "name"
+  }, {
+    label: t("ES_VENDOR_SEARCH_VENDOR_TYPE"),
+    name: "vendor",
+    type: "dropdown",
+    options: formattedServiceTypes,
+    optionsKey: "code"
   }] : [{
     label: t("ES_VENDOR_SEARCH_VENDOR_NAME"),
     name: "name"
@@ -3022,7 +3033,7 @@ const SearchVendor = () => {
       table: tableData
     },
     searchParams: searchParams,
-    isLoading: isLoading || isVendorLoading,
+    isLoading: isLoading || isVendorLoading || isServiceTypeLoading,
     onSort: handleSort,
     disableSort: false,
     sortParams: sortParams,
@@ -5167,9 +5178,10 @@ const AddVendor = () => {
       const _temp = function () {
         if (isEkyc) {
           return Promise.resolve(refetch()).then(function (_ref) {
-            var _mergedData$zoneIds, _mergedData$clusterId;
+            var _data$vendor, _mergedData$zoneIds, _mergedData$clusterId;
             let data = _ref.data;
-            if ((data === null || data === void 0 ? void 0 : data.totalCount) >= 3) {
+            const activeVendorCount = (data === null || data === void 0 ? void 0 : (_data$vendor = data.vendor) === null || _data$vendor === void 0 ? void 0 : _data$vendor.filter(vendor => vendor.status === "ACTIVE").length) || 0;
+            if (activeVendorCount >= 3) {
               setShowToast({
                 key: "error",
                 message: t("EKYC_VENDOR_LIMIT"),