@djb25/digit-ui-module-vendor 1.0.67 → 1.0.69

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: {
@@ -2394,10 +2394,11 @@ const VendorInbox = props => {
         const _temp6 = function () {
           if (props.selectedTab === "SURVEYOR") {
             return _catch(function () {
-              var _props$searchParams;
+              var _props$searchParams, _props$searchParams2;
               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,
+                mobileNumber: ((_props$searchParams2 = props.searchParams) === null || _props$searchParams2 === void 0 ? void 0 : _props$searchParams2.mobileNumber) || undefined,
                 limit: 100000,
                 offset: 0
               })).then(function (response) {
@@ -2420,10 +2421,11 @@ const VendorInbox = props => {
       const _temp7 = function () {
         if (props.selectedTab === "SUPERVISOR") {
           return _catch(function () {
-            var _props$searchParams2;
+            var _props$searchParams3, _props$searchParams4;
             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$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) {
@@ -2699,12 +2701,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 +2908,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 +4396,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"
@@ -9612,31 +9612,54 @@ const SelectEkycZones = _ref => {
       return ((_s$id = s.id) === null || _s$id === void 0 ? void 0 : _s$id.toLowerCase()) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$uuid = loggedInUser.uuid) === null || _loggedInUser$uuid === void 0 ? void 0 : _loggedInUser$uuid.toLowerCase()) || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : (_s$owner$uuid = _s$owner.uuid) === null || _s$owner$uuid === void 0 ? void 0 : _s$owner$uuid.toLowerCase()) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$uuid2 = loggedInUser.uuid) === null || _loggedInUser$uuid2 === void 0 ? void 0 : _loggedInUser$uuid2.toLowerCase()) || ((_s$owner2 = s.owner) === null || _s$owner2 === void 0 ? void 0 : _s$owner2.mobileNumber) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber) || s.mobileNo === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber);
     });
   }, [supervisorSearchResponse, loggedInUser]);
-  const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS("dl", "egov-location", ["TenantBoundary"]),
-    boundaryData = _Digit$Hooks$useCommo.data,
+  const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS("dl", "common-masters", ["ZroOfficeList"]),
+    zroData = _Digit$Hooks$useCommo.data,
     isLoading = _Digit$Hooks$useCommo.isLoading;
   React.useEffect(() => {
-    var _boundaryData$egovLo, _boundaryData$MdmsRes, _boundaryData$MdmsRes2;
-    const tenantBoundaryList = (boundaryData === null || boundaryData === void 0 ? void 0 : (_boundaryData$egovLo = boundaryData["egov-location"]) === null || _boundaryData$egovLo === void 0 ? void 0 : _boundaryData$egovLo.TenantBoundary) || (boundaryData === null || boundaryData === void 0 ? void 0 : (_boundaryData$MdmsRes = boundaryData.MdmsRes) === null || _boundaryData$MdmsRes === void 0 ? void 0 : (_boundaryData$MdmsRes2 = _boundaryData$MdmsRes["egov-location"]) === null || _boundaryData$MdmsRes2 === void 0 ? void 0 : _boundaryData$MdmsRes2.TenantBoundary) || [];
-    const zoneMap = {};
-    tenantBoundaryList.forEach(tb => {
-      const walkBoundary = node => {
-        if (!node) return;
-        if (node.label === "Zone" && node.code && node.code !== "UNKNOWN") {
-          if (!zoneMap[node.code]) {
-            zoneMap[node.code] = {
-              code: node.code,
-              name: node.name || node.code
-            };
+    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)) {
+      let activeZros = zroOfficeList.filter(zro => zro && zro.active).map(zro => ({
+        code: 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 = [];
           }
         }
-        (node.children || []).forEach(walkBoundary);
-      };
-      walkBoundary(tb.boundary);
-    });
-    const uniqueZones = Object.values(zoneMap).sort((a, b) => a.name.localeCompare(b.name));
-    setZones(uniqueZones);
-  }, [boundaryData]);
+      }
+      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, matchedVendor, matchedSupervisor, isEkycVendor, isEkycSupervisor, isVendorPage, t]);
   React.useEffect(() => {
     if (!zones.length || !(formData !== null && formData !== void 0 && formData.zoneIds)) return;
     if (isMultiSelect) {
@@ -9645,10 +9668,7 @@ const SelectEkycZones = _ref => {
         setSelectedZones(formData.zoneIds.filter(Boolean));
         return;
       }
-      const selected = zones.filter(zone => zone && formData.zoneIds.some(id => {
-        var _zone$code, _zone$name;
-        return id && (id.toString().toUpperCase() === ((_zone$code = zone.code) === null || _zone$code === void 0 ? void 0 : _zone$code.toUpperCase()) || id.toString().toUpperCase() === ((_zone$name = zone.name) === null || _zone$name === void 0 ? void 0 : _zone$name.toUpperCase()));
-      }));
+      const selected = zones.filter(zone => zone && (formData.zoneIds.includes(zone.name) || formData.zoneIds.includes(zone.code)));
       setSelectedZones(selected);
       if (!initialized.current) {
         initialized.current = true;
@@ -9663,10 +9683,7 @@ const SelectEkycZones = _ref => {
       if (selectedVal && typeof selectedVal === "object") {
         selectedVal = selectedVal.name || selectedVal.code || "";
       }
-      const selected = zones.find(zone => {
-        var _zone$name2, _selectedVal, _zone$code2, _selectedVal2;
-        return zone && (((_zone$name2 = zone.name) === null || _zone$name2 === void 0 ? void 0 : _zone$name2.toUpperCase()) === ((_selectedVal = selectedVal) === null || _selectedVal === void 0 ? void 0 : _selectedVal.toString().toUpperCase()) || ((_zone$code2 = zone.code) === null || _zone$code2 === void 0 ? void 0 : _zone$code2.toUpperCase()) === ((_selectedVal2 = selectedVal) === null || _selectedVal2 === void 0 ? void 0 : _selectedVal2.toString().toUpperCase()));
-      });
+      const selected = zones.find(zone => zone && (zone.name === selectedVal || zone.code === selectedVal));
       setSelectedZones(selected ? [selected] : []);
       if (!initialized.current && selected) {
         initialized.current = true;
@@ -9685,7 +9702,7 @@ const SelectEkycZones = _ref => {
     if (isMultiSelect) {
       const selected = Array.isArray(value) ? value.map(v => Array.isArray(v) ? v[1] : v).filter(Boolean) : [];
       setSelectedZones(selected);
-      onSelect(config.key, selected.map(z => z.name));
+      onSelect(config.key, selected);
     } else {
       const selectedZone = Array.isArray(value) ? Array.isArray(value[0]) ? value[0][1] : value[0] : value;
       setSelectedZones(selectedZone ? [selectedZone] : []);
@@ -9717,10 +9734,10 @@ const SelectEkycZones = _ref => {
     disable: disable || isEkycSupervisor || ((_config$props = config.props) === null || _config$props === void 0 ? void 0 : _config$props.disable) || config.disable
   })), isMultiSelect && selectedZones.length > 0 && /*#__PURE__*/React__default.createElement("div", {
     className: "selected-zones"
-  }, selectedZones.filter(zone => zone && zone.name).map(zone => /*#__PURE__*/React__default.createElement("span", {
+  }, selectedZones.filter(zone => zone && zone.code).map(zone => /*#__PURE__*/React__default.createElement("span", {
     key: zone.code,
     className: "selected-zone-chip"
-  }, zone.name))));
+  }, t(zone.code)))));
 };
 
 const SelectEkycClusters = _ref => {