@fto-consult/expo-ui 6.12.1 → 6.13.1

package/.env.readMe.txt

@@ -6,3 +6,6 @@ pour que ce soit possible, la variable TABLES_DATA_PATH doit exister et doit poi
 TABLES_DATAS_PATH = //path, chemin vers le dossier des tables de données de l'application
 
 
+STRUCTS_DATA_PATH = //path, chemin vers le dossiers des structs data des données de l'application
+
+

package/appConfig.txt

@@ -19,6 +19,9 @@
     getTableData : {function(tableName)=>table} retourne l'ojet table data,
     handleHelpScreen : {boolean}, //if Help screen will be added on navigation's main drawer
     
+    tablesDataPath : {string}, //chemin relatif pointant sur le dossier parent aux tables data de l'application
+    structsDataPath : {string},//chemin relatif pointnat sur le dossier parent aux structs data de l'application
+    
     checkNavigationPermsOnTableOrStructData : {boolean}, si le test de la permission sur la table data où sur la struct data sera effectuée lorsqu'on appelera la fonction navigateToTableData ou navigateToStructData
  }
  

package/babel.config.js

@@ -33,39 +33,20 @@ module.exports = function(api,opts) {
      if(fs.existsSync(writeFilePath)){
         const writeFile = require(`${writeFilePath}`);
         //generate getTable.js file
-        const generateGetTable = String(envObj.GENERATE_GET_TABLE_JS_FILE ).trim().toLowerCase();
-        const willGenerateGetTableJs = generateGetTable === "false" || generateGetTable ==="0" ? false : true;
         const tableDataPath = envObj.TABLES_DATA_PATH && path.resolve(String(envObj.TABLES_DATA_PATH)) || packageJSON?.tablesDataPath && path.resolve(String(packageJSON.tablesDataPath)) || null;
-        if(willGenerateGetTableJs && tableDataPath && fs.existsSync(tableDataPath)){
-          if(fs.lstatSync(tableDataPath).isDirectory()){
-            const getTableJsPath = path.resolve(tableDataPath,"getTable.js");
-            let getTableJSContent = '';
-            const tables = fs.readdirSync(tableDataPath);
-            if(Array.isArray(tables)){
-                tables.map((table,i)=>{
-                  table = table.trim();
-                  const tableName = table.toUpperCase();
-                  const tablePath = path.join(tableDataPath, table);
-                  const indexTablePath = path.join(tablePath,"index.js");
-                  const stat = fs.lstatSync(tablePath);
-                  if(!stat.isDirectory() || !fs.existsSync(indexTablePath)) return;
-                  const indexContent = fs.readFileSync(indexTablePath,'utf8') ;
-                  if(!indexContent || (!indexContent.includes("table") && !indexContent.includes("tableName"))){
-                      return;
-                  }
-                   getTableJSContent+=`\t\tif(tableName === "${tableName}"){return require("./${table}").default;}\n`;
-                });
-                //on génère le fichier getTable des tables data de l'application
-                if(getTableJSContent){
-                    writeFile(getTableJsPath,`
-  module.exports = function(tableName){
-    \tif(!tableName || typeof tableName !=="string") return null;
-    \ttableName = tableName.toUpperCase().trim();
-    \t${getTableJSContent}\treturn null;
-  }
-                    `);
-                }
-            }
+        if(tableDataPath && fs.existsSync(tableDataPath)){
+          const getTableJSContent = generateTableOrStructDataStr(tableDataPath);
+          if(getTableJSContent){
+            writeFile(path.resolve(tableDataPath,"getTable.js"),getTableJSContent);
+          }
+        }
+        
+        //generate getStructData.js file 
+        const structsDataPath = envObj.STRUCTS_DATA_PATH && path.resolve(String(envObj.STRUCTS_DATA_PATH)) || packageJSON?.structsDataPath && path.resolve(String(packageJSON.structsDataPath)) || null;
+        if(structsDataPath && fs.existsSync(structsDataPath)){
+          const getStructDataJSContent = generateTableOrStructDataStr(structsDataPath);
+          if(getStructDataJSContent){
+            writeFile(path.resolve(structsDataPath,"getStructData.js"),getStructDataJSContent);
           }
         }
       
@@ -110,3 +91,45 @@ module.exports = function(api,opts) {
     ],
   };
 };
+
+
+/****
+  retourne la chaine de caractère liée à la fonction getTable.js ou getStructData.js
+  @param {string} tableDataPath, le chemin de la tableDataPath
+  @return {string}, la chaine de caractère à enregistrer  dans la fonction getTable.js ou getStructData.js
+*/
+const generateTableOrStructDataStr = (tableDataPath)=>{
+  if(typeof tableDataPath !== 'string' || !tableDataPath.trim()) return null;
+  tableDataPath = tableDataPath.trim();
+  const fs = require("fs"), path = require("path");
+  if(fs.lstatSync(tableDataPath).isDirectory()){
+    let getTableJSContent = '';
+    const tables = fs.readdirSync(tableDataPath);
+    if(Array.isArray(tables)){
+        tables.map((table,i)=>{
+          table = table.trim();
+          const tableName = table.toUpperCase();
+          const tablePath = path.join(tableDataPath, table);
+          const indexTablePath = path.join(tablePath,"index.js");
+          const stat = fs.lstatSync(tablePath);
+          if(!stat.isDirectory() || !fs.existsSync(indexTablePath)) return;
+          const indexContent = fs.readFileSync(indexTablePath,'utf8') ;
+          if(!indexContent || (!indexContent.includes("table") && !indexContent.includes("tableName"))){
+              return;
+          }
+           getTableJSContent+=`\t\t\tif(tableName === "${tableName}"){return require("./${table}").default;}\n`;
+        });
+        //on génère le fichier getTable des tables data de l'application
+        if(getTableJSContent){
+          return (`
+module.exports = function(tableName){
+\tif(!tableName || typeof tableName !=="string") return null;
+\ttableName = tableName.toUpperCase().trim();
+${getTableJSContent}\treturn null;
+}
+            `);
+        }
+    }
+  }
+  return null;
+}

package/package.json

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

package/src/components/AppBar/Content.js

@@ -36,8 +36,7 @@ const AppbarContent = ({
    const webStyle = isWeb() && theme.styles.webFontFamilly;
    const content = (
     <View
-      pointerEvents="box-none"
-      style={[styles.container, style]}
+      style={[styles.container,{pointerEvents:"box-none"}, style]}
       testID={testID}
       {...rest}
     >

package/src/components/Logo/Logo.js

@@ -34,7 +34,7 @@ export default function Logo (props) {
         </View>
 }   
 
-const getStyle = ({style,color,height:customHeight,smallStyle,mediumStyle,largeStyle})=>{
+export const getStyle = ({style,color,height:customHeight,smallStyle,mediumStyle,largeStyle})=>{
     const cColor = flattenStyle([{color:Colors.isValid(color)? color : theme.colors.primaryOnSurface}]);
     let size = 5;
     if(typeof customHeight =='number' && customHeight <= customHeight){

package/src/components/Logo/Progress.js

@@ -8,9 +8,8 @@ import appConfig from "$capp/config";
 
 export default function LogoProgress (props){
     let containerStyle = {width:(Logo.width?Logo.width:undefined),height:(Logo.height?(Logo.height+100):undefined),flex:1,alignItems:"center",justifyContent:"center"};
-    const isLight = theme.isLight();
-    let primaryColor = isLight?theme.colors.primaryOnSurface : defaultDarkTheme.colors.primary, 
-    secondaryColor = isLight ? theme.colors.secondaryOnSurface : defaultDarkTheme.colors.secondary;
+    const primaryColor = theme.colors.primaryOnSurface,
+    secondaryColor = theme.colors.secondaryOnSurface;
     return <View style={[containerStyle]}>
             <Logo key='logo' style={{marginBottom:0}} color={primaryColor}/>
             <ActivityIndicator size = {isIos()?'large':40} animating={true} color={secondaryColor} />

package/src/components/View/index.js

@@ -1,12 +1,12 @@
-import {View} from "react-native";
+import {View,StyleSheet} from "react-native";
 import PropTypes from "prop-types";
 import React from "$react";
 import {isMobileNative} from "$cplatform";
-import {debounce,isNumber} from "$cutils";
+import {debounce,isNumber,isNonNullString} from "$cutils";
 import {useMediaQueryUpdateStyle} from "$context/hooks";
 
 
-const ViewComponent = React.forwardRef(({onRender,onLayoutTimeout,onLayout,autoHeight,autoWidth,elevation,...props},ref)=>{
+const ViewComponent = React.forwardRef(({onRender,onLayoutTimeout,pointerEvents,onLayout,autoHeight,autoWidth,elevation,...props},ref)=>{
     const style = useMediaQueryUpdateStyle(props);
     const autoSize = autoHeight||autoWidth ? true : false;
     const [state,setState] = autoSize ? React.useState({}) : [{}];
@@ -26,7 +26,8 @@ const ViewComponent = React.forwardRef(({onRender,onLayoutTimeout,onLayout,autoH
     React.useOnRender(onRender);
     return <View
          {...props} 
-         style = {[style,
+         style = {[isNonNullString(pointerEvents) && pointerEventsStyles[pointerEvents] ||null,
+         style,
             autoSize && [
                 autoHeight && isNumber(height) && height > 10 && {height},
                 autoWidth && isNumber(width) && width > 10 && {width}
@@ -47,4 +48,16 @@ ViewComponent.propTypes = {
     autoHeight : PropTypes.bool,//si la taille de 
     onLayout : PropTypes.func,
     ///si useCurrentMedia est à true, alors la mise à jour sera opérée uniquement lorsque le current media change
-}
+}
+
+const pointerEventsStyles = StyleSheet.create({
+    auto : {
+        pointerEvents : "auto",
+    },
+    none : {
+        pointerEvents : "none",
+    },
+    "box-none" : {
+        pointerEvents : "box-none",
+    },
+})

package/src/layouts/DatabaseStatistics/index.js

@@ -33,7 +33,7 @@ export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tabl
             const chartAllowedPerm =  defaultStr(table.chartAllowedPerm);
             const testID = "RN_DatabaseStatisticsCell_"+index;
             if((chartAllowedPerm && !Auth.isAllowedFromStr(chartAllowedPerm)) || (!Auth.isTableDataAllowed({table:tableName}))) return null;
-            content.push(<Cell elevation = {5} withSurface mobileSize={12} desktopSize={3} tabletSize={4} {...contentProps} testID={testID} key = {index} >
+            content.push(<Cell elevation = {5} withSurface mobileSize={12} desktopSize={3} tabletSize={6} {...contentProps} testID={testID} key = {index} >
                 <Surface testID = {testID+"_Surface"} elevation = {5} style={[theme.styles.w100]}>
                     <DatabaseStatistic
                         icon = {table.icon}