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

package/dist/index.modern.js

@@ -385,9 +385,8 @@ const EmployeeApp = ({
     className: "employee-form"
   }, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/registry/new-vendor`,
-    component: () => /*#__PURE__*/React.createElement(AddVendor, {
-      parentRoute: path
-    })
+    component: AddVendor,
+    parentRoute: path
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/search-vendor`,
     component: () => /*#__PURE__*/React.createElement(SearchVendor, {
@@ -617,17 +616,20 @@ const VendorConfig = (t, disabled = false) => {
       label: "ES_VENDOR_REGISTRY_SERVICE_TYPE",
       isMandatory: true,
       type: "component",
-      route: "select-gender",
-      hideInEmployee: false,
       key: "serviceType",
       component: "SelectServiceType",
       disable: disabled,
+      populators: {
+        name: "serviceType",
+        defaultValue: {
+          code: "WT",
+          name: "WT",
+          i18nKey: "WT"
+        }
+      },
       texts: {
-        headerCaption: "",
-        header: "CS_COMMON_CHOOSE_GENDER",
-        cardText: "CS_COMMON_SELECT_GENDER",
-        submitBarLabel: "CS_COMMON_NEXT",
-        skipText: "CORE_COMMON_SKIP_CONTINUE"
+        header: "CS_COMMON_CHOOSE_SERVICE_TYPE",
+        submitBarLabel: "CS_COMMON_NEXT"
       }
     }]
   }, {
@@ -744,6 +746,11 @@ const AddVendor = ({
   }, []);
   const Config = VendorConfig(t);
   const defaultValues = {
+    serviceType: {
+      code: "WT",
+      name: "WT",
+      i18nKey: "WT"
+    },
     tripData: {
       noOfTrips: 1,
       amountPerTrip: null,
@@ -758,8 +765,8 @@ const AddVendor = ({
     label: "ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS"
   }];
   const onFormValueChange = (setValue, formData) => {
-    var _formData$selectGende;
-    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) {
+    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) {
       setCanSubmit(true);
     } else {
       setCanSubmit(false);
@@ -874,6 +881,7 @@ const AddVendor = ({
       overflowY: "auto"
     }
   }, currentStep === 1 && /*#__PURE__*/React.createElement(FormComposer, {
+    isDisabled: !canSubmit,
     label: t("CS_COMMON_NEXT"),
     config: vendorStepConfig.filter(i => !i.hideInEmployee).map(config => ({
       ...config,
@@ -894,7 +902,7 @@ const AddVendor = ({
     })),
     onSubmit: onSubmit,
     defaultValues: defaultValues,
-    onFormValueChange: onFormValueChange,
+    onFormValueChange: (setValue, formData) => {},
     noBreakLine: true
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error",
@@ -8226,6 +8234,7 @@ const VendorInbox = props => {
   const [tableData, setTableData] = useState([]);
   const [showToast, setShowToast] = useState(null);
   const [vendors, setVendors] = useState([]);
+  const [drivers, setDrivers] = useState([]);
   const queryClient = useQueryClient();
   const [address, setAddress] = useState();
   const {
@@ -8241,6 +8250,18 @@ const VendorInbox = props => {
   }, {
     enabled: false
   });
+  const {
+    data: driverData,
+    refetch: refetchDriver
+  } = Digit.Hooks.fsm.useDriverSearch({
+    tenantId,
+    filters: {
+      sortBy: "name",
+      sortOrder: "ASC",
+      status: "ACTIVE",
+      driverWithNoVendor: true
+    }
+  });
   const {
     isLoading: isUpdateVendorLoading,
     isError: vendorUpdateError,
@@ -8267,7 +8288,10 @@ const VendorInbox = props => {
     setTableData((props === null || props === void 0 ? void 0 : (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.table) || []);
   }, [props]);
   useEffect(() => {
-    if (props.selectedTab === "DRIVER" || props.selectedTab === "VEHICLE") refetchVendor();
+    if (props.selectedTab === "DRIVER" || props.selectedTab === "VEHICLE") {
+      refetchVendor();
+      refetchDriver();
+    }
   }, [props.selectedTab]);
   useEffect(() => {
     if (vendorData) {
@@ -8275,6 +8299,11 @@ const VendorInbox = props => {
       setVendors(vendors);
     }
   }, [vendorData]);
+  useEffect(() => {
+    if (driverData) {
+      setDrivers(driverData.driver || []);
+    }
+  }, [driverData]);
   const closeToast = () => {
     setShowToast(null);
   };
@@ -8413,6 +8442,34 @@ const VendorInbox = props => {
       }
     });
   };
+  const onDriverSelect = (row, selectedOption) => {
+    let vehicleData = row.original;
+    let selectedDriver = selectedOption;
+    const formData = {
+      vehicle: {
+        ...vehicleData,
+        driverData: selectedDriver
+      }
+    };
+    mutateVehicle(formData, {
+      onError: (error, variables) => {
+        setShowToast({
+          key: "error",
+          action: error
+        });
+        setTimeout(closeToast, 5000);
+      },
+      onSuccess: (data, variables) => {
+        setShowToast({
+          key: "success",
+          action: "VEHICLE"
+        });
+        queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
+        props.refetchData();
+        setTimeout(closeToast, 3000);
+      }
+    });
+  };
   const onSelectAdd = () => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -8437,18 +8494,12 @@ const VendorInbox = props => {
   } = Digit.Hooks.vendor.useEmpvendorCommonSearch({
     tenantId,
     filters: {
-      vendorIds: vendorIds
+      vendorIds: vendorIds === null || vendorIds === void 0 ? void 0 : vendorIds.join(","),
+      vendorId: vendorIds === null || vendorIds === void 0 ? void 0 : vendorIds.join(",")
     }
   }, {
     enabled: (vendorIds === null || vendorIds === void 0 ? void 0 : vendorIds.length) > 0
   });
-  const hasAdditionalDetails = vendorId => {
-    var _additionalVendorData;
-    return additionalVendorData === null || additionalVendorData === void 0 ? void 0 : (_additionalVendorData = additionalVendorData.VendorDetails) === null || _additionalVendorData === void 0 ? void 0 : _additionalVendorData.some(v => {
-      var _v$vendorAdditionalDe;
-      return ((_v$vendorAdditionalDe = v.vendorAdditionalDetails) === null || _v$vendorAdditionalDe === void 0 ? void 0 : _v$vendorAdditionalDe.vendorId) === vendorId;
-    });
-  };
   const columns = React.useMemo(() => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -8515,21 +8566,25 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original4;
+            var _row$original4, _additionalVendorData;
             const vendorId = (_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.id;
-            const hasDetails = hasAdditionalDetails(vendorId);
-            return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
-              className: "link"
-            }, /*#__PURE__*/React.createElement(Link, {
+            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;
+            });
+            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", {
               className: "submit-bar",
-              type: "button",
               style: {
-                color: "white",
-                backgroundColor: hasDetails ? "#417505" : "#F47738"
+                backgroundColor: hasDetails ? "#417505" : "#F47738",
+                color: "white"
               }
-            }, hasDetails ? t("ES_VENDOR_VIEW_DETAILS") : t("ES_VENDOR_ADD_DETAILS")))));
+            }, hasDetails ? "View Details" : "Add Details"));
           }
         }];
       case "VEHICLE":
@@ -8599,6 +8654,20 @@ 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 [{
@@ -8671,7 +8740,7 @@ const VendorInbox = props => {
       default:
         return [];
     }
-  }, [props.selectedTab, vendors]);
+  }, [props.selectedTab, vendors, drivers, tableData, additionalVendorData, t]);
   let result;
   if (props.isLoading) {
     result = /*#__PURE__*/React.createElement(Loader, null);
@@ -9049,6 +9118,15 @@ const SelectServiceType = ({
         value: `${services.name}`
       }));
       setFormattedServiceTypes(transformedData);
+      if (!serviceTypes || serviceTypes.code === "WT") {
+        const defaultWT = transformedData.find(item => item.code === "WT");
+        if (defaultWT) {
+          setserviceTypes(defaultWT);
+          if (userType === "employee") {
+            onSelect(config.key, defaultWT);
+          }
+        }
+      }
     }
   }, [ServiceType]);
   const selectServiceType = value => {
@@ -9255,7 +9333,7 @@ const AddDriver = ({
         additionalDetails: {
           serviceType: additionalDetails
         },
-        vendorDriverStatus: "INACTIVE"
+        vendorDriverStatus: "ACTIVE"
       }
     };
     mutate(formData, {
@@ -9411,7 +9489,6 @@ const EditVendorDetails = props => {
   }, {
     enabled: !!dsoId
   });
-  console.log(vendorAdditionalData, "w2e3r4t5yh");
   const {
     mutate
   } = Digit.Hooks.fsm.useVendorUpdate(tenantId);
@@ -10012,6 +10089,15 @@ const AddVehicle = ({
   };
   const onFormValueChange = (setValue, formData) => {
     var _formData$vehicle, _formData$vehicle2;
+    if (formData !== null && formData !== void 0 && formData.registrationNumber) {
+      let updatedRegNo = formData.registrationNumber.toUpperCase().replace(/ /g, "-").replace(/[^A-Z0-9-]/g, "");
+      if (updatedRegNo.length > 13) {
+        updatedRegNo = updatedRegNo.slice(0, 13);
+      }
+      if (updatedRegNo !== formData.registrationNumber) {
+        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) {
       setSubmitValve(true);
     } else {