@djb25/digit-ui-module-vendor 1.0.10 → 1.0.11

package/dist/index.modern.js

@@ -385,8 +385,9 @@ const EmployeeApp = ({
     className: "employee-form"
   }, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/new-vendor`,
-    component: AddVendor,
-    parentRoute: path
+    component: () => /*#__PURE__*/React.createElement(AddVendor, {
+      parentRoute: path
+    })
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/search-vendor`,
     component: () => /*#__PURE__*/React.createElement(SearchVendor, {
@@ -544,39 +545,6 @@ const VendorConfig = (t, disabled = false) => {
         defaultValue: "",
         className: "payment-form-text-input-correction"
       }
-    }, {
-      label: "ES_FSM_REGISTRY_NEW_GENDER",
-      isMandatory: true,
-      type: "component",
-      route: "select-gender",
-      hideInEmployee: false,
-      key: "selectGender",
-      component: "SelectGender",
-      disable: disabled,
-      texts: {
-        headerCaption: "",
-        header: "CS_COMMON_CHOOSE_GENDER",
-        cardText: "CS_COMMON_SELECT_GENDER",
-        submitBarLabel: "CS_COMMON_NEXT",
-        skipText: "CORE_COMMON_SKIP_CONTINUE"
-      }
-    }, {
-      label: t("ES_FSM_REGISTRY_NEW_DOB"),
-      isMandatory: false,
-      type: "custom",
-      key: "dob",
-      populators: {
-        name: "dob",
-        validation: {
-          required: true
-        },
-        component: (props, customProps) => /*#__PURE__*/React.createElement(DatePicker, Object.assign({
-          onChange: props.onChange,
-          date: props.value
-        }, customProps, {
-          max: convertEpochToDate(new Date().setFullYear(new Date().getFullYear()))
-        }))
-      }
     }, {
       label: "ES_FSM_REGISTRY_NEW_EMAIL",
       isMandatory: false,
@@ -765,8 +733,8 @@ const AddVendor = ({
     label: "ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS"
   }];
   const onFormValueChange = (setValue, formData) => {
-    var _formData$selectGende, _formData$serviceType;
-    if (formData !== null && formData !== void 0 && formData.vendorName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$selectGende = formData.selectGender) !== null && _formData$selectGende !== void 0 && _formData$selectGende.code && formData !== null && formData !== void 0 && (_formData$serviceType = formData.serviceType) !== null && _formData$serviceType !== void 0 && _formData$serviceType.code) {
+    var _formData$serviceType;
+    if (formData !== null && formData !== void 0 && formData.vendorName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$serviceType = formData.serviceType) !== null && _formData$serviceType !== void 0 && _formData$serviceType.code) {
       setCanSubmit(true);
     } else {
       setCanSubmit(false);
@@ -776,7 +744,7 @@ const AddVendor = ({
     setShowToast(null);
   };
   const onSubmit = data => {
-    var _mergedData$street, _mergedData$doorNo, _mergedData$plotNo, _mergedData$landmark, _mergedData$address, _mergedData$address$c, _mergedData$address2, _mergedData$address2$, _mergedData$address3, _mergedData$address3$, _mergedData$address4, _mergedData$address4$, _mergedData$buildingN, _mergedData$address5, _mergedData$address5$, _mergedData$address6, _mergedData$address6$, _mergedData$address7, _mergedData$address7$, _mergedData$selectGen, _mergedData$serviceTy, _mergedData$address8, _mergedData$address9;
+    var _mergedData$street, _mergedData$doorNo, _mergedData$plotNo, _mergedData$landmark, _mergedData$address, _mergedData$address$c, _mergedData$address2, _mergedData$address2$, _mergedData$address3, _mergedData$address3$, _mergedData$address4, _mergedData$address4$, _mergedData$buildingN, _mergedData$address5, _mergedData$address5$, _mergedData$address6, _mergedData$address6$, _mergedData$address7, _mergedData$address7$, _mergedData$serviceTy, _mergedData$address8, _mergedData$address9;
     if (currentStep === 1) {
       setStep1Data(data);
       setCurrentStep(2);
@@ -800,7 +768,7 @@ const AddVendor = ({
     const localityCode = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address5 = mergedData.address) === null || _mergedData$address5 === void 0 ? void 0 : (_mergedData$address5$ = _mergedData$address5.locality) === null || _mergedData$address5$ === void 0 ? void 0 : _mergedData$address5$.code;
     const localityName = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address6 = mergedData.address) === null || _mergedData$address6 === void 0 ? void 0 : (_mergedData$address6$ = _mergedData$address6.locality) === null || _mergedData$address6$ === void 0 ? void 0 : _mergedData$address6$.name;
     const localityArea = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address7 = mergedData.address) === null || _mergedData$address7 === void 0 ? void 0 : (_mergedData$address7$ = _mergedData$address7.locality) === null || _mergedData$address7$ === void 0 ? void 0 : _mergedData$address7$.area;
-    const gender = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$selectGen = mergedData.selectGender) === null || _mergedData$selectGen === void 0 ? void 0 : _mergedData$selectGen.code;
+    const gender = "MALE";
     const emailId = mergedData === null || mergedData === void 0 ? void 0 : mergedData.emailId;
     const phone = mergedData === null || mergedData === void 0 ? void 0 : mergedData.phone;
     const dob = new Date(`${mergedData.dob}`).getTime() || new Date(`1/1/1970`).getTime();
@@ -841,7 +809,7 @@ const AddVendor = ({
           fatherOrHusbandName: name,
           relationship: "OTHER",
           gender: gender,
-          dob: dob,
+          dob: "915148800",
           emailId: emailId || "abc@egov.com",
           mobileNumber: phone
         },
@@ -8575,7 +8543,6 @@ const VendorInbox = props => {
               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;
             });
-            console.log(hasDetails, "ytgyg");
             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", {
@@ -8637,6 +8604,19 @@ const VendorInbox = props => {
             const serviceType = ((_additionalDetail = additionalDetail) === null || _additionalDetail === void 0 ? void 0 : _additionalDetail.serviceType) || "N/A";
             return /*#__PURE__*/React.createElement("div", null, serviceType);
           }
+        }, {
+          Header: t("ES_FSM_REGISTRY_SELECT_DRIVER"),
+          Cell: ({
+            row
+          }) => {
+            return /*#__PURE__*/React.createElement(Dropdown$2, {
+              selected: row.original.driverData || row.original.driver,
+              option: drivers,
+              select: value => onDriverSelect(row, value),
+              optionKey: "name",
+              t: t
+            });
+          }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
           disableSortBy: true,
@@ -8654,20 +8634,6 @@ const VendorInbox = props => {
               name: `switch-${row.id}`
             });
           }
-        }, {
-          Header: t("ES_FSM_REGISTRY_SELECT_DRIVER"),
-          Cell: ({
-            row
-          }) => {
-            return /*#__PURE__*/React.createElement(Dropdown$2, {
-              className: "fsm-registry-dropdown",
-              selected: row.original.driver,
-              option: drivers,
-              select: value => onDriverSelect(row, value),
-              optionKey: "name",
-              t: t
-            });
-          }
         }];
       case "DRIVER":
         return [{
@@ -8994,7 +8960,9 @@ const SearchVendor = () => {
             return (_ele$dsoDetails = ele.dsoDetails) === null || _ele$dsoDetails === void 0 ? void 0 : (_ele$dsoDetails$vehic = _ele$dsoDetails.vehicles) === null || _ele$dsoDetails$vehic === void 0 ? void 0 : _ele$dsoDetails$vehic.find(vehicle => vehicle.id === data.id);
           });
           if (vendor) {
+            var _vendor$dsoDetails, _vendor$dsoDetails$ve, _vendor$dsoDetails$ve2;
             data.vendor = vendor.dsoDetails;
+            data.driverData = (_vendor$dsoDetails = vendor.dsoDetails) === null || _vendor$dsoDetails === void 0 ? void 0 : (_vendor$dsoDetails$ve = _vendor$dsoDetails.vehicles) === null || _vendor$dsoDetails$ve === void 0 ? void 0 : (_vendor$dsoDetails$ve2 = _vendor$dsoDetails$ve.find(vehicle => vehicle.id === data.id)) === null || _vendor$dsoDetails$ve2 === void 0 ? void 0 : _vendor$dsoDetails$ve2.driverData;
           }
           return data;
         });
@@ -9255,6 +9223,26 @@ const DriverConfig = (t, disabled = false) => {
         defaultValue: "",
         className: "payment-form-text-input-correction"
       }
+    }, {
+      label: "ES_FSM_REGISTRY_DRIVER_PHONE",
+      isMandatory: true,
+      type: "mobileNumber",
+      key: "phone",
+      disable: disabled,
+      populators: {
+        name: "phone",
+        validation: {
+          required: true,
+          pattern: /^[6-9]\d{9}$/
+        },
+        error: t("FSM_REGISTRY_INVALID_PHONE"),
+        defaultValue: "",
+        className: "payment-form-text-input-correction",
+        labelStyle: {
+          border: "1px solid black",
+          borderRight: "none"
+        }
+      }
     }]
   }];
 };
@@ -9313,6 +9301,7 @@ const AddDriver = ({
     const license = data === null || data === void 0 ? void 0 : data.license;
     const gender = data === null || data === void 0 ? void 0 : (_data$selectGender = data.selectGender) === null || _data$selectGender === void 0 ? void 0 : _data$selectGender.code;
     const emailId = data === null || data === void 0 ? void 0 : data.emailId;
+    const phone = data === null || data === void 0 ? void 0 : data.phone;
     const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime();
     const additionalDetails = data === null || data === void 0 ? void 0 : (_data$additionalDetai = data.additionalDetails) === null || _data$additionalDetai === void 0 ? void 0 : _data$additionalDetai.code;
     const formData = {
@@ -9328,7 +9317,8 @@ const AddDriver = ({
           relationship: "OTHER",
           gender: gender,
           dob: dob,
-          emailId: emailId || "abc@egov.com"
+          emailId: emailId || "abc@egov.com",
+          mobileNumber: phone
         },
         additionalDetails: {
           serviceType: additionalDetails
@@ -9535,21 +9525,31 @@ const EditVendorDetails = props => {
       };
     }
     if (selectedAction === "ADD_VEHICLE") {
+      var _dsoDetails$owner;
       let selectedVehicle = selectedOption;
       selectedVehicle.vendorVehicleStatus = "ACTIVE";
       formData = {
         vendor: {
           ...dsoDetails,
+          owner: {
+            ...dsoDetails.owner,
+            gender: ((_dsoDetails$owner = dsoDetails.owner) === null || _dsoDetails$owner === void 0 ? void 0 : _dsoDetails$owner.gender) || "OTHERS"
+          },
           vehicles: dsoDetails.vehicles ? [...dsoDetails.vehicles, selectedVehicle] : [selectedVehicle]
         }
       };
     }
     if (selectedAction === "ADD_DRIVER") {
+      var _dsoDetails$owner2;
       let selectedDriver = selectedOption;
       selectedDriver.vendorDriverStatus = "ACTIVE";
       formData = {
         vendor: {
           ...dsoDetails,
+          owner: {
+            ...dsoDetails.owner,
+            gender: ((_dsoDetails$owner2 = dsoDetails.owner) === null || _dsoDetails$owner2 === void 0 ? void 0 : _dsoDetails$owner2.gender) || "OTHERS"
+          },
           drivers: dsoDetails.drivers ? [...dsoDetails.drivers, selectedDriver] : [selectedDriver]
         }
       };
@@ -9592,7 +9592,7 @@ const EditVendorDetails = props => {
   const onDelete = (details, type, id) => {
     let formData = {};
     if (type === "ES_FSM_REGISTRY_DETAILS_TYPE_DRIVER") {
-      var _dsoData$2;
+      var _dsoData$2, _dsoDetails$owner3;
       let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$2 = dsoData[0]) === null || _dsoData$2 === void 0 ? void 0 : _dsoData$2.dsoDetails;
       let drivers = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.drivers;
       drivers = drivers.map(data => {
@@ -9604,11 +9604,15 @@ const EditVendorDetails = props => {
       formData = {
         vendor: {
           ...dsoDetails,
+          owner: {
+            ...dsoDetails.owner,
+            gender: ((_dsoDetails$owner3 = dsoDetails.owner) === null || _dsoDetails$owner3 === void 0 ? void 0 : _dsoDetails$owner3.gender) || "OTHERS"
+          },
           drivers: drivers
         }
       };
     } else {
-      var _dsoData$3, _details$values2, _details$values2$find;
+      var _dsoData$3, _details$values2, _details$values2$find, _dsoDetails$owner4;
       let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$3 = dsoData[0]) === null || _dsoData$3 === void 0 ? void 0 : _dsoData$3.dsoDetails;
       let vehicles = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.vehicles;
       let registrationNumber = details === null || details === void 0 ? void 0 : (_details$values2 = details.values) === null || _details$values2 === void 0 ? void 0 : (_details$values2$find = _details$values2.find(ele => ele.title === "ES_FSM_REGISTRY_VEHICLE_NUMBER")) === null || _details$values2$find === void 0 ? void 0 : _details$values2$find.value;
@@ -9621,6 +9625,10 @@ const EditVendorDetails = props => {
       formData = {
         vendor: {
           ...dsoDetails,
+          owner: {
+            ...dsoDetails.owner,
+            gender: ((_dsoDetails$owner4 = dsoDetails.owner) === null || _dsoDetails$owner4 === void 0 ? void 0 : _dsoDetails$owner4.gender) || "OTHERS"
+          },
           vehicles: vehicles
         }
       };
@@ -9862,7 +9870,7 @@ const VehicleConfig = (t, disabled = false) => {
         name: "registrationNumber",
         ValidationRequired: true,
         validation: {
-          pattern: `[A-Z]{2}\\s{1}[0-9]{2}\\s{0,1}[A-Z]{1,2}\\s{1}[0-9]{4}`,
+          pattern: `^[A-Z]{2}-[0-9]{2}-[A-Z]{1,2}-[0-9]{4}$`,
           title: t("ES_FSM_VEHICLE_FORMAT_TIP")
         },
         error: t("FSM_REGISTRY_INVALID_REGISTRATION_NUMBER"),
@@ -10820,7 +10828,7 @@ const DriverDetails = props => {
     setShowModal(false);
   };
   const handleDeleteVendor = () => {
-    var _driverData$2, _driverData$2$vendorD, _driverData$2$vendorD2;
+    var _driverData$2, _driverData$2$vendorD, _driverData$2$vendorD2, _dsoDetails$owner;
     let formData = {};
     let dsoDetails = driverData === null || driverData === void 0 ? void 0 : (_driverData$2 = driverData[0]) === null || _driverData$2 === void 0 ? void 0 : (_driverData$2$vendorD = _driverData$2.vendorDetails) === null || _driverData$2$vendorD === void 0 ? void 0 : (_driverData$2$vendorD2 = _driverData$2$vendorD.vendor) === null || _driverData$2$vendorD2 === void 0 ? void 0 : _driverData$2$vendorD2[0];
     let getDriverVendorDetails = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.drivers;
@@ -10833,6 +10841,10 @@ const DriverDetails = props => {
     formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner = dsoDetails.owner) === null || _dsoDetails$owner === void 0 ? void 0 : _dsoDetails$owner.gender) || "OTHERS"
+        },
         drivers: getDriverVendorDetails
       }
     };
@@ -10857,13 +10869,17 @@ const DriverDetails = props => {
     setShowModal(false);
   };
   const handleAddVendor = () => {
-    var _driverData$3;
+    var _driverData$3, _dsoDetails$owner2;
     let dsoDetails = selectedOption;
     let driverDetails = driverData === null || driverData === void 0 ? void 0 : (_driverData$3 = driverData[0]) === null || _driverData$3 === void 0 ? void 0 : _driverData$3.driverData;
     driverDetails.vendorDriverStatus = "ACTIVE";
     const formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner2 = dsoDetails.owner) === null || _dsoDetails$owner2 === void 0 ? void 0 : _dsoDetails$owner2.gender) || "OTHERS"
+        },
         drivers: dsoDetails.drivers ? [...dsoDetails.drivers, driverDetails] : [driverDetails]
       }
     };
@@ -10890,13 +10906,17 @@ const DriverDetails = props => {
     setSelectedAction(null);
   };
   const handleEditVendor = () => {
-    var _driverData$4;
+    var _driverData$4, _dsoDetails$owner3;
     let dsoDetails = selectedOption;
     let driverDetails = driverData === null || driverData === void 0 ? void 0 : (_driverData$4 = driverData[0]) === null || _driverData$4 === void 0 ? void 0 : _driverData$4.driverData;
     driverDetails.vendorDriverStatus = "ACTIVE";
     const formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner3 = dsoDetails.owner) === null || _dsoDetails$owner3 === void 0 ? void 0 : _dsoDetails$owner3.gender) || "OTHERS"
+        },
         drivers: dsoDetails.drivers ? [...dsoDetails.drivers, driverDetails] : [driverDetails]
       }
     };
@@ -11187,13 +11207,17 @@ const VehicleDetails = props => {
     setShowModal(false);
   };
   const handleAddVendor = () => {
-    var _vehicleData$2;
+    var _vehicleData$2, _dsoDetails$owner;
     let dsoDetails = selectedOption;
     let vehicleDetails = vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$2 = vehicleData[0]) === null || _vehicleData$2 === void 0 ? void 0 : _vehicleData$2.vehicleData;
     vehicleDetails.vendorVehicleStatus = "ACTIVE";
     const formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner = dsoDetails.owner) === null || _dsoDetails$owner === void 0 ? void 0 : _dsoDetails$owner.gender) || "OTHERS"
+        },
         vehicles: dsoDetails.vehicles ? [...dsoDetails.vehicles, vehicleDetails] : [vehicleDetails]
       }
     };
@@ -11219,13 +11243,17 @@ const VehicleDetails = props => {
     setSelectedAction(null);
   };
   const handleEditVendor = () => {
-    var _vehicleData$3;
+    var _vehicleData$3, _dsoDetails$owner2;
     let dsoDetails = selectedOption;
     let vehicleDetails = vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$3 = vehicleData[0]) === null || _vehicleData$3 === void 0 ? void 0 : _vehicleData$3.vehicleData;
     vehicleDetails.vendorVehicleStatus = "ACTIVE";
     const formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner2 = dsoDetails.owner) === null || _dsoDetails$owner2 === void 0 ? void 0 : _dsoDetails$owner2.gender) || "OTHERS"
+        },
         vehicles: dsoDetails.vehicles ? [...dsoDetails.vehicles, vehicleDetails] : [vehicleDetails]
       }
     };
@@ -11251,7 +11279,7 @@ const VehicleDetails = props => {
     setSelectedAction(null);
   };
   const handleDeleteVendor = () => {
-    var _vehicleData$4, _vehicleData$4$vendor, _vehicleData$4$vendor2;
+    var _vehicleData$4, _vehicleData$4$vendor, _vehicleData$4$vendor2, _dsoDetails$owner3;
     let formData = {};
     let dsoDetails = vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$4 = vehicleData[0]) === null || _vehicleData$4 === void 0 ? void 0 : (_vehicleData$4$vendor = _vehicleData$4.vendorDetails) === null || _vehicleData$4$vendor === void 0 ? void 0 : (_vehicleData$4$vendor2 = _vehicleData$4$vendor.vendor) === null || _vehicleData$4$vendor2 === void 0 ? void 0 : _vehicleData$4$vendor2[0];
     let getVehicleVendorDetails = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.vehicles;
@@ -11264,6 +11292,10 @@ const VehicleDetails = props => {
     formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner3 = dsoDetails.owner) === null || _dsoDetails$owner3 === void 0 ? void 0 : _dsoDetails$owner3.gender) || "OTHERS"
+        },
         vehicles: getVehicleVendorDetails
       }
     };