acsi-core 0.1.68 → 0.1.71

package/dist/components/CoreSearch/index.d.ts

@@ -5,7 +5,6 @@ interface IProps {
     onChange: (name: string, value: string) => void;
     width?: number;
     onPressEnter?: (value: string) => void;
-    placeholder?: string;
 }
 declare const CoreSearch: (props: IProps) => React.JSX.Element;
 export default CoreSearch;

package/dist/components/CoreTooltip/index.d.ts

@@ -1,6 +1,6 @@
 import React, { ReactNode } from "react";
 interface IProps {
-    id: string;
+    id?: string;
     content: string | ReactNode;
     children: ReactNode;
     placement?: "left" | "top" | "bottom" | "right";
@@ -8,5 +8,5 @@ interface IProps {
     timeDelay?: number;
     innerClassName?: string;
 }
-declare const CoreTooltip: (props: IProps) => React.JSX.Element;
+declare const CoreTooltip: ({ id, content, children, placement, isDelay, timeDelay, innerClassName }: IProps) => React.JSX.Element;
 export default CoreTooltip;

package/dist/containers/Login/hooks/useLogin.d.ts

@@ -17,6 +17,7 @@ declare const useLogin: (onNavigate: any, trackEvent?: ((props: any) => void) |
     code: string;
     setCode: import("react").Dispatch<import("react").SetStateAction<string>>;
     isScreenCode: boolean;
+    setIsScreenCode: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     formatTime: () => string;
     loginWithEmailCode: (role: string) => Promise<void>;
 };

package/dist/index.css

@@ -127,9 +127,6 @@
 ._2HB5r {
   padding-right: 30px !important; }
 
-._4ehXP {
-  width: 400px !important; }
-
 ._xvNBN {
   border-radius: 8px;
   font-size: 14px;

package/dist/index.js

@@ -93,7 +93,7 @@ var COLORS = {
 var ORGANIZATION_TENANT = "ORGANIZATION_TENANT";
 var ORGANIZATION_TEAM = "ORGANIZATION_TEAM";
 
-var styleGlobal = {"signup_wrap":"_1KLz9","box-signin":"_2Jo1o","signin_title":"_3egBO","signup_link":"_1DoIT","google_button":"_34hK_","box-field":"_2e9xO","box-input":"_3zXRp","box-text":"_8NJga","box-button-email":"_21FPk","box-signin-container":"_1QERu","box-signin-text":"_2-znH","box-signin-logo":"_1aB2m","box-right":"_3qndF","box-right-body":"_JzdCr","box-right-footer":"_19aCA","pr-30":"_2HB5r","width-400":"_4ehXP"};
+var styleGlobal = {"signup_wrap":"_1KLz9","box-signin":"_2Jo1o","signin_title":"_3egBO","signup_link":"_1DoIT","google_button":"_34hK_","box-field":"_2e9xO","box-input":"_3zXRp","box-text":"_8NJga","box-button-email":"_21FPk","box-signin-container":"_1QERu","box-signin-text":"_2-znH","box-signin-logo":"_1aB2m","box-right":"_3qndF","box-right-body":"_JzdCr","box-right-footer":"_19aCA","pr-30":"_2HB5r"};
 
 var api = axios.create({
   baseURL: BASE_URL,
@@ -823,9 +823,7 @@ var CoreSearch = function CoreSearch(props) {
     value = props.value,
     _onChange = props.onChange,
     width = props.width,
-    onPressEnter = props.onPressEnter,
-    _props$placeholder = props.placeholder,
-    placeholder = _props$placeholder === void 0 ? "Search..." : _props$placeholder;
+    onPressEnter = props.onPressEnter;
   var handleClear = function handleClear() {
     _onChange(name, "");
     onPressEnter && onPressEnter("");
@@ -844,7 +842,7 @@ var CoreSearch = function CoreSearch(props) {
     onChange: function onChange(e) {
       return _onChange(name, e.target.value);
     },
-    placeholder: placeholder,
+    placeholder: "Search...",
     onKeyDown: function onKeyDown(e) {
       if (e.key === "Enter") {
         onPressEnter && onPressEnter(value);
@@ -1136,15 +1134,18 @@ var CoreTitleInput = function CoreTitleInput(props) {
 
 var styles$d = {"core-tooltip":"_1Bmhs"};
 
-var CoreTooltip = function CoreTooltip(props) {
-  var id = props.id,
-    content = props.content,
-    children = props.children,
-    placement = props.placement,
-    isDelay = props.isDelay,
-    _props$timeDelay = props.timeDelay,
-    timeDelay = _props$timeDelay === void 0 ? 1500 : _props$timeDelay,
-    innerClassName = props.innerClassName;
+var CoreTooltip = function CoreTooltip(_ref) {
+  var id = _ref.id,
+    content = _ref.content,
+    children = _ref.children,
+    _ref$placement = _ref.placement,
+    placement = _ref$placement === void 0 ? "top" : _ref$placement,
+    _ref$isDelay = _ref.isDelay,
+    isDelay = _ref$isDelay === void 0 ? false : _ref$isDelay,
+    _ref$timeDelay = _ref.timeDelay,
+    timeDelay = _ref$timeDelay === void 0 ? 1500 : _ref$timeDelay,
+    innerClassName = _ref.innerClassName;
+  var generatedId = React.useRef(id || "tt-" + Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 5));
   var timeoutRef = React.useRef(null);
   var _useState = React.useState(false),
     isOpenTooltip = _useState[0],
@@ -1166,14 +1167,14 @@ var CoreTooltip = function CoreTooltip(props) {
     setIsOpenTooltip(false);
   };
   return React__default.createElement("div", {
-    id: id,
+    id: generatedId.current,
     className: styles$d["core-tooltip"],
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave
   }, React__default.createElement("div", {
     className: styles$d["icon"]
-  }, children), content && React__default.createElement(reactstrap.Tooltip, {
-    target: id,
+  }, children), content && typeof window !== "undefined" && React__default.createElement(reactstrap.Tooltip, {
+    target: generatedId.current,
     isOpen: isOpenTooltip,
     placement: placement,
     innerClassName: innerClassName
@@ -1189,22 +1190,21 @@ var BlockLogin = function BlockLogin(_ref) {
     loginWithEmail = _ref.loginWithEmail,
     code = _ref.code,
     setCode = _ref.setCode,
+    isScreenCode = _ref.isScreenCode,
+    setIsScreenCode = _ref.setIsScreenCode,
     formatTime = _ref.formatTime,
     loginWithEmailCode = _ref.loginWithEmailCode,
     trackEvent = _ref.trackEvent;
   var dispatch = reactRedux.useDispatch();
-  var _useState = React.useState(false),
-    isOTPModalOpen = _useState[0],
-    setIsOTPModalOpen = _useState[1];
-  var _useState2 = React.useState(""),
-    otpCode = _useState2[0],
-    setOtpCode = _useState2[1];
-  var _useState3 = React.useState(0),
-    resendCooldown = _useState3[0],
-    setResendCooldown = _useState3[1];
-  var _useState4 = React.useState(null),
-    resendTimer = _useState4[0],
-    setResendTimer = _useState4[1];
+  var _useState = React.useState(""),
+    otpCode = _useState[0],
+    setOtpCode = _useState[1];
+  var _useState2 = React.useState(0),
+    resendCooldown = _useState2[0],
+    setResendCooldown = _useState2[1];
+  var _useState3 = React.useState(null),
+    resendTimer = _useState3[0],
+    setResendTimer = _useState3[1];
   var googleLogin = google.useGoogleLogin({
     onSuccess: function (tokenResponse) {
       try {
@@ -1301,7 +1301,6 @@ var BlockLogin = function BlockLogin(_ref) {
       return;
     }
     loginWithEmail(role);
-    setIsOTPModalOpen(true);
   };
   var startResendCooldown = function startResendCooldown() {
     setResendCooldown(300);
@@ -1508,41 +1507,28 @@ var BlockLogin = function BlockLogin(_ref) {
     },
     alt: "",
     src: "/images/icons/Vector 22.png"
-  })))))))), React__default.createElement(CoreModal, {
-    open: isOTPModalOpen,
-    onClose: function onClose() {
-      setIsOTPModalOpen(false);
+  })))))))), React__default.createElement(reactstrap.Modal, {
+    isOpen: isScreenCode,
+    toggle: function toggle() {
+      setIsScreenCode(false);
       setResendCooldown(0);
       if (resendTimer) {
         clearInterval(resendTimer);
       }
     },
-    title: "Enter OTP Code",
-    footer: React__default.createElement(React__default.Fragment, null, React__default.createElement(CoreButton, {
-      onClick: function onClick() {
-        setIsOTPModalOpen(false);
-        setResendCooldown(0);
-        if (resendTimer) {
-          clearInterval(resendTimer);
-        }
-      },
-      type: "text"
-    }, "Cancel"), React__default.createElement(CoreButton, {
-      type: "primary",
-      htmlType: "submit",
-      onClick: function onClick() {
-        if (!otpCode.trim()) {
-          alert("Please enter the OTP code");
-          return;
-        }
-        loginWithEmailCode(role);
-        setIsOTPModalOpen(false);
-        setResendCooldown(0);
-        if (resendTimer) {
-          clearInterval(resendTimer);
-        }
+    centered: true
+  }, React__default.createElement(reactstrap.ModalHeader, {
+    toggle: function toggle() {
+      setIsScreenCode(false);
+      setResendCooldown(0);
+      if (resendTimer) {
+        clearInterval(resendTimer);
       }
-    }, "Login"))
+    }
+  }, "Enter OTP Code"), React__default.createElement(reactstrap.ModalBody, {
+    style: {
+      padding: "24px"
+    }
   }, React__default.createElement("div", {
     className: "mx-auto",
     style: {
@@ -1556,11 +1542,16 @@ var BlockLogin = function BlockLogin(_ref) {
   }, React__default.createElement(CoreInput, {
     name: "otpCode",
     value: code,
-    onChange: function onChange(event) {
-      setCode(event.target.value);
-      setOtpCode(event.target.value);
+    onChange: function onChange(_, value) {
+      setCode(value);
+      setOtpCode(value);
     },
-    placeholder: "Code OTP"
+    placeholder: "Code OTP",
+    onKeyDown: function onKeyDown(event) {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+      }
+    }
   }), React__default.createElement("p", {
     className: "mt-1 text-muted"
   }, "Your code will expire: ", React__default.createElement("span", {
@@ -1575,7 +1566,40 @@ var BlockLogin = function BlockLogin(_ref) {
       cursor: "pointer"
     },
     onClick: handleResend
-  }, "Click here to resend"), " ", "or check your spam inbox."))));
+  }, "Click here to resend"), " ", "or check your spam inbox."))), React__default.createElement(reactstrap.ModalFooter, null, React__default.createElement(CoreButton, {
+    onClick: function onClick() {
+      setIsScreenCode(false);
+      setResendCooldown(0);
+      if (resendTimer) {
+        clearInterval(resendTimer);
+      }
+    },
+    type: "text"
+  }, "Cancel"), React__default.createElement(CoreButton, {
+    type: "primary",
+    htmlType: "button",
+    onClick: function (event) {
+      try {
+        event.preventDefault();
+        event.stopPropagation();
+        if (!otpCode.trim()) {
+          alert("Please enter the OTP code");
+          return Promise.resolve();
+        }
+        return Promise.resolve(loginWithEmailCode(role)).then(function (success) {
+          if (success) {
+            setIsScreenCode(false);
+            setResendCooldown(0);
+            if (resendTimer) {
+              clearInterval(resendTimer);
+            }
+          }
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, "Login"))));
 };
 
 // A type of promise-like that resolves synchronously and supports only one observer
@@ -1641,28 +1665,13 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
         return Promise.resolve(apiSendEmailCode(body)).then(function (res) {
           var data = res.data;
           if (data.status == 1) {
-            if (data.data.token != null) {
-              var tokenJWT = data.data.token;
-              localStorage.setItem(ACCESS_TOKEN, tokenJWT);
-              trackEvent === null || trackEvent === void 0 ? void 0 : trackEvent({
-                eventName: exports.AmplitudeEvent.LOGIN,
-                eventProperties: {
-                  email: email,
-                  login_method: 'email',
-                  timestamp: new Date().toISOString()
-                }
-              });
-              onNavigate("/dashboard");
-            } else {
-              setIsScreenCode(true);
-            }
+            setIsScreenCode(true);
           } else {
             dispatch(setLoading(false));
             alert("Please contact admin.");
           }
         });
       }, function (e) {
-        reactToastify.toast.error("An error occurred while sending the code. Please try again later.");
         console.log(e);
       });
       return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
@@ -1697,12 +1706,11 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
             });
             onNavigate("/dashboard");
           } else {
-            dispatch(setLoading(false));
-            alert("The code is not correct. Please check again.");
+            reactToastify.toast.error("The code is not correct. Please check again.");
           }
         });
-      }, function (e) {
-        console.log(e);
+      }, function () {
+        reactToastify.toast.error("An error occurred while verifying the code. Please try again.");
       });
       return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
     } catch (e) {
@@ -1743,6 +1751,7 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
     code: code,
     setCode: setCode,
     isScreenCode: isScreenCode,
+    setIsScreenCode: setIsScreenCode,
     formatTime: formatTime,
     loginWithEmailCode: loginWithEmailCode
   };
@@ -1761,6 +1770,7 @@ var Login = function Login(props) {
     code = _useLogin.code,
     setCode = _useLogin.setCode,
     isScreenCode = _useLogin.isScreenCode,
+    setIsScreenCode = _useLogin.setIsScreenCode,
     formatTime = _useLogin.formatTime,
     loginWithEmailCode = _useLogin.loginWithEmailCode;
   return React__default.createElement("div", {
@@ -1775,6 +1785,7 @@ var Login = function Login(props) {
     setCode: setCode,
     formatTime: formatTime,
     isScreenCode: isScreenCode,
+    setIsScreenCode: setIsScreenCode,
     onNavigate: onNavigate,
     loginWithEmailCode: loginWithEmailCode,
     role: role,