@djb25/digit-ui-module-vendor 1.0.24 → 1.0.26

package/dist/index.modern.js

@@ -454,16 +454,19 @@ const VENDORCard = () => {
   const {
     t
   } = useTranslation();
+  const history = useHistory();
   const [total, setTotal] = useState("-");
-  if (!Digit.Utils.vendorAccess()) {
+  const isCitizen = window.location.pathname.toLowerCase().includes("citizen");
+  const hasAccess = Digit.Utils.vendorAccess() || Digit.UserService.hasAccess(["WT_VENDOR", "MT_VENDOR"]);
+  if (!hasAccess) {
     return null;
   }
   const links = [{
     label: t("VENDOR_NEW_REGISTERATION"),
-    link: `/digit-ui/employee/vendor/registry/new-vendor`
+    link: isCitizen ? `/digit-ui/citizen/vendor/registry/new-vendor` : `/digit-ui/employee/vendor/registry/new-vendor`
   }, {
     label: t("SEARCH_VENDOR"),
-    link: `/digit-ui/employee/vendor/search-vendor`
+    link: isCitizen ? `/digit-ui/citizen/vendor/search-vendor` : `/digit-ui/employee/vendor/search-vendor`
   }];
   const VENDORRole = Digit.UserService.hasAccess(["WT_VENDOR"]);
   const propsForModuleCard = {
@@ -472,10 +475,18 @@ const VENDORCard = () => {
     kpis: [{
       count: total === null || total === void 0 ? void 0 : total.totalCount,
       label: t("Inbox"),
-      link: `/digit-ui/employee/asset/assetservice/inbox`
+      link: isCitizen ? `/digit-ui/citizen/vendor/search-vendor` : `/digit-ui/employee/vendor/search-vendor`
     }],
-    links: links.filter(link => !(link !== null && link !== void 0 && link.role) || VENDORRole)
+    links: links.filter(link => !(link !== null && link !== void 0 && link.role) || VENDORRole),
+    ...(isCitizen ? {
+      onDetailsClick: () => history.push("/digit-ui/citizen/vendor/search-vendor")
+    } : {})
   };
+  if (isCitizen) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "wt-citizen-card-premium"
+    }, /*#__PURE__*/React.createElement(EmployeeModuleCard, propsForModuleCard));
+  }
   return /*#__PURE__*/React.createElement(EmployeeModuleCard, propsForModuleCard);
 };
 
@@ -8080,7 +8091,8 @@ const SearchApplication = ({
           validate: searchValidation
         }), {
           watch: watch,
-          shouldUpdate: true
+          shouldUpdate: true,
+          placeholder: input.label
         }));
     }
   };
@@ -8819,7 +8831,9 @@ const VendorInbox = props => {
               option: vendors,
               select: value => onVehicleVendorSelect(row, value),
               style: {
-                textAlign: "left"
+                textAlign: "left",
+                width: "100%",
+                minWidth: "250px"
               },
               optionKey: "name",
               t: t
@@ -9434,7 +9448,7 @@ const SearchVendor = () => {
   const searchFields = tab === "VEHICLE" ? [{
     label: t("ES_VEHICLE_SEARCH_VEHICLE_NUMBER"),
     name: "registrationNumber",
-    pattern: `[A-Z]{2}\\s{1}[0-9]{2}\\s{0,1}[A-Z]{1,2}\\s{1}[0-9]{4}`,
+    pattern: "[A-Z]{2}[- ]?[0-9]{2}[- ]?[A-Z]{1,2}[- ]?[0-9]{4}",
     title: t("ES_FSM_VEHICLE_FORMAT_TIP")
   }] : tab === "DRIVER" ? [{
     label: t("ES_DRIVER_SEARCH_DRIVER_NAME"),
@@ -9596,9 +9610,17 @@ const DriverConfig = (t, disabled = false) => {
       type: "component",
       route: "select-service",
       hideInEmployee: false,
-      key: "additionalDetails",
+      key: "serviceType",
       component: "SelectServiceType",
       disable: disabled,
+      populators: {
+        name: "serviceType",
+        defaultValue: {
+          code: "WT",
+          name: "WT",
+          i18nKey: "WT"
+        }
+      },
       texts: {
         headerCaption: "",
         header: "CS_COMMON_CHOOSE_GENDER",
@@ -9715,6 +9737,11 @@ const AddDriver = ({
   const Config = DriverConfig(t);
   const [canSubmit, setSubmitValve] = useState(false);
   const defaultValues = {
+    serviceType: {
+      code: "WT",
+      name: "WT",
+      i18nKey: "WT"
+    },
     tripData: {
       noOfTrips: 1,
       amountPerTrip: null,
@@ -9742,18 +9769,20 @@ const AddDriver = ({
   const closeToast = () => {
     setShowToast(null);
   };
+  const isCitizen = Digit.UserService.getType() === "WT_VENDOR";
+  console.log(isCitizen, 'iscitizen');
   const onSubmit = data => {
-    var _data$selectGender, _data$additionalDetai;
+    var _data$selectGender, _data$serviceType;
     const name = data === null || data === void 0 ? void 0 : data.driverName;
     const license = data === null || data === void 0 ? void 0 : data.license;
     const gender = data === null || data === void 0 ? void 0 : (_data$selectGender = data.selectGender) === null || _data$selectGender === void 0 ? void 0 : _data$selectGender.code;
     const emailId = data === null || data === void 0 ? void 0 : data.emailId;
     const phone = data === null || data === void 0 ? void 0 : data.phone;
     const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime();
-    const additionalDetails = data === null || data === void 0 ? void 0 : (_data$additionalDetai = data.additionalDetails) === null || _data$additionalDetai === void 0 ? void 0 : _data$additionalDetai.code;
+    const additionalDetails = data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code;
     const formData = {
       driver: {
-        tenantId: tenantId,
+        tenantId: !isCitizen ? "dl.djb" : tenantId,
         name: name,
         licenseNumber: license,
         status: "ACTIVE",
@@ -10230,20 +10259,21 @@ const EditVendorDetails = props => {
         },
         className: "delete",
         fill: "#a82227"
-      })))), data === null || data === void 0 ? void 0 : (_data$values = data.values) === null || _data$values === void 0 ? void 0 : _data$values.map((value, index) => {
-        var _detail$values3;
-        return /*#__PURE__*/React.createElement(Row, {
-          key: t(String(value.title)),
-          label: t(String(value.title)),
-          text: value.value ? t(String(value.value)) : "N/A",
-          last: index === (detail === null || detail === void 0 ? void 0 : (_detail$values3 = detail.values) === null || _detail$values3 === void 0 ? void 0 : _detail$values3.length) - 1,
-          caption: value.caption,
-          className: "border-none",
-          textStyle: value.value === "ACTIVE" ? {
-            color: "green"
-          } : {}
-        });
-      }));
+      })))), /*#__PURE__*/React.createElement("div", {
+        className: "additional-grid",
+        style: {
+          padding: "8px 16px"
+        }
+      }, data === null || data === void 0 ? void 0 : (_data$values = data.values) === null || _data$values === void 0 ? void 0 : _data$values.map((value, index) => /*#__PURE__*/React.createElement(React.Fragment, {
+        key: index
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "additional-label"
+      }, t(String(value.title))), /*#__PURE__*/React.createElement("div", {
+        className: "additional-value",
+        style: value.value === "ACTIVE" ? {
+          color: "green"
+        } : {}
+      }, value.value ? t(String(value.value)) : "N/A")))));
     }), detail.type && /*#__PURE__*/React.createElement("div", {
       className: "add-details-link hover-button",
       onClick: () => onActionSelect(detail.type === "ES_FSM_REGISTRY_DETAILS_TYPE_DRIVER" ? "ADD_DRIVER" : "ADD_VEHICLE")
@@ -10566,9 +10596,10 @@ const AddVehicle = ({
     const gender = data === null || data === void 0 ? void 0 : (_data$selectGender = data.selectGender) === null || _data$selectGender === void 0 ? void 0 : _data$selectGender.code;
     const emailId = data === null || data === void 0 ? void 0 : data.emailId;
     const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime();
+    const isCitizen = Digit.UserService.getType() === "WT_VENDOR";
     const formData = {
       vehicle: {
-        tenantId: tenantId,
+        tenantId: !isCitizen ? "dl.djb" : tenantId,
         registrationNumber: registrationNumber,
         model: vehicleModal,
         type: vehicleType,
@@ -11447,14 +11478,21 @@ const DriverDetails = props => {
         marginBottom: "16px",
         marginTop: "32px"
       }
-    }, 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;
+    }, t(detail.title)), /*#__PURE__*/React.createElement(Card, {
+      className: "card-with-background",
+      style: {
+        margin: "10px 16px",
+        padding: "20px"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "additional-grid"
+    }, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
       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",
+        className: "additional-label"
+      }, t(value.title)), /*#__PURE__*/React.createElement("div", {
+        className: "additional-value",
         style: {
           color: "#a82227",
           display: "flex",
@@ -11462,40 +11500,37 @@ const DriverDetails = props => {
           alignItems: "center"
         }
       }, t(value.value) || "N/A", value.value === "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("span", {
-        className: "add-details-link hover-button hover-button-round",
-        onClick: () => onActionSelect("ADD_VENDOR")
+        className: "add-details-link hover-button",
+        onClick: () => onActionSelect("ADD_VENDOR"),
+        style: {
+          cursor: "pointer"
+        }
       }, /*#__PURE__*/React.createElement(AddIcon, {
         className: "",
-        fill: "#a82227",
-        styles: {
-          cursor: "pointer",
-          height: "24px"
-        }
+        fill: "#a82227"
       })), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
-        className: "add-details-link hover-button hover-button-round",
-        onClick: () => onActionSelect("EDIT_VENDOR")
-      }, /*#__PURE__*/React.createElement(EditIcon, {
+        className: "add-details-link hover-button",
+        onClick: () => onActionSelect("EDIT_VENDOR"),
         style: {
           cursor: "pointer"
         }
-      })), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
-        className: "add-details-link hover-button hover-button-round",
-        onClick: () => onActionSelect("DELETE_VENDOR")
-      }, /*#__PURE__*/React.createElement(DeleteIcon, {
-        className: "delete",
-        fill: "#a82227",
+      }, /*#__PURE__*/React.createElement(EditIcon, null)), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
+        className: "add-details-link hover-button",
+        onClick: () => onActionSelect("DELETE_VENDOR"),
         style: {
           cursor: "pointer"
         }
-      }))))) : /*#__PURE__*/React.createElement(Row, {
-        key: t(value.title),
-        label: t(value.title),
-        text: t(value.value) || "N/A",
-        last: index === (detail === null || detail === void 0 ? void 0 : (_detail$values3 = detail.values) === null || _detail$values3 === void 0 ? void 0 : _detail$values3.length) - 1,
-        caption: value.caption,
-        className: "border-none"
-      });
-    })));
+      }, /*#__PURE__*/React.createElement(DeleteIcon, {
+        className: "delete",
+        fill: "#a82227"
+      })))) : /*#__PURE__*/React.createElement(React.Fragment, {
+        key: index
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "additional-label"
+      }, t(value.title)), /*#__PURE__*/React.createElement("div", {
+        className: "additional-value"
+      }, t(value.value) || "N/A"));
+    }))));
   }))), showModal && /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement(Heading$1, {
       label: t(modalHeading())
@@ -11859,14 +11894,21 @@ const VehicleDetails = props => {
         marginBottom: "16px",
         marginTop: "32px"
       }
-    }, 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;
+    }, t(detail.title)), /*#__PURE__*/React.createElement(Card, {
+      className: "card-with-background",
+      style: {
+        margin: "10px 16px",
+        padding: "20px"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "additional-grid"
+    }, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
       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 add-details-link hover-button",
+        className: "additional-label"
+      }, t(value.title)), /*#__PURE__*/React.createElement("div", {
+        className: "additional-value",
         style: {
           color: "#a82227",
           display: "flex",
@@ -11879,32 +11921,38 @@ const VehicleDetails = props => {
           color: "#a82227",
           display: "flex",
           alignItems: "center",
-          gap: "8px"
+          gap: "8px",
+          cursor: "pointer"
         }
       }, /*#__PURE__*/React.createElement(AddIcon, {
         className: "",
         fill: "#a82227"
       }), " ", t(value.value) || "N/A"), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
         className: "add-details-link hover-button",
-        onClick: () => onActionSelect("EDIT_VENDOR")
+        onClick: () => onActionSelect("EDIT_VENDOR"),
+        style: {
+          cursor: "pointer"
+        }
       }, /*#__PURE__*/React.createElement(EditIcon, null)), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
         className: "add-details-link hover-button",
-        onClick: () => onActionSelect("DELETE_VENDOR")
+        onClick: () => onActionSelect("DELETE_VENDOR"),
+        style: {
+          cursor: "pointer"
+        }
       }, /*#__PURE__*/React.createElement(DeleteIcon, {
         className: "delete",
         fill: "#a82227"
-      }))))) : /*#__PURE__*/React.createElement(Row, {
-        key: t(value.title),
-        label: t(value.title),
-        text: t(value.value) || "N/A",
-        last: index === (detail === null || detail === void 0 ? void 0 : (_detail$values3 = detail.values) === null || _detail$values3 === void 0 ? void 0 : _detail$values3.length) - 1,
-        caption: value.caption,
-        className: "border-none",
-        textStyle: value.value === "ACTIVE" ? {
+      })))) : /*#__PURE__*/React.createElement(React.Fragment, {
+        key: index
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "additional-label"
+      }, t(value.title)), /*#__PURE__*/React.createElement("div", {
+        className: "additional-value",
+        style: value.value === "ACTIVE" ? {
           color: "green"
         } : {}
-      });
-    })));
+      }, t(value.value) || "N/A"));
+    }))));
   })), showModal && /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement(Heading$2, {
       label: t(modalHeading())