ywana-core8 0.1.13 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "ywana-core8",
   "homepage": "https://ywana.github.io/workspace",
   "author": "Ernesto Roldan Garcia",

package/src/widgets/login/ResetPasswordBox.css

@@ -9,10 +9,8 @@
 .reset-password-box>header {
     grid-area: header;
     display: flex;
-    flex: 1;
     flex-direction: column;
     justify-content: space-around;
-    align-items: center;
 }
 
 .reset-password-box>main {

package/src/widgets/login/ResetPasswordBox.js

@@ -6,7 +6,7 @@ import './ResetPasswordBox.css'
 /**
  * Reset Password
  */
-export const ResetPasswordBox = ({ logo, title, userRequired = true, lang = "EN", children, onOK, onClose }) => {
+export const ResetPasswordBox = ({ logo, title, userRequired = true, oldPwdRequired = false, lang = "EN", children, onOK, onClose }) => {
 
     const [form, setForm] = useState({})
     const [isValid, setIsValid] = useState(false)
@@ -14,16 +14,17 @@ export const ResetPasswordBox = ({ logo, title, userRequired = true, lang = "EN"
 
     useEffect(() => {
         setIsValid(validate())
-    }, [form.password1, form.password2])
+    }, [form.password1, form.password2, form.oldPassword])
 
     function validate() {
         const hasRequiredUser = userRequired ? form.user && form.user.length > 0 : true
+        const hasRequiredOldPwd = oldPwdRequired ? form.oldPassword && form.oldPassword.length > 0 : true
         const hasPassword1 = form.password1 && form.password1.length > 0
         const [isValid, error] = hasPassword1 ? validatePassword(form.password1) : [false, "La contraseña es requerida."]
         setError(error)
         const areEqual = form.password1 === form.password2
         if (isValid && !areEqual) setError("Las contraseñas no coinciden.")
-        return hasRequiredUser && areEqual && isValid
+        return hasRequiredUser && hasRequiredOldPwd && areEqual && isValid 
     }
 
     function changeField(id, value) {
@@ -32,7 +33,7 @@ export const ResetPasswordBox = ({ logo, title, userRequired = true, lang = "EN"
     }
 
     function ok() {
-        if (onOK && canOK()) {
+        if (onOK) {
             onOK(form)
         }
     }
@@ -56,8 +57,8 @@ export const ResetPasswordBox = ({ logo, title, userRequired = true, lang = "EN"
                 {children}
             </header>
             <main>
-                <Text use="headline6">{text}</Text>
                 {userRequired ? <TextField id="user" outlined icon="person" label={userLabel} lapse={100} onChange={changeField} onEnter={ok} /> : null}
+                {oldPwdRequired ? <TextField id="oldPassword" outlined icon="lock" type="password" label="Old Password" lapse={100} onChange={changeField} onEnter={ok} /> : null}
                 <TextField id="password1" outlined icon="lock" type="password" label={passwordLabel} lapse={100} onChange={changeField} onEnter={ok} />
                 <TextField id="password2" outlined icon="lock" type="password" label={password2Label} lapse={100} onChange={changeField} onEnter={ok} />
                 {error ? <div className="error">{error}</div> : null}

package/src/widgets/login/ResetPasswordBoxTest.js

@@ -10,6 +10,7 @@ export const ResetPasswordBoxTest = (prop) => {
     const config = {
         title: 'Reset Password',
         userRequired: false,
+        oldPwdRequired: false,
         lang: 'EN',
         onOK: (form) => {
             console.log('onOK', form)