@djb25/digit-ui-module-vendor 1.0.77 → 1.0.79

package/dist/index.js

@@ -1101,6 +1101,7 @@ const VendorInbox = props => {
   const userInfo = Digit.SessionStorage.get("User");
   const userRoles = userInfo.info.roles;
   const userType = (_userInfo$info$type = userInfo.info.type) === null || _userInfo$info$type === void 0 ? void 0 : _userInfo$info$type.toLowerCase();
+  const isVendor = Digit.Utils.vendorAccess() || Digit.UserService.hasAccess(["WT_VENDOR", "EKYC_VENDOR", "VENDOR", "FSM_VENDOR", "DSO", "FSM_DSO"]) || (userRoles === null || userRoles === void 0 ? void 0 : userRoles.some(role => ["FSM_VENDOR", "VENDOR", "EKYC_VENDOR", "WT_VENDOR", "DSO", "FSM_DSO"].includes(typeof role === "string" ? role : role === null || role === void 0 ? void 0 : role.code))) || userType === "vendor";
   const EKYC_ROLES = ["EKYC_SUPERVISOR", "EKYC_SURVEYOR"];
   const isEkycRole = userRoles === null || userRoles === void 0 ? void 0 : userRoles.some(role => EKYC_ROLES.includes((role === null || role === void 0 ? void 0 : role.code) || role));
   const openWorkOrderModal = vendorDetails => {
@@ -1210,8 +1211,7 @@ const VendorInbox = props => {
     mutateVehicle = _Digit$Hooks$fsm$useU.mutate;
   const _Digit$Hooks$fsm$useD3 = Digit.Hooks.fsm.useDriverUpdate(tenantId),
     mutateDriver = _Digit$Hooks$fsm$useD3.mutate;
-  const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorUpdate(tenantId),
-    mutateSupervisor = _Digit$Hooks$fsm$useS.mutate;
+  const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorUpdate(tenantId);
   const _Digit$Hooks$fsm$useS2 = Digit.Hooks.fsm.useSurveyorUpdate(tenantId),
     mutateSurveyor = _Digit$Hooks$fsm$useS2.mutate;
   React.useEffect(() => {
@@ -1400,82 +1400,6 @@ const VendorInbox = props => {
       }
     });
   };
-  const onSupervisorUpdate = row => {
-    var _formDetails$owner9, _formDetails$owner0, _formDetails$owner1, _formDetails$owner10;
-    let formDetails = row.original;
-    const newStatus = (formDetails === null || formDetails === void 0 ? void 0 : formDetails.status) === "ACTIVE" ? "DISABLED" : "ACTIVE";
-    const newActive = newStatus === "ACTIVE";
-    const formData = {
-      supervisor: _extends({}, formDetails, {
-        status: newStatus,
-        active: newActive,
-        owner: _extends({}, formDetails === null || formDetails === void 0 ? void 0 : formDetails.owner, {
-          active: newActive,
-          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(),
-          emailId: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner1 = formDetails.owner) === null || _formDetails$owner1 === void 0 ? void 0 : _formDetails$owner1.emailId) || "abc@egov.com",
-          relationship: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner10 = formDetails.owner) === null || _formDetails$owner10 === void 0 ? void 0 : _formDetails$owner10.relationship) || "OTHER"
-        })
-      })
-    };
-    mutateSupervisor(formData, {
-      onError: (error, variables) => {
-        setShowToast({
-          key: "error",
-          action: (error === null || error === void 0 ? void 0 : error.message) || error
-        });
-      },
-      onSuccess: (data, variables) => {
-        console.log("newStatus:", newStatus, "isDisable:", newStatus === "DISABLED");
-        setShowToast({
-          key: "success",
-          action: "SUPERVISOR",
-          isDisable: newStatus === "DISABLED"
-        });
-        queryClient.invalidateQueries("FSM_SUPERVISOR_SEARCH");
-        queryClient.invalidateQueries("SUPERVISOR_SEARCH");
-        props.refetchData();
-      }
-    });
-  };
-  const onSurveyorUpdate = row => {
-    var _formDetails$owner11, _formDetails$owner12, _formDetails$owner13, _formDetails$owner14;
-    let formDetails = row.original;
-    const newStatus = (formDetails === null || formDetails === void 0 ? void 0 : formDetails.status) === "ACTIVE" ? "DISABLED" : "ACTIVE";
-    const newActive = newStatus === "ACTIVE";
-    const formData = {
-      surveyor: _extends({}, formDetails, {
-        status: newStatus,
-        active: newActive,
-        owner: _extends({}, formDetails === null || formDetails === void 0 ? void 0 : formDetails.owner, {
-          active: newActive,
-          gender: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner11 = formDetails.owner) === null || _formDetails$owner11 === void 0 ? void 0 : _formDetails$owner11.gender) || "OTHERS",
-          dob: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner12 = formDetails.owner) === null || _formDetails$owner12 === void 0 ? void 0 : _formDetails$owner12.dob) || new Date("1/1/1970").getTime(),
-          emailId: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner13 = formDetails.owner) === null || _formDetails$owner13 === void 0 ? void 0 : _formDetails$owner13.emailId) || "abc@egov.com",
-          relationship: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$owner14 = formDetails.owner) === null || _formDetails$owner14 === void 0 ? void 0 : _formDetails$owner14.relationship) || "OTHER"
-        })
-      })
-    };
-    mutateSurveyor(formData, {
-      onError: (error, variables) => {
-        setShowToast({
-          key: "error",
-          action: (error === null || error === void 0 ? void 0 : error.message) || error
-        });
-      },
-      onSuccess: (data, variables) => {
-        console.log("newStatus:", newStatus, "isDisable:", newStatus === "DISABLED");
-        setShowToast({
-          key: "success",
-          action: "SURVEYOR",
-          isDisable: newStatus === "DISABLED"
-        });
-        queryClient.invalidateQueries("FSM_SURVEYOR_SEARCH");
-        queryClient.invalidateQueries("SURVEYOR_SEARCH");
-        props.refetchData();
-      }
-    });
-  };
   const onVendorSelect = (row, selectedOption) => {
     let driverData = row.original;
     let existingVendor = driverData === null || driverData === void 0 ? void 0 : driverData.vendor;
@@ -1830,7 +1754,7 @@ const VendorInbox = props => {
             const serviceType = ((_additionalDetails2 = additionalDetails) === null || _additionalDetails2 === void 0 ? void 0 : _additionalDetails2.serviceType) || "N/A";
             return /*#__PURE__*/React__default.createElement("div", null, serviceType);
           }
-        }, {
+        }, ...(!isVendor ? [{
           Header: t("ES_VENDOR_REGISTRY_INBOX_ENABLED"),
           id: "status",
           accessor: row => {
@@ -1850,7 +1774,7 @@ const VendorInbox = props => {
               name: "switch-" + row.id
             });
           }
-        }, ...(!(userType !== "CITIZEN" && isEkycRole) ? [{
+        }] : []), ...(!(userType !== "CITIZEN" && isEkycRole) ? [{
           Header: t("ES_VENDOR_ADDITIONAL_DETAILS"),
           disableSortBy: true,
           Cell: _ref10 => {
@@ -2019,7 +1943,7 @@ const VendorInbox = props => {
               disable: !selectedFillingPoint || !availableDrivers.length
             });
           }
-        }, {
+        }, ...(!isVendor ? [{
           Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
           id: "status",
           accessor: row => row.status || "",
@@ -2036,7 +1960,7 @@ const VendorInbox = props => {
               name: "switch-" + row.id
             });
           }
-        }];
+        }] : [])];
       case "DRIVER":
         return [{
           Header: t("ES_FSM_REGISTRY_INBOX_USERNAME"),
@@ -2108,7 +2032,7 @@ const VendorInbox = props => {
               t: t
             });
           }
-        }, {
+        }, ...(!isVendor ? [{
           Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
           id: "status",
           accessor: row => row.status || "",
@@ -2125,7 +2049,7 @@ const VendorInbox = props => {
               name: "switch-" + row.id
             });
           }
-        }];
+        }] : [])];
       case "SUPERVISOR":
       case "SURVEYOR":
         return [{
@@ -2151,11 +2075,11 @@ const VendorInbox = props => {
         }, ...(props.selectedTab === "SUPERVISOR" ? [{
           Header: t("ES_VENDOR_SUPERVISOR_ZONE_NAME"),
           id: "zoneId",
-          accessor: row => row.assignedZoneId || "NA",
+          accessor: row => row.assignedZoneId || row.zoneId || row.zoneCode || "NA",
           Cell: _ref28 => {
-            var _row$original16;
+            var _row$original16, _row$original17, _row$original18;
             let row = _ref28.row;
-            const zoneId = (_row$original16 = row.original) === null || _row$original16 === void 0 ? void 0 : _row$original16.assignedZoneId;
+            const zoneId = ((_row$original16 = row.original) === null || _row$original16 === void 0 ? void 0 : _row$original16.assignedZoneId) || ((_row$original17 = row.original) === null || _row$original17 === void 0 ? void 0 : _row$original17.zoneId) || ((_row$original18 = row.original) === null || _row$original18 === void 0 ? void 0 : _row$original18.zoneCode);
             return /*#__PURE__*/React__default.createElement("div", null, zoneId ? t(zoneId) : "NA");
           }
         }, {
@@ -2166,19 +2090,29 @@ const VendorInbox = props => {
             return row.vendorName || ((_row$vendorData3 = row.vendorData) === null || _row$vendorData3 === void 0 ? void 0 : _row$vendorData3.name) || ((_row$vendor3 = row.vendor) === null || _row$vendor3 === void 0 ? void 0 : _row$vendor3.name) || "NA";
           },
           Cell: _ref29 => {
-            var _row$original17, _row$original18, _row$original18$vendo, _row$original19, _row$original19$vendo;
+            var _row$original19, _row$original20, _row$original20$vendo, _row$original21, _row$original21$vendo;
             let row = _ref29.row;
-            return /*#__PURE__*/React__default.createElement("div", null, ((_row$original17 = row.original) === null || _row$original17 === void 0 ? void 0 : _row$original17.vendorName) || ((_row$original18 = row.original) === null || _row$original18 === void 0 ? void 0 : (_row$original18$vendo = _row$original18.vendorData) === null || _row$original18$vendo === void 0 ? void 0 : _row$original18$vendo.name) || ((_row$original19 = row.original) === null || _row$original19 === void 0 ? void 0 : (_row$original19$vendo = _row$original19.vendor) === null || _row$original19$vendo === void 0 ? void 0 : _row$original19$vendo.name) || "NA");
+            return /*#__PURE__*/React__default.createElement("div", null, ((_row$original19 = row.original) === null || _row$original19 === void 0 ? void 0 : _row$original19.vendorName) || ((_row$original20 = row.original) === null || _row$original20 === void 0 ? void 0 : (_row$original20$vendo = _row$original20.vendorData) === null || _row$original20$vendo === void 0 ? void 0 : _row$original20$vendo.name) || ((_row$original21 = row.original) === null || _row$original21 === void 0 ? void 0 : (_row$original21$vendo = _row$original21.vendor) === null || _row$original21$vendo === void 0 ? void 0 : _row$original21$vendo.name) || "NA");
           }
         }] : []), ...(props.selectedTab === "SURVEYOR" ? [{
+          Header: t("ES_VENDOR_SURVEYOR_ZONE_NAME"),
+          id: "zoneId",
+          accessor: row => row.assignedZoneId || row.zoneId || row.zoneCode || "NA",
+          Cell: _ref30 => {
+            var _row$original22, _row$original23, _row$original24;
+            let row = _ref30.row;
+            const zoneId = ((_row$original22 = row.original) === null || _row$original22 === void 0 ? void 0 : _row$original22.assignedZoneId) || ((_row$original23 = row.original) === null || _row$original23 === void 0 ? void 0 : _row$original23.zoneId) || ((_row$original24 = row.original) === null || _row$original24 === void 0 ? void 0 : _row$original24.zoneCode);
+            return /*#__PURE__*/React__default.createElement("div", null, zoneId ? t(zoneId) : "NA");
+          }
+        }, {
           Header: t("ES_FSM_REGISTRY_INBOX_SUPERVISOR_NAME"),
           id: "supervisor",
           accessor: row => {
             var _row$reportingManager;
             return row.supervisorName || ((_row$reportingManager = row.reportingManager) === null || _row$reportingManager === void 0 ? void 0 : _row$reportingManager.name) || "NA";
           },
-          Cell: _ref30 => {
-            let row = _ref30.row;
+          Cell: _ref31 => {
+            let row = _ref31.row;
             return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
               className: "fsm-registry-dropdown",
               selected: getSelectedSupervisorOption(row.original, supervisors),
@@ -2197,39 +2131,16 @@ const VendorInbox = props => {
         }] : []), {
           Header: t("ES_FSM_REGISTRY_INBOX_DATE_CREATION"),
           accessor: "createdTime",
-          Cell: _ref31 => {
-            var _row$original20, _row$original20$audit, _row$original21, _row$original21$audit;
-            let row = _ref31.row;
-            return GetCell((_row$original20 = row.original) !== null && _row$original20 !== void 0 && (_row$original20$audit = _row$original20.auditDetails) !== null && _row$original20$audit !== void 0 && _row$original20$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original21 = row.original) === null || _row$original21 === void 0 ? void 0 : (_row$original21$audit = _row$original21.auditDetails) === null || _row$original21$audit === void 0 ? void 0 : _row$original21$audit.createdTime) : "");
-          }
-        }, {
-          Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
-          id: "status",
-          accessor: row => row.status || "",
           Cell: _ref32 => {
-            var _row$original22;
+            var _row$original25, _row$original25$audit, _row$original26, _row$original26$audit;
             let row = _ref32.row;
-            return /*#__PURE__*/React__default.createElement(digitUiReactComponents.ToggleSwitch, {
-              style: {
-                display: "flex",
-                justifyContent: "left"
-              },
-              value: ((_row$original22 = row.original) === null || _row$original22 === void 0 ? void 0 : _row$original22.status) === "DISABLED" ? false : true,
-              onChange: () => {
-                if (props.selectedTab === "SUPERVISOR") {
-                  onSupervisorUpdate(row);
-                } else if (props.selectedTab === "SURVEYOR") {
-                  onSurveyorUpdate(row);
-                }
-              },
-              name: "switch-" + row.id
-            });
+            return GetCell((_row$original25 = row.original) !== null && _row$original25 !== void 0 && (_row$original25$audit = _row$original25.auditDetails) !== null && _row$original25$audit !== void 0 && _row$original25$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original26 = row.original) === null || _row$original26 === void 0 ? void 0 : (_row$original26$audit = _row$original26.auditDetails) === null || _row$original26$audit === void 0 ? void 0 : _row$original26$audit.createdTime) : "");
           }
         }];
       default:
         return [];
     }
-  }, [props.selectedTab, vendors, drivers, tableData, additionalVendorData, allFillingPoints, supervisors, t]);
+  }, [props.selectedTab, vendors, drivers, tableData, additionalVendorData, allFillingPoints, supervisors, isVendor, t]);
   const csvExportColumns = React__default.useMemo(() => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -2335,6 +2246,9 @@ const VendorInbox = props => {
         }, {
           Header: t("USER_NAME"),
           exportAccessor: row => (row === null || row === void 0 ? void 0 : row.name) || "NA"
+        }, {
+          Header: t("ZONE"),
+          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.assignedZoneId) || (row === null || row === void 0 ? void 0 : row.zoneId) || (row === null || row === void 0 ? void 0 : row.zoneCode) || "NA"
         }, {
           Header: t("VENDOR_NAME"),
           exportAccessor: row => {
@@ -2370,7 +2284,7 @@ const VendorInbox = props => {
           exportAccessor: row => (row === null || row === void 0 ? void 0 : row.name) || "NA"
         }, {
           Header: t("ZONE"),
-          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.assignedZoneId) || "NA"
+          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.assignedZoneId) || (row === null || row === void 0 ? void 0 : row.zoneId) || (row === null || row === void 0 ? void 0 : row.zoneCode) || "NA"
         }, {
           Header: t("VENDOR_NAME"),
           exportAccessor: row => {
@@ -4452,7 +4366,7 @@ const VendorDetails = () => {
         })), /*#__PURE__*/React__default.createElement("div", {
           className: "add-details-link hover-button",
           onClick: () => history.push("/digit-ui/" + userType + "/vendor/registry/additionaldetails/modify-details?vendorId=" + (dsoId || vendorId))
-        }, t("Edit Details"))) : userType !== "CITIZEN" && !isEkyc && /*#__PURE__*/React__default.createElement("div", {
+        }, t("Edit Details"))) : userType !== "CITIZEN" && /*#__PURE__*/React__default.createElement("div", {
           onClick: () => history.push("/digit-ui/" + userType + "/vendor/registry/additionaldetails/modify-details?vendorId=" + (dsoId || vendorId)),
           className: "add-details-link hover-button"
         }, t("Add Additional Details")));