@djb25/digit-ui-module-vendor 1.0.57 → 1.0.58

package/dist/index.js

@@ -907,6 +907,21 @@ const getSelectedVendorOption = function (row, vendors) {
   if (!selectedVendorId) return null;
   return vendors.find(vendor => (vendor === null || vendor === void 0 ? void 0 : vendor.id) === selectedVendorId) || ((_row25 = row) === null || _row25 === void 0 ? void 0 : _row25.vendor) || ((_row26 = row) === null || _row26 === void 0 ? void 0 : _row26.vendorData) || null;
 };
+const getSelectedSupervisorOption = function (row, supervisorsList) {
+  var _row27;
+  if (row === void 0) {
+    row = {};
+  }
+  if (supervisorsList === void 0) {
+    supervisorsList = [];
+  }
+  const supervisorId = (_row27 = row) === null || _row27 === void 0 ? void 0 : _row27.supervisorId;
+  if (!supervisorId) return null;
+  return supervisorsList.find(s => {
+    var _s$owner;
+    return s.id === supervisorId || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : _s$owner.uuid) === supervisorId;
+  }) || null;
+};
 const getVendorFillingPoints = function (vendor) {
   var _vendor, _vendor2, _vendor3, _vendor4;
   if (vendor === void 0) {
@@ -945,14 +960,14 @@ const getVendorDriversForFillingPoint = (vendor, fillingPoint) => {
   });
 };
 const getSelectedDriverOption = function (row, drivers) {
-  var _row27, _row27$driverData, _row28, _row28$driver;
+  var _row28, _row28$driverData, _row29, _row29$driver;
   if (row === void 0) {
     row = {};
   }
   if (drivers === void 0) {
     drivers = [];
   }
-  const selectedDriverId = ((_row27 = row) === null || _row27 === void 0 ? void 0 : (_row27$driverData = _row27.driverData) === null || _row27$driverData === void 0 ? void 0 : _row27$driverData.id) || ((_row28 = row) === null || _row28 === void 0 ? void 0 : (_row28$driver = _row28.driver) === null || _row28$driver === void 0 ? void 0 : _row28$driver.id);
+  const selectedDriverId = ((_row28 = row) === null || _row28 === void 0 ? void 0 : (_row28$driverData = _row28.driverData) === null || _row28$driverData === void 0 ? void 0 : _row28$driverData.id) || ((_row29 = row) === null || _row29 === void 0 ? void 0 : (_row29$driver = _row29.driver) === null || _row29$driver === void 0 ? void 0 : _row29$driver.id);
   if (!selectedDriverId) return null;
   return drivers.find(driver => (driver === null || driver === void 0 ? void 0 : driver.id) === selectedDriverId) || null;
 };
@@ -1105,6 +1120,8 @@ const VendorInbox = props => {
     mutateVehicle = _Digit$Hooks$fsm$useU.mutate;
   const _Digit$Hooks$fsm$useD3 = Digit.Hooks.fsm.useDriverUpdate(tenantId),
     mutateDriver = _Digit$Hooks$fsm$useD3.mutate;
+  const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSurveyorUpdate(tenantId),
+    mutateSurveyor = _Digit$Hooks$fsm$useS.mutate;
   React.useEffect(() => {
     var _props$data;
     setTableData((props === null || props === void 0 ? void 0 : (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.table) || []);
@@ -1421,6 +1438,37 @@ const VendorInbox = props => {
       }
     });
   };
+  const onSurveyorSupervisorSelect = (row, selectedSupervisor) => {
+    var _selectedSupervisor$o, _formDetails$owner9, _formDetails$owner0, _formDetails$owner1, _formDetails$owner10;
+    let formDetails = row.original;
+    const formData = {
+      surveyor: _extends({}, formDetails, {
+        supervisorId: (selectedSupervisor === null || selectedSupervisor === void 0 ? void 0 : selectedSupervisor.id) || (selectedSupervisor === null || selectedSupervisor === void 0 ? void 0 : (_selectedSupervisor$o = selectedSupervisor.owner) === null || _selectedSupervisor$o === void 0 ? void 0 : _selectedSupervisor$o.uuid) || null,
+        owner: _extends({}, formDetails === null || formDetails === void 0 ? void 0 : formDetails.owner, {
+          gender: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner9 = formDetails.owner) === null || _formDetails$owner9 === void 0 ? void 0 : _formDetails$owner9.gender) || "OTHERS",
+          dob: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner0 = formDetails.owner) === null || _formDetails$owner0 === void 0 ? void 0 : _formDetails$owner0.dob) || new Date("1/1/1970").getTime(),
+          emailId: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner1 = formDetails.owner) === null || _formDetails$owner1 === void 0 ? void 0 : _formDetails$owner1.emailId) || "abc@egov.com",
+          relationship: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner10 = formDetails.owner) === null || _formDetails$owner10 === void 0 ? void 0 : _formDetails$owner10.relationship) || "OTHER"
+        })
+      })
+    };
+    mutateSurveyor(formData, {
+      onError: error => {
+        setShowToast({
+          key: "error",
+          label: (error === null || error === void 0 ? void 0 : error.message) || error || t("ES_FSM_REGISTRY_INBOX_FAILED_TO_UPDATE_SUPERVISOR")
+        });
+      },
+      onSuccess: () => {
+        setShowToast({
+          key: "success",
+          label: t("ES_FSM_REGISTRY_INBOX_SUPERVISOR_MAPPED_SUCCESSFULLY")
+        });
+        queryClient.invalidateQueries(t("SURVEYOR_SEARCH"));
+        props.refetchData();
+      }
+    });
+  };
   const onSelectAdd = () => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -1465,6 +1513,21 @@ const VendorInbox = props => {
     allFillingPointsData = _Digit$Hooks$wt$useFi.data,
     isAllFillingPointsLoading = _Digit$Hooks$wt$useFi.isLoading;
   const allFillingPoints = (allFillingPointsData === null || allFillingPointsData === void 0 ? void 0 : allFillingPointsData.fillingPoints) || [];
+  const _Digit$Hooks$fsm$useS2 = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
+      status: "ACTIVE"
+    }, {
+      enabled: props.selectedTab === "SURVEYOR"
+    }),
+    supervisorSearchResponse = _Digit$Hooks$fsm$useS2.data;
+  const supervisors = React__default.useMemo(() => {
+    const list = (supervisorSearchResponse === null || supervisorSearchResponse === void 0 ? void 0 : supervisorSearchResponse.supervisors) || (supervisorSearchResponse === null || supervisorSearchResponse === void 0 ? void 0 : supervisorSearchResponse.supervisor) || [];
+    return list.map(s => {
+      var _s$owner2, _s$owner3;
+      return _extends({}, s, {
+        displayName: (s.name || ((_s$owner2 = s.owner) === null || _s$owner2 === void 0 ? void 0 : _s$owner2.name) || "N/A") + " (" + (((_s$owner3 = s.owner) === null || _s$owner3 === void 0 ? void 0 : _s$owner3.mobileNumber) || s.mobileNo || "N/A") + ")"
+      });
+    });
+  }, [supervisorSearchResponse]);
   const columns = React__default.useMemo(() => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -1856,28 +1919,41 @@ const VendorInbox = props => {
           }
         }] : []), ...(props.selectedTab === "SURVEYOR" ? [{
           Header: t("ES_FSM_REGISTRY_INBOX_SUPERVISOR_NAME"),
+          id: "supervisor",
           accessor: row => {
             var _row$reportingManager;
             return row.supervisorName || ((_row$reportingManager = row.reportingManager) === null || _row$reportingManager === void 0 ? void 0 : _row$reportingManager.name) || "NA";
           },
           Cell: _ref29 => {
-            var _row$original19, _row$original20, _row$original20$repor;
             let row = _ref29.row;
-            return /*#__PURE__*/React__default.createElement("div", null, ((_row$original19 = row.original) === null || _row$original19 === void 0 ? void 0 : _row$original19.supervisorName) || ((_row$original20 = row.original) === null || _row$original20 === void 0 ? void 0 : (_row$original20$repor = _row$original20.reportingManager) === null || _row$original20$repor === void 0 ? void 0 : _row$original20$repor.name) || "NA");
+            return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
+              className: "fsm-registry-dropdown",
+              selected: getSelectedSupervisorOption(row.original, supervisors),
+              option: supervisors,
+              select: value => onSurveyorSupervisorSelect(row, value),
+              optionKey: "displayName",
+              t: t,
+              style: {
+                textAlign: "left",
+                width: "100%",
+                minWidth: "250px"
+              },
+              disable: !supervisors.length
+            });
           }
         }] : []), {
           Header: t("ES_FSM_REGISTRY_INBOX_DATE_CREATION"),
           accessor: "createdTime",
           Cell: _ref30 => {
-            var _row$original21, _row$original21$audit, _row$original22, _row$original22$audit;
+            var _row$original19, _row$original19$audit, _row$original20, _row$original20$audit;
             let row = _ref30.row;
-            return GetCell((_row$original21 = row.original) !== null && _row$original21 !== void 0 && (_row$original21$audit = _row$original21.auditDetails) !== null && _row$original21$audit !== void 0 && _row$original21$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original22 = row.original) === null || _row$original22 === void 0 ? void 0 : (_row$original22$audit = _row$original22.auditDetails) === null || _row$original22$audit === void 0 ? void 0 : _row$original22$audit.createdTime) : "");
+            return GetCell((_row$original19 = row.original) !== null && _row$original19 !== void 0 && (_row$original19$audit = _row$original19.auditDetails) !== null && _row$original19$audit !== void 0 && _row$original19$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original20 = row.original) === null || _row$original20 === void 0 ? void 0 : (_row$original20$audit = _row$original20.auditDetails) === null || _row$original20$audit === void 0 ? void 0 : _row$original20$audit.createdTime) : "");
           }
         }];
       default:
         return [];
     }
-  }, [props.selectedTab, vendors, drivers, tableData, additionalVendorData, allFillingPoints, t]);
+  }, [props.selectedTab, vendors, drivers, tableData, additionalVendorData, allFillingPoints, supervisors, t]);
   const csvExportColumns = React__default.useMemo(() => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -1989,8 +2065,9 @@ const VendorInbox = props => {
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_SUPERVISOR_NAME"),
           exportAccessor: row => {
-            var _row$reportingManager2;
-            return (row === null || row === void 0 ? void 0 : row.supervisorName) || (row === null || row === void 0 ? void 0 : (_row$reportingManager2 = row.reportingManager) === null || _row$reportingManager2 === void 0 ? void 0 : _row$reportingManager2.name) || "NA";
+            var _selectedSupervisor$o2, _row$reportingManager2;
+            const selectedSupervisor = getSelectedSupervisorOption(row, supervisors);
+            return selectedSupervisor ? selectedSupervisor.name || ((_selectedSupervisor$o2 = selectedSupervisor.owner) === null || _selectedSupervisor$o2 === void 0 ? void 0 : _selectedSupervisor$o2.name) : (row === null || row === void 0 ? void 0 : row.supervisorName) || (row === null || row === void 0 ? void 0 : (_row$reportingManager2 = row.reportingManager) === null || _row$reportingManager2 === void 0 ? void 0 : _row$reportingManager2.name) || "NA";
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
@@ -2046,7 +2123,7 @@ const VendorInbox = props => {
       default:
         return [];
     }
-  }, [props.selectedTab, t]);
+  }, [props.selectedTab, supervisors, t]);
   const getCSVExportData = React__default.useCallback(function () {
     return Promise.resolve(tableData);
   }, [tableData]);
@@ -2705,7 +2782,7 @@ const SupervisorDetails = props => {
         var _v$dsoDetails, _v$dsoDetails2;
         return ((_v$dsoDetails = v.dsoDetails) === null || _v$dsoDetails === void 0 ? void 0 : _v$dsoDetails.id) === data.vendorId || ((_v$dsoDetails2 = v.dsoDetails) === null || _v$dsoDetails2 === void 0 ? void 0 : _v$dsoDetails2.vendorId) === data.vendorId;
       });
-      const vendorName = (mappedVendor === null || mappedVendor === void 0 ? void 0 : (_mappedVendor$dsoDeta = mappedVendor.dsoDetails) === null || _mappedVendor$dsoDeta === void 0 ? void 0 : _mappedVendor$dsoDeta.name) || data.vendorId || "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR";
+      const vendorName = data.vendorName || (mappedVendor === null || mappedVendor === void 0 ? void 0 : (_mappedVendor$dsoDeta = mappedVendor.dsoDetails) === null || _mappedVendor$dsoDeta === void 0 ? void 0 : _mappedVendor$dsoDeta.name) || data.vendorId || "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR";
       return {
         supervisorData: data,
         vendorDetails: {
@@ -4556,11 +4633,11 @@ const AddVendor = () => {
       vendorData = _extends({}, vendorData, {
         zoneIds: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$zoneIds = mergedData.zoneIds) === null || _mergedData$zoneIds === void 0 ? void 0 : _mergedData$zoneIds.map(z => {
           var _z$;
-          return z === null || z === void 0 ? void 0 : (_z$ = z[1]) === null || _z$ === void 0 ? void 0 : _z$.code;
+          return (z === null || z === void 0 ? void 0 : z.code) || (z === null || z === void 0 ? void 0 : (_z$ = z[1]) === null || _z$ === void 0 ? void 0 : _z$.code) || z;
         })) || [],
         clusterIds: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$clusterId = mergedData.clusterIds) === null || _mergedData$clusterId === void 0 ? void 0 : _mergedData$clusterId.map(c => {
           var _c$;
-          return c === null || c === void 0 ? void 0 : (_c$ = c[1]) === null || _c$ === void 0 ? void 0 : _c$.code;
+          return (c === null || c === void 0 ? void 0 : c.code) || (c === null || c === void 0 ? void 0 : (_c$ = c[1]) === null || _c$ === void 0 ? void 0 : _c$.code) || c;
         })) || [],
         contractStartDate: mergedData.contractStartDate ? new Date(mergedData.contractStartDate).getTime() : null,
         contractEndDate: mergedData.contractEndDate ? new Date(mergedData.contractEndDate).getTime() : null
@@ -9327,7 +9404,7 @@ const SelectEkycZones = _ref => {
       setSelectedZones(Array.isArray(formData === null || formData === void 0 ? void 0 : formData.zoneIds) ? zones.filter(ele => formData.zoneIds.includes(ele.code)) : []);
     } else {
       const selected = zones.find(ele => {
-        return ele.code === (formData === null || formData === void 0 ? void 0 : formData.zoneIds);
+        return ele.code === (formData === null || formData === void 0 ? void 0 : formData.zoneIds) || ele.name === (formData === null || formData === void 0 ? void 0 : formData.zoneIds);
       });
       setSelectedZones(selected ? [selected] : []);
     }
@@ -9352,7 +9429,7 @@ const SelectEkycZones = _ref => {
     } else {
       const selectedZone = Array.isArray(value) ? Array.isArray(value[0]) ? value[0][1] : value[0] : value;
       setSelectedZones(selectedZone ? [selectedZone] : []);
-      onSelect(config.key, (selectedZone === null || selectedZone === void 0 ? void 0 : selectedZone.code) || "");
+      onSelect(config.key, (selectedZone === null || selectedZone === void 0 ? void 0 : selectedZone.name) || "");
     }
   };
   if (isLoading) return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
@@ -9405,7 +9482,7 @@ const SelectEkycClusters = _ref => {
     let allClusters = [];
     if (selectedZones.length > 0 && Array.isArray(boundaries) && boundaries.length > 0) {
       selectedZones.forEach(zone => {
-        const zoneBoundary = boundaries.find(b => b.code === zone.code);
+        const zoneBoundary = boundaries.find(b => b.code === ((zone === null || zone === void 0 ? void 0 : zone.code) || zone));
         const children = (zoneBoundary === null || zoneBoundary === void 0 ? void 0 : zoneBoundary.children) || (zoneBoundary === null || zoneBoundary === void 0 ? void 0 : zoneBoundary.boundary) || [];
         if (Array.isArray(children)) {
           children.forEach(child => {
@@ -9442,12 +9519,14 @@ const SelectEkycClusters = _ref => {
       };
       if (selectedZones.length > 0) {
         selectedZones.forEach(z => {
-          if (staticClusters[z.code]) {
-            allClusters = [...allClusters, ...staticClusters[z.code]];
+          const zCode = (z === null || z === void 0 ? void 0 : z.code) || z;
+          const zName = (z === null || z === void 0 ? void 0 : z.name) || z;
+          if (staticClusters[zCode]) {
+            allClusters = [...allClusters, ...staticClusters[zCode]];
           } else {
             allClusters.push({
-              code: z.code + "-C1",
-              name: z.name + " Cluster 1"
+              code: zCode + "-C1",
+              name: zName + " Cluster 1"
             });
           }
         });