@mseva/digit-ui-module-core 1.0.66-dev.1.2 → 1.0.66-dev.1.3

package/dist/index.modern.js

@@ -11754,6 +11754,69 @@ const Header = () => {
   });
 };
 
+const OtpInput = ({
+  otp,
+  onOtpChange,
+  onVerifyOtp,
+  onResendOtp,
+  canSubmit,
+  isOtpValid
+}) => {
+  const {
+    t
+  } = useTranslation();
+  const [timeLeft, setTimeLeft] = useState(30);
+  useEffect(() => {
+    if (timeLeft === 0) return;
+    const timer = setInterval(() => {
+      setTimeLeft(prev => {
+        if (prev <= 1) {
+          clearInterval(timer);
+          return 0;
+        }
+        return prev - 1;
+      });
+    }, 1000);
+    return () => clearInterval(timer);
+  }, [timeLeft]);
+  const handleResendOtp = () => {
+    onResendOtp && onResendOtp();
+    setTimeLeft(30);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "input-wrapper"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      paddingLeft: "20px"
+    },
+    className: "label"
+  }, t("CS_LOGIN_OTP")), /*#__PURE__*/React.createElement(FormStep, {
+    onSelect: onVerifyOtp,
+    config: {
+      texts: {
+        submitBarLabel: t("CS_COMMON_SUBMIT")
+      }
+    },
+    t: t,
+    isDisabled: !((otp === null || otp === void 0 ? void 0 : otp.length) === 6 && canSubmit),
+    cardStyle: {
+      backgroundColor: "transparent",
+      boxShadow: "none",
+      WebkitBoxShadow: "none",
+      padding: "20px"
+    }
+  }, /*#__PURE__*/React.createElement(OTPInput, {
+    length: 6,
+    onChange: onOtpChange,
+    value: otp
+  }), timeLeft > 0 ? /*#__PURE__*/React.createElement("div", {
+    className: "resendIn"
+  }, t("CS_RESEND_ANOTHER_OTP"), " ", /*#__PURE__*/React.createElement("span", null, timeLeft), " ", t("CS_RESEND_SECONDS")) : /*#__PURE__*/React.createElement("div", {
+    className: "card-text-button resend",
+    onClick: handleResendOtp
+  }, t("CS_RESEND_OTP")), !isOtpValid && /*#__PURE__*/React.createElement(CardLabelError$1, null, t("CS_INVALID_OTP"))));
+};
+
 const setEmployeeDetail = (userObject, token) => {
   var _JSON$parse;
   let locale = ((_JSON$parse = JSON.parse(sessionStorage.getItem("Digit.locale"))) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.value) || "en_IN";
@@ -11784,9 +11847,13 @@ const Login = ({
   const [showToast, setShowToast] = useState(null);
   const [disable, setDisable] = useState(false);
   const [isForgotPasswordView, setIsForgotPasswordView] = useState(false);
+  const [showOTP, setShowOTP] = useState(false);
+  const [otp, setOtp] = useState("");
+  const [isOtpValid, setIsOtpValid] = useState(true);
+  const [canSubmit, setCanSubmit] = useState(true);
   const history = useHistory();
   useEffect(() => {
-    var _user$info, _user$info$roles, _user$info2, _user$info2$roles, _window, _window$location, _window$location$href, _user$info3, _user$info4, _user$info4$roles, _user$info5, _user$info5$roles, _user$info6, _user$info7, _user$info7$roles, _user$info8, _user$info8$roles;
+    var _user$info, _user$info$roles, _user$info2, _user$info2$roles, _window, _window$location, _window$location$href;
     if (!user) {
       return;
     }
@@ -11800,20 +11867,12 @@ const Login = ({
       var _window2, _window2$location, _window2$location$hre, _window2$location$hre2;
       redirectPath = decodeURIComponent((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$location = _window2.location) === null || _window2$location === void 0 ? void 0 : (_window2$location$hre = _window2$location.href) === null || _window2$location$hre === void 0 ? void 0 : (_window2$location$hre2 = _window2$location$hre.split("from=")) === null || _window2$location$hre2 === void 0 ? void 0 : _window2$location$hre2[1]) || "/digit-ui/employee";
     }
-    if (user !== null && user !== void 0 && (_user$info3 = user.info) !== null && _user$info3 !== void 0 && _user$info3.roles && (user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : (_user$info4$roles = _user$info4.roles) === null || _user$info4$roles === void 0 ? void 0 : _user$info4$roles.length) > 0 && user !== null && user !== void 0 && (_user$info5 = user.info) !== null && _user$info5 !== void 0 && (_user$info5$roles = _user$info5.roles) !== null && _user$info5$roles !== void 0 && _user$info5$roles.every(e => e.code === "NATADMIN")) {
-      redirectPath = "/digit-ui/employee/dss/landing/NURT_DASHBOARD";
-    }
-    if (user !== null && user !== void 0 && (_user$info6 = user.info) !== null && _user$info6 !== void 0 && _user$info6.roles && (user === null || user === void 0 ? void 0 : (_user$info7 = user.info) === null || _user$info7 === void 0 ? void 0 : (_user$info7$roles = _user$info7.roles) === null || _user$info7$roles === void 0 ? void 0 : _user$info7$roles.length) > 0 && user !== null && user !== void 0 && (_user$info8 = user.info) !== null && _user$info8 !== void 0 && (_user$info8$roles = _user$info8.roles) !== null && _user$info8$roles !== void 0 && _user$info8$roles.every(e => e.code === "STADMIN")) {
-      redirectPath = "/digit-ui/employee/dss/landing/home";
-    }
-    history.replace(redirectPath);
   }, [user]);
   const onLogin = async data => {
     if (!data.city) {
       alert("Please Select City!");
       return;
     }
-    setDisable(true);
     const requestData = {
       ...data,
       userType: "EMPLOYEE"
@@ -11825,6 +11884,16 @@ const Login = ({
         UserRequest: info,
         ...tokens
       } = await Digit.UserService.authenticate(requestData);
+      const _data = {
+        mobileNumber: info === null || info === void 0 ? void 0 : info.mobileNumber,
+        tenantId: info === null || info === void 0 ? void 0 : info.tenantId,
+        userType: "EMPLOYEE",
+        type: "login"
+      };
+      setShowOTP(true);
+      sendOtp({
+        otp: _data
+      });
       Digit.SessionStorage.set("Employee.tenantId", info === null || info === void 0 ? void 0 : info.tenantId);
       setUser({
         info,
@@ -11832,10 +11901,10 @@ const Login = ({
       });
     } catch (err) {
       var _err$response, _err$response$data;
+      setDisable(false);
       setShowToast((err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.error_description) || "Invalid login credentials!");
       setTimeout(closeToast, 5000);
     }
-    setDisable(false);
   };
   const closeToast = () => {
     setShowToast(null);
@@ -11886,6 +11955,65 @@ const Login = ({
     script.async = true;
     document.body.appendChild(script);
   }, []);
+  const resendOtp = async () => {
+    var _user$info3, _user$info4;
+    const data = {
+      mobileNumber: user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber,
+      tenantId: user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : _user$info4.tenantId,
+      userType: "employee",
+      type: "login"
+    };
+    const [res, err] = await sendOtp({
+      otp: data
+    });
+  };
+  async function onVerifyOtp() {
+    try {
+      var _user$info5, _user$info6;
+      setIsOtpValid(true);
+      setCanSubmit(false);
+      const requestData = {
+        username: user === null || user === void 0 ? void 0 : (_user$info5 = user.info) === null || _user$info5 === void 0 ? void 0 : _user$info5.userName,
+        password: otp,
+        tenantId: user === null || user === void 0 ? void 0 : (_user$info6 = user.info) === null || _user$info6 === void 0 ? void 0 : _user$info6.tenantId,
+        userType: "EMPLOYEE"
+      };
+      const {
+        ResponseInfo,
+        UserRequest: info,
+        ...tokens
+      } = await Digit.UserService.authenticate(requestData);
+      setUser({
+        info,
+        ...tokens
+      });
+      history.push("/digit-ui/employee");
+    } catch (e) {
+      setCanSubmit(true);
+      setIsOtpValid(false);
+    }
+  }
+  const sendOtp = async data => {
+    try {
+      var _user$info7;
+      const res = await Digit.UserService.sendOtp(data, user === null || user === void 0 ? void 0 : (_user$info7 = user.info) === null || _user$info7 === void 0 ? void 0 : _user$info7.tenantId);
+      setDisable(true);
+      return [res, null];
+    } catch (err) {
+      return [null, err];
+    }
+  };
+  const prevRef = React.useRef({});
+  const onFormValueChange = (setValue, data) => {
+    var _prev$city, _data$city;
+    const prev = prevRef.current;
+    const isChanged = (prev === null || prev === void 0 ? void 0 : (_prev$city = prev.city) === null || _prev$city === void 0 ? void 0 : _prev$city.code) !== (data === null || data === void 0 ? void 0 : (_data$city = data.city) === null || _data$city === void 0 ? void 0 : _data$city.code) || (prev === null || prev === void 0 ? void 0 : prev.username) !== (data === null || data === void 0 ? void 0 : data.username) || (prev === null || prev === void 0 ? void 0 : prev.password) !== (data === null || data === void 0 ? void 0 : data.password);
+    if (isChanged) {
+      setDisable(false);
+      setShowOTP(false);
+    }
+    prevRef.current = data;
+  };
   return isLoading || isStoreLoading ? /*#__PURE__*/React.createElement(Loader, null) :
   /*#__PURE__*/
   React.createElement(Background, null, /*#__PURE__*/React.createElement("div", {
@@ -11910,9 +12038,9 @@ const Login = ({
     onClick: onBackToLogin,
     className: "employee-back-button",
     type: "button"
-  }, "\u2190 Back to Login"), !isForgotPasswordView ? /*#__PURE__*/React.createElement(FormComposer, {
+  }, "\u2190 Back to Login"), !isForgotPasswordView ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormComposer, {
     onSubmit: onLogin,
-    isDisabled: isDisabled || disable,
+    isDisabled: disable,
     noBoxShadow: true,
     inline: true,
     submitInForm: true,
@@ -11921,6 +12049,7 @@ const Login = ({
     secondaryActionLabel: propsConfig.texts.secondaryButtonLabel,
     onSecondayActionClick: onForgotPassword,
     heading: propsConfig.texts.header,
+    onFormValueChange: onFormValueChange,
     description: "Enter your details to access your account",
     headingStyle: {
       textAlign: "left",
@@ -11936,7 +12065,14 @@ const Login = ({
       borderRadius: "8px",
       padding: "12px"
     }
-  }) : /*#__PURE__*/React.createElement("div", {
+  }), showOTP && /*#__PURE__*/React.createElement(OtpInput, {
+    otp: otp,
+    onOtpChange: setOtp,
+    onVerifyOtp: onVerifyOtp,
+    onResendOtp: resendOtp,
+    canSubmit: canSubmit,
+    isOtpValid: isOtpValid
+  })) : /*#__PURE__*/React.createElement("div", {
     className: "employee-forgot-password-content"
   }, /*#__PURE__*/React.createElement("h2", {
     style: {
@@ -14522,8 +14658,8 @@ const UserProfile = ({
   const {
     t
   } = useTranslation();
-  const location = useLocation();
   const url = window.location.href;
+  const location = useLocation();
   const stateId = Digit.ULBService.getStateId();
   const tenant = Digit.ULBService.getCurrentTenantId();
   const userInfo = ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info) || {};
@@ -14559,7 +14695,6 @@ const UserProfile = ({
   const [selectedCorrespondentDistrict, setSelectedCorrespondentDistrict] = useState();
   const [pinCodeCorrespondent, setPinCodeCorrespondent] = useState();
   const isUserArchitect = window.location.href.includes("citizen") && (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$roles = userInfo.roles) === null || _userInfo$roles === void 0 ? void 0 : _userInfo$roles.some(role => role.code.includes("BPA_ARCHITECT")));
-  console.log("location", location);
   const getUserInfo = async () => {
     const uuid = userInfo === null || userInfo === void 0 ? void 0 : userInfo.uuid;
     if (uuid) {
@@ -14572,9 +14707,6 @@ const UserProfile = ({
       setLoading(false);
     }
   };
-  useEffect(() => {
-    console.log("userDetails", userDetails);
-  }, [userDetails]);
   React.useEffect(() => {
     window.addEventListener("resize", () => setWindowWidth(window.innerWidth));
     return () => {
@@ -14654,7 +14786,7 @@ const UserProfile = ({
     setSelectedCorrespondentDistrict(userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceDistrict);
     setCorrespondenceAddress(userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceAddress);
     setSelectedCorrespondentState(userDetails === null || userDetails === void 0 ? void 0 : userDetails.correspondenceState);
-    setSelectedState(userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentState);
+    setSelectedState((userDetails === null || userDetails === void 0 ? void 0 : userDetails.permanentState) || "Punjab");
     if (userDetails !== null && userDetails !== void 0 && userDetails.isAddressSame) {
       setIsAddressSame(userDetails === null || userDetails === void 0 ? void 0 : userDetails.isAddressSame);
     }
@@ -15077,20 +15209,12 @@ const UserProfile = ({
     }
   };
   if (loading) return /*#__PURE__*/React.createElement(Loader, null);
+  console.log("stateOptions", stateOptions);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-profile"
   }, /*#__PURE__*/React.createElement("section", {
     className: `user-profile-section-wrapper ${userType === "employee" ? "employee" : ""}`
-  }, userType === "citizen" ? /*#__PURE__*/React.createElement("h6", {
-    onClick: () => history.push("/digit-ui/citizen"),
-    style: {
-      marginTop: "60px",
-      paddingLeft: "13px",
-      fontSize: "16px",
-      fontWeight: "bolder",
-      cursor: "pointer"
-    }
-  }, "Home") : /*#__PURE__*/React.createElement(BreadCrumb, {
+  }, userType === "citizen" ? /*#__PURE__*/React.createElement(BackButton, null) : /*#__PURE__*/React.createElement(BreadCrumb, {
     crumbs: [{
       path: "/digit-ui/employee",
       content: t("ES_COMMON_HOME"),
@@ -15166,7 +15290,7 @@ const UserProfile = ({
     className: "user-profile-field-wrapper"
   }, /*#__PURE__*/React.createElement(CardLabel$1, {
     className: "user-profile-label"
-  }, `${t("CORE_COMMON_PROFILE_EMAIL")}`), /*#__PURE__*/React.createElement(TextInput$1, {
+  }, `${t("CORE_COMMON_PROFILE_EMAIL")}`, "*"), /*#__PURE__*/React.createElement(TextInput$1, {
     t: t,
     type: "email",
     isMandatory: false,
@@ -15222,7 +15346,7 @@ const UserProfile = ({
     option: (stateOptions === null || stateOptions === void 0 ? void 0 : stateOptions.sort((a, b) => a.state_name.localeCompare(b.state_name))) || [],
     selected: selectedState,
     select: SelectState,
-    disable: editScreen
+    disable: true
   })), /*#__PURE__*/React.createElement("div", {
     className: "user-profile-field-wrapper"
   }, /*#__PURE__*/React.createElement(CardLabel$1, {
@@ -16824,7 +16948,7 @@ const MobileInput = ({
   }))));
 };
 
-const OtpInput = ({
+const OtpInput$1 = ({
   otp,
   onOtpChange,
   onVerifyOtp,
@@ -17069,6 +17193,15 @@ const NewLogin = ({
       selectedCity: selectedCity
     });
   };
+  useEffect(() => {
+    var _window2;
+    localStorage.clear();
+    if ((_window2 = window) !== null && _window2 !== void 0 && _window2.caches) {
+      caches.keys().then(names => {
+        names.forEach(name => caches.delete(name));
+      });
+    }
+  }, []);
   return (
     /*#__PURE__*/
     React.createElement("div", {
@@ -17157,7 +17290,7 @@ const NewLogin = ({
       onSendOtp: onSendOtp,
       canSubmit: canSubmit && (lastSubmittedMobile ? mobileNumber !== lastSubmittedMobile : true),
       step: step
-    }), step === "OTP" && /*#__PURE__*/React.createElement(OtpInput, {
+    }), step === "OTP" && /*#__PURE__*/React.createElement(OtpInput$1, {
       otp: otp,
       onOtpChange: setOtp,
       onVerifyOtp: onVerifyOtp,
@@ -17582,14 +17715,14 @@ const NewRegistration = ({
     id: "name",
     selected: getGender,
     select: setGender,
-    placeholder: t("COMMON_TABLE_SEARCH")
+    placeholder: t("CORE_COMMON_GENDER")
   })), step === "FORM" && /*#__PURE__*/React.createElement(RegistrationForm, {
     onRegisterSubmit: onRegisterSubmit,
     onAgeError: onAgeError,
     selectedLanguage: selectedLanguage,
     selectedCity: selectedCity,
     mobileNumber: (_location$state4 = location.state) === null || _location$state4 === void 0 ? void 0 : _location$state4.mobileNumber
-  }), step === "OTP" && /*#__PURE__*/React.createElement(OtpInput, {
+  }), step === "OTP" && /*#__PURE__*/React.createElement(OtpInput$1, {
     otp: otp,
     onOtpChange: setOtp,
     onVerifyOtp: onVerifyOtp,