@djb25/digit-ui-module-vendor 1.0.22 → 1.0.23

package/dist/index.modern.js

@@ -8180,8 +8180,8 @@ const getFillingPointIdentifiers = fillingPoint => {
   return [fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.id, fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.fillingStationId, fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.bookingId, fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.fillingPointId, fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.uuid, fillingPoint === null || fillingPoint === void 0 ? void 0 : (_fillingPoint$filling = fillingPoint.fillingpointmetadata) === null || _fillingPoint$filling === void 0 ? void 0 : _fillingPoint$filling.fillingPointId].filter(value => value !== undefined && value !== null && value !== "").map(String);
 };
 const getRowFillingPointIdentifiers = (row = {}) => {
-  var _row$dsoDetails, _row$fillingpointmeta, _row$dsoDetails2;
-  return Array.from(new Set([...[row === null || row === void 0 ? void 0 : row.fillingPointId, row === null || row === void 0 ? void 0 : (_row$dsoDetails = row.dsoDetails) === null || _row$dsoDetails === void 0 ? void 0 : _row$dsoDetails.fillingPointId, row === null || row === void 0 ? void 0 : (_row$fillingpointmeta = row.fillingpointmetadata) === null || _row$fillingpointmeta === void 0 ? void 0 : _row$fillingpointmeta.fillingPointId, row === null || row === void 0 ? void 0 : row.fillingPtName, row === null || row === void 0 ? void 0 : row.filling_pt_name].filter(value => value !== undefined && value !== null && value !== "").map(String), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : row.fillingPoint), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : (_row$dsoDetails2 = row.dsoDetails) === null || _row$dsoDetails2 === void 0 ? void 0 : _row$dsoDetails2.fillingPoint), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : row.fillingPointDetail)]));
+  var _row$dsoDetails, _row$fillingpointmeta, _row$fillingPoint, _row$fillingPoint2, _row$dsoDetails2;
+  return Array.from(new Set([...[row === null || row === void 0 ? void 0 : row.fillingPointId, row === null || row === void 0 ? void 0 : (_row$dsoDetails = row.dsoDetails) === null || _row$dsoDetails === void 0 ? void 0 : _row$dsoDetails.fillingPointId, row === null || row === void 0 ? void 0 : (_row$fillingpointmeta = row.fillingpointmetadata) === null || _row$fillingpointmeta === void 0 ? void 0 : _row$fillingpointmeta.fillingPointId, row === null || row === void 0 ? void 0 : row.fillingPtName, row === null || row === void 0 ? void 0 : row.filling_pt_name, row === null || row === void 0 ? void 0 : (_row$fillingPoint = row.fillingPoint) === null || _row$fillingPoint === void 0 ? void 0 : _row$fillingPoint.fillingPointId].filter(value => value !== undefined && value !== null && value !== "").map(String), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : row.fillingPoint), ...getFillingPointIdentifiers(row !== null && row !== void 0 && (_row$fillingPoint2 = row.fillingPoint) !== null && _row$fillingPoint2 !== void 0 && _row$fillingPoint2.length ? row.fillingPoint[0] : row.fillingPoint), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : (_row$dsoDetails2 = row.dsoDetails) === null || _row$dsoDetails2 === void 0 ? void 0 : _row$dsoDetails2.fillingPoint), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : row.fillingPointDetail)]));
 };
 const getSelectedFillingPointOption = (row, fillingPoints = []) => {
   const rowFillingPointIdentifiers = getRowFillingPointIdentifiers(row);
@@ -8189,8 +8189,8 @@ const getSelectedFillingPointOption = (row, fillingPoints = []) => {
   return fillingPoints.find(fillingPoint => getFillingPointIdentifiers(fillingPoint).some(identifier => rowFillingPointIdentifiers.includes(identifier))) || null;
 };
 const getFillingPointDisplayValue = (row = {}) => {
-  var _row$fillingPoint, _row$dsoDetails3, _row$dsoDetails3$fill, _row$dsoDetails4, _row$dsoDetails5, _row$dsoDetails6, _row$dsoDetails7, _row$fillingpointmeta2;
-  return (row === null || row === void 0 ? void 0 : (_row$fillingPoint = row.fillingPoint) === null || _row$fillingPoint === void 0 ? void 0 : _row$fillingPoint.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails3 = row.dsoDetails) === null || _row$dsoDetails3 === void 0 ? void 0 : (_row$dsoDetails3$fill = _row$dsoDetails3.fillingPoint) === null || _row$dsoDetails3$fill === void 0 ? void 0 : _row$dsoDetails3$fill.fillingPointName) || (row === null || row === void 0 ? void 0 : row.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails4 = row.dsoDetails) === null || _row$dsoDetails4 === void 0 ? void 0 : _row$dsoDetails4.fillingPointName) || (row === null || row === void 0 ? void 0 : row.fillingPointId) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails5 = row.dsoDetails) === null || _row$dsoDetails5 === void 0 ? void 0 : _row$dsoDetails5.fillingPointId) || (typeof (row === null || row === void 0 ? void 0 : row.fillingPoint) === "string" ? row === null || row === void 0 ? void 0 : row.fillingPoint : null) || (typeof (row === null || row === void 0 ? void 0 : (_row$dsoDetails6 = row.dsoDetails) === null || _row$dsoDetails6 === void 0 ? void 0 : _row$dsoDetails6.fillingPoint) === "string" ? row === null || row === void 0 ? void 0 : (_row$dsoDetails7 = row.dsoDetails) === null || _row$dsoDetails7 === void 0 ? void 0 : _row$dsoDetails7.fillingPoint : null) || (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta2 = row.fillingpointmetadata) === null || _row$fillingpointmeta2 === void 0 ? void 0 : _row$fillingpointmeta2.fillingPointId) || (row === null || row === void 0 ? void 0 : row.filling_pt_name) || (row === null || row === void 0 ? void 0 : row.fillingPtName) || "NA";
+  var _row$fillingPoint3, _row$dsoDetails3, _row$dsoDetails3$fill, _row$dsoDetails4, _row$dsoDetails5, _row$dsoDetails6, _row$dsoDetails7, _row$fillingpointmeta2;
+  return (row === null || row === void 0 ? void 0 : (_row$fillingPoint3 = row.fillingPoint) === null || _row$fillingPoint3 === void 0 ? void 0 : _row$fillingPoint3.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails3 = row.dsoDetails) === null || _row$dsoDetails3 === void 0 ? void 0 : (_row$dsoDetails3$fill = _row$dsoDetails3.fillingPoint) === null || _row$dsoDetails3$fill === void 0 ? void 0 : _row$dsoDetails3$fill.fillingPointName) || (row === null || row === void 0 ? void 0 : row.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails4 = row.dsoDetails) === null || _row$dsoDetails4 === void 0 ? void 0 : _row$dsoDetails4.fillingPointName) || (row === null || row === void 0 ? void 0 : row.fillingPointId) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails5 = row.dsoDetails) === null || _row$dsoDetails5 === void 0 ? void 0 : _row$dsoDetails5.fillingPointId) || (typeof (row === null || row === void 0 ? void 0 : row.fillingPoint) === "string" ? row === null || row === void 0 ? void 0 : row.fillingPoint : null) || (typeof (row === null || row === void 0 ? void 0 : (_row$dsoDetails6 = row.dsoDetails) === null || _row$dsoDetails6 === void 0 ? void 0 : _row$dsoDetails6.fillingPoint) === "string" ? row === null || row === void 0 ? void 0 : (_row$dsoDetails7 = row.dsoDetails) === null || _row$dsoDetails7 === void 0 ? void 0 : _row$dsoDetails7.fillingPoint : null) || (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta2 = row.fillingpointmetadata) === null || _row$fillingpointmeta2 === void 0 ? void 0 : _row$fillingpointmeta2.fillingPointId) || (row === null || row === void 0 ? void 0 : row.filling_pt_name) || (row === null || row === void 0 ? void 0 : row.fillingPtName) || "NA";
 };
 const getSelectedVendorOption = (row = {}, vendors = []) => {
   var _row$vendor, _row$vendorData;
@@ -8246,7 +8246,6 @@ const VendorInbox = props => {
     t
   } = useTranslation();
   const history = useHistory();
-  const DSO = Digit.UserService.hasAccess(["FSM_DSO"]) || false;
   const GetCell = value => /*#__PURE__*/React.createElement("span", {
     className: "cell-text"
   }, value);
@@ -8814,15 +8813,12 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original7, _additionalVendorData;
+            var _row$original7, _row$original8;
             const vendorId = (_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.id;
             if (!additionalVendorData) {
               return /*#__PURE__*/React.createElement("span", null, "Loading...");
             }
-            const hasDetails = additionalVendorData === null || additionalVendorData === void 0 ? void 0 : (_additionalVendorData = additionalVendorData.VendorDetails) === null || _additionalVendorData === void 0 ? void 0 : _additionalVendorData.some(item => {
-              var _item$vendorAdditiona;
-              return (item === null || item === void 0 ? void 0 : (_item$vendorAdditiona = item.vendorAdditionalDetails) === null || _item$vendorAdditiona === void 0 ? void 0 : _item$vendorAdditiona.vendorId) === vendorId;
-            });
+            const hasDetails = ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.vendorAdditionalDetails) !== null;
             return /*#__PURE__*/React.createElement(Link, {
               to: hasDetails ? "/digit-ui/employee/vendor/registry/additionaldetails/info?vendorId=" + vendorId : "/digit-ui/employee/vendor/registry/additionaldetails/vendor-details?vendorId=" + vendorId
             }, /*#__PURE__*/React.createElement("button", {
@@ -8853,8 +8849,8 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original8, _row$original8$auditD, _row$original9, _row$original9$auditD;
-            return GetCell((_row$original8 = row.original) !== null && _row$original8 !== void 0 && (_row$original8$auditD = _row$original8.auditDetails) !== null && _row$original8$auditD !== void 0 && _row$original8$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original9 = row.original) === null || _row$original9 === void 0 ? void 0 : (_row$original9$auditD = _row$original9.auditDetails) === null || _row$original9$auditD === void 0 ? void 0 : _row$original9$auditD.createdTime) : "");
+            var _row$original9, _row$original9$auditD, _row$original0, _row$original0$auditD;
+            return GetCell((_row$original9 = row.original) !== null && _row$original9 !== void 0 && (_row$original9$auditD = _row$original9.auditDetails) !== null && _row$original9$auditD !== void 0 && _row$original9$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original0 = row.original) === null || _row$original0 === void 0 ? void 0 : (_row$original0$auditD = _row$original0.auditDetails) === null || _row$original0$auditD === void 0 ? void 0 : _row$original0$auditD.createdTime) : "");
           }
         }, {
           Header: "Map Vendor",
@@ -8970,13 +8966,13 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original0;
+            var _row$original1;
             return /*#__PURE__*/React.createElement(ToggleSwitch, {
               style: {
                 display: "flex",
                 justifyContent: "left"
               },
-              value: ((_row$original0 = row.original) === null || _row$original0 === void 0 ? void 0 : _row$original0.status) === "DISABLED" ? false : true,
+              value: ((_row$original1 = row.original) === null || _row$original1 === void 0 ? void 0 : _row$original1.status) === "DISABLED" ? false : true,
               onChange: () => onVehicleUpdate(row),
               name: `switch-${row.id}`
             });
@@ -9018,8 +9014,8 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original1, _row$original1$auditD, _row$original10, _row$original10$audit;
-            return GetCell((_row$original1 = row.original) !== null && _row$original1 !== void 0 && (_row$original1$auditD = _row$original1.auditDetails) !== null && _row$original1$auditD !== void 0 && _row$original1$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original10 = row.original) === null || _row$original10 === void 0 ? void 0 : (_row$original10$audit = _row$original10.auditDetails) === null || _row$original10$audit === void 0 ? void 0 : _row$original10$audit.createdTime) : "");
+            var _row$original10, _row$original10$audit, _row$original11, _row$original11$audit;
+            return GetCell((_row$original10 = row.original) !== null && _row$original10 !== void 0 && (_row$original10$audit = _row$original10.auditDetails) !== null && _row$original10$audit !== void 0 && _row$original10$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original11 = row.original) === null || _row$original11 === void 0 ? void 0 : (_row$original11$audit = _row$original11.auditDetails) === null || _row$original11$audit === void 0 ? void 0 : _row$original11$audit.createdTime) : "");
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
@@ -9056,13 +9052,13 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original11;
+            var _row$original12;
             return /*#__PURE__*/React.createElement(ToggleSwitch, {
               style: {
                 display: "flex",
                 justifyContent: "left"
               },
-              value: ((_row$original11 = row.original) === null || _row$original11 === void 0 ? void 0 : _row$original11.status) === "DISABLED" ? false : true,
+              value: ((_row$original12 = row.original) === null || _row$original12 === void 0 ? void 0 : _row$original12.status) === "DISABLED" ? false : true,
               onChange: () => onDriverUpdate(row),
               name: `switch-${row.id}`
             });
@@ -9171,7 +9167,21 @@ const VendorInbox = props => {
   const getCSVExportData = React.useCallback(async () => tableData, [tableData]);
   let result;
   if (props.isLoading || isAllFillingPointsLoading) {
-    result = /*#__PURE__*/React.createElement(Loader, null);
+    result = /*#__PURE__*/React.createElement("div", {
+      style: {
+        zIndex: 10,
+        position: "relative",
+        padding: "10px",
+        backgroundColor: "#fff",
+        width: "75px",
+        height: "75px",
+        borderRadius: "12px",
+        display: "flex",
+        justifyContent: "center",
+        alignItems: "center",
+        margin: "auto"
+      }
+    }, /*#__PURE__*/React.createElement(Loader, null));
   } else if (tableData.length === 0) {
     let emptyCardText = "";
     let emptyButtonText = "";
@@ -9299,7 +9309,6 @@ const SearchVendor = () => {
   const [vehicleIds, setVehicleIds] = useState("");
   const [driverIds, setDriverIds] = useState("");
   const [tableData, setTableData] = useState([]);
-  const userInfo = Digit.UserService.getUser();
   let paginationParms = {
     limit: pageSize,
     offset: pageOffset,
@@ -9308,9 +9317,9 @@ const SearchVendor = () => {
   };
   const {
     data: dsoData,
-    isLoading: isLoading,
-    isSuccess: isDsoSuccess,
-    error: dsoError,
+    isLoading,
+    isSuccess,
+    error,
     refetch
   } = tab === "VEHICLE" ? Digit.Hooks.fsm.useVehiclesSearch({
     tenantId,
@@ -9370,6 +9379,7 @@ const SearchVendor = () => {
   const inboxTotalCount = (dsoData === null || dsoData === void 0 ? void 0 : dsoData.totalCount) || 50;
   useEffect(() => {
     refetch();
+    refetchVendor();
   }, []);
   useEffect(() => {
     refetch();
@@ -9377,17 +9387,13 @@ const SearchVendor = () => {
   useEffect(() => {
     if (dsoData !== null && dsoData !== void 0 && dsoData.vehicle && tab === "VEHICLE") {
       let vehicleIds = "";
-      dsoData.vehicle.map(data => {
-        vehicleIds += `${data.id},`;
-      });
+      dsoData.vehicle.map(data => vehicleIds += `${data.id},`);
       setVehicleIds(vehicleIds);
       setTableData(dsoData.vehicle);
     }
     if (dsoData !== null && dsoData !== void 0 && dsoData.driver && tab === "DRIVER") {
       let driverIds = "";
-      dsoData.driver.map(data => {
-        driverIds += `${data.id},`;
-      });
+      dsoData.driver.map(data => driverIds += `${data.id},`);
       setDriverIds(driverIds);
       setTableData(dsoData === null || dsoData === void 0 ? void 0 : dsoData.driver);
     }
@@ -9403,6 +9409,8 @@ const SearchVendor = () => {
           activeDrivers: (_dso$drivers = dso.drivers) === null || _dso$drivers === void 0 ? void 0 : _dso$drivers.filter(driver => driver.status === "ACTIVE"),
           allVehicles: dso.vehicles,
           dsoDetails: dso,
+          vendorAdditionalDetails: dso.vendorAdditionalDetails,
+          fillingPoint: dso.fillingPoint,
           vehicles: (_dso$vehicles = dso.vehicles) === null || _dso$vehicles === void 0 ? void 0 : (_dso$vehicles$filter = _dso$vehicles.filter(vehicle => vehicle.status === "ACTIVE")) === null || _dso$vehicles$filter === void 0 ? void 0 : _dso$vehicles$filter.map(vehicle => ({
             id: vehicle.id,
             registrationNumber: vehicle === null || vehicle === void 0 ? void 0 : vehicle.registrationNumber,
@@ -9497,10 +9505,6 @@ const SearchVendor = () => {
   const refetchVendorData = () => {
     refetchVendor();
   };
-  useEffect(() => {
-    refetch();
-    refetchVendor();
-  }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "employee-form-content"
   }, /*#__PURE__*/React.createElement(VendorInbox, {