@fto-consult/expo-ui 6.73.7 → 6.73.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.73.7",
+  "version": "6.73.10",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {

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

@@ -7,7 +7,7 @@ import {defaultStr,extendObj,isFunction,defaultVal,isObjOrArray,defaultObj} from
 import PropTypes from "prop-types";
 import actions from "$cactions";
 import {navigateToTableData} from "$enavigation/utils";
-import {getFetchOptions,prepareFilters} from "$cutils/filters";
+import {getFetchOptions,prepareFilters,convertToSQL as convFiltersToSQL} from "$cutils/filters";
 import fetch from "$capi"
 import React from "$react";
 import useApp from "$econtext/hooks";
@@ -147,11 +147,12 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,foreignKeyLabel
             if(!isMounted()) return;
             if(typeof beforeFetchItems ==='function' && beforeFetchItems({fetchOptions}) === false) return;
             let opts = Object.clone(fetchOptions);
-            if(cPrepareFilters !== false){
-                opts.selector = prepareFilters(fetchOptions.selector,{convertToSQL:convertFiltersToSQL});
+            if(convertFiltersToSQL){
+                opts.selector = convFiltersToSQL(opts.selector);
                 opts = getFetchOptions(opts);
+                delete opts.selector;
             } else {
-                opts = {fetchOptions};
+                opts = {fetchOptions:opts};
             }
             const r = fetchItems(opts);
             if(r === false) return;

package/src/screens/Auth/PermLines.js

@@ -1,7 +1,7 @@
 import React from "$react";
 import { StyleSheet } from "react-native";
 import {defaultObj,extendObj} from "$cutils";
-import Auth from "$cauth";
+import Auth,{getTableDataPermResourcePrefix} from "$cauth";
 import Expandable from "$ecomponents/Expandable";
 import PropTypes from "prop-types";
 import theme from "$theme";
@@ -9,7 +9,7 @@ import {defaultActions as mDefaultAction,hasResource} from "./utils";
 import PermLine from "./PermLine";
 import Grid from "$ecomponents/Grid";
 
-const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActions,disabled,isUserMasterAdmin:cIsMasterAdmin,permLineProps,cellProps,containerProps,style,tablePermPrefix,tables,title,testID,perms,onChange:cOnChange,...props},ref)=>{
+const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActions,disabled,isUserMasterAdmin:cIsMasterAdmin,permLineProps,cellProps,containerProps,style,tables,title,testID,perms,onChange:cOnChange,...props},ref)=>{
     const isUserMasterAdmin = !!cIsMasterAdmin;
     user = defaultObj(user,Auth.getLoggedUser());
     gridProps = defaultObj(gridProps);
@@ -22,7 +22,6 @@ const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActio
     const defaultActions = React.useRef(extendObj(true,{},mDefaultAction,defaultActions)).current;
     const data = dataRef.current;
     disabled = !!disabled || isUserMasterAdmin;
-    tablePermPrefix = tablePermPrefix === false ? "" : typeof tablePermPrefix =="string" ? tablePermPrefix.trim() : defaultStr("table/").toLowerCase();
     const  onChange = disabled ? undefined : (arg)=>{
         let {data,resource} = arg;
         if(!isNonNullString(resource)) return;
@@ -58,7 +57,7 @@ const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActio
             if(!isObj(table) || !isObj(table.perms)) return null;
             tableName = defaultStr(table.tableName,table.table,tableName).toLowerCase().trim();
             const text = defaultStr(table.text,table.label)
-            const resource = (tablePermPrefix+tableName.ltrim(tablePermPrefix)).toLowerCase();
+            const resource = getTableDataPermResourcePrefix(tableName);
             const perms = {};
             Object.map(table.perms,(perm,i)=>{
                 if(perm ===false) {
@@ -87,7 +86,6 @@ const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActio
                 isUserMasterAdmin = {isUserMasterAdmin}
                 disabled = {disabled}
                 table = {tableName}
-                tablePermPrefix = {tablePermPrefix}
                 perms  = {perms}
                 data = {data}
                 defaultActions = {defaultActions}
@@ -100,7 +98,7 @@ const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActio
             />);
         })
         return content;
-    },[tables,allPerms,isUserMasterAdmin,disabled,tablePermPrefix])
+    },[tables,allPerms,isUserMasterAdmin,disabled])
     return <Expandable withScrollView={false} {...props} testID={testID} style={[theme.styles.w100,style]} containerProps={containerProps} titleProps = {{style:[styles.expandable,theme.styles.w100]}} title={title}>
         <Grid testID={testID+"_Grid"} {...gridProps}>
             {content }
@@ -133,10 +131,6 @@ PermLines.propTypes = {
     perms : PropTypes.object,//la liste des permissions qui peuvent associer au compte d'un utilisaters
     /*** si les élements de permissions seront modifiable où non */
     disabled : PropTypes.bool,
-    tablePermPrefix : PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.bool,
-    ]),/*** le prefixe de permission à jouter à chaque permissions de table de donénes, exemple : 'table/', pour le prefix des permissions de type table de données */
     title : PropTypes.oneOfType([
         PropTypes.node,
         PropTypes.element,