@djb25/digit-ui-module-vendor 1.0.15 → 1.0.16

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useCallback, useState, Fragment as Fragment$1 } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams, useLocation, Switch, Link, useHistory, 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, HomeIcon, PropertyHouse, EmployeeModuleCard, VerticalTimeline, FormComposer, FormStep, CardLabel, TextInput, LabelFieldPair, UploadFile, CardSubHeader, CardText, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, AddIcon, Menu, Label, 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, CardLabel, Tooltip, TextInput, LabelFieldPair, UploadFile, CardSubHeader, CardText, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, AddIcon, Menu, Label, LinkLabel, ToggleSwitch, CardSectionHeader, Row, EditIcon, DeleteIcon, Modal, InfoIcon, CardHeader, StatusTable, LinkButton, Banner } from '@djb25/digit-ui-react-components';
 import { useForm, Controller } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
 
@@ -383,49 +383,67 @@ const EmployeeApp = ({
     breadcrumbs: getDynamicBreadcrumbs()
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/search-vendor`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(SearchVendor, Object.assign({}, props, {
+    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(SearchVendor, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.normal)
+    })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/new-driver`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(AddDriver, Object.assign({}, props, {
+    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "action"
+    }, /*#__PURE__*/React.createElement(AddDriver, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.action)
+    })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/new-vehicle`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(AddVehicle, Object.assign({}, props, {
+    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "action"
+    }, /*#__PURE__*/React.createElement(AddVehicle, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.action)
+    })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/additionaldetails`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(VendorCreate, Object.assign({}, props, {
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(VendorCreate, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.normal)
+    }))), layouts.action)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/driver-details/:id`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(DriverDetails, Object.assign({}, props, {
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "action"
+    }, /*#__PURE__*/React.createElement(DriverDetails, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.action)
+    }))).layouts.action)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/common-search/:id`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(SearchApp, Object.assign({}, props, {
+    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "normal"
+    }, /*#__PURE__*/React.createElement(SearchApp, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.normal)
+    })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/new-vendor`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(AddVendor, Object.assign({}, props, {
+    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "action"
+    }, /*#__PURE__*/React.createElement(AddVendor, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.action)
+    })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/vendor-details/:id`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(EditVendorDetails, Object.assign({}, props, {
+    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "action"
+    }, /*#__PURE__*/React.createElement(EditVendorDetails, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.action)
+    })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/vehicle-details/:id`,
-    component: renderWithLayout(props => /*#__PURE__*/React.createElement(VehicleDetails, Object.assign({}, props, {
+    component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
+      layoutClass: "action"
+    }, /*#__PURE__*/React.createElement(VehicleDetails, Object.assign({}, props, {
       parentRoute: path
-    })), layouts.action)
+    })))
   })))));
 };
 const renderWithLayout = (Component, layoutClass) => routeProps => /*#__PURE__*/React.createElement("div", {
@@ -471,19 +489,6 @@ const checkForNotNull = (value = "") => {
 const checkForNA = (value = "") => {
   return checkForNotNull(value) ? value : "NA";
 };
-const convertEpochToDate = (dateEpoch, businessService) => {
-  const dateFromApi = new Date(dateEpoch);
-  if (dateEpoch) {
-    let month = dateFromApi.getMonth() + 1;
-    let day = dateFromApi.getDate();
-    let year = dateFromApi.getFullYear();
-    month = (month > 9 ? "" : "0") + month;
-    day = (day > 9 ? "" : "0") + day;
-    if (businessService == "asset-create") return `${day}-${month}-${year}`;else return `${day}/${month}/${year}`;
-  } else {
-    return null;
-  }
-};
 const VendorData = data => {
   var _data$vendordet, _data$vendordet2, _data$vendordet3, _data$vendordet4, _data$vendordet5, _data$vendordet6, _data$vendordet7, _data$vendordet8, _data$vendordet9, _data$vendordet0, _data$vendordet1, _data$vendordet10, _data$vendordet11, _data$vendordet12, _data$vendordet13, _data$vendordet13$Sta, _data$vendordet14, _data$vendordet14$Ven, _data$vendordet15, _data$vendordet16, _data$vendordet17, _data$vendordet17$Ven, _data$documents, _data$vendordet18, _data$vendordet19;
   const formdata = {
@@ -544,7 +549,7 @@ const VendorConfig = (t, disabled = false) => {
         name: "vendorName",
         validation: {
           required: true,
-          pattern: /^[A-Za-z]/
+          pattern: /^[A-Za-z\s]+$/
         },
         error: t("FSM_REGISTRY_INVALID_NAME"),
         defaultValue: "",
@@ -860,6 +865,7 @@ const AddVendor = ({
       overflowY: "auto"
     }
   }, currentStep === 1 && /*#__PURE__*/React.createElement(FormComposer, {
+    key: "step1",
     isDisabled: !canSubmit,
     label: t("CS_COMMON_NEXT"),
     config: vendorStepConfig.filter(i => !i.hideInEmployee).map(config => ({
@@ -874,13 +880,16 @@ const AddVendor = ({
     onFormValueChange: onFormValueChange,
     noBreakLine: true
   }), currentStep === 2 && /*#__PURE__*/React.createElement(FormComposer, {
+    key: "step2",
     label: t("ES_COMMON_APPLICATION_SUBMIT"),
     config: addressStepConfig.filter(i => !i.hideInEmployee).map(config => ({
       ...config,
       body: config.body.filter(a => !a.hideInEmployee)
     })),
     onSubmit: onSubmit,
-    defaultValues: defaultValues,
+    defaultValues: {
+      ...defaultValues
+    },
     onFormValueChange: (setValue, formData) => {},
     noBreakLine: true
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
@@ -992,9 +1001,6 @@ const VendorDetails = ({
   function setesino(e) {
     setEsiNo(e.target.value);
   }
-  function setphoneno(e) {
-    setPhoneNo(e.target.value);
-  }
   function setcontactperson(e) {
     setContactPerson(e.target.value);
   }
@@ -1097,7 +1103,13 @@ const VendorDetails = ({
     config: config,
     onSelect: goNext,
     t: t
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("IFSC_CODE")}`), /*#__PURE__*/React.createElement(TextInput, Object.assign({
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    label: `${t("IFSC_CODE")}`,
+    isMandatory: false,
+    message: t("INVALID_IFSC_CODE_ERROR_MESSAGE")
+  })), /*#__PURE__*/React.createElement(TextInput, Object.assign({
     t: t,
     type: "text",
     isMandatory: false,
@@ -1178,25 +1190,14 @@ const VendorDetails = ({
     pattern: "[0-9]{9,18}",
     type: "text",
     title: t("INVALID_ACCOUNT_NO_ERROR_MESSAGE")
-  }))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PHONE_NO")}`), /*#__PURE__*/React.createElement(TextInput, Object.assign({
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
-    name: "PhoneNo",
+  }))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PHONE_NO")}`), /*#__PURE__*/React.createElement(MobileNumber, {
     value: PhoneNo,
-    onChange: setphoneno,
+    name: "PhoneNo",
+    onChange: setPhoneNo,
     style: {
       width: "100%"
-    },
-    ValidationRequired: true
-  }, validation = {
-    isRequired: true,
-    pattern: "[0-9]{9,18}",
-    type: "text",
-    title: t("INVALID_ACCOUNT_NO_ERROR_MESSAGE"),
-    length: 10
-  }))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("CONTACT_PERSON")}`), /*#__PURE__*/React.createElement(TextInput, Object.assign({
+    }
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("CONTACT_PERSON")}`), /*#__PURE__*/React.createElement(TextInput, Object.assign({
     t: t,
     type: "text",
     isMandatory: false,
@@ -7674,9 +7675,16 @@ const ApplicationTable = ({
   pageSizeLimit,
   sortParams,
   totalRecords,
-  isPaginationRequired
+  isPaginationRequired,
+  showCSVExport,
+  csvExportFileName,
+  csvExportData,
+  getCSVExportData,
+  csvExportColumns,
+  csvExportButtonLabel,
+  ...rest
 }) => {
-  return /*#__PURE__*/React.createElement(Table, {
+  return /*#__PURE__*/React.createElement(Table, Object.assign({
     className: _className,
     t: t,
     data: data,
@@ -7691,8 +7699,14 @@ const ApplicationTable = ({
     onSort: onSort,
     sortParams: sortParams,
     totalRecords: totalRecords,
-    isPaginationRequired: isPaginationRequired
-  });
+    isPaginationRequired: isPaginationRequired,
+    showCSVExport: showCSVExport,
+    csvExportFileName: csvExportFileName,
+    csvExportData: csvExportData,
+    getCSVExportData: getCSVExportData,
+    csvExportColumns: csvExportColumns,
+    csvExportButtonLabel: csvExportButtonLabel
+  }, rest));
 };
 
 const StatusCount = ({
@@ -8151,6 +8165,16 @@ const SearchApplication = ({
   }, t("ES_SEARCH_APPLICATION_ERROR")) : null))));
 };
 
+const parseAdditionalDetails = additionalDetails => {
+  if (!additionalDetails) return {};
+  if (typeof additionalDetails === "object") return additionalDetails;
+  if (typeof additionalDetails !== "string") return {};
+  try {
+    return JSON.parse(additionalDetails);
+  } catch (error) {
+    return {};
+  }
+};
 const VendorInbox = props => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const {
@@ -8801,6 +8825,103 @@ const VendorInbox = props => {
         return [];
     }
   }, [props.selectedTab, vendors, drivers, tableData, additionalVendorData, allFillingPoints, t]);
+  const csvExportColumns = React.useMemo(() => {
+    switch (props.selectedTab) {
+      case "VENDOR":
+        return [{
+          Header: t("ES_VENDOR_INBOX_VENDOR_NAME"),
+          exportAccessor: row => {
+            var _row$dsoDetails6;
+            return (row === null || row === void 0 ? void 0 : row.name) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails6 = row.dsoDetails) === null || _row$dsoDetails6 === void 0 ? void 0 : _row$dsoDetails6.name) || "NA";
+          }
+        }, {
+          Header: t("ES_VENDOR_INBOX_DATE_VENDOR_CREATION"),
+          exportAccessor: row => {
+            var _row$auditDetails, _row$auditDetails2;
+            return row !== null && row !== void 0 && (_row$auditDetails = row.auditDetails) !== null && _row$auditDetails !== void 0 && _row$auditDetails.createdTime ? Digit.DateUtils.ConvertEpochToDate(row === null || row === void 0 ? void 0 : (_row$auditDetails2 = row.auditDetails) === null || _row$auditDetails2 === void 0 ? void 0 : _row$auditDetails2.createdTime) : "";
+          }
+        }, {
+          Header: t("WT_FILLING_POINT"),
+          exportAccessor: row => {
+            var _row$dsoDetails7, _row$dsoDetails7$fill, _row$dsoDetails8, _row$dsoDetails9;
+            return (row === null || row === void 0 ? void 0 : (_row$dsoDetails7 = row.dsoDetails) === null || _row$dsoDetails7 === void 0 ? void 0 : (_row$dsoDetails7$fill = _row$dsoDetails7.fillingPoint) === null || _row$dsoDetails7$fill === void 0 ? void 0 : _row$dsoDetails7$fill.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails8 = row.dsoDetails) === null || _row$dsoDetails8 === void 0 ? void 0 : _row$dsoDetails8.fillingPoint) || (row === null || row === void 0 ? void 0 : row.fillingPoint) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails9 = row.dsoDetails) === null || _row$dsoDetails9 === void 0 ? void 0 : _row$dsoDetails9.fillingPointId) || (row === null || row === void 0 ? void 0 : row.fillingPointId) || "NA";
+          }
+        }, {
+          Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
+          exportAccessor: row => {
+            var _parseAdditionalDetai, _row$dsoDetails0;
+            return ((_parseAdditionalDetai = parseAdditionalDetails(row === null || row === void 0 ? void 0 : (_row$dsoDetails0 = row.dsoDetails) === null || _row$dsoDetails0 === void 0 ? void 0 : _row$dsoDetails0.additionalDetails)) === null || _parseAdditionalDetai === void 0 ? void 0 : _parseAdditionalDetai.serviceType) || "N/A";
+          }
+        }, {
+          Header: t("ES_VENDOR_REGISTRY_INBOX_ENABLED"),
+          exportAccessor: row => {
+            var _row$dsoDetails1;
+            return (row === null || row === void 0 ? void 0 : (_row$dsoDetails1 = row.dsoDetails) === null || _row$dsoDetails1 === void 0 ? void 0 : _row$dsoDetails1.status) || "NA";
+          }
+        }];
+      case "VEHICLE":
+        return [{
+          Header: t("ES_FSM_REGISTRY_INBOX_VEHICLE_NAME"),
+          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.registrationNumber) || "NA"
+        }, {
+          Header: t("ES_FSM_REGISTRY_INBOX_DATE_VEHICLE_CREATION"),
+          exportAccessor: row => {
+            var _row$auditDetails3, _row$auditDetails4;
+            return row !== null && row !== void 0 && (_row$auditDetails3 = row.auditDetails) !== null && _row$auditDetails3 !== void 0 && _row$auditDetails3.createdTime ? Digit.DateUtils.ConvertEpochToDate(row === null || row === void 0 ? void 0 : (_row$auditDetails4 = row.auditDetails) === null || _row$auditDetails4 === void 0 ? void 0 : _row$auditDetails4.createdTime) : "";
+          }
+        }, {
+          Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
+          exportAccessor: row => {
+            var _row$vendor3;
+            return (row === null || row === void 0 ? void 0 : (_row$vendor3 = row.vendor) === null || _row$vendor3 === void 0 ? void 0 : _row$vendor3.name) || "NA";
+          }
+        }, {
+          Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
+          exportAccessor: row => {
+            var _parseAdditionalDetai2;
+            return ((_parseAdditionalDetai2 = parseAdditionalDetails(row === null || row === void 0 ? void 0 : row.additionalDetails)) === null || _parseAdditionalDetai2 === void 0 ? void 0 : _parseAdditionalDetai2.serviceType) || "N/A";
+          }
+        }, {
+          Header: t("ES_FSM_REGISTRY_SELECT_DRIVER"),
+          exportAccessor: row => {
+            var _row$driverData2, _row$driver2;
+            return (row === null || row === void 0 ? void 0 : (_row$driverData2 = row.driverData) === null || _row$driverData2 === void 0 ? void 0 : _row$driverData2.name) || (row === null || row === void 0 ? void 0 : (_row$driver2 = row.driver) === null || _row$driver2 === void 0 ? void 0 : _row$driver2.name) || "NA";
+          }
+        }, {
+          Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
+          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.status) || "NA"
+        }];
+      case "DRIVER":
+        return [{
+          Header: t("ES_FSM_REGISTRY_INBOX_USERNAME"),
+          exportAccessor: row => {
+            var _row$owner2;
+            return (row === null || row === void 0 ? void 0 : (_row$owner2 = row.owner) === null || _row$owner2 === void 0 ? void 0 : _row$owner2.userName) || "NA";
+          }
+        }, {
+          Header: t("ES_FSM_REGISTRY_INBOX_DRIVER_NAME"),
+          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.name) || "NA"
+        }, {
+          Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
+          exportAccessor: row => {
+            var _row$auditDetails5, _row$auditDetails6;
+            return row !== null && row !== void 0 && (_row$auditDetails5 = row.auditDetails) !== null && _row$auditDetails5 !== void 0 && _row$auditDetails5.createdTime ? Digit.DateUtils.ConvertEpochToDate(row === null || row === void 0 ? void 0 : (_row$auditDetails6 = row.auditDetails) === null || _row$auditDetails6 === void 0 ? void 0 : _row$auditDetails6.createdTime) : "";
+          }
+        }, {
+          Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
+          exportAccessor: row => {
+            var _row$vendorData2, _row$vendor4;
+            return (row === null || row === void 0 ? void 0 : (_row$vendorData2 = row.vendorData) === null || _row$vendorData2 === void 0 ? void 0 : _row$vendorData2.name) || (row === null || row === void 0 ? void 0 : (_row$vendor4 = row.vendor) === null || _row$vendor4 === void 0 ? void 0 : _row$vendor4.name) || "NA";
+          }
+        }, {
+          Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
+          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.status) || "NA"
+        }];
+      default:
+        return [];
+    }
+  }, [props.selectedTab, t]);
+  const getCSVExportData = React.useCallback(async () => tableData, [tableData]);
   let result;
   if (props.isLoading || isAllFillingPointsLoading) {
     result = /*#__PURE__*/React.createElement(Loader, null);
@@ -8861,7 +8982,11 @@ const VendorInbox = props => {
       onSort: props.onSort,
       disableSort: props.disableSort,
       sortParams: props.sortParams,
-      totalRecords: props.totalRecords
+      totalRecords: props.totalRecords,
+      showCSVExport: true,
+      getCSVExportData: getCSVExportData,
+      csvExportColumns: csvExportColumns,
+      csvExportFileName: `vendor-${String(props.selectedTab || "registry").toLowerCase()}-inbox`
     });
   }
   return /*#__PURE__*/React.createElement("div", {
@@ -8913,6 +9038,9 @@ const SearchVendor = () => {
     t
   } = useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const {
+    selectedTabs
+  } = Digit.Hooks.useQueryParams();
   const [searchParams, setSearchParams] = useState({});
   const [sortParams, setSortParams] = useState([{
     id: "createdTime",
@@ -8920,7 +9048,7 @@ const SearchVendor = () => {
   }]);
   const [pageOffset, setPageOffset] = useState(0);
   const [pageSize, setPageSize] = useState(10);
-  const [tab, setTab] = useState("VENDOR");
+  const [tab, setTab] = useState(selectedTabs || "VENDOR");
   const [vehicleIds, setVehicleIds] = useState("");
   const [driverIds, setDriverIds] = useState("");
   const [tableData, setTableData] = useState([]);
@@ -9232,7 +9360,10 @@ const DriverConfig = (t, disabled = false) => {
         name: "driverName",
         validation: {
           required: true,
-          pattern: /^[A-Za-z]/
+          pattern: {
+            value: /^[A-Za-z\s]+$/,
+            message: t("FSM_REGISTRY_INVALID_NAME")
+          }
         },
         error: t("FSM_REGISTRY_INVALID_NAME"),
         defaultValue: "",
@@ -9247,9 +9378,12 @@ const DriverConfig = (t, disabled = false) => {
         name: "license",
         validation: {
           required: true,
-          pattern: /^[a-zA-Z-]{0,}[- ]{0,1}[ 0-9]{1,}/
+          pattern: {
+            value: /^[A-Z]{2}-[0-9]{2}-[0-9]{4}-[0-9]{7}$/,
+            message: t("ES_FSM_REGISTRY_INVALID_LICENSE")
+          }
         },
-        error: t("FSM_REGISTRY_INVALID_DRIVER_LICENSE"),
+        error: t("ES_FSM_REGISTRY_INVALID_LICENSE"),
         required: false,
         defaultValue: "",
         className: "payment-form-text-input-correction"
@@ -9290,7 +9424,7 @@ const DriverConfig = (t, disabled = false) => {
       }
     }, {
       label: t("ES_FSM_REGISTRY_NEW_DOB"),
-      isMandatory: false,
+      isMandatory: true,
       type: "custom",
       key: "dob",
       populators: {
@@ -9302,7 +9436,11 @@ const DriverConfig = (t, disabled = false) => {
           onChange: props.onChange,
           date: props.value
         }, customProps, {
-          max: convertEpochToDate(new Date().setFullYear(new Date().getFullYear()))
+          max: (() => {
+            const date = new Date();
+            date.setFullYear(date.getFullYear() - 18);
+            return date.toISOString().split("T")[0];
+          })()
         }))
       }
     }, {
@@ -9382,7 +9520,18 @@ const AddDriver = ({
     }
   };
   const onFormValueChange = (setValue, formData) => {
-    if (formData !== null && formData !== void 0 && formData.driverName && formData !== null && formData !== void 0 && formData.selectGender) {
+    if (formData !== null && formData !== void 0 && formData.license) {
+      const cleaned = formData.license.replace(/[^A-Za-z0-9]/g, "").toUpperCase();
+      let formatted = cleaned;
+      if (cleaned.length > 2) formatted = cleaned.slice(0, 2) + "-" + cleaned.slice(2);
+      if (cleaned.length > 4) formatted = formatted.slice(0, 5) + "-" + formatted.slice(5);
+      if (cleaned.length > 8) formatted = formatted.slice(0, 10) + "-" + formatted.slice(10);
+      const finalFormatted = formatted.slice(0, 18);
+      if (formData.license !== finalFormatted) {
+        setValue("license", finalFormatted);
+      }
+    }
+    if (formData !== null && formData !== void 0 && formData.driverName && /^[A-Za-z\s]+$/.test(formData === null || formData === void 0 ? void 0 : formData.driverName) && formData !== null && formData !== void 0 && formData.license && /^[A-Z]{2}-[0-9]{2}-[0-9]{4}-[0-9]{7}$/.test(formData === null || formData === void 0 ? void 0 : formData.license) && formData !== null && formData !== void 0 && formData.selectGender && formData !== null && formData !== void 0 && formData.dob && new Date(formData === null || formData === void 0 ? void 0 : formData.dob).getTime() <= new Date().setFullYear(new Date().getFullYear() - 18)) {
       setSubmitValve(true);
     } else {
       setSubmitValve(false);
@@ -9470,7 +9619,8 @@ const AddDriver = ({
     onSubmit: onSubmit,
     defaultValues: defaultValues,
     onFormValueChange: onFormValueChange,
-    noBreakLine: true
+    noBreakLine: true,
+    mode: "onChange"
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error" ? true : false,
     label: t(showToast.key === "success" ? `ES_FSM_${showToast.action}_SUCCESS` : showToast.action),
@@ -10060,7 +10210,10 @@ const VehicleConfig = (t, disabled = false) => {
         name: "ownerName",
         validation: {
           required: true,
-          pattern: /^[A-Za-z]/
+          pattern: {
+            value: /^[A-Za-z\s]+$/,
+            message: t("FSM_REGISTRY_INVALID_NAME")
+          }
         },
         error: t("FSM_REGISTRY_INVALID_NAME"),
         defaultValue: ""
@@ -10090,7 +10243,7 @@ const VehicleConfig = (t, disabled = false) => {
       component: "SelectGender"
     }, {
       label: t("ES_FSM_REGISTRY_NEW_DOB"),
-      isMandatory: false,
+      isMandatory: true,
       type: "custom",
       key: "dob",
       populators: {
@@ -10102,7 +10255,11 @@ const VehicleConfig = (t, disabled = false) => {
           onChange: props.onChange,
           date: props.value
         }, customProps, {
-          max: convertEpochToDate(new Date().setFullYear(new Date().getFullYear()))
+          max: (() => {
+            const date = new Date();
+            date.setFullYear(date.getFullYear() - 18);
+            return date.toISOString().split("T")[0];
+          })()
         }))
       }
     }, {
@@ -10195,7 +10352,7 @@ const AddVehicle = ({
         setValue("registrationNumber", updatedRegNo);
       }
     }
-    if (formData !== null && formData !== void 0 && formData.registrationNumber && formData !== null && formData !== void 0 && formData.ownerName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$vehicle = formData.vehicle) !== null && _formData$vehicle !== void 0 && _formData$vehicle.modal && formData !== null && formData !== void 0 && (_formData$vehicle2 = formData.vehicle) !== null && _formData$vehicle2 !== void 0 && _formData$vehicle2.type && formData !== null && formData !== void 0 && formData.selectGender) {
+    if (formData !== null && formData !== void 0 && formData.registrationNumber && formData !== null && formData !== void 0 && formData.ownerName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$vehicle = formData.vehicle) !== null && _formData$vehicle !== void 0 && _formData$vehicle.modal && formData !== null && formData !== void 0 && (_formData$vehicle2 = formData.vehicle) !== null && _formData$vehicle2 !== void 0 && _formData$vehicle2.type && formData !== null && formData !== void 0 && formData.selectGender && formData !== null && formData !== void 0 && formData.dob && new Date(formData === null || formData === void 0 ? void 0 : formData.dob).getTime() <= new Date().setFullYear(new Date().getFullYear() - 18)) {
       setSubmitValve(true);
     } else {
       setSubmitValve(false);
@@ -10266,8 +10423,11 @@ const AddVehicle = ({
           key: "success",
           action: "ADD_VEHICLE"
         });
-        setTimeout(closeToast, 5000);
         queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
+        setTimeout(() => {
+          closeToast();
+          history.push(`/digit-ui/employee/vendor/search-vendor?selectedTabs=VEHICLE`);
+        }, 3000);
       }
     });
   };
@@ -10301,7 +10461,8 @@ const AddVehicle = ({
     onSubmit: onSubmit,
     defaultValues: defaultValues,
     onFormValueChange: onFormValueChange,
-    noBreakLine: true
+    noBreakLine: true,
+    mode: "onChange"
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error" ? true : false,
     label: t(showToast.key === "success" ? `ES_FSM_REGISTRY_${showToast.action}_SUCCESS` : showToast.action),