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

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams, useLocation, Switch, useHistory, Link, useRouteMatch, Route, Redirect } from 'react-router-dom';
-import { Header, SearchForm, SearchField, Dropdown as Dropdown$2, MobileNumber, CardLabelError, DatePicker as DatePicker$3, SubmitBar, Card, Table, Loader, Toast, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PropertyHouse, EmployeeModuleCard, VerticalTimeline, FormComposer, FormStep, LabelFieldPair, CardLabel, Tooltip, TextInput, UploadFile, CardSubHeader, CardText, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, AddIcon, Menu, LinkLabel, ToggleSwitch, CardSectionHeader, Row, EditIcon, DeleteIcon, Modal, InfoIcon, CardHeader, StatusTable, LinkButton, Banner } from '@djb25/digit-ui-react-components';
+import { Header, SearchForm, SearchField, Dropdown as Dropdown$2, MobileNumber, CardLabelError, DatePicker as DatePicker$3, SubmitBar, Card, Table, Loader, Toast, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PropertyHouse, EmployeeModuleCard, VerticalTimeline, FormComposer, FormStep, LabelFieldPair, CardLabel, Tooltip, TextInput, UploadFile, ActionBar, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ApplyFilterBar, AddIcon, Menu, LinkLabel, ToggleSwitch, CardSectionHeader, Row, EditIcon, DeleteIcon, Modal, CardText, InfoIcon, CardHeader, CardSubHeader, StatusTable, LinkButton, Banner } from '@djb25/digit-ui-react-components';
 import { useForm, Controller } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
 
@@ -404,11 +404,14 @@ const EmployeeApp = ({
     })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/additionaldetails`,
-    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
-      layoutClass: "normal"
-    }, /*#__PURE__*/React.createElement(VendorCreate, Object.assign({}, props, {
-      parentRoute: path
-    })))
+    component: props => {
+      const isInfoPage = props.location.pathname.includes("/info");
+      return /*#__PURE__*/React.createElement(LayoutWrapper, {
+        layoutClass: isInfoPage ? "action" : "normal"
+      }, /*#__PURE__*/React.createElement(VendorCreate, Object.assign({}, props, {
+        parentRoute: path
+      })));
+    }
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/driver-details/:id`,
     component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
@@ -1577,7 +1580,6 @@ const ServiceDoc = ({
   onSelect
 }) => {
   var _Documentsob$ASSET;
-  const tenantId = Digit.ULBService.getCurrentTenantId();
   const stateId = Digit.ULBService.getStateId();
   const docType = config !== null && config !== void 0 && config.isMutation ? ["MutationDocuments"] : "Documents";
   const {
@@ -1585,12 +1587,9 @@ const ServiceDoc = ({
     data: Documentsob = {}
   } = Digit.Hooks.asset.useAssetDocumentsMDMS(stateId, "ASSET", docType);
   let docs = Documentsob === null || Documentsob === void 0 ? void 0 : (_Documentsob$ASSET = Documentsob.ASSET) === null || _Documentsob$ASSET === void 0 ? void 0 : _Documentsob$ASSET.Documents;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("AST_REQ_SCREEN_LABEL")), /*#__PURE__*/React.createElement(CardText, {
-    style: {
-      color: "red",
-      marginBottom: "20px"
-    }
-  }, t("AST_DOCUMENT_ACCEPTED_PDF_JPG_PNG"))), isLoading && /*#__PURE__*/React.createElement(Loader, null), Array.isArray(docs) && docs.map(({
+  return /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-content"
+  }, isLoading && /*#__PURE__*/React.createElement(Loader, null), Array.isArray(docs) && docs.map(({
     code,
     dropdownData
   }, index) => /*#__PURE__*/React.createElement(Card, {
@@ -1606,10 +1605,10 @@ const ServiceDoc = ({
       marginBottom: "6px",
       fontSize: "14px"
     }
-  }, dropdownIndex + 1, ". ", t(stringReplaceAll(dropdownData === null || dropdownData === void 0 ? void 0 : dropdownData.code, ".", "_")))))), /*#__PURE__*/React.createElement(SubmitBar, {
+  }, dropdownIndex + 1, ". ", t(stringReplaceAll(dropdownData === null || dropdownData === void 0 ? void 0 : dropdownData.code, ".", "_")))))), /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("COMMON_NEXT"),
     onSubmit: onSelect
-  }));
+  })));
 };
 
 const VendorSelectAddress = ({
@@ -8180,8 +8179,9 @@ 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$dsoDetails2;
+  const getIdentifiers = fp => Array.isArray(fp) ? fp.flatMap(getFillingPointIdentifiers) : getFillingPointIdentifiers(fp);
+  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), ...getIdentifiers(row === null || row === void 0 ? void 0 : row.fillingPoint), ...getIdentifiers(row === null || row === void 0 ? void 0 : (_row$dsoDetails2 = row.dsoDetails) === null || _row$dsoDetails2 === void 0 ? void 0 : _row$dsoDetails2.fillingPoint), ...getIdentifiers(row === null || row === void 0 ? void 0 : row.fillingPointDetail)]));
 };
 const getSelectedFillingPointOption = (row, fillingPoints = []) => {
   const rowFillingPointIdentifiers = getRowFillingPointIdentifiers(row);
@@ -8189,8 +8189,12 @@ 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$fillingPoint2, _row$dsoDetails3, _row$dsoDetails3$fill, _row$dsoDetails4, _row$dsoDetails5, _row$dsoDetails6, _row$dsoDetails7, _row$fillingpointmeta2;
+  if (Array.isArray(row === null || row === void 0 ? void 0 : row.fillingPoint)) {
+    const list = row.fillingPoint.map(fp => (fp === null || fp === void 0 ? void 0 : fp.fillingPointName) || (fp === null || fp === void 0 ? void 0 : fp.fillingPointId)).filter(Boolean);
+    if (list.length > 0) return list.join(", ");
+  }
+  return (row === null || row === void 0 ? void 0 : (_row$fillingPoint2 = row.fillingPoint) === null || _row$fillingPoint2 === void 0 ? void 0 : _row$fillingPoint2.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;
@@ -8199,7 +8203,7 @@ const getSelectedVendorOption = (row = {}, vendors = []) => {
   return vendors.find(vendor => (vendor === null || vendor === void 0 ? void 0 : vendor.id) === selectedVendorId) || (row === null || row === void 0 ? void 0 : row.vendor) || (row === null || row === void 0 ? void 0 : row.vendorData) || null;
 };
 const getVendorFillingPoints = (vendor = {}) => {
-  const fillingPointOptions = [vendor === null || vendor === void 0 ? void 0 : vendor.fillingPoint, ...(Array.isArray(vendor === null || vendor === void 0 ? void 0 : vendor.fillingPoints) ? vendor.fillingPoints : [])].filter(Boolean);
+  const fillingPointOptions = [...(Array.isArray(vendor === null || vendor === void 0 ? void 0 : vendor.fillingPoint) ? vendor.fillingPoint : [vendor === null || vendor === void 0 ? void 0 : vendor.fillingPoint]), ...(Array.isArray(vendor === null || vendor === void 0 ? void 0 : vendor.fillingPoints) ? vendor.fillingPoints : [vendor === null || vendor === void 0 ? void 0 : vendor.fillingPoints])].filter(Boolean);
   const uniqueFillingPoints = new Map();
   fillingPointOptions.forEach(fillingPoint => {
     const identifier = getFillingPointIdentifiers(fillingPoint)[0] || (fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.fillingPointName) || (fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.id);
@@ -8246,7 +8250,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);
@@ -8679,37 +8682,6 @@ const VendorInbox = props => {
     enabled: true
   });
   const allFillingPoints = (allFillingPointsData === null || allFillingPointsData === void 0 ? void 0 : allFillingPointsData.fillingPoints) || [];
-  const {
-    mutate: mapFixedFilling
-  } = Digit.Hooks.wt.useVendorFillingMap(tenantId);
-  const onFillingPointSelect = (row, value) => {
-    const payload = {
-      mappings: [{
-        tenantId: tenantId,
-        fillingPointId: (value === null || value === void 0 ? void 0 : value.id) || (value === null || value === void 0 ? void 0 : value.bookingId) || (value === null || value === void 0 ? void 0 : value.fillingPointId),
-        vendorId: row.original.id
-      }]
-    };
-    mapFixedFilling(payload, {
-      onSuccess: () => {
-        setShowToast({
-          key: "success",
-          label: "WT_FIXED_FILLING_MAPPING_SUCCESS"
-        });
-        props.refetchData();
-        props.refetchVendor && props.refetchVendor();
-        setTimeout(closeToast, 5000);
-      },
-      onError: err => {
-        var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
-        setShowToast({
-          key: "error",
-          label: (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$Er = _err$response$data.Errors) === null || _err$response$data$Er === void 0 ? void 0 : (_err$response$data$Er2 = _err$response$data$Er[0]) === null || _err$response$data$Er2 === void 0 ? void 0 : _err$response$data$Er2.message) || "WT_FIXED_FILLING_MAPPING_FAIL"
-        });
-        setTimeout(closeToast, 5000);
-      }
-    });
-  };
   const columns = React.useMemo(() => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -8734,28 +8706,6 @@ const VendorInbox = props => {
             var _row$original4, _row$original4$auditD, _row$original5, _row$original5$auditD;
             return GetCell((_row$original4 = row.original) !== null && _row$original4 !== void 0 && (_row$original4$auditD = _row$original4.auditDetails) !== null && _row$original4$auditD !== void 0 && _row$original4$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$auditD = _row$original5.auditDetails) === null || _row$original5$auditD === void 0 ? void 0 : _row$original5$auditD.createdTime) : "");
           }
-        }, {
-          Header: t("WT_FILLING_POINT"),
-          accessor: row => getFillingPointDisplayValue(row),
-          id: "fillingPoint",
-          minWidth: 250,
-          Cell: ({
-            row
-          }) => {
-            return /*#__PURE__*/React.createElement(Dropdown$2, {
-              className: "fsm-registry-dropdown",
-              selected: getSelectedFillingPointOption(row.original, allFillingPoints),
-              option: allFillingPoints,
-              select: value => onFillingPointSelect(row, value),
-              style: {
-                textAlign: "left",
-                width: "100%",
-                minWidth: "250px"
-              },
-              optionKey: "fillingPointName",
-              t: t
-            });
-          }
         }, {
           Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
           id: "serviceType",
@@ -8814,15 +8764,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 +8800,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 +8917,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 +8965,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 +9003,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 +9118,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 +9260,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 +9268,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 +9330,7 @@ const SearchVendor = () => {
   const inboxTotalCount = (dsoData === null || dsoData === void 0 ? void 0 : dsoData.totalCount) || 50;
   useEffect(() => {
     refetch();
+    refetchVendor();
   }, []);
   useEffect(() => {
     refetch();
@@ -9377,17 +9338,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 +9360,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 +9456,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, {