@fto-consult/expo-ui 6.73.0 → 6.73.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.73.0",
+  "version": "6.73.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {
@@ -71,7 +71,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.60.0",
+    "@fto-consult/common": "^3.60.3",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",

package/src/components/Datagrid/SWRDatagrid.js

@@ -122,8 +122,6 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     }
     canMakePhoneCall = defaultBool(canMakePhoneCall,table.canMakePhoneCall);
     makePhoneCallProps = isValidMakePhoneCallProps(makePhoneCallProps) && makePhoneCallProps || isValidMakePhoneCallProps(rest.makePhoneCallProps) && rest.makePhoneCallProps ||  isValidMakePhoneCallProps(table.makePhoneCallProps) && table.makePhoneCallProps || {};
-    const isExportable = !!Auth.isTableDataAllowed({table:tableName,action:'export'});
-    rest.exportable = isExportable;
     rowKey = defaultStr(rowKey,table.rowKey,table.primaryKeyColumnName);
     const title = React.isValidElement(customTitle,true) && customTitle || defaultStr(table.label,table.text)
     columns = table.fields;

package/src/components/Form/Fields/SelectTableData/Component.js

@@ -267,9 +267,8 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,foreignKeyLabel
     const showAdd = React.useMemo(()=>{
         if(isFilter || !foreignKeyTable) return false;
         if(typeof canShowAdd ==='function'){
-            return canShowAdd({...props,table:foreignKeyTable,foreignKeyColumn,foreignKeyLabel,sortDir,foreignKeyTableObj:fKeyTable,foreignKeyTable})
-        }
-        if(Auth[isStructData?"isStructDataAllowed":"isTableDataAllowed"]({table:foreignKeyTable,action:'create'})){
+            return !!canShowAdd({...props,table:foreignKeyTable,foreignKeyColumn,foreignKeyLabel,sortDir,foreignKeyTableObj:fKeyTable,foreignKeyTable})
+        } else if(Auth[isStructData?"isStructDataAllowed":"isTableDataAllowed"]({table:foreignKeyTable,action:'create'})){
             return !!defaultVal(customShowAdd,true);
         }
         return false;

package/src/components/TableLink/index.js

@@ -36,8 +36,10 @@ const TableLinKComponent = React.forwardRef((props,ref)=>{
     const pointerEvents = disabled || readOnly ? 'none' : 'auto';
     const onPressLink = (event)=>{
         React.stopEventPropagation(event);
-        if((isNonNullString(perm) && !Auth.isAllowedFromString(perm)) || !Auth[isStructData?"isStructDataAllowed":"isTableDataAllowed"]({table:foreignKeyTable,action:'read'})){
-            return;
+        if((isNonNullString(perm))){
+            if(!Auth.isAllowedFromString(perm))return;
+        } else {
+            if(!Auth[isStructData?"isStructDataAllowed":"isTableDataAllowed"]({table:foreignKeyTable,action:'read'})) return;
         }
         const args = {...React.getOnPressArgs(event),...rest,type,columnType:type,isStructData,fetch,foreignKeyTable,foreignKeyColumn,data,id,value:id};
         let r = typeof onPress =='function'? onPress(args) : undefined;

package/src/layouts/DatabaseStatistics/index.js

@@ -35,7 +35,9 @@ export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,item
             if(table.databaseStatistic === false || table.databaseStatistics === false) return null;
             const chartAllowedPerm =  defaultStr(table.chartAllowedPerm);
             const testID = "RN_DatabaseStatisticsCell_"+index;
-            if((chartAllowedPerm && !Auth.isAllowedFromStr(chartAllowedPerm)) || (!Auth.isTableDataAllowed({table:tableName}))) return null;
+            if(chartAllowedPerm){
+                if(!Auth.isAllowedFromStr(chartAllowedPerm)) 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} key = {index} >
                 <Surface testID = {testID+"_Surface"} elevation = {5} {...itemContainerProps} style={[theme.styles.w100,styles.itemContainer,itemContainerProps.style]}>
                     <DatabaseStatistic