@fto-consult/expo-ui 8.83.3 → 9.0.0

package/src/components/Datagrid/Accordion/Filters.js

@@ -18,8 +18,8 @@ import { useDatagrid } from "../hooks";
 const MIN_WIDTH = 250;
 let windowWidth = Dimensions.get("window").width;
 
-const FiltersAccordionComponent = React.forwardRef(({children,filters,filteredColumns,context,label,testID:cTestID,filterTitle:customFilterTitle,visible:customVisible,orOperator,andOperator,onToggleFilters,...rest},ref)=>{
-    const testID = defaultStr(testID,"RN_AccordionFilters");
+const FiltersAccordionComponent = React.forwardRef(({children,testID,filters,filteredColumns,context,label,testID:cTestID,filterTitle:customFilterTitle,visible:customVisible,orOperator,andOperator,onToggleFilters,...rest},ref)=>{
+    testID = defaultStr(testID,"RN_AccordionFilters");
     const [visibleColumns,setVisibleColumns] = React.useState(filteredColumns);
     const [visible,setVisible] = React.useState(defaultBool(customVisible,false));
     const valuesRefs = React.useRef({});

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});
         }
@@ -1054,7 +1051,7 @@ export default class CommonDatagridComponent extends AppComponent {
     renderDataSourceSelector(){
         const t = !this.props.handleTitle ? null : isNonNullString(this.props.title) || typeof this.props.title ==='number' ? <Label textBold primary style={[theme.styles.fs14]} testID={"RN_DatagridTitleProp"}>{this.props.title}</Label> : React.isValidElement(this.props.title)? this.props.title : null;
         const table = defaultStr(this.props.table,this.props.tableName);
-        const dS = dS === false ? null : typeof this.props.dataSourceSelector ==='function'? this.props.dataSourceSelector({
+        const dS = this.props.dataSourceSelector === false ? null : typeof this.props.dataSourceSelector ==='function'? this.props.dataSourceSelector({
             defaultValue : this.currentDataSources,
             onChange : this.onChangeDataSources.bind(this),
             tableName:table,

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/Filter/index.js

@@ -481,6 +481,7 @@ export default class Filter extends AppComponent {
       data,
       testID,
       filterContainerProps,
+      responsiveProps,
       ...rest
     } = {...this.props,...this.filterProps};
      const type = this.type;
@@ -646,7 +647,7 @@ export default class Filter extends AppComponent {
      const containerProps = defaultObj(this.props.containerProps,rest.containerProps);
      delete rest.containerProps;
      const Component = isBetweenAction ? FilterBetweenComponent : this.Component;
-     const responsiveProps = Object.assign({},responsiveProps);
+     responsiveProps = Object.assign({},responsiveProps);
      responsiveProps.style = [theme.styles.w100,responsiveProps.style]
      if(ignoreDefaultValue && isPeriodAction) {
         rest.isPeriodAction = true;

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

@@ -22,7 +22,7 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
     const [state,setState] = React.useState({});
     const isMobile = isMobileOrTabletMedia();
     const formRef = React.useRef(null);
-    const {closeAction} = props;
+    let {closeAction} = props;
     const context = {
         open : (props)=>{
             let sData = {};
@@ -68,7 +68,7 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
             rest.windowWidth = !isMob ? MAX_WIDTH : undefined;
             const no = extendObj({},props.no,state.no);
             rest.actions = Array.isArray(rest.actions)? Object.clone(rest.actions) : isObj(rest.actions)? Object.clone(rest.actions) : null;
-            const closeAction = defaultObj(closeAction);
+            closeAction = defaultObj(closeAction);
             rest.cancelButton = false;
             if(cancelButton !== false && rest.actions && (!isMob || rest.fullScreen === false) && state.no !== false){
                 if(isDesktopMedia() && typeof rest.maxActions !=='number'){

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/Grid/Cell.js

@@ -74,7 +74,7 @@ const GridCellComponent = React.forwardRef((p,ref)=>{
     const testID = defaultStr(props.testID,"RN_Grid.CellComponent");
     const contentProps = defaultObj(cProps);
     const C = onPress || onLongPress || onPressIn || onPressOut ? Pressable : View;
-    const elevation = typeof elevation == "number"? elevation : withSurface ? 5 : undefined;
+    const elevation = typeof cElev == "number"? cElev : withSurface ? 5 : undefined;
     const elevStyle = typeof elevation =="number" ? Elevations[elevation] || null : null;
     return <View 
         {...props}

package/src/components/Icon/Checkbox.js

@@ -8,9 +8,9 @@ import {CHECKED_ICON,UNCHECKED_ICON} from "$ecomponents/Icon/utils";
 /****** icon de type checkbox variant en fonction de l'environnement ou la plateforme */
 const Checkbox = React.forwardRef((props,ref)=>{
     const {checked:customChecked,color:customColor,primary,secondary,primaryOnCheck,secondaryOnCheck,onChange,checkedIcon:customCheckedIcon,uncheckedIcon:customUncheckedIcon,onPress,...rest} = props; 
-    const checkedIcon = defaultStr(checkedIcon,CHECKED_ICON);
-    const uncheckedIcon = defaultStr(uncheckedIcon,UNCHECKED_ICON);
-    const [checked,setIsChecked] = React.useState(!!checked);
+    const checkedIcon = customCheckedIcon || CHECKED_ICON;
+    const uncheckedIcon = customUncheckedIcon || UNCHECKED_ICON;
+    const [checked,setIsChecked] = React.useState(!!customChecked);
     const isMounted = React.useIsMounted();
     const prevChecked = React.usePrevious(checked);
     const callOnChangeRef = React.useRef(true);

package/src/components/Image/index.js

@@ -7,7 +7,7 @@ let maxWidthDiff = 100, maxHeightDiff = 100;
 import {StyleSheet} from "react-native";
 import React from "$react";
 import PropTypes from "prop-types";
-import {isMobileNative} from "$cplatform";
+import {isMobileNative,isWeb} from "$cplatform";
 import {uniqid} from "$cutils";
 //import Signature from "$ecomponents/Signature";
 import Label from "$ecomponents/Label";
@@ -26,9 +26,12 @@ export const isValidImageSrc = (src)=>{
 export const resolveAssetSource = (source)=>{
     if(!source && !isDecimal(source)) return undefined;
     try {
+        if(isWeb()){
+            return {uri:source};
+        }
         return Image.resolveAssetSource(source);
     } catch(e){
-        console.log(r," triing to resolve image asset from source ",source)
+        console.log(e," triing to resolve image asset from source ",source)
         return undefined;
     }
 }

package/src/components/Table/Header/index.js

@@ -17,8 +17,6 @@ import Filters from "./Filters";
 
 export default function RowHeaderComponent({isFilter,isFooter,isHeader,className,children:cChildren,...rest}){
     const {showHeaders,visibleColsNames,colsWidths,filterable,visibleColsNamesStr,headerContainerProps,footerContainerProps,filtersContainerProps,showFilters,filters,showFooters} = useTable();
-    const canV = showHeaders === false ? false : Array.isArray(children)? !!children.length : true;
-    const visible = canV && (isHeader ?  true : isFilter ? !!showFilters && filterable !== false : isFooter ? !!showFooters: true);
     const containerProps = defaultObj( isHeader ? headerContainerProps : isFooter ? footerContainerProps : filtersContainerProps);
     const style = filters ? styles.filters : isFooter ? styles.footer : null;
     const children = React.useMemo(()=>{    
@@ -26,6 +24,8 @@ export default function RowHeaderComponent({isFilter,isFooter,isHeader,className
             return <CellWrapper width={colsWidths[columnField]} isFilter={isFilter} isFooter={isFooter} key={columnField} columnField={columnField} columIndex={index}/>
         });
     },[visibleColsNamesStr]);
+    const canV = showHeaders === false ? false : Array.isArray(children)? !!children.length : true;
+    const visible = canV && (isHeader ?  true : isFilter ? !!showFilters && filterable !== false : isFooter ? !!showFooters: true);
     if(!visible && !isFilter) return null;
     const rP = isNative ? rest : {className:classNames(className,"table-footer-or-header-row")}
     return <Component {...rP} {...containerProps} style={StyleSheet.flatten([styles.header,style,rest.style,containerProps.style,!visible && hStyle.hidden])}>

package/src/components/Table/index.js

@@ -65,9 +65,7 @@ const TableComponent = React.forwardRef(({containerProps,tableHeadId,fixedHeader
     const hasData = !!Object.size(items,true);
     const emptyData = !hasData && (renderListContent === false ?null : typeof renderEmpty =='function' ? renderEmpty() : null) || null;
     const hasEmptyData = emptyData && React.isValidElement(emptyData);
-    const emptyContent = <View onRender={onComponentRender} testID={testID+"_EmptyData"} style={styles.hasNotData}>
-        {emptyData}
-    </View> 
+    const listWidth = '100%';
     const scrollContentContainerStyle = {flex:1,width:listWidth,minWidth:totalWidths,height:'100%'};
     const scrollEventThrottle = isMobileNative()?200:50;
     const scrollViewFlexGrow = {flexGrow:0};
@@ -80,7 +78,6 @@ const TableComponent = React.forwardRef(({containerProps,tableHeadId,fixedHeader
         scrollViewProps.style],
         contentContainerStyle : [styles.scrollView,scrollViewProps.contentContainerStyle,scrollViewFlexGrow,scrollContentContainerStyle]
     }
-    const listWidth = '100%';
     const footerScrollViewRef = React.useRef(null);
     const context = {
         listRef,
@@ -143,6 +140,9 @@ const TableComponent = React.forwardRef(({containerProps,tableHeadId,fixedHeader
             }
         }
     };
+    const emptyContent = <View onRender={onComponentRender} testID={testID+"_EmptyData"} style={styles.hasNotData}>
+        {emptyData}
+    </View> 
     return <View testID= {testID+"_Container"}  {...containerProps} onLayout={(e)=>{
         layoutRef.current = e.nativeEvent.layout;
         if(containerProps.onLayout){

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/context/Provider.js

@@ -1,3 +1,4 @@
+import "@expo/metro-runtime";
 import "$session";
 import React from "$react";
 import appConfig from "$capp/config";

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/layouts/Screen/TableData.js

@@ -289,6 +289,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
                         currentField.readOnly = true;
                     }
                 });
+                const isPrimary = this.primaryKeyFields[columnField] && true || false;
                 const cArgs = {...rest,field:currentField,columnField,columnDef:currentField,isUpdate:isUpdated,name:columnField,index:i,counterIndex,isPrimary,fields:preparedFields,contex:this,data:this.getCurrentData(),datas,currentIndex,isUpdated,tableName,table};
                 if(isUpdated){
                     //la props readOnlyOnEditing permet de rendre le champ readOnly en cas de mise à jour de la tableData
@@ -311,7 +312,6 @@ export default class TableDataScreenComponent extends FormDataScreen{
                 if(field.primaryKey ===true){
                     this.primaryKeyFields[columnField] = true;
                 }
-                const isPrimary = this.primaryKeyFields[columnField] && true || false;
                 if(!canRenderActions){
                     currentField.disabled = true;
                 }

package/src/navigation/Drawer/index.js

@@ -14,6 +14,8 @@ const DrawerNavigator = React.forwardRef(({content,children:customChildren,state
     const mergedRefs = React.useMergeRefs(drawerRef,ref);
     const forceRender = React.useForceRender();
     const refreshItemsRef = React.useRef(false);
+    const isAuthLoggedIn = Auth.isLoggedIn();
+    const [isLoggedIn,setIsLoggedIn] = React.useState(isAuthLoggedIn);
     const items = useGetItems({refresh:()=>{
         if(drawerRef.current && drawerRef.current && drawerRef.current.forceRenderNavigationView){
             return  drawerRef.current.forceRenderNavigationView();
@@ -45,8 +47,6 @@ const DrawerNavigator = React.forwardRef(({content,children:customChildren,state
         }
         return <ProfilAvatar ref={uProfileRef} drawerRef={drawerRef}/>;
     };
-    const isAuthLoggedIn = Auth.isLoggedIn();
-    const [isLoggedIn,setIsLoggedIn] = React.useState(isAuthLoggedIn);
     const prevIsLoggedIn = React.usePrevious(isLoggedIn);
     const navigationViewRef = React.useRef(null);
     state = defaultObj(state);

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

@@ -111,14 +111,6 @@ const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActio
 });
 
 PermLines.displayName = "AuthPermsLinesComponent";
-const PermTextType = PropTypes.shape({
-    text : PropTypes.string,//le texte de la permission
-    label : PropTypes.string,
-    title : PropTypes.string, //le tooltip associé à la permission
-    tooltip : PropTypes.string, //alias à title,
-    actions : PropTypes.objectOf(PermTextType),//les actions supportées par la permission
-    defaultAction : PropTypes.bool,//si les actions par défaut seront associés à la permission en cours
-});
 
 const permsType = PropTypes.oneOfType([
     PropTypes.func,PropTypes.object,

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());

package/bin/create-app/webpack.config.js

@@ -1 +0,0 @@
-module.exports = require("@fto-consult/expo-ui/webpack.config.js");

package/compiler.config.js

@@ -1,33 +0,0 @@
-const path = require("path");
-module.exports = function({config,nodeModulesPath}){
-    const base = process.cwd();
-    const expoUi = path.resolve(require("./expo-ui-path")());
-    nodeModulesPath = Array.isArray(nodeModulesPath)? nodeModulesPath : [];
-    config.resolve.modules = Array.isArray(config.resolve.modules)? config.resolve.modules:[]
-    config.resolve.modules = [path.resolve(base, 'node_modules'),path.resolve(expoUi,"node_modules"),...nodeModulesPath,...config.resolve.modules];
-    config.module.rules.push({
-        test: /\.(js|jsx|ts|tsx)$/,
-        type: "javascript/auto",
-        include: [
-            base,
-            /node_modules\/@fto-consult/,
-            expoUi,
-        ],
-        exclude:[
-            /node_modules[/\\](?!react-native-paper|react-native|react-native-vector-icons|react-native-safe-area-view)/,
-        ],
-        use: {
-          loader: 'babel-loader',
-        },
-    });
-    config.module.rules.push({
-        test: /\.mjs$/,
-        include: /node_modules/,
-        type: 'javascript/auto',
-        resolve: {
-          fullySpecified: false
-        }
-    });
-    config.plugins.push(require("@fto-consult/common/circular-dependencies"));
-    return config;
-}

package/webpack.config.js

@@ -1,82 +0,0 @@
-/**@see : https://www.npmjs.com/package/@expo/webpack-config */
-const isObj = x => x && typeof x =='object' && !Array.isArray(x);
-//const webpack = require("webpack");
-const fs = require("fs");
-const supportedPlatforms = ["web","electron"];
-const mainExtensions = [".js", ".jsx",".ts",".tsx",".mjs"];
-const path = require("path");
-
-// Expo CLI will await this method so you can optionally return a promise.
-module.exports = async function(env, argv,opts) {
-  const isLocalDev = require("./is-local-dev")();//si l'application est en developpement local
-  const nodeModulePath = path.resolve(`${process.cwd()}`,"node_modules");
-  const localNodeEuiP = path.resolve(nodeModulePath,"@expo/webpack-config");
-  const wConfigPath = fs.existsSync(localNodeEuiP) && localNodeEuiP || "@expo/webpack-config";
-  const createExpoWebpackConfigAsync = require(wConfigPath);
-    env = env || {};
-    opts = typeof opts =="object" && opts ? opts : {};
-    const babel = isObj(opts.babel)? opts.babel : {};
-    const isElectron = process.env.isElectron || process.env.platform =="electron" || typeof env.platform =="string" && env.platform.toLowerCase().trim() ==='electron';
-    const isNeutralino = process.env.isNeutralino || process.env.platform =="neutralino";
-    if(isElectron || isNeutralino){
-       env.platform = isElectron ? "electron":"neutralino";
-       env.mode = env.mode =="production" && "production" || "development";
-       env.pwa = false;
-    }
-    const platform = isElectron && "electron" || isNeutralino && "neutralino" || process.env.platform && supportedPlatforms.includes(process.platform) && process.platform || typeof opts.platform =="string" && supportedPlatforms.includes(opts.platform)? opts.platform : "web";
-    const transpileModules = Array.isArray(opts.transpileModules)? opts.transpileModules : [];
-    const projectRoot = opts.projectRoot && typeof opts.projectRoot =="string" && fs.existsSync(opts.projectRoot) && opts.projectRoot || process.cwd();
-    const config = await createExpoWebpackConfigAsync(
-      {
-        ...env,
-        platform,
-        projectRoot,
-        babel: {
-          ...babel,
-          dangerouslyAddModulePathsToTranspile: [
-            // Ensure that all packages starting with @fto-consult are transpiled.
-            '@fto-consult',
-            ...transpileModules,
-          ],
-        },
-      },
-      argv
-    );
-    config.module.rules.push(
-      {
-          test: /.mjs$/,
-          include: /node_modules/,
-          type: "javascript/auto",
-          use: {loader: 'babel-loader'}
-    });
-    config.mode = (config.mode =="development" || config.mode =='production') ? config.mode  : "development";
-    // Maybe you want to turn off compression in dev mode.
-    if (config.mode === 'development') {
-      config.devServer.compress = false;
-    }
-    // Or prevent minimizing the bundle when you build.
-    if (config.mode === 'production') {
-      config.optimization.minimize = true;
-    }
-    config.performance = typeof config.performance =="object" && config.performance ? config.performance : {};
-    config.performance.hints = "hints" in config.performance ? config.performance.hints : false;
-    config.performance.maxEntrypointSize = typeof config.performance.maxEntrypointSize =='number'? config.performance.maxEntrypointSize : 512000;
-    config.performance.maxAssetSize = typeof config.performance.maxAssetSize =='number'? config.performance.maxAssetSize : 512000;
-    config.devtool = (config.mode === 'development') ? 'inline-source-map' : false;
-    require("./compiler.config.js")({config,...opts});
-    const extensions = config.resolve.extensions;
-    if(isElectron || isNeutralino){
-      mainExtensions.map((ex)=>{
-        const nExt =  `.${isElectron?"electron":"neu"}${ex}`;
-        if(!extensions.includes(nExt)){
-          extensions.unshift(nExt);
-        }
-      });
-    }
-    config.resolve.fallback = {
-      ...Object.assign({},config.resolve.fallback),
-      crypto: require.resolve("crypto-browserify"),
-      stream: require.resolve("stream-browserify"),
-    }
-    return config;
-};;