@djb25/digit-ui-module-vendor 1.0.59 → 1.0.60

package/dist/index.modern.js

@@ -224,7 +224,7 @@ const AddSurveyor = _ref => {
               showSuccessToast: true,
               message: {
                 key: "success",
-                action: "ES_VENDOR_ADD_SURVEYOR_SUCCESS"
+                action: t("ES_VENDOR_ADD_SURVEYOR_SUCCESS")
               }
             }
           });
@@ -915,8 +915,8 @@ const getSelectedSupervisorOption = function (row, supervisorsList) {
   const supervisorId = (_row27 = row) === null || _row27 === void 0 ? void 0 : _row27.supervisorId;
   if (!supervisorId) return null;
   return supervisorsList.find(s => {
-    var _s$owner;
-    return s.id === supervisorId || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : _s$owner.uuid) === supervisorId;
+    var _s$owner, _s$owner2;
+    return s.id === supervisorId || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : _s$owner.uuid) === supervisorId || s.name === supervisorId || ((_s$owner2 = s.owner) === null || _s$owner2 === void 0 ? void 0 : _s$owner2.name) === supervisorId;
   }) || null;
 };
 const getVendorFillingPoints = function (vendor) {
@@ -1185,9 +1185,10 @@ const VendorInbox = props => {
   const onVendorUpdate = row => {
     var _formDetails$owner, _formDetails$owner2, _formDetails$owner3, _formDetails$owner4;
     let formDetails = row.original.dsoDetails;
+    const isDisable = (formDetails === null || formDetails === void 0 ? void 0 : formDetails.status) === "ACTIVE";
     const formData = {
       vendor: _extends({}, formDetails, {
-        status: (formDetails === null || formDetails === void 0 ? void 0 : formDetails.status) === "ACTIVE" ? "DISABLED" : "ACTIVE",
+        status: isDisable ? "DISABLED" : "ACTIVE",
         owner: _extends({}, formDetails.owner, {
           gender: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner = formDetails.owner) === null || _formDetails$owner === void 0 ? void 0 : _formDetails$owner.gender) || "OTHER",
           dob: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner2 = formDetails.owner) === null || _formDetails$owner2 === void 0 ? void 0 : _formDetails$owner2.dob) || new Date("1/1/1970").getTime(),
@@ -1200,48 +1201,72 @@ const VendorInbox = props => {
       onError: (error, variables) => {
         setShowToast({
           key: "error",
-          action: error
+          action: (error === null || error === void 0 ? void 0 : error.message) || "UPDATE_FAILED"
         });
       },
       onSuccess: (data, variables) => {
-        setShowToast({
-          key: "success",
-          action: "VENDOR"
-        });
-        queryClient.invalidateQueries("DSO_SEARCH");
-        props.refetchData();
+        var _data$Errors, _data$data, _data$data$Errors;
+        const isError = (data === null || data === void 0 ? void 0 : data.error) === true || (data === null || data === void 0 ? void 0 : (_data$Errors = data.Errors) === null || _data$Errors === void 0 ? void 0 : _data$Errors.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$Errors = _data$data.Errors) === null || _data$data$Errors === void 0 ? void 0 : _data$data$Errors.length) > 0;
+        if (isError) {
+          var _data$data2, _data$data2$Errors, _data$data2$Errors$, _data$Errors2, _data$Errors2$;
+          setShowToast({
+            key: "error",
+            action: (data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : (_data$data2$Errors = _data$data2.Errors) === null || _data$data2$Errors === void 0 ? void 0 : (_data$data2$Errors$ = _data$data2$Errors[0]) === null || _data$data2$Errors$ === void 0 ? void 0 : _data$data2$Errors$.message) || (data === null || data === void 0 ? void 0 : (_data$Errors2 = data.Errors) === null || _data$Errors2 === void 0 ? void 0 : (_data$Errors2$ = _data$Errors2[0]) === null || _data$Errors2$ === void 0 ? void 0 : _data$Errors2$.message) || (data === null || data === void 0 ? void 0 : data.message) || "UPDATE_FAILED"
+          });
+        } else {
+          setShowToast({
+            key: "success",
+            action: "VENDOR",
+            isDisable
+          });
+          queryClient.invalidateQueries("DSO_SEARCH");
+          props.refetchData();
+        }
       }
     });
   };
   const onVehicleUpdate = row => {
     var _row$original;
+    const isDisable = ((_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.status) === "ACTIVE";
     const formData = getVehicleUpdatePayload(row.original, {
-      status: ((_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.status) === "ACTIVE" ? "DISABLED" : "ACTIVE"
+      status: isDisable ? "DISABLED" : "ACTIVE"
     });
     mutateVehicle(formData, {
       onError: (error, variables) => {
         setShowToast({
           key: "error",
-          action: error
+          action: (error === null || error === void 0 ? void 0 : error.message) || "UPDATE_FAILED"
         });
       },
       onSuccess: (data, variables) => {
-        setShowToast({
-          key: "success",
-          action: "VEHICLE"
-        });
-        queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
-        props.refetchVendor();
-        props.refetchData();
+        var _data$Errors3, _data$data3, _data$data3$Errors;
+        const isError = (data === null || data === void 0 ? void 0 : data.error) === true || (data === null || data === void 0 ? void 0 : (_data$Errors3 = data.Errors) === null || _data$Errors3 === void 0 ? void 0 : _data$Errors3.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : (_data$data3$Errors = _data$data3.Errors) === null || _data$data3$Errors === void 0 ? void 0 : _data$data3$Errors.length) > 0;
+        if (isError) {
+          var _data$data4, _data$data4$Errors, _data$data4$Errors$, _data$Errors4, _data$Errors4$;
+          setShowToast({
+            key: "error",
+            action: (data === null || data === void 0 ? void 0 : (_data$data4 = data.data) === null || _data$data4 === void 0 ? void 0 : (_data$data4$Errors = _data$data4.Errors) === null || _data$data4$Errors === void 0 ? void 0 : (_data$data4$Errors$ = _data$data4$Errors[0]) === null || _data$data4$Errors$ === void 0 ? void 0 : _data$data4$Errors$.message) || (data === null || data === void 0 ? void 0 : (_data$Errors4 = data.Errors) === null || _data$Errors4 === void 0 ? void 0 : (_data$Errors4$ = _data$Errors4[0]) === null || _data$Errors4$ === void 0 ? void 0 : _data$Errors4$.message) || (data === null || data === void 0 ? void 0 : data.message) || "UPDATE_FAILED"
+          });
+        } else {
+          setShowToast({
+            key: "success",
+            action: "VEHICLE",
+            isDisable
+          });
+          queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
+          props.refetchVendor();
+          props.refetchData();
+        }
       }
     });
   };
   const onDriverUpdate = row => {
     var _formDetails$owner5, _formDetails$owner6, _formDetails$owner7, _formDetails$owner8;
     let formDetails = row.original;
+    const isDisable = (formDetails === null || formDetails === void 0 ? void 0 : formDetails.status) === "ACTIVE";
     const formData = {
       driver: _extends({}, formDetails, {
-        status: (formDetails === null || formDetails === void 0 ? void 0 : formDetails.status) === "ACTIVE" ? "DISABLED" : "ACTIVE",
+        status: isDisable ? "DISABLED" : "ACTIVE",
         owner: _extends({}, formDetails.owner, {
           gender: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner5 = formDetails.owner) === null || _formDetails$owner5 === void 0 ? void 0 : _formDetails$owner5.gender) || "OTHER",
           dob: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner6 = formDetails.owner) === null || _formDetails$owner6 === void 0 ? void 0 : _formDetails$owner6.dob) || new Date("1/1/1970").getTime(),
@@ -1254,17 +1279,28 @@ const VendorInbox = props => {
       onError: (error, variables) => {
         setShowToast({
           key: "error",
-          action: error
+          action: (error === null || error === void 0 ? void 0 : error.message) || "UPDATE_FAILED"
         });
       },
       onSuccess: (data, variables) => {
-        setShowToast({
-          key: "success",
-          action: "DRIVER"
-        });
-        queryClient.invalidateQueries("FSM_DRIVER_SEARCH");
-        props.refetchVendor();
-        props.refetchData();
+        var _data$Errors5, _data$data5, _data$data5$Errors;
+        const isError = (data === null || data === void 0 ? void 0 : data.error) === true || (data === null || data === void 0 ? void 0 : (_data$Errors5 = data.Errors) === null || _data$Errors5 === void 0 ? void 0 : _data$Errors5.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$data5 = data.data) === null || _data$data5 === void 0 ? void 0 : (_data$data5$Errors = _data$data5.Errors) === null || _data$data5$Errors === void 0 ? void 0 : _data$data5$Errors.length) > 0;
+        if (isError) {
+          var _data$data6, _data$data6$Errors, _data$data6$Errors$, _data$Errors6, _data$Errors6$;
+          setShowToast({
+            key: "error",
+            action: (data === null || data === void 0 ? void 0 : (_data$data6 = data.data) === null || _data$data6 === void 0 ? void 0 : (_data$data6$Errors = _data$data6.Errors) === null || _data$data6$Errors === void 0 ? void 0 : (_data$data6$Errors$ = _data$data6$Errors[0]) === null || _data$data6$Errors$ === void 0 ? void 0 : _data$data6$Errors$.message) || (data === null || data === void 0 ? void 0 : (_data$Errors6 = data.Errors) === null || _data$Errors6 === void 0 ? void 0 : (_data$Errors6$ = _data$Errors6[0]) === null || _data$Errors6$ === void 0 ? void 0 : _data$Errors6$.message) || (data === null || data === void 0 ? void 0 : data.message) || "UPDATE_FAILED"
+          });
+        } else {
+          setShowToast({
+            key: "success",
+            action: "DRIVER",
+            isDisable
+          });
+          queryClient.invalidateQueries("FSM_DRIVER_SEARCH");
+          props.refetchVendor();
+          props.refetchData();
+        }
       }
     });
   };
@@ -1333,10 +1369,20 @@ const VendorInbox = props => {
         onError: error => {
           setShowToast({
             key: "error",
-            action: error
+            action: (error === null || error === void 0 ? void 0 : error.message) || "UPDATE_FAILED"
           });
         },
-        onSuccess: () => {
+        onSuccess: data => {
+          var _data$Errors7, _data$data7, _data$data7$Errors;
+          const isError = (data === null || data === void 0 ? void 0 : data.error) === true || (data === null || data === void 0 ? void 0 : (_data$Errors7 = data.Errors) === null || _data$Errors7 === void 0 ? void 0 : _data$Errors7.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$data7 = data.data) === null || _data$data7 === void 0 ? void 0 : (_data$data7$Errors = _data$data7.Errors) === null || _data$data7$Errors === void 0 ? void 0 : _data$data7$Errors.length) > 0;
+          if (isError) {
+            var _data$data8, _data$data8$Errors, _data$data8$Errors$, _data$Errors8, _data$Errors8$;
+            setShowToast({
+              key: "error",
+              action: (data === null || data === void 0 ? void 0 : (_data$data8 = data.data) === null || _data$data8 === void 0 ? void 0 : (_data$data8$Errors = _data$data8.Errors) === null || _data$data8$Errors === void 0 ? void 0 : (_data$data8$Errors$ = _data$data8$Errors[0]) === null || _data$data8$Errors$ === void 0 ? void 0 : _data$data8$Errors$.message) || (data === null || data === void 0 ? void 0 : (_data$Errors8 = data.Errors) === null || _data$Errors8 === void 0 ? void 0 : (_data$Errors8$ = _data$Errors8[0]) === null || _data$Errors8$ === void 0 ? void 0 : _data$Errors8$.message) || (data === null || data === void 0 ? void 0 : data.message) || "UPDATE_FAILED"
+            });
+            return;
+          }
           updateVehicleRowState(currentVehicle === null || currentVehicle === void 0 ? void 0 : currentVehicle.id, {
             vendor: updatedSelectedVendor,
             fillingPoint: null,
@@ -1345,7 +1391,8 @@ const VendorInbox = props => {
           });
           setShowToast({
             key: "success",
-            action: "VEHICLE"
+            action: "VEHICLE",
+            isDisable: false
           });
           queryClient.invalidateQueries("DSO_SEARCH");
           queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
@@ -1362,10 +1409,22 @@ const VendorInbox = props => {
         onError: error => {
           setShowToast({
             key: "error",
-            action: error
+            action: (error === null || error === void 0 ? void 0 : error.message) || "UPDATE_FAILED"
           });
         },
-        onSuccess: addVehicleToSelectedVendor
+        onSuccess: data => {
+          var _data$Errors9, _data$data9, _data$data9$Errors;
+          const isError = (data === null || data === void 0 ? void 0 : data.error) === true || (data === null || data === void 0 ? void 0 : (_data$Errors9 = data.Errors) === null || _data$Errors9 === void 0 ? void 0 : _data$Errors9.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$data9 = data.data) === null || _data$data9 === void 0 ? void 0 : (_data$data9$Errors = _data$data9.Errors) === null || _data$data9$Errors === void 0 ? void 0 : _data$data9$Errors.length) > 0;
+          if (isError) {
+            var _data$data0, _data$data0$Errors, _data$data0$Errors$, _data$Errors0, _data$Errors0$;
+            setShowToast({
+              key: "error",
+              action: (data === null || data === void 0 ? void 0 : (_data$data0 = data.data) === null || _data$data0 === void 0 ? void 0 : (_data$data0$Errors = _data$data0.Errors) === null || _data$data0$Errors === void 0 ? void 0 : (_data$data0$Errors$ = _data$data0$Errors[0]) === null || _data$data0$Errors$ === void 0 ? void 0 : _data$data0$Errors$.message) || (data === null || data === void 0 ? void 0 : (_data$Errors0 = data.Errors) === null || _data$Errors0 === void 0 ? void 0 : (_data$Errors0$ = _data$Errors0[0]) === null || _data$Errors0$ === void 0 ? void 0 : _data$Errors0$.message) || (data === null || data === void 0 ? void 0 : data.message) || "UPDATE_FAILED"
+            });
+            return;
+          }
+          addVehicleToSelectedVendor();
+        }
       });
       return;
     }
@@ -1379,17 +1438,27 @@ const VendorInbox = props => {
       onError: (error, variables) => {
         setShowToast({
           key: "error",
-          action: error
+          action: (error === null || error === void 0 ? void 0 : error.message) || "UPDATE_FAILED"
         });
       },
       onSuccess: (data, variables) => {
-        var _row$original2;
+        var _data$Errors1, _data$data1, _data$data1$Errors, _row$original2;
+        const isError = (data === null || data === void 0 ? void 0 : data.error) === true || (data === null || data === void 0 ? void 0 : (_data$Errors1 = data.Errors) === null || _data$Errors1 === void 0 ? void 0 : _data$Errors1.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$data1 = data.data) === null || _data$data1 === void 0 ? void 0 : (_data$data1$Errors = _data$data1.Errors) === null || _data$data1$Errors === void 0 ? void 0 : _data$data1$Errors.length) > 0;
+        if (isError) {
+          var _data$data10, _data$data10$Errors, _data$data10$Errors$, _data$Errors10, _data$Errors10$;
+          setShowToast({
+            key: "error",
+            action: (data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : (_data$data10$Errors = _data$data10.Errors) === null || _data$data10$Errors === void 0 ? void 0 : (_data$data10$Errors$ = _data$data10$Errors[0]) === null || _data$data10$Errors$ === void 0 ? void 0 : _data$data10$Errors$.message) || (data === null || data === void 0 ? void 0 : (_data$Errors10 = data.Errors) === null || _data$Errors10 === void 0 ? void 0 : (_data$Errors10$ = _data$Errors10[0]) === null || _data$Errors10$ === void 0 ? void 0 : _data$Errors10$.message) || (data === null || data === void 0 ? void 0 : data.message) || "UPDATE_FAILED"
+          });
+          return;
+        }
         updateVehicleRowState((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.id, {
           driverData: selectedOption
         });
         setShowToast({
           key: "success",
-          action: "VEHICLE"
+          action: "VEHICLE",
+          isDisable: false
         });
         queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
         queryClient.invalidateQueries("DSO_SEARCH");
@@ -1410,8 +1479,17 @@ const VendorInbox = props => {
           label: (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || "Failed to map filling point"
         });
       },
-      onSuccess: () => {
-        var _row$original3;
+      onSuccess: data => {
+        var _data$Errors11, _data$data11, _data$data11$Errors, _row$original3;
+        const isError = (data === null || data === void 0 ? void 0 : data.error) === true || (data === null || data === void 0 ? void 0 : (_data$Errors11 = data.Errors) === null || _data$Errors11 === void 0 ? void 0 : _data$Errors11.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$Errors = _data$data11.Errors) === null || _data$data11$Errors === void 0 ? void 0 : _data$data11$Errors.length) > 0;
+        if (isError) {
+          var _data$data12, _data$data12$Errors, _data$data12$Errors$, _data$Errors12, _data$Errors12$;
+          setShowToast({
+            key: "error",
+            label: (data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : (_data$data12$Errors = _data$data12.Errors) === null || _data$data12$Errors === void 0 ? void 0 : (_data$data12$Errors$ = _data$data12$Errors[0]) === null || _data$data12$Errors$ === void 0 ? void 0 : _data$data12$Errors$.message) || (data === null || data === void 0 ? void 0 : (_data$Errors12 = data.Errors) === null || _data$Errors12 === void 0 ? void 0 : (_data$Errors12$ = _data$Errors12[0]) === null || _data$Errors12$ === void 0 ? void 0 : _data$Errors12$.message) || (data === null || data === void 0 ? void 0 : data.message) || "Failed to map filling point"
+          });
+          return;
+        }
         const mappedVendor = getSelectedVendorOption(row.original, vendors);
         const vendorDrivers = getVendorDriversForFillingPoint(mappedVendor, selectedOption);
         const selectedDriver = getSelectedDriverOption(row.original, vendorDrivers);
@@ -1435,11 +1513,12 @@ const VendorInbox = props => {
     });
   };
   const onSurveyorSupervisorSelect = (row, selectedSupervisor) => {
-    var _selectedSupervisor$o, _formDetails$owner9, _formDetails$owner0, _formDetails$owner1, _formDetails$owner10;
+    var _selectedSupervisor$o, _selectedSupervisor$o2, _formDetails$owner9, _formDetails$owner0, _formDetails$owner1, _formDetails$owner10;
     let formDetails = row.original;
     const formData = {
       surveyor: _extends({}, formDetails, {
-        supervisorId: (selectedSupervisor === null || selectedSupervisor === void 0 ? void 0 : selectedSupervisor.id) || (selectedSupervisor === null || selectedSupervisor === void 0 ? void 0 : (_selectedSupervisor$o = selectedSupervisor.owner) === null || _selectedSupervisor$o === void 0 ? void 0 : _selectedSupervisor$o.uuid) || null,
+        supervisorId: (selectedSupervisor === null || selectedSupervisor === void 0 ? void 0 : selectedSupervisor.name) || (selectedSupervisor === null || selectedSupervisor === void 0 ? void 0 : (_selectedSupervisor$o = selectedSupervisor.owner) === null || _selectedSupervisor$o === void 0 ? void 0 : _selectedSupervisor$o.name) || null,
+        supervisorName: (selectedSupervisor === null || selectedSupervisor === void 0 ? void 0 : selectedSupervisor.name) || (selectedSupervisor === null || selectedSupervisor === void 0 ? void 0 : (_selectedSupervisor$o2 = selectedSupervisor.owner) === null || _selectedSupervisor$o2 === void 0 ? void 0 : _selectedSupervisor$o2.name) || null,
         owner: _extends({}, formDetails === null || formDetails === void 0 ? void 0 : formDetails.owner, {
           gender: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner9 = formDetails.owner) === null || _formDetails$owner9 === void 0 ? void 0 : _formDetails$owner9.gender) || "OTHERS",
           dob: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner0 = formDetails.owner) === null || _formDetails$owner0 === void 0 ? void 0 : _formDetails$owner0.dob) || new Date("1/1/1970").getTime(),
@@ -1455,7 +1534,17 @@ const VendorInbox = props => {
           label: (error === null || error === void 0 ? void 0 : error.message) || error || t("ES_FSM_REGISTRY_INBOX_FAILED_TO_UPDATE_SUPERVISOR")
         });
       },
-      onSuccess: () => {
+      onSuccess: data => {
+        var _data$Errors13, _data$data13, _data$data13$Errors;
+        const isError = (data === null || data === void 0 ? void 0 : data.error) === true || (data === null || data === void 0 ? void 0 : (_data$Errors13 = data.Errors) === null || _data$Errors13 === void 0 ? void 0 : _data$Errors13.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$data13 = data.data) === null || _data$data13 === void 0 ? void 0 : (_data$data13$Errors = _data$data13.Errors) === null || _data$data13$Errors === void 0 ? void 0 : _data$data13$Errors.length) > 0;
+        if (isError) {
+          var _data$data14, _data$data14$Errors, _data$data14$Errors$, _data$Errors14, _data$Errors14$;
+          setShowToast({
+            key: "error",
+            label: (data === null || data === void 0 ? void 0 : (_data$data14 = data.data) === null || _data$data14 === void 0 ? void 0 : (_data$data14$Errors = _data$data14.Errors) === null || _data$data14$Errors === void 0 ? void 0 : (_data$data14$Errors$ = _data$data14$Errors[0]) === null || _data$data14$Errors$ === void 0 ? void 0 : _data$data14$Errors$.message) || (data === null || data === void 0 ? void 0 : (_data$Errors14 = data.Errors) === null || _data$Errors14 === void 0 ? void 0 : (_data$Errors14$ = _data$Errors14[0]) === null || _data$Errors14$ === void 0 ? void 0 : _data$Errors14$.message) || (data === null || data === void 0 ? void 0 : data.message) || t("ES_FSM_REGISTRY_INBOX_FAILED_TO_UPDATE_SUPERVISOR")
+          });
+          return;
+        }
         setShowToast({
           key: "success",
           label: t("ES_FSM_REGISTRY_INBOX_SUPERVISOR_MAPPED_SUCCESSFULLY")
@@ -1518,9 +1607,9 @@ const VendorInbox = props => {
   const supervisors = React.useMemo(() => {
     const list = (supervisorSearchResponse === null || supervisorSearchResponse === void 0 ? void 0 : supervisorSearchResponse.supervisors) || (supervisorSearchResponse === null || supervisorSearchResponse === void 0 ? void 0 : supervisorSearchResponse.supervisor) || [];
     return list.map(s => {
-      var _s$owner2, _s$owner3;
+      var _s$owner3, _s$owner4;
       return _extends({}, s, {
-        displayName: (s.name || ((_s$owner2 = s.owner) === null || _s$owner2 === void 0 ? void 0 : _s$owner2.name) || "N/A") + " (" + (((_s$owner3 = s.owner) === null || _s$owner3 === void 0 ? void 0 : _s$owner3.mobileNumber) || s.mobileNo || "N/A") + ")"
+        displayName: (s.name || ((_s$owner3 = s.owner) === null || _s$owner3 === void 0 ? void 0 : _s$owner3.name) || "N/A") + " (" + (((_s$owner4 = s.owner) === null || _s$owner4 === void 0 ? void 0 : _s$owner4.mobileNumber) || s.mobileNo || "N/A") + ")"
       });
     });
   }, [supervisorSearchResponse]);
@@ -2061,9 +2150,9 @@ const VendorInbox = props => {
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_SUPERVISOR_NAME"),
           exportAccessor: row => {
-            var _selectedSupervisor$o2, _row$reportingManager2;
+            var _selectedSupervisor$o3, _row$reportingManager2;
             const selectedSupervisor = getSelectedSupervisorOption(row, supervisors);
-            return selectedSupervisor ? selectedSupervisor.name || ((_selectedSupervisor$o2 = selectedSupervisor.owner) === null || _selectedSupervisor$o2 === void 0 ? void 0 : _selectedSupervisor$o2.name) : (row === null || row === void 0 ? void 0 : row.supervisorName) || (row === null || row === void 0 ? void 0 : (_row$reportingManager2 = row.reportingManager) === null || _row$reportingManager2 === void 0 ? void 0 : _row$reportingManager2.name) || "NA";
+            return selectedSupervisor ? selectedSupervisor.name || ((_selectedSupervisor$o3 = selectedSupervisor.owner) === null || _selectedSupervisor$o3 === void 0 ? void 0 : _selectedSupervisor$o3.name) : (row === null || row === void 0 ? void 0 : row.supervisorName) || (row === null || row === void 0 ? void 0 : (_row$reportingManager2 = row.reportingManager) === null || _row$reportingManager2 === void 0 ? void 0 : _row$reportingManager2.name) || "NA";
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
@@ -2246,7 +2335,7 @@ const VendorInbox = props => {
     }
   }, result)), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error" ? true : false,
-    label: showToast.label ? t(showToast.label) : t(showToast.key === "success" ? "ES_FSM_REGISTRY_" + showToast.action + "_DISABLE_SUCCESS" : showToast.action),
+    label: showToast.label ? t(showToast.label) : showToast.key === "success" ? t("ES_FSM_REGISTRY_" + showToast.action + "_" + (showToast.isDisable ? "DISABLE" : "ENABLE") + "_SUCCESS") : t(showToast.action),
     onClose: closeToast
   }), showWorkOrderModal && /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement("h1", {
@@ -2878,7 +2967,7 @@ const SupervisorDetails = props => {
             showSuccessToast: true,
             message: {
               key: "success",
-              action: "DELETE_SUPERVISOR"
+              action: t("ES_VENDOR_DELETE_SUPERVISOR_SUCCESS")
             }
           }
         });
@@ -3078,7 +3167,7 @@ const SupervisorDetails = props => {
     title: "ES_VENDOR_SUPERVISOR_DELETE_TEXT"
   }))), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error",
-    label: t(showToast.key === "success" ? "ES_VENDOR_" + showToast.action + "_SUCCESS" : showToast.action),
+    label: showToast.key === "success" ? t("ES_VENDOR_" + showToast.action + "_SUCCESS", showToast.action === "UPDATE_SUPERVISOR" ? "Supervisor updated successfully" : undefined) : t(showToast.action),
     onClose: () => setShowToast(null),
     duration: 5000
   }), /*#__PURE__*/React.createElement(ActionBar, {
@@ -3225,7 +3314,7 @@ const AddSupervisor = _ref => {
     canSubmit = _useState2[0],
     setCanSubmit = _useState2[1];
   const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorCreate(tenantId),
-    mutateAsync = _Digit$Hooks$fsm$useS.mutate;
+    mutateAsync = _Digit$Hooks$fsm$useS.mutateAsync;
   const history = useHistory();
   const Config = SupervisorConfig(t);
   const defaultValues = {
@@ -3308,7 +3397,7 @@ const AddSupervisor = _ref => {
               showSuccessToast: true,
               message: {
                 key: "success",
-                action: "ES_VENDOR_ADD_SURVEYOR_SUCCESS"
+                action: t("ES_VENDOR_ADD_SUPERVISOR_SUCCESS")
               }
             }
           });
@@ -3519,7 +3608,7 @@ const SurveyorDetails = props => {
             showSuccessToast: true,
             message: {
               key: "success",
-              action: "ES_VENDOR_DELETE_SURVEYOR_SUCCESS"
+              action: t("ES_VENDOR_DELETE_SURVEYOR_SUCCESS")
             }
           }
         });
@@ -3624,7 +3713,7 @@ const SurveyorDetails = props => {
     }
   }, renderModalContent())), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error",
-    label: t(showToast.key === "success" ? "ES_VENDOR_" + showToast.action + "_SUCCESS" : showToast.action),
+    label: showToast.key === "success" ? t("ES_VENDOR_" + showToast.action + "_SUCCESS", showToast.action === "UPDATE_SURVEYOR" ? "Surveyor updated successfully" : undefined) : t(showToast.action),
     onClose: closeToast
   }), /*#__PURE__*/React.createElement(ActionBar, {
     style: {
@@ -3764,7 +3853,10 @@ const VendorDetails = () => {
       case "EDIT":
         return history.push("/digit-ui/" + userType + "/vendor/registry/modify-vendor/" + (dsoId || vendorId));
       case "HOME":
-        return history.push("/digit-ui/" + userType + "/vendor/registry?selectedTabs=VENDOR");
+        if (userType === "citizen") {
+          return history.push("/digit-ui/citizen/vendor");
+        }
+        return history.push("/digit-ui/" + userType + "/vendor/search-vendor?selectedTabs=VENDOR");
     }
   }, [selectedAction]);
   useEffect(() => {
@@ -7929,7 +8021,7 @@ const CloseBtn$1 = props => {
   }, /*#__PURE__*/React.createElement(CloseSvg, null));
 };
 const DriverDetails = () => {
-  var _driverData$5, _driverData$5$employe;
+  var _Digit$UserService$ge, _userInfo$type, _driverData$5, _driverData$5$employe;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -7937,6 +8029,8 @@ const DriverDetails = () => {
   const queryClient = useQueryClient();
   const _useParams = useParams(),
     dsoId = _useParams.id;
+  const userInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
+  const userType = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$type = userInfo.type) === null || _userInfo$type === void 0 ? void 0 : _userInfo$type.toLowerCase();
   const _useState = useState(false),
     displayMenu = _useState[0],
     setDisplayMenu = _useState[1];
@@ -7994,9 +8088,12 @@ const DriverDetails = () => {
       case "DELETE_VENDOR":
         return setShowModal(true);
       case "EDIT":
-        return history.push("/digit-ui/employee/fsm/registry/modify-driver/" + dsoId);
+        return history.push("/digit-ui/" + userType + "/vendor/registry/modify-driver/" + dsoId);
       case "HOME":
-        return history.push("/digit-ui/employee/fsm/registry?selectedTabs=DRIVER");
+        if (userType === "citizen") {
+          return history.push("/digit-ui/citizen/vendor");
+        }
+        return history.push("/digit-ui/" + userType + "/vendor/search-vendor?selectedTabs=DRIVER");
     }
   }, [selectedAction]);
   const closeToast = () => {
@@ -8785,7 +8882,7 @@ const CloseBtn$2 = props => {
   }, /*#__PURE__*/React.createElement(CloseSvg, null));
 };
 const VehicleDetails = props => {
-  var _vehicleData$6, _vehicleData$6$employ;
+  var _Digit$UserService$ge, _userInfo$type, _vehicleData$6, _vehicleData$6$employ;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -8793,6 +8890,8 @@ const VehicleDetails = props => {
   const queryClient = useQueryClient();
   let _useParams = useParams(),
     vehicleNumber = _useParams.id;
+  const userInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
+  const userType = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$type = userInfo.type) === null || _userInfo$type === void 0 ? void 0 : _userInfo$type.toLowerCase();
   const _useState = useState(false),
     displayMenu = _useState[0],
     setDisplayMenu = _useState[1];
@@ -8859,9 +8958,12 @@ const VehicleDetails = props => {
       case "DELETE_VENDOR":
         return setShowModal(true);
       case "EDIT":
-        return history.push("/digit-ui/employee/fsm/registry/modify-vehicle/" + vehicleNumber);
+        return history.push("/digit-ui/" + userType + "/vendor/registry/modify-vehicle/" + vehicleNumber);
       case "HOME":
-        return history.push("/digit-ui/employee/fsm/registry?selectedTabs=VEHICLE");
+        if (userType === "citizen") {
+          return history.push("/digit-ui/citizen/vendor");
+        }
+        return history.push("/digit-ui/" + userType + "/vendor/search-vendor?selectedTabs=VEHICLE");
     }
   }, [selectedAction]);
   const closeToast = () => {
@@ -9205,18 +9307,36 @@ const SelectEkycZones = _ref => {
     }
   }, [boundaryData]);
   useEffect(() => {
-    if (!zones.length || !Array.isArray(formData === null || formData === void 0 ? void 0 : formData.zoneIds)) return;
-    if (formData.zoneIds.length && typeof formData.zoneIds[0] === "object") {
-      setSelectedZones(formData.zoneIds);
-      return;
-    }
-    const selected = zones.filter(zone => formData.zoneIds.includes(zone.name));
-    setSelectedZones(selected);
-    if (!initialized.current) {
-      initialized.current = true;
-      onSelect(config.key, selected);
+    if (!zones.length || !(formData !== null && formData !== void 0 && formData.zoneIds)) return;
+    if (isMultiSelect) {
+      if (!Array.isArray(formData.zoneIds)) return;
+      if (formData.zoneIds.length && typeof formData.zoneIds[0] === "object") {
+        setSelectedZones(formData.zoneIds);
+        return;
+      }
+      const selected = zones.filter(zone => formData.zoneIds.includes(zone.name) || formData.zoneIds.includes(zone.code));
+      setSelectedZones(selected);
+      if (!initialized.current) {
+        initialized.current = true;
+        onSelect(config.key, selected);
+      }
+    } else {
+      let selectedVal = formData.zoneIds;
+      if (Array.isArray(selectedVal)) {
+        var _selectedVal$, _selectedVal$2;
+        selectedVal = ((_selectedVal$ = selectedVal[0]) === null || _selectedVal$ === void 0 ? void 0 : _selectedVal$.name) || ((_selectedVal$2 = selectedVal[0]) === null || _selectedVal$2 === void 0 ? void 0 : _selectedVal$2.code) || selectedVal[0] || "";
+      }
+      if (typeof selectedVal === "object") {
+        selectedVal = selectedVal.name || selectedVal.code || "";
+      }
+      const selected = zones.find(zone => zone.name === selectedVal || zone.code === selectedVal);
+      setSelectedZones(selected ? [selected] : []);
+      if (!initialized.current && selected) {
+        initialized.current = true;
+        onSelect(config.key, selected.name || "");
+      }
     }
-  }, [zones, formData === null || formData === void 0 ? void 0 : formData.zoneIds, config.key, onSelect]);
+  }, [zones, formData === null || formData === void 0 ? void 0 : formData.zoneIds, config.key, onSelect, isMultiSelect]);
   const handleSelect = value => {
     if (isMultiSelect) {
       const selected = Array.isArray(value) ? value.map(v => Array.isArray(v) ? v[1] : v).filter(Boolean) : [];
@@ -9225,7 +9345,7 @@ const SelectEkycZones = _ref => {
     } else {
       const selectedZone = Array.isArray(value) ? Array.isArray(value[0]) ? value[0][1] : value[0] : value;
       setSelectedZones(selectedZone ? [selectedZone] : []);
-      onSelect(config.key, (selectedZone === null || selectedZone === void 0 ? void 0 : selectedZone.code) || "");
+      onSelect(config.key, (selectedZone === null || selectedZone === void 0 ? void 0 : selectedZone.name) || "");
     }
   };
   if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);