@fto-consult/expo-ui 6.12.0 → 6.13.0

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,40 +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+=`\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();
-    ${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);
           }
         }
       
@@ -111,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\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();
+\t${getTableJSContent}\treturn null;
+}
+            `);
+        }
+    }
+  }
+  return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.12.0",
+  "version": "6.13.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -72,7 +72,7 @@
     "@react-navigation/native": "^6.1.7",
     "@react-navigation/native-stack": "^6.9.13",
     "@shopify/flash-list": "1.4.3",
-    "apexcharts": "^3.41.0",
+    "apexcharts": "^3.41.1",
     "expo": "^49.0.6",
     "expo-camera": "~13.4.2",
     "expo-clipboard": "~4.3.0",
@@ -95,7 +95,7 @@
     "react-native": "0.72.3",
     "react-native-big-list": "^1.6.1",
     "react-native-blob-util": "^0.18.6",
-    "react-native-gesture-handler": "^2.12.0",
+    "react-native-gesture-handler": "^2.12.1",
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-mime-types": "^2.4.0",
     "react-native-paper": "^5.9.1",

package/src/navigation/Drawer/index.js

@@ -32,7 +32,7 @@ const DrawerNavigator = React.forwardRef(({content,children:customChildren,state
             refreshItemsRef.current = false;
         };
         const onResizePage = ()=>{
-            forceRender();
+            //forceRender();
         }
         APP.on(APP.EVENTS.AUTH_LOGOUT_USER,onLogoutUser);
         const bindResize = Dimensions.addEventListener("change",()=>{