@fto-consult/expo-ui 8.83.3 → 8.84.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.83.3",
+  "version": "8.84.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "react-native-paper-doc": "https://github.com/callstack/react-native-paper/tree/main/docs/docs/guides",
   "scripts": {

package/src/auth/utils.js

@@ -0,0 +1,10 @@
+import {isAllowedFromStr} from "$cauth/perms";
+/***
+ * vérifie si pour la permission perm, l'utilisateur connecté à accès à la resource
+ */
+export const isPermAllowed = (perm,...permsArgs)=>{
+    if(typeof perm === 'boolean') return perm;
+    if(typeof perm ==='function' && perm(...permsArgs) === false) return false;
+    if(isNonNullString(perm) && !isAllowedFromStr(perm,...permsArgs)) return false;
+    return true;
+}

package/src/components/AppBar/utils.js

@@ -7,8 +7,8 @@ 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";
 import breakpoints from "$cdimensions/breakpoints";
+import {isPermAllowed} from "$eauth/utils";
 
 export const ACTION_ICON_SIZE = 30;
 
@@ -104,9 +104,7 @@ export const splitActions = (args)=>{
         let cEl = null;
         if(!React.isValidElement(act)&& isPlainObj(act)){
             let {label,perm,text,...action} = act;
-            if(isNonNullString(perm) && !isAllowedFromStr(perm)){
-                continue;
-            } else if(typeof perm =='function' && perm(args) === false){
+            if(!isPermAllowed(perm,args)) {
                 continue;
             }
             action = {...defaultObj(action)};
@@ -146,7 +144,7 @@ export const splitActions = (args)=>{
     }
     if(isPlainObj(cancelButton) && !React.isValidElement(cancelButton)){
         let {label,perm,text,...action} = cancelButton;
-        let canAddCancelBtn = isNonNullString(perm) ? isAllowedFromStr(perm) : typeof perm =='function' ? perm(args)  : true;
+        const canAddCancelBtn = isPermAllowed(perm,{...args,cancelButton,action:cancelButton});
         if(canAddCancelBtn && (text||label)){
             action = {...defaultObj(action)};
             action.label = defaultVal(label,text)

package/src/components/Datagrid/Common/Common.js

@@ -44,10 +44,11 @@ import events from "../events";
 import {MORE_ICON} from "$ecomponents/Icon"
 import ActivityIndicator from "$ecomponents/ActivityIndicator";
 import {createTableHeader,fields as pdfFields,pageHeaderMargin,sprintf as pdfSprintf} from "$cpdf";
-import {isWeb,isMobileNative} from "$cplatform";
+import {isMobileNative} from "$cplatform";
 import { createPDF,getFields as getPdfFields } from '$expo-ui/pdf';
 import actions from '$cactions';
 import {printTableData} from "$epdf";
+import {isPermAllowed} from "$eauth/utils";
 
 export const TIMEOUT = 100;
 
@@ -160,10 +161,6 @@ Object.map(displayTypes,(c,k)=>{
 const dataSourceArgs = {};
 export const footerFieldName = "dgrid-fters-fields";
 
-const checkPerm = (perm,args)=>{
-    return typeof perm ==='function'? perm(args) : isNonNullString(perm) ? Auth.isAllowedFromStr(perm) : typeof perm =='boolean'? perm : true;
-}
-
 /*****
  * Pour spécifier qu'un champ du datagrid n'existe pas en bd il s'ufit de suffixer le nom du champ par le suffix : "FoundInDB" et de renseigner false comme valeur 
 de l'objet rowData de cette propriété
@@ -206,10 +203,10 @@ export default class CommonDatagridComponent extends AppComponent {
         const disTypes = {};
         let hasFoundDisplayTypes = false;
         const pArgs = {context:this,data,props:this.props}
-        const perm = checkPerm(renderChartIsAllowed,pArgs)
-        const ePDFIsAllowed = !isMobileNative() && checkPerm(exportToPDFIsAllowed,pArgs);
-        const eExcelISAllowed = checkPerm(exportToExcelIsAllowed,pArgs);
-        const renderSectionListIsAllowedP = checkPerm(renderSectionListIsAllowed,pArgs);
+        const perm = isPermAllowed(renderChartIsAllowed,pArgs)
+        const ePDFIsAllowed = !isMobileNative() && isPermAllowed(exportToPDFIsAllowed,pArgs);
+        const eExcelISAllowed = isPermAllowed(exportToExcelIsAllowed,pArgs);
+        const renderSectionListIsAllowedP = isPermAllowed(renderSectionListIsAllowed,pArgs);
         if(typeof customCheckPerms =='function'){
             customCheckPerms({context:this});
         }

package/src/components/Drawer/DrawerItems/index.js

@@ -6,8 +6,7 @@ import DrawerSection from "./DrawerSection"
 import PropTypes from "prop-types";
 import Divider from "$ecomponents/Divider";
 import View from "$ecomponents/View";
-import Auth from "$cauth";
-import { useDrawer } from '../context';
+import {isPermAllowed} from "$eauth/utils";
 
 export * from "./utils";
 
@@ -23,7 +22,7 @@ const DrawerItemsComponent = React.forwardRef((props,ref)=> {
   const r = React.useMemo(()=>{
     let items = []
     const renderExpandableOrSection = ({item,key,items})=>{
-          if(isNonNullString(item.perm) && !Auth.isAllowedFromStr(item.perm)) return null;
+          if(!isPermAllowed(item.perm,props)) return null;
           const {section,items:itx2,...rest} = item;
           if(section){
             const sDivider = rest.divider !== false && !hasDivider && items.length ? true : false;
@@ -128,7 +127,8 @@ const getDefaultProps = function(item){
   return item;
 }
 
-const renderItem = ({item,minimized,renderExpandableOrSection,index,key})=>{
+const renderItem = (args1)=>{
+  let {item,minimized,renderExpandableOrSection,index,key} = args1;
   key = key||index;
   if(React.isValidElement(item)){
     hasDivider = false;
@@ -136,7 +136,7 @@ const renderItem = ({item,minimized,renderExpandableOrSection,index,key})=>{
         {item}
     </React.Fragment>
   } else {
-    if(isNonNullString(item.perm) && !Auth.isAllowedFromStr(item.perm)) return null;
+    if(!isPermAllowed(item.perm,args1)) return null;
     if(!item.label && !item.text && !item.icon) {
         if(item.divider === true && !hasDivider){
           const {divider,...rest} = item;

package/src/components/Fab/Group.js

@@ -7,7 +7,7 @@ import {MENU_ICON} from "$ecomponents/Icon";
 import theme,{Colors} from "$theme";
 import Group from "./GroupComponent";
 import {Portal} from "react-native-paper";
-import {isAllowedFromStr} from "$cauth/perms";
+import { isPermAllowed } from "$eauth/utils";
 import { useIsScreenFocused } from '$enavigation/hooks';
 import { useScreen } from '$econtext/hooks';
 
@@ -129,8 +129,7 @@ const FabGroupComponent = React.forwardRef((props,innerRef)=>{
                 const a = actionMutator ? actionMutator ({action:act,key:i,isFab:true,fab:true}) : act;
                 if(!isObj(a) || !isNonNullString(a.label)) return null;
                 const {perm,isAllowed,primary,secondary,...restItem} = a;
-                if(typeof isAllowed =='function' && isAllowed() === false) return null;
-                if(isNonNullString(perm) && !isAllowedFromStr(perm)) return false;
+                if(!isPermAllowed(perm,{...props,permAction:"fab",action:a}) || !isPermAllowed(isAllowed,{...props,permAction:"fab",action:a})) return false;
                 if(primary){
                     restItem.style = StyleSheet.flatten([restItem.style,{color:theme.colors.onPrimary,backgroundColor:theme.colors.primary}])
                 } else if(secondary){

package/src/components/Form/Form.js

@@ -7,6 +7,7 @@ import { StyleSheet } from "react-native";
 import APP from "$capp/instance";
 import PropTypes from "prop-types";
 import View from "$ecomponents/View";
+import { isPermAllowed } from "$eauth/utils";
 
 /**** règles d'utilisation : 
     1. les forms doivent toujours avoir un nom : chaine de caractère unique pour l'application et non null
@@ -101,7 +102,7 @@ export default class FormComponent extends React.AppComponent {
         Forms.trigger("novalidate",this.props.name,...rest);
     }
     render (){
-        if(isNonNullString(this.props.perm) && !Auth.isAllowedFromStr(this.props.perm)){
+        if(!isPermAllowed(this.props.perm,this.props)){
             return null;
         }
         let {

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

@@ -4,6 +4,7 @@ import {defaultStr,isNonNullString,defaultObj,defaultBool} from "$cutils";
 import getComponentFromType from "./componentsTypes";
 import appConfig from "$capp/config";
 import Colors from "$theme/colors";
+import { isPermAllowed } from "$eauth/utils";
 
 const FieldContentComponent = React.forwardRef(({field,data,index,fields,formName,onLoopField,fieldProps,backgroundColor,primaryKey:customPrimaryKey,increment,fieldProp,archivable,disabled,windowWidth,responsive,responsiveProps,archived,...props},ref)=>{
     if(field?.form === false) return null;
@@ -19,7 +20,7 @@ const FieldContentComponent = React.forwardRef(({field,data,index,fields,formNam
     if(customPrimaryKey === true){
         primaryKey = true;
     }
-    if(form === false || ignore || (isNonNullString(perm) && !Auth.isAllowedFromStr(perm))){
+    if(form === false || ignore || (!isPermAllowed(perm,{...props,field,isFormData:true,index,data,formName}))){
         return null;
     }
     if(rest.nullable === false){

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

@@ -11,6 +11,7 @@ import {handleBeforeSaveCallback} from "./utils";
 import isDbDocEditing,{checkPrimaryKey} from "../utils/isDocEditing";
 import keyboardShortcuts from "../utils/keyboardShortcuts";
 import FieldsContent from "./FieldsContent";
+import { isPermAllowed } from "$eauth/utils";
 
 export default class FormDataComponent extends AppComponent{
     constructor(props){
@@ -24,7 +25,7 @@ export default class FormDataComponent extends AppComponent{
                 value : x=> formName,
             },
             isAllowed : {
-                value : isNonNullString(this.props.perm) ? Auth.isAllowedFromStr(this.props.perm) : true
+                value : isPermAllowed(this.props.perm,props),
             },
         });
     }

package/src/components/TableLink/index.js

@@ -16,6 +16,8 @@ import Auth from "$cauth";
 import fetch from "$capi/fetch";
 import useContext from "$econtext/hooks";
 import TouchableRipple from "$ecomponents/TouchableRipple";
+import { isPermAllowed } from "$eauth/utils";
+
 /***** la fonction fetchForeignData permet de spécifier s'il s'agit d'une données de structure où non 
     dans le champ isStructData
 */
@@ -50,13 +52,8 @@ export const usePrepareProps = (props)=>{
     }
     const fetchArgs = {type,columnType:type,isStructData,fetch,foreignKeyTable,foreignKeyColumn,data,id};
     const checkIfAllowed = ()=>{
-        if((isNonNullString(perm))){
-            if(!Auth.isAllowedFromString(perm))return false;
-        } else {
-            if(typeof isAllowed ==="function"){
-                if(!isAllowed(args)) return false;
-            } else if(!Auth[isStructData?"isStructDataAllowed":"isTableDataAllowed"]({table:foreignKeyTable,action:'read'})) return false;
-        }
+        if(!isPermAllowed(perm,props) || !isPermAllowed(isAllowed,props)) return false;
+        if((!perm && !isAllowed && perm !== undefined &&  isAllowed !== undefined) && !Auth[isStructData?"isStructDataAllowed":"isTableDataAllowed"]({table:foreignKeyTable,action:'read'})) return false;
         return true;
     }
     const navigate = (data)=>{

package/src/layouts/DatabaseStatistics/index.js

@@ -8,6 +8,7 @@ import PropTypes from "prop-types";
 import Auth from "$cauth";
 import Surface from "$ecomponents/Surface";
 import { StyleSheet } from "react-native";
+import {isPermAllowed} from "$eauth/utils";
 
 export const title = 'Statistiques en BD';
 export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,itemProps,itemContainerProps,tableFilter,fetchCount,fetchData,title:customTitle,contentProps,containerProps,tables,Component,...props}){
@@ -38,10 +39,9 @@ export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,item
             let {containerProps,cellProps,...rDBProps} = dbStatisticsProps;
             cellProps = Object.assign({},cellProps);
             containerProps = Object.assign({},containerProps);
-            const chartAllowedPerm =  defaultStr(table.chartAllowedPerm);
             const testID = "RN_DatabaseStatisticsCell_"+index;
-            if(chartAllowedPerm){
-                if(!Auth.isAllowedFromStr(chartAllowedPerm)) return null;
+            if(table.chartAllowedPerm !== undefined){
+                if(!isPermAllowed(table.chartAllowedPerm,{table,tables,databaseStatistic:true})) return null;
             } else if((!Auth.isTableDataAllowed({table:tableName}))) return null;
             content.push(<Cell elevation = {5} withSurface mobileSize={12} desktopSize={3} tabletSize={6} {...contentProps} testID={testID}  {...cellProps} style={[contentProps.style,cellProps.style]} key = {index} >
                 <Surface testID = {testID+"_Surface"} elevation = {5} {...itemContainerProps} {...containerProps} style={[theme.styles.w100,styles.itemContainer,itemContainerProps.style,containerProps.style]}>

package/src/navigation/Drawer/items/index.js

@@ -16,6 +16,7 @@ import useExpoUI from "$econtext/hooks";
 import Auth,{useIsSignedIn,tableDataPerms} from "$cauth";
 import {getTableDataListRouteName} from "$enavigation/utils";
 import {isValidElement,usePrevious} from "$react";
+import { isPermAllowed } from "$eauth/utils";
 
 /***** les props supplémentaires à passer aux drawers items d'une table de données sont dans le champ drawerItemProps */
 const useGetItems = (options)=>{
@@ -73,7 +74,7 @@ const useGetItems = (options)=>{
             if(!tableName || table.showInDrawer === false || !Auth.isTableDataAllowed({table:tableName})){
                 return;
             }
-            if(isNonNullString(table.perm) && !Auth.isAllowedFromStr(table.perm)) return;
+            if(!isPermAllowed(table.perm,{...options,tableName:table,permAction:"drawerItem",tables,table,index})) return;
             const section = (table.drawerSection).trim();
             if(!items[section]){
                 if(!sections) sections = Object.keys(items);

package/src/navigation/utils.js

@@ -4,6 +4,7 @@
 import {navigate,sanitizeName} from "$cnavigation";
 import {isNonNullString,defaultStr,defaultObj,isObj} from "$cutils";
 import appConfig from "$capp/config";
+import { isPermAllowed } from "$eauth/utils";
 
 export const tableDataRouteName = 'table-data';
 
@@ -35,8 +36,8 @@ const navigateToTableOrStructData = function(tableName,params,actionType){
     let isAllowed = true;
     actionType = defaultStr(actionType,"tabledata").replaceAll("_","").replaceAll("-","").replaceAll(" ","").toLowerCase();
     const isTableData = actionType =='tabledata';
-    if(isNonNullString(perm)){
-        isAllowed = Auth.isAllowedFromStr(perm)
+    if(perm !== undefined){
+        isAllowed = isPermAllowed(perm,{permAction:"navigate",...params,tableName,table:tableName})
     } else if(canCheckNavPerms() !== false){
         if(actionType =='structdata') {
             isAllowed = Auth.isStructDataAllowed({table:tableName})

package/src/pdf/index.js

@@ -10,6 +10,7 @@ import appConfig from "$capp/config";
 import Auth from "$cauth";
 import DateLib from "$clib/date";
 import crypToJS from "$clib/crypto-js";
+import { isPermAllowed } from "$eauth/utils";
 
 export const QR_CODE_HASH_KEY_PREFIX = defaultStr(appConfig.name).replace(/\s/g, "");
 export const QR_CODE_HASH_KEY = `${QR_CODE_HASH_KEY_PREFIX}-QR_CODE_HASH_KEY`;//la clé de décryptage du QRCODE
@@ -266,14 +267,8 @@ export function printTableData(data,options){
     if(!tablePrint){
         return Promise.reject({message : `La fonction d'impression n'est pas supportée par la table [${tableText}]`})
     }
-    if(typeof options.perm =="function"){
-        if(!options.perm({table,tableObj})) {
-            return Promise.reject({message:'Vous n\'etes pas autorisé à imprimer ce type de document'});
-        }
-    } else if(isNonNullString(options.perm)){
-        if(!Auth.isAllowedFromString(options.perm)){
-            return Promise.reject({message:'Vous n\'etes pas autorisé à imprimer ce type de document'});
-        }
+    if((options.perm !== undefined && !isPermAllowed(options.perm,{...options,table,tableObj,permAction:'print',tableName:table,data}))){
+        return Promise.reject({message:'Vous n\'etes pas autorisé à imprimer ce type de document'});
     } else if(!Auth.isTableDataAllowed({table,action:'print'})){
         return Promise.reject({message:'Vous n\'etes pas autorisé à imprimer ce type de document'});
     }

package/src/screens/Auth/Profile.js

@@ -15,7 +15,7 @@ import {isValidUrl} from "$cutils";
 import {screenName} from "./utils";
 import notify from "$notify";
 import {getAnimationType,setAnimationType,animationTypes} from "$enavigation/animationTypes"
-import {isWeb} from "$cplatform";
+import { isPermAllowed } from "$eauth/utils";
 
 export default function UserProfileScreen({fields,...p}){
     const {auth:{profilePropsMutator}} = useContext();
@@ -49,11 +49,8 @@ export default function UserProfileScreen({fields,...p}){
     const {changeElectronAppUrlPerm} = props;
     const changeElectronUrl = React.useMemo(()=>{
         if(!isElectron() || !window?.ELECTRON || typeof ELECTRON?.setAppUrl !=='function' || typeof ELECTRON?.getAppUrl !=='function') return false;
-        if(typeof changeElectronAppUrlPerm ==='string'){
-            return Auth.isAllowedFromStr(changeElectronAppUrlPerm);
-        } else if(typeof changeElectronAppUrlPerm =='function'){
-            return !!changeElectronAppUrlPerm(props);
-        } 
+        if(!isPermAllowed(changeElectronAppUrlPerm,props)) return false;
+        if(changeElectronAppUrlPerm) return true;
         return Auth.isMasterAdmin();
     },[changeElectronAppUrlPerm]);
     const user = defaultObj(props.user,Auth.getLoggedUser());