@fto-consult/expo-ui 1.1.36 → 1.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "1.1.36",
+  "version": "1.1.38",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@expo/html-elements": "^0.2.0",
     "@expo/metro-config": "^0.4.0",
     "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.1.28",
+    "@fto-consult/common": "^1.2.0",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.2.0",

package/src/auth/Login.js

@@ -1,5 +1,5 @@
 import React from "$react";
-import {isNonNullString,defaultNumber,defaultStr,uniqid,extendObj,isFunction} from "$utils";
+import {isNonNullString,isObj,defaultNumber,defaultStr,uniqid,extendObj,isFunction} from "$utils";
 import {navigate} from "$cnavigation";
 import FormData from "$ecomponents/Form/FormData/FormData";
 import {getForm} from "$ecomponents/Form/utils";
@@ -37,7 +37,12 @@ export default function LoginComponent(props){
     const _getForm = x=> getForm(formName);
     
     const auth = useAuth();
-    const notifyUser = (message)=> notify.error({message,position:'top'})
+    const notifyUser = (message,title)=> {
+        if(isObj(message)){
+            return notify.error({...message,position:'top'})
+        } else if(typeof message =='object') return false;
+        return notify.error({message,title,position:'top'});
+    }
     const [state,setState] = React.useState({
         step : defaultNumber(step,1),
         data : defaultObj(props.data),
@@ -77,6 +82,9 @@ export default function LoginComponent(props){
     const {header,children,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,canSubmit:canSubmitForm,onStepChange,...loginProps} = defaultObj(getProps({
         ...state,
         state,
+        showError : notifyUser,
+        notifyUser,
+        notify,
         getForm,
         getData,
         focusField,
@@ -118,18 +126,24 @@ export default function LoginComponent(props){
                 return
             }
         }
-        if(canSubmit(args) && step > 1){
-            Preloader.open("vérification ...");
-            return auth.signIn(data).then((a)=>{
-                if(typeof onLoginSuccess =='function' && onLoginSuccess(a)=== false) return;
-                if(isFunction(onSuccess)){
-                    onSuccess(data);
-                } else {
-                    navigate("Home");
-                } 
-            }).finally(()=>{
-                Preloader.close();
-            })
+        if(step > 1){
+            if(!form.isValid()){
+                notifyUser(form.getErrorText());
+                return;
+            }
+            if(canSubmit(args)){
+                Preloader.open("vérification ...");
+                return auth.signIn(data).then((a)=>{
+                    if(typeof onLoginSuccess =='function' && onLoginSuccess(a)=== false) return;
+                    if(isFunction(onSuccess)){
+                        onSuccess(data);
+                    } else {
+                        navigate("Home");
+                    } 
+                }).finally(()=>{
+                    Preloader.close();
+                })
+            }
         } else {
             setState({...state,step:step+1,data})
         }

package/src/components/AppBar/utils.js

@@ -7,6 +7,7 @@ import theme from "$theme"
 import Action from "$ecomponents/Form/Action";
 import Menu from "$ecomponents/Menu";
 import Icon,{ MORE_ICON } from "$ecomponents/Icon";
+import {isAllowedFromStr} from "$cauth/perms";
 
 export const ACTION_ICON_SIZE = 30;
 
@@ -91,7 +92,9 @@ export const splitActions = (args)=>{
         let cEl = null;
         if(!React.isValidElement(act)&& isPlainObj(act)){
             let {label,perm,text,...action} = act;
-            if(typeof perm =='function' && perm(args) === false){
+            if(isNonNullString(perm) && !isAllowedFromStr(perm)){
+                continue;
+            } else if(typeof perm =='function' && perm(args) === false){
                 continue;
             }
             action = {...defaultObj(action)};
@@ -131,7 +134,7 @@ export const splitActions = (args)=>{
     }
     if(isPlainObj(cancelButton) && !React.isValidElement(cancelButton)){
         let {label,perm,text,...action} = cancelButton;
-        let canAddCancelBtn = typeof perm =='function' ? perm(args)  : true;
+        let canAddCancelBtn = isNonNullString(perm) ? isAllowedFromStr(perm) : typeof perm =='function' ? perm(args)  : true;
         if(canAddCancelBtn && (text||label)){
             action = {...defaultObj(action)};
             action.label = defaultVal(label,text)

package/src/components/Form/Fields/Field.js

@@ -777,7 +777,7 @@ export default class Field extends AppComponent {
         const isFilter = this.isFilter();
         rest = defaultObj(rest);
         data = defaultObj(data);
-        label = defaultVal(label,text);
+        this.label = label = defaultVal(label,text);
         rest.name = this.name;
         rest.label = label;
         rest.data = data;

package/src/components/Form/Form.js

@@ -29,7 +29,6 @@ export default class FormComponent extends React.AppComponent {
         this.resetFields = this.resetFields.bind(this);
         this.getData = this.getData.bind(this);
         Forms.trigger("mount",props.name,this);
-        
     }
     getErrorText(){
         return defaultStr(this.___errorText);
@@ -105,6 +104,9 @@ export default class FormComponent extends React.AppComponent {
             testID,
             ...rest
         } = this.props;
+        if(isNonNullString(perm) && !Auth.isAllowedFromStr(perm)){
+                return null;
+        }
         rest = defaultObj(rest);
         const ComponentNode = defaultVal(Component,defaultComponentNode);
         testID = defaultStr(testID,"RN_FormComponent");

package/src/components/Form/FormData/FormData.js

@@ -25,7 +25,7 @@ export default class FormDataComponent extends AppComponent{
                 value : x=> formName,
             },
             isAllowed : {
-                value : true
+                value : isNonNullString(this.props.perm) ? Auth.isAllowedFromStr(this.props.perm) : true
             },
         });
     }