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

package/dist/index.modern.js

@@ -1,7 +1,7 @@
-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, Stepper, FormComposer, TickMark, FormStep, CardLabel, TextInput, LabelFieldPair, UploadFile, CardSubHeader, CardText, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, AddIcon, Menu, Label, LinkLabel, ToggleSwitch, CardSectionHeader, StatusTable, Row, EditIcon, DeleteIcon, Modal, InfoIcon, CardHeader, LinkButton, Banner } from '@djb25/digit-ui-react-components';
-import React, { useEffect, useMemo, useCallback, useState, Fragment } from 'react';
+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, Stepper, FormComposer, TickMark, FormStep, CardLabel, TextInput, LabelFieldPair, UploadFile, CardSubHeader, CardText, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, AddIcon, Menu, Label, LinkLabel, ToggleSwitch, CardSectionHeader, StatusTable, Row, EditIcon, DeleteIcon, Modal, InfoIcon, CardHeader, LinkButton, Banner } from '@djb25/digit-ui-react-components';
 import { useForm, Controller } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
 
@@ -381,54 +381,59 @@ const EmployeeApp = ({
     }), "Back"),
     onLeftClick: () => window.history.back(),
     breadcrumbs: getDynamicBreadcrumbs()
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "employee-form"
-  }, /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/registry/new-vendor`,
-    component: () => /*#__PURE__*/React.createElement(AddVendor, {
-      parentRoute: path
-    })
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/search-vendor`,
-    component: () => /*#__PURE__*/React.createElement(SearchVendor, {
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(SearchVendor, Object.assign({}, props, {
       parentRoute: path
-    })
+    })), layouts.normal)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/new-driver`,
-    component: () => /*#__PURE__*/React.createElement(AddDriver, {
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(AddDriver, Object.assign({}, props, {
       parentRoute: path
-    })
+    })), layouts.normal)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/registry/vendor-details/:id`,
-    component: () => /*#__PURE__*/React.createElement(EditVendorDetails, {
+    path: `${path}/registry/new-vehicle`,
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(AddVehicle, Object.assign({}, props, {
       parentRoute: path
-    })
+    })), layouts.normal)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/registry/vehicle-details/:id`,
-    component: () => /*#__PURE__*/React.createElement(VehicleDetails, {
+    path: `${path}/registry/additionaldetails`,
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(VendorCreate, Object.assign({}, props, {
       parentRoute: path
-    })
+    })), layouts.normal)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/registry/new-vehicle`,
-    component: () => /*#__PURE__*/React.createElement(AddVehicle, {
+    path: `${path}/registry/driver-details/:id`,
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(DriverDetails, Object.assign({}, props, {
       parentRoute: path
-    })
+    })), layouts.action)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/registry/additionaldetails`,
-    component: () => /*#__PURE__*/React.createElement(VendorCreate, {
+    path: `${path}/common-search/:id`,
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(SearchApp, Object.assign({}, props, {
       parentRoute: path
-    })
+    })), layouts.normal)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/registry/driver-details`,
-    component: () => /*#__PURE__*/React.createElement(DriverDetails, {
+    path: `${path}/registry/new-vendor`,
+    component: renderWithLayout(props => /*#__PURE__*/React.createElement(AddVendor, Object.assign({}, props, {
       parentRoute: path
-    })
+    })), layouts.action)
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/common-search/:id`,
-    component: props => /*#__PURE__*/React.createElement(SearchApp, Object.assign({}, props, {
+    path: `${path}/registry/vendor-details/:id`,
+    component: renderWithLayout(props => /*#__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, {
+      parentRoute: path
+    })), layouts.action)
+  })))));
+};
+const renderWithLayout = (Component, layoutClass) => routeProps => /*#__PURE__*/React.createElement("div", {
+  className: layoutClass
+}, /*#__PURE__*/React.createElement(Component, routeProps));
+const layouts = {
+  normal: "employee-form",
+  action: "employee-form employee-form-content-with-action-bar"
 };
 
 const VENDORCard = () => {
@@ -1024,9 +1029,6 @@ const VendorDetails = ({
   function setcontactperson(e) {
     setContactPerson(e.target.value);
   }
-  function setcompanyname(e) {
-    setCompany(e.target.value);
-  }
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const stateId = Digit.ULBService.getStateId();
   const {
@@ -1233,23 +1235,6 @@ const VendorDetails = ({
     pattern: "^[a-zA-Z0-9/-]{1,20}$",
     type: "text",
     title: t("INVALID_ACCOUNT_NO_ERROR_MESSAGE")
-  }))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMPANY_NAME")}`), /*#__PURE__*/React.createElement(TextInput, Object.assign({
-    t: t,
-    type: "text",
-    isMandatory: false,
-    optionKey: "i18nKey",
-    name: "Company",
-    value: Company,
-    onChange: setcompanyname,
-    style: {
-      width: "100%"
-    },
-    ValidationRequired: true
-  }, validation = {
-    isRequired: true,
-    pattern: "^[a-zA-Z0-9/-]{1,20}$",
-    type: "text",
-    title: t("INVALID_ACCOUNT_NO_ERROR_MESSAGE")
   }))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("PAN_NO")}`), /*#__PURE__*/React.createElement(TextInput, Object.assign({
     t: t,
     type: "text",
@@ -1756,9 +1741,7 @@ const VendorSelectAddress = ({
     });
   }
   if (userType === "employee") {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardLabel, {
-      className: "card-label-smaller"
-    }, t("MYCITY_CODE_LABEL"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$2, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("MYCITY_CODE_LABEL"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$2, {
       className: "",
       isMandatory: true,
       selected: (cities === null || cities === void 0 ? void 0 : cities.length) === 1 ? cities[0] : selectedCity,
@@ -1767,9 +1750,7 @@ const VendorSelectAddress = ({
       select: selectCity,
       optionKey: "code",
       t: t
-    }), /*#__PURE__*/React.createElement(CardLabel, {
-      className: "card-label-smaller"
-    }, t("ES_NEW_APPLICATION_LOCATION_MOHALLA"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$2, {
+    })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_NEW_APPLICATION_LOCATION_MOHALLA"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$2, {
       className: "",
       isMandatory: true,
       selected: selectedLocality,
@@ -1777,7 +1758,7 @@ const VendorSelectAddress = ({
       select: selectLocality,
       optionKey: "name",
       t: t
-    }));
+    })));
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormStep, {
     config: config,
@@ -8226,8 +8207,7 @@ const VendorInbox = props => {
     filters: {
       sortBy: "name",
       sortOrder: "ASC",
-      status: "ACTIVE",
-      driverWithNoVendor: true
+      status: "ACTIVE"
     }
   });
   const {
@@ -8405,6 +8385,7 @@ const VendorInbox = props => {
           action: "VENDOR"
         });
         queryClient.invalidateQueries("DSO_SEARCH");
+        props.refetchVendor();
         props.refetchData();
         setTimeout(closeToast, 3000);
       }
@@ -8433,7 +8414,9 @@ const VendorInbox = props => {
           action: "VEHICLE"
         });
         queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
+        queryClient.invalidateQueries("DSO_SEARCH");
         props.refetchData();
+        props.refetchVendor();
         setTimeout(closeToast, 3000);
       }
     });
@@ -8610,11 +8593,18 @@ const VendorInbox = props => {
             row
           }) => {
             return /*#__PURE__*/React.createElement(Dropdown$2, {
-              selected: row.original.driverData || row.original.driver,
+              className: "fsm-registry-dropdown",
+              selected: (drivers === null || drivers === void 0 ? void 0 : drivers.find(driver => {
+                var _row$original$driverD, _row$original$driver;
+                return (((_row$original$driverD = row.original.driverData) === null || _row$original$driverD === void 0 ? void 0 : _row$original$driverD.id) || ((_row$original$driver = row.original.driver) === null || _row$original$driver === void 0 ? void 0 : _row$original$driver.id)) === driver.id;
+              })) || row.original.driverData || row.original.driver,
               option: drivers,
               select: value => onDriverSelect(row, value),
               optionKey: "name",
-              t: t
+              t: t,
+              style: {
+                textAlign: "left"
+              }
             });
           }
         }, {
@@ -8678,9 +8668,15 @@ const VendorInbox = props => {
           }) => {
             return /*#__PURE__*/React.createElement(Dropdown$2, {
               className: "fsm-registry-dropdown",
-              selected: row.original.vendor,
+              selected: (vendors === null || vendors === void 0 ? void 0 : vendors.find(vendor => {
+                var _row$original$vendorD, _row$original$vendor;
+                return (((_row$original$vendorD = row.original.vendorData) === null || _row$original$vendorD === void 0 ? void 0 : _row$original$vendorD.id) || ((_row$original$vendor = row.original.vendor) === null || _row$original$vendor === void 0 ? void 0 : _row$original$vendor.id)) === vendor.id;
+              })) || row.original.vendorData || row.original.vendor,
               option: vendors,
               select: value => onVendorSelect(row, value),
+              style: {
+                textAlign: "left"
+              },
               optionKey: "name",
               t: t
             });
@@ -8960,9 +8956,12 @@ 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;
+            var _vendor$dsoDetails, _vendor$dsoDetails$ve;
             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;
+            const vehicleInVendor = (_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$ve.find(vehicle => vehicle.id === data.id);
+            if (vehicleInVendor) {
+              data.driverData = vehicleInVendor.driverData || vehicleInVendor.driver || data.driverData;
+            }
           }
           return data;
         });
@@ -9107,7 +9106,7 @@ const SelectServiceType = ({
     return /*#__PURE__*/React.createElement(Loader, null);
   }
   if (userType === "employee") {
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Dropdown$2, {
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, config.label), /*#__PURE__*/React.createElement(Dropdown$2, {
       className: "payment-form-text-input-correction",
       isMandatory: config.isMandatory,
       selected: serviceTypes,
@@ -10705,18 +10704,16 @@ const CloseBtn$1 = props => {
 const DriverDetails = props => {
   var _driverData$5, _driverData$5$employe;
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const state = Digit.ULBService.getStateId();
   const {
     t
   } = useTranslation();
   const history = useHistory();
   const queryClient = useQueryClient();
-  let {
+  const {
     id: dsoId
   } = useParams();
   const [displayMenu, setDisplayMenu] = useState(false);
   const [selectedAction, setSelectedAction] = useState(null);
-  const [config, setCurrentConfig] = useState({});
   const [showModal, setShowModal] = useState(false);
   const [showToast, setShowToast] = useState(null);
   const [vendors, setVendors] = useState([]);
@@ -10989,14 +10986,8 @@ const DriverDetails = props => {
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, {
-    style: {
-      marginBottom: "16px"
-    }
-  }, t("ES_FSM_REGISTRY_DRIVER_DETAILS")), /*#__PURE__*/React.createElement("div", {
-    style: !isMobile ? {
-      marginLeft: "-15px"
-    } : {}
+  return !isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-content"
   }, /*#__PURE__*/React.createElement(Card, {
     style: {
       position: "relative"
@@ -11012,7 +11003,9 @@ const DriverDetails = props => {
       }
     }, t(detail.title)), /*#__PURE__*/React.createElement(StatusTable, null, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
       var _detail$values2, _detail$values3;
-      return (value === null || value === void 0 ? void 0 : value.type) === "custom" ? /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
+      return (value === null || value === void 0 ? void 0 : value.type) === "custom" ? /*#__PURE__*/React.createElement(React.Fragment, {
+        key: index
+      }, /*#__PURE__*/React.createElement("div", {
         className: `${index === (detail === null || detail === void 0 ? void 0 : (_detail$values2 = detail.values) === null || _detail$values2 === void 0 ? void 0 : _detail$values2.length) - 1 ? "row last" : "row"} border-none`
       }, /*#__PURE__*/React.createElement("h2", null, t(value.title)), /*#__PURE__*/React.createElement("div", {
         className: "value",
@@ -11087,7 +11080,7 @@ const DriverDetails = props => {
   }) : null, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("ES_COMMON_TAKE_ACTION"),
     onSubmit: () => setDisplayMenu(!displayMenu)
-  }))) : /*#__PURE__*/React.createElement(Loader, null));
+  }))) : /*#__PURE__*/React.createElement(Loader, null);
 };
 
 const Heading$2 = props => {
@@ -11369,7 +11362,7 @@ const VehicleDetails = props => {
       });
     }
     if (selectedAction === "ADD_VENDOR") {
-      return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
         t: t,
         option: vendors,
         value: selectedOption,
@@ -11379,7 +11372,7 @@ const VehicleDetails = props => {
       }));
     }
     if (selectedAction === "EDIT_VENDOR") {
-      return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
         t: t,
         option: vendors,
         value: selectedOption,
@@ -11389,7 +11382,6 @@ const VehicleDetails = props => {
       }));
     }
   };
-  const isMobile = window.Digit.Utils.browser.isMobile();
   const modalHeading = () => {
     switch (selectedAction) {
       case "DELETE":
@@ -11404,15 +11396,8 @@ const VehicleDetails = props => {
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, {
-    style: {
-      marginBottom: "16px"
-    }
-  }, t("ES_FSM_REGISTRY_VEHICLE_DETAILS")), /*#__PURE__*/React.createElement("div", {
-    style: !isMobile ? {
-      marginLeft: "-15px"
-    } : {}
-  }, /*#__PURE__*/React.createElement(Card, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, {
+    className: "vehicle-details-card",
     style: {
       position: "relative"
     }
@@ -11427,7 +11412,7 @@ const VehicleDetails = props => {
       }
     }, t(detail.title)), /*#__PURE__*/React.createElement(StatusTable, null, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
       var _detail$values2, _detail$values3;
-      return (value === null || value === void 0 ? void 0 : value.type) === "custom" ? /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
+      return (value === null || value === void 0 ? void 0 : value.type) === "custom" ? /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement("div", {
         className: `${index === (detail === null || detail === void 0 ? void 0 : (_detail$values2 = detail.values) === null || _detail$values2 === void 0 ? void 0 : _detail$values2.length) - 1 ? "row last" : "row"} border-none`
       }, /*#__PURE__*/React.createElement("h2", null, t(value.title)), /*#__PURE__*/React.createElement("div", {
         className: "value",
@@ -11473,7 +11458,7 @@ const VehicleDetails = props => {
         } : {}
       });
     })));
-  }))), showModal && /*#__PURE__*/React.createElement(Modal, {
+  })), showModal && /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement(Heading$2, {
       label: t(modalHeading())
     }),
@@ -11521,7 +11506,6 @@ const SelectVehicleType = ({
     data: vehicleData,
     isLoading: vehicleLoading
   } = Digit.Hooks.wt.useWTMDMS(stateId, "Vehicle", "VehicleMakeModel");
-  console.log("vehicleData", vehicleData);
   const {
     data: serviceTypeData,
     isLoading: serviceLoading
@@ -11599,7 +11583,7 @@ const SelectVehicleType = ({
   if (!vehicleData || !serviceTypeData) {
     return /*#__PURE__*/React.createElement("div", null, t("ERROR_FETCHING_DATA"));
   }
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("ES_FSM_REGISTRY_VEHICLE_MODEL")), /*#__PURE__*/React.createElement(Dropdown$2, {
     className: "form-field",