@djb25/digit-ui-module-wt 1.0.22 → 1.0.24

package/dist/index.modern.js

@@ -944,13 +944,11 @@ const WTSearchApplication = ({
         marginTop: "16px"
       }
     }, /*#__PURE__*/React.createElement("span", {
-      className: "clear-search-link",
+      className: "generic-button clear-search",
       onClick: handleClearSearch,
       style: {
-        color: "#f47738",
         cursor: "pointer",
-        alignSelf: "center",
-        textDecoration: "underline"
+        alignSelf: "center"
       }
     }, t("ES_COMMON_CLEAR_ALL")), /*#__PURE__*/React.createElement("div", {
       style: {
@@ -3757,6 +3755,7 @@ const FixedPointScheduleManagement = ({
   const {
     t
   } = useTranslation();
+  const queryClient = useQueryClient();
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const [showModal, setShowModal] = useState(false);
   const [toast, setToast] = useState(null);
@@ -3782,8 +3781,7 @@ const FixedPointScheduleManagement = ({
   });
   const {
     isLoading,
-    data: scheduleData,
-    refetch: reSearch
+    data: scheduleData
   } = Digit.Hooks.wt.useFixedPointScheduleSearch(tenantId, filters);
   const {
     data: fixedPointData,
@@ -3855,10 +3853,10 @@ const FixedPointScheduleManagement = ({
       document.body.removeChild(a);
     }
   };
-  const [data, setData] = useState([]);
   const mapScheduleRows = React.useCallback((rows = []) => rows.map(item => ({
     scheduleId: item.systemAssignedScheduleId,
-    fixedPoint: item.fixedPointCode,
+    fixedPointName: item.fixedPointName,
+    fixedPoint: item.fixedPointId,
     day: item.day,
     freq: item.tripNo,
     arrToFpl: item.arrivalTimeToFpl,
@@ -3871,11 +3869,9 @@ const FixedPointScheduleManagement = ({
     active: item.isEnable ? "Y" : "N",
     totalCount: item.totalCount
   })), []);
-  React.useEffect(() => {
-    if (scheduleData !== null && scheduleData !== void 0 && scheduleData.fixedPointTimeTableDetails) {
-      setData(mapScheduleRows(scheduleData.fixedPointTimeTableDetails));
-    }
-  }, [mapScheduleRows, scheduleData]);
+  const data = React.useMemo(() => {
+    return mapScheduleRows((scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.fixedPointTimeTableDetails) || []);
+  }, [scheduleData, mapScheduleRows]);
   const fetchNextPage = () => {
     setPageOffset(prevState => prevState + pageSize);
   };
@@ -3906,8 +3902,11 @@ const FixedPointScheduleManagement = ({
     }
   }, [pageOffset, pageSize]);
   const columns = React.useMemo(() => [{
-    Header: t("WT_FIXED_POINT"),
+    Header: t("WT_FIXED_POINT_CODE"),
     accessor: "fixedPoint"
+  }, {
+    Header: t("WT_FIXED_POINT_NAME"),
+    accessor: "fixedPointName"
   }, {
     Header: t("WT_DAY"),
     accessor: "day"
@@ -4030,6 +4029,26 @@ const FixedPointScheduleManagement = ({
     accessor: "active"
   }], [t]);
   const days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"];
+  const clearSearch = () => {
+    setSelectedDay("all");
+    setDay({
+      label: "All Days",
+      value: "all"
+    });
+    setFixedPoint({
+      label: "All Fixed Points",
+      value: "all"
+    });
+    setStatus({
+      label: "All Status",
+      value: "all"
+    });
+    setPageOffset(0);
+    setFilters({
+      limit: pageSize,
+      offset: 0
+    });
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "fixed-point-schedule-management"
   }, /*#__PURE__*/React.createElement(Card, {
@@ -4138,11 +4157,16 @@ const FixedPointScheduleManagement = ({
     },
     placeholder: "All Status"
   })), /*#__PURE__*/React.createElement("div", {
-    className: "finance-mainlayout-col1",
+    className: "finance-mainlayout-col1"
+  }, /*#__PURE__*/React.createElement(Label, null, "\xA0"), /*#__PURE__*/React.createElement("span", {
+    className: "generic-button clear-search",
+    onClick: clearSearch,
     style: {
-      alignSelf: "flex-end"
+      alignSelf: "center"
     }
-  }, /*#__PURE__*/React.createElement(SubmitBar, {
+  }, t("ES_COMMON_CLEAR_SEARCH"))), /*#__PURE__*/React.createElement("div", {
+    className: "finance-mainlayout-col1"
+  }, /*#__PURE__*/React.createElement(Label, null, "\xA0"), /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("ES_COMMON_SEARCH"),
     onSubmit: () => handleSearch()
   }))), /*#__PURE__*/React.createElement("div", {
@@ -4306,7 +4330,7 @@ const FixedPointScheduleManagement = ({
             setTimeout(closeToast, 5000);
             setShowModal(false);
             setEditingRowIndex(null);
-            reSearch();
+            queryClient.invalidateQueries(["FIXED_POINT_SCHEDULE_SEARCH", tenantId]);
           }
         });
       } else {
@@ -4326,7 +4350,7 @@ const FixedPointScheduleManagement = ({
             setTimeout(closeToast, 5000);
             setShowModal(false);
             setEditingRowIndex(null);
-            reSearch();
+            queryClient.invalidateQueries(["FIXED_POINT_SCHEDULE_SEARCH", tenantId]);
           }
         });
       }
@@ -4753,7 +4777,8 @@ const StatusBadge = ({
 const DriverCard = ({
   driver,
   isSelected,
-  onClick
+  onClick,
+  vendorList
 }) => {
   const [currentAddress, setCurrentAddress] = useState("Resolving area...");
   const [deliveryAddress, setDeliveryAddress] = useState("Resolving area...");
@@ -4797,6 +4822,21 @@ const DriverCard = ({
     };
     resolveDest();
   }, [driver.deliveryLat, driver.deliveryLng]);
+  const vehicleNumber = useMemo(() => {
+    if (!vendorList || !vendorList.length) return null;
+    for (const vendor of vendorList) {
+      if (!vendor.drivers || !vendor.drivers.length) continue;
+      const driverMatch = vendor.drivers.find(d => {
+        var _d$owner, _d$owner2, _d$owner3, _d$owner4;
+        return ((_d$owner = d.owner) === null || _d$owner === void 0 ? void 0 : _d$owner.mobileNumber) === driver.driverId || ((_d$owner2 = d.owner) === null || _d$owner2 === void 0 ? void 0 : _d$owner2.uuid) === driver.driverId || d.id === driver.driverId || String((_d$owner3 = d.owner) === null || _d$owner3 === void 0 ? void 0 : _d$owner3.mobileNumber) === String(driver.driverId) || String((_d$owner4 = d.owner) === null || _d$owner4 === void 0 ? void 0 : _d$owner4.uuid) === String(driver.driverId);
+      });
+      if (driverMatch && vendor.vehicles && vendor.vehicles.length > 0) {
+        var _vendor$vehicles$, _vendor$vehicles$2;
+        return ((_vendor$vehicles$ = vendor.vehicles[0]) === null || _vendor$vehicles$ === void 0 ? void 0 : _vendor$vehicles$.registrationNumber) || ((_vendor$vehicles$2 = vendor.vehicles[0]) === null || _vendor$vehicles$2 === void 0 ? void 0 : _vendor$vehicles$2.vehicleNo) || null;
+      }
+    }
+    return null;
+  }, [vendorList, driver.driverId]);
   const calculateETA = () => {
     if (!driver.lat || !driver.lng || !driver.deliveryLat || !driver.deliveryLng) return null;
     const distance = calculateDistance$1(driver.lat, driver.lng, driver.deliveryLat, driver.deliveryLng);
@@ -4952,7 +4992,16 @@ const DriverCard = ({
       gridTemplateColumns: "1fr 1fr",
       gap: "4px"
     }
-  }, driver.accuracy && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "Accuracy"), /*#__PURE__*/React.createElement("span", null, Math.round(driver.accuracy), "m")), driver.heading && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "Heading"), /*#__PURE__*/React.createElement("span", null, Math.round(driver.heading), "\xB0")), driver.lastSeen && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "Last seen"), /*#__PURE__*/React.createElement("span", null, new Date(driver.lastSeen).toLocaleTimeString()))));
+  }, vehicleNumber && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: "#555"
+    }
+  }, "Vehicle"), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontWeight: "600",
+      color: "#667eea"
+    }
+  }, vehicleNumber)), driver.accuracy && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "Accuracy"), /*#__PURE__*/React.createElement("span", null, Math.round(driver.accuracy), "m")), driver.heading && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "Heading"), /*#__PURE__*/React.createElement("span", null, Math.round(driver.heading), "\xB0")), driver.lastSeen && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "Last seen"), /*#__PURE__*/React.createElement("span", null, new Date(driver.lastSeen).toLocaleTimeString()))));
 };
 function calculateDistance$1(lat1, lon1, lat2, lon2) {
   return calculateDistance(lat1, lon1, lat2, lon2);
@@ -4996,8 +5045,33 @@ function LiveTrackingSystem() {
       select: data => (data === null || data === void 0 ? void 0 : data.vendor) || []
     }
   });
+  const filteredVendorOptions = useMemo(() => {
+    if (!vendorOptions || !vendorOptions.length) return [];
+    if (!selectedFillingPoint) return vendorOptions;
+    return vendorOptions.filter(vendor => {
+      var _vendor$fillingPoint;
+      return (vendor === null || vendor === void 0 ? void 0 : (_vendor$fillingPoint = vendor.fillingPoint) === null || _vendor$fillingPoint === void 0 ? void 0 : _vendor$fillingPoint.id) === (selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.id);
+    });
+  }, [vendorOptions, selectedFillingPoint]);
+  useEffect(() => {
+    if (vendorOptions !== null && vendorOptions !== void 0 && vendorOptions.length && Object.keys(drivers).length) {
+      var _vendorOptions$, _vendorOptions$2, _vendorOptions$2$driv;
+      console.log("=== VENDOR DEBUG ===");
+      console.log("Vendor[0] vehicles:", (_vendorOptions$ = vendorOptions[0]) === null || _vendorOptions$ === void 0 ? void 0 : _vendorOptions$.vehicles);
+      console.log("Vendor[0] drivers:", (_vendorOptions$2 = vendorOptions[0]) === null || _vendorOptions$2 === void 0 ? void 0 : (_vendorOptions$2$driv = _vendorOptions$2.drivers) === null || _vendorOptions$2$driv === void 0 ? void 0 : _vendorOptions$2$driv.map(d => {
+        var _d$owner5, _d$owner6;
+        return {
+          id: d.id,
+          mobile: (_d$owner5 = d.owner) === null || _d$owner5 === void 0 ? void 0 : _d$owner5.mobileNumber,
+          uuid: (_d$owner6 = d.owner) === null || _d$owner6 === void 0 ? void 0 : _d$owner6.uuid
+        };
+      }));
+      console.log("Socket driverId example:", Object.keys(drivers)[0]);
+    }
+  }, [vendorOptions, drivers]);
   const handleFillingPointSelect = value => {
     setSelectedFillingPoint(value);
+    setSelectedVendor(null);
   };
   useEffect(() => {
     const handleResize = () => {
@@ -5084,8 +5158,24 @@ function LiveTrackingSystem() {
   const filteredDrivers = Object.values(drivers).filter(driver => {
     const matchesSearch = driver.driverId.toLowerCase().includes(searchTerm.toLowerCase());
     const matchesStatus = filterOnline === "all" || filterOnline === "online" && driver.isOnline || filterOnline === "offline" && !driver.isOnline;
-    const matchesFillingPoint = !selectedFillingPoint || driver.fillingPointId === selectedFillingPoint.id;
-    const matchesVendor = !selectedVendor || driver.vendorId === (selectedVendor.id || selectedVendor.code);
+    const matchesFillingPoint = !selectedFillingPoint || (() => {
+      if (!vendorOptions || !vendorOptions.length) return false;
+      return vendorOptions.some(vendor => {
+        var _vendor$fillingPoint2, _vendor$drivers;
+        if ((vendor === null || vendor === void 0 ? void 0 : (_vendor$fillingPoint2 = vendor.fillingPoint) === null || _vendor$fillingPoint2 === void 0 ? void 0 : _vendor$fillingPoint2.id) !== (selectedFillingPoint === null || selectedFillingPoint === void 0 ? void 0 : selectedFillingPoint.id)) return false;
+        return (_vendor$drivers = vendor.drivers) === null || _vendor$drivers === void 0 ? void 0 : _vendor$drivers.some(d => {
+          var _d$owner7, _d$owner8, _d$owner9, _d$owner0;
+          return ((_d$owner7 = d.owner) === null || _d$owner7 === void 0 ? void 0 : _d$owner7.mobileNumber) === driver.driverId || ((_d$owner8 = d.owner) === null || _d$owner8 === void 0 ? void 0 : _d$owner8.uuid) === driver.driverId || d.id === driver.driverId || String((_d$owner9 = d.owner) === null || _d$owner9 === void 0 ? void 0 : _d$owner9.mobileNumber) === String(driver.driverId) || String((_d$owner0 = d.owner) === null || _d$owner0 === void 0 ? void 0 : _d$owner0.uuid) === String(driver.driverId);
+        });
+      });
+    })();
+    const matchesVendor = !selectedVendor || (_selectedVendor$drive => {
+      const vendorDriverIds = ((_selectedVendor$drive = selectedVendor.drivers) === null || _selectedVendor$drive === void 0 ? void 0 : _selectedVendor$drive.map(d => {
+        var _d$owner1, _d$owner10, _d$owner11, _d$owner12;
+        return [(_d$owner1 = d.owner) === null || _d$owner1 === void 0 ? void 0 : _d$owner1.mobileNumber, (_d$owner10 = d.owner) === null || _d$owner10 === void 0 ? void 0 : _d$owner10.uuid, d.id, String((_d$owner11 = d.owner) === null || _d$owner11 === void 0 ? void 0 : _d$owner11.mobileNumber), String((_d$owner12 = d.owner) === null || _d$owner12 === void 0 ? void 0 : _d$owner12.uuid)];
+      }).flat().filter(Boolean)) || [];
+      return vendorDriverIds.some(id => driver.driverId === id);
+    })();
     return matchesSearch && matchesStatus && matchesFillingPoint && matchesVendor;
   });
   const onlineCount = Object.values(drivers).filter(d => d.isOnline).length;
@@ -5292,7 +5382,7 @@ function LiveTrackingSystem() {
     }
   }), /*#__PURE__*/React.createElement(Dropdown, {
     t: t,
-    option: vendorOptions,
+    option: filteredVendorOptions,
     optionKey: "name",
     select: setSelectedVendor,
     selected: selectedVendor,
@@ -5395,6 +5485,7 @@ function LiveTrackingSystem() {
     key: driver.driverId,
     driver: driver,
     isSelected: (selectedDriver === null || selectedDriver === void 0 ? void 0 : selectedDriver.driverId) === driver.driverId,
+    vendorList: vendorOptions,
     onClick: () => {
       setSelectedDriver(driver);
       if (isMobile) {
@@ -6630,7 +6721,7 @@ const SearchFillingPointAddress = () => {
       placeholder: "WT_ENTER_FIXED_POINT_NAME"
     },
     FILLING_POINT: {
-      label: "WT_FILLING_POINT_CODE",
+      label: "WT_FILLING_POINT_NAME",
       placeholder: "WT_ENTER_FILLING_POINT_NAME"
     }
   };
@@ -6761,10 +6852,17 @@ const SearchFillingPointAddress = () => {
   const columns = React.useMemo(() => {
     if (selectedTab === "FIXED_POINT") {
       return [{
-        Header: t("WT_FIXING_POINT_APPLICANT_DETAILS"),
+        Header: t("WT_FIXED_POINT_CODE"),
         accessor: row => {
           var _row$applicantDetail;
-          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail = row.applicantDetail) === null || _row$applicantDetail === void 0 ? void 0 : _row$applicantDetail.name) || "NA";
+          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail = row.applicantDetail) === null || _row$applicantDetail === void 0 ? void 0 : _row$applicantDetail.fixedPointId) || "NA";
+        },
+        id: "fixedPointId"
+      }, {
+        Header: t("WT_FIXING_POINT_APPLICANT_DETAILS"),
+        accessor: row => {
+          var _row$applicantDetail2;
+          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail2 = row.applicantDetail) === null || _row$applicantDetail2 === void 0 ? void 0 : _row$applicantDetail2.name) || "NA";
         },
         id: "applicantName",
         Cell: ({
@@ -6780,8 +6878,8 @@ const SearchFillingPointAddress = () => {
       }, {
         Header: t("WT_MOBILE_NUMBER"),
         accessor: row => {
-          var _row$applicantDetail2;
-          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail2 = row.applicantDetail) === null || _row$applicantDetail2 === void 0 ? void 0 : _row$applicantDetail2.mobileNumber) || "NA";
+          var _row$applicantDetail3;
+          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail3 = row.applicantDetail) === null || _row$applicantDetail3 === void 0 ? void 0 : _row$applicantDetail3.mobileNumber) || "NA";
         },
         id: "mobileNumber"
       }, {
@@ -6824,6 +6922,10 @@ const SearchFillingPointAddress = () => {
     } else {
       return [{
         Header: t("WT_FILLING_POINT_CODE"),
+        accessor: row => (row === null || row === void 0 ? void 0 : row.fillingPointId) || "NA",
+        id: "fillingPointId"
+      }, {
+        Header: t("WT_FILLING_POINT_NAME"),
         accessor: row => (row === null || row === void 0 ? void 0 : row.fillingPointName) || "NA",
         id: "fillingPointName",
         Cell: ({
@@ -6975,14 +7077,14 @@ const SearchFillingPointAddress = () => {
       return [{
         Header: t("WT_APPLICANT_NAME"),
         exportAccessor: row => {
-          var _row$applicantDetail3;
-          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail3 = row.applicantDetail) === null || _row$applicantDetail3 === void 0 ? void 0 : _row$applicantDetail3.name) || "NA";
+          var _row$applicantDetail4;
+          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail4 = row.applicantDetail) === null || _row$applicantDetail4 === void 0 ? void 0 : _row$applicantDetail4.name) || "NA";
         }
       }, {
         Header: t("WT_MOBILE_NUMBER"),
         exportAccessor: row => {
-          var _row$applicantDetail4;
-          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail4 = row.applicantDetail) === null || _row$applicantDetail4 === void 0 ? void 0 : _row$applicantDetail4.mobileNumber) || "NA";
+          var _row$applicantDetail5;
+          return (row === null || row === void 0 ? void 0 : (_row$applicantDetail5 = row.applicantDetail) === null || _row$applicantDetail5 === void 0 ? void 0 : _row$applicantDetail5.mobileNumber) || "NA";
         }
       }, {
         Header: t("WT_LOCALITY"),
@@ -7085,20 +7187,16 @@ const SearchFillingPointAddress = () => {
     select: setStatus,
     t: t
   })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      marginTop: "32px",
-      justifyContent: isMobile ? "center" : "flex-end",
-      flexDirection: isMobile ? "column-reverse" : "row",
-      gap: "16px"
-    }
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "clear-search",
+    className: "finance-mainlayout-col1"
+  }, /*#__PURE__*/React.createElement(Label, null, "\xA0"), /*#__PURE__*/React.createElement("span", {
+    className: "generic-button clear-search",
     onClick: clearSearch,
     style: {
       alignSelf: "center"
     }
-  }, t("ES_COMMON_CLEAR_SEARCH")), /*#__PURE__*/React.createElement(SubmitBar, {
+  }, t("ES_COMMON_CLEAR_SEARCH"))), /*#__PURE__*/React.createElement("div", {
+    className: "finance-mainlayout-col1"
+  }, /*#__PURE__*/React.createElement(Label, null, "\xA0"), /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("ES_COMMON_SEARCH"),
     onSubmit: onSearch
   })))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(ApplicationTable, {
@@ -7223,6 +7321,7 @@ const VendorAssign = ({
   const {
     t
   } = useTranslation();
+  const history = useHistory();
   const [showToast, setShowToast] = useState(null);
   const [vendor, setVendor] = useState(null);
   const [validFrom, setValidFrom] = useState("");
@@ -7289,6 +7388,9 @@ const VendorAssign = ({
           isError: false,
           label: t("ES_COMMON_SAVE_SUCCESS")
         });
+        setTimeout(() => {
+          history.push("/digit-ui/employee/vendor/search-vendor");
+        }, 3000);
       },
       onError: err => {
         var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;