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

package/dist/index.js

@@ -1866,7 +1866,7 @@ const VendorInbox = props => {
             }
             const hasDetails = ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.vendorAdditionalDetails) !== null;
             return /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-              to: !hasDetails ? "/digit-ui/" + userType + "/vendor/registry/additionaldetails/info?vendorId=" + vendorId : "/digit-ui/" + userType + "/vendor/registry/vendor-details/" + vendorId
+              to: !hasDetails ? "/digit-ui/" + userType + "/vendor/registry/additionaldetails/modify-details?vendorId=" + vendorId : "/digit-ui/" + userType + "/vendor/registry/vendor-details/" + vendorId
             }, /*#__PURE__*/React__default.createElement("button", {
               className: "submit-bar",
               style: {
@@ -2388,16 +2388,47 @@ const VendorInbox = props => {
   const getCSVExportData = React__default.useCallback(function () {
     try {
       let _exit = false;
-      function _temp8(_result) {
+      function _temp10(_result) {
         let _exit2 = false;
         if (_exit) return _result;
-        const _temp6 = function () {
+        function _temp0(_result2) {
+          let _exit3 = false;
+          if (_exit2) return _result2;
+          const _temp8 = function () {
+            if (props.selectedTab === "VENDOR") {
+              return _catch(function () {
+                var _props$searchParams, _props$searchParams2;
+                return Promise.resolve(Digit.FSMService.vendorSearch(tenantId, {
+                  status: "ACTIVE,DISABLED",
+                  name: (_props$searchParams = props.searchParams) === null || _props$searchParams === void 0 ? void 0 : _props$searchParams.name,
+                  mobileNumber: ((_props$searchParams2 = props.searchParams) === null || _props$searchParams2 === void 0 ? void 0 : _props$searchParams2.mobileNumber) || undefined,
+                  limit: 100000,
+                  offset: 0
+                })).then(function (response) {
+                  const _temp6 = (response === null || response === void 0 ? void 0 : response.vendors) || (response === null || response === void 0 ? void 0 : response.vendor) || [];
+                  _exit3 = true;
+                  return _temp6;
+                });
+              }, function (e) {
+                console.error(e);
+                const _temp7 = [];
+                _exit3 = true;
+                return _temp7;
+              });
+            }
+          }();
+          return _temp8 && _temp8.then ? _temp8.then(function (_result3) {
+            return _exit3 ? _result3 : tableData;
+          }) : _exit3 ? _temp8 : tableData;
+        }
+        const _temp9 = function () {
           if (props.selectedTab === "SURVEYOR") {
             return _catch(function () {
-              var _props$searchParams;
+              var _props$searchParams3, _props$searchParams4;
               return Promise.resolve(Digit.FSMService.surveyorSearch(tenantId, {
                 status: "ACTIVE,DISABLED",
-                name: (_props$searchParams = props.searchParams) === null || _props$searchParams === void 0 ? void 0 : _props$searchParams.name,
+                name: (_props$searchParams3 = props.searchParams) === null || _props$searchParams3 === void 0 ? void 0 : _props$searchParams3.name,
+                mobileNumber: ((_props$searchParams4 = props.searchParams) === null || _props$searchParams4 === void 0 ? void 0 : _props$searchParams4.mobileNumber) || undefined,
                 limit: 100000,
                 offset: 0
               })).then(function (response) {
@@ -2413,17 +2444,16 @@ const VendorInbox = props => {
             });
           }
         }();
-        return _temp6 && _temp6.then ? _temp6.then(function (_result2) {
-          return _exit2 ? _result2 : tableData;
-        }) : _exit2 ? _temp6 : tableData;
+        return _temp9 && _temp9.then ? _temp9.then(_temp0) : _temp0(_temp9);
       }
-      const _temp7 = function () {
+      const _temp1 = function () {
         if (props.selectedTab === "SUPERVISOR") {
           return _catch(function () {
-            var _props$searchParams2;
+            var _props$searchParams5, _props$searchParams6;
             return Promise.resolve(Digit.FSMService.supervisorSearch(tenantId, {
               status: "ACTIVE,DISABLED",
-              name: (_props$searchParams2 = props.searchParams) === null || _props$searchParams2 === void 0 ? void 0 : _props$searchParams2.name,
+              name: (_props$searchParams5 = props.searchParams) === null || _props$searchParams5 === void 0 ? void 0 : _props$searchParams5.name,
+              mobileNumber: ((_props$searchParams6 = props.searchParams) === null || _props$searchParams6 === void 0 ? void 0 : _props$searchParams6.mobileNumber) || undefined,
               limit: 100000,
               offset: 0
             })).then(function (response) {
@@ -2439,7 +2469,7 @@ const VendorInbox = props => {
           });
         }
       }();
-      return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7));
+      return Promise.resolve(_temp1 && _temp1.then ? _temp1.then(_temp10) : _temp10(_temp1));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -2699,12 +2729,14 @@ const SearchVendor = () => {
       }
     }) : tab === "SUPERVISOR" ? Digit.Hooks.fsm.useSupervisorSearch(tenantId, _extends({}, paginationParms, {
       status: "ACTIVE,DISABLED",
-      name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name
+      name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name,
+      mobileNumber: (searchParams === null || searchParams === void 0 ? void 0 : searchParams.mobileNumber) || undefined
     }), {
       enabled: false
     }) : tab === "SURVEYOR" ? Digit.Hooks.fsm.useSurveyorSearch(tenantId, _extends({}, paginationParms, {
       status: "ACTIVE,DISABLED",
-      name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name
+      name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name,
+      mobileNumber: (searchParams === null || searchParams === void 0 ? void 0 : searchParams.mobileNumber) || undefined
     }), {
       enabled: false
     }) : Digit.Hooks.fsm.useVendorSearch({
@@ -2904,19 +2936,15 @@ const SearchVendor = () => {
     label: t("ES_DRIVER_SEARCH_DRIVER_NAME"),
     name: "name"
   }] : tab === "SUPERVISOR" || tab === "SURVEYOR" ? [{
-    label: t("ES_VENDOR_SEARCH_VENDOR_NAME"),
-    name: "vendor",
-    type: "dropdown",
-    options: allVendors === null || allVendors === void 0 ? void 0 : allVendors.map(data => {
-      var _data$dsoDetails$owne3;
-      return _extends({}, data.dsoDetails, {
-        displayName: data.dsoDetails.name + " (" + (data.dsoDetails.mobileNumber || ((_data$dsoDetails$owne3 = data.dsoDetails.owner) === null || _data$dsoDetails$owne3 === void 0 ? void 0 : _data$dsoDetails$owne3.mobileNumber) || "N/A") + ")"
-      });
-    }),
-    optionsKey: "displayName"
-  }, {
     label: tab === "SUPERVISOR" ? t("ES_SUPERVISOR_SEARCH_NAME") : t("ES_SURVEYOR_SEARCH_NAME"),
     name: "name"
+  }, {
+    label: t("WT_MOBILE_NUMBER"),
+    name: "mobileNumber",
+    type: "text",
+    pattern: "[0-9]{10}",
+    maxLength: 10,
+    title: t("ES_FSM_MOBILE_NUMBER_FORMAT_TIP") || "Enter 10-digit mobile number"
   }] : [{
     label: t("ES_VENDOR_SEARCH_VENDOR_NAME"),
     name: "name"
@@ -4396,7 +4424,7 @@ const VendorDetails = () => {
           }, safeVal));
         })), /*#__PURE__*/React__default.createElement("div", {
           className: "add-details-link hover-button",
-          onClick: () => history.push("/digit-ui/" + userType + "/vendor/registry/additionaldetails/info?vendorId=" + (dsoId || vendorId))
+          onClick: () => history.push("/digit-ui/" + userType + "/vendor/registry/additionaldetails/modify-details?vendorId=" + (dsoId || vendorId))
         }, t("Edit Details"))) : userType !== "CITIZEN" && !isEkyc && /*#__PURE__*/React__default.createElement("div", {
           onClick: () => history.push("/digit-ui/" + userType + "/vendor/registry/additionaldetails/modify-details?vendorId=" + (dsoId || vendorId)),
           className: "add-details-link hover-button"
@@ -9619,13 +9647,47 @@ const SelectEkycZones = _ref => {
     var _zroData$commonMaste, _zroData$MdmsRes, _zroData$MdmsRes$comm;
     const zroOfficeList = (zroData === null || zroData === void 0 ? void 0 : (_zroData$commonMaste = zroData["common-masters"]) === null || _zroData$commonMaste === void 0 ? void 0 : _zroData$commonMaste.ZroOfficeList) || (zroData === null || zroData === void 0 ? void 0 : (_zroData$MdmsRes = zroData.MdmsRes) === null || _zroData$MdmsRes === void 0 ? void 0 : (_zroData$MdmsRes$comm = _zroData$MdmsRes["common-masters"]) === null || _zroData$MdmsRes$comm === void 0 ? void 0 : _zroData$MdmsRes$comm.ZroOfficeList) || [];
     if (Array.isArray(zroOfficeList)) {
-      const activeZros = zroOfficeList.filter(zro => zro && zro.active).map(zro => ({
+      let activeZros = zroOfficeList.filter(zro => zro && zro.active).map(zro => ({
         code: zro.code,
-        name: zro.code
+        name: t(zro.code)
       }));
+      if (isEkycVendor && !isVendorPage) {
+        if (!matchedVendor) {
+          activeZros = [];
+        } 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);
+          } else if (matchedVendor !== null && matchedVendor !== void 0 && matchedVendor.assignedZoneId) {
+            vendorZoneCodes = matchedVendor.assignedZoneId.split(",").map(z => z.trim().toUpperCase()).filter(Boolean);
+          }
+          if (vendorZoneCodes.length > 0) {
+            activeZros = activeZros.filter(zro => vendorZoneCodes.includes(zro.code.trim().toUpperCase()));
+          } else {
+            activeZros = [];
+          }
+        }
+      }
+      if (isEkycSupervisor) {
+        if (!matchedSupervisor) {
+          activeZros = [];
+        } 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);
+          } else if (matchedSupervisor !== null && matchedSupervisor !== void 0 && matchedSupervisor.assignedZoneId) {
+            supervisorZoneCodes = matchedSupervisor.assignedZoneId.split(",").map(z => z.trim().toUpperCase()).filter(Boolean);
+          }
+          if (supervisorZoneCodes.length > 0) {
+            activeZros = activeZros.filter(zro => supervisorZoneCodes.includes(zro.code.trim().toUpperCase()));
+          } else {
+            activeZros = [];
+          }
+        }
+      }
       setZones(activeZros);
     }
-  }, [zroData]);
+  }, [zroData, matchedVendor, matchedSupervisor, isEkycVendor, isEkycSupervisor, isVendorPage, t]);
   React.useEffect(() => {
     if (!zones.length || !(formData !== null && formData !== void 0 && formData.zoneIds)) return;
     if (isMultiSelect) {