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

package/dist/index.modern.js

@@ -1024,9 +1024,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 +1230,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",
@@ -8226,8 +8206,7 @@ const VendorInbox = props => {
     filters: {
       sortBy: "name",
       sortOrder: "ASC",
-      status: "ACTIVE",
-      driverWithNoVendor: true
+      status: "ACTIVE"
     }
   });
   const {
@@ -8405,6 +8384,7 @@ const VendorInbox = props => {
           action: "VENDOR"
         });
         queryClient.invalidateQueries("DSO_SEARCH");
+        props.refetchVendor();
         props.refetchData();
         setTimeout(closeToast, 3000);
       }
@@ -8433,7 +8413,9 @@ const VendorInbox = props => {
           action: "VEHICLE"
         });
         queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
+        queryClient.invalidateQueries("DSO_SEARCH");
         props.refetchData();
+        props.refetchVendor();
         setTimeout(closeToast, 3000);
       }
     });
@@ -8610,11 +8592,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 +8667,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 +8955,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;
         });