@fto-consult/expo-ui 1.1.37 → 1.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "1.1.37",
+  "version": "1.1.39",
   "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.29",
+    "@fto-consult/common": "^1.2.1",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.2.0",

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/Form.js

@@ -104,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
             },
         });
     }