@fto-consult/expo-ui 8.50.9 → 8.51.0

package/bin/create-app/src/database/tables/users/index.js

@@ -1,7 +1,8 @@
 export default {
     table : require("./table").default,
     icon : 'material-people',
-    title : "Exemple table : Utilisateurs",
+    fields : require("./fields").default,
+    label : "Exemple table : Utilisateurs",
     datagrid : require("./datagrid").default,
     perms : require("./perms").default,
     newElementLabel : require("./newElementLabel").default,

package/bin/create-app/src/layouts/TableData/List.js

@@ -16,7 +16,6 @@ const TableDataListLayoutComponent = forwardRef(
         filterable={true} //si la table de données est filterable, spécifiez la valeur false, pour que les données ne soit pas filtrable
         canFetchOnlyVisibleColumns={false} //si uniquement les colonnes visisible seront récupérérs depuis la base de données, via le champ fields des options envoyés à la fonction fetcher
         parseMangoQueries = {true} //Spécifiez la valeur false, si vous utilisez une base de données qui accepte les requêtes mangoes (Voir https://www.mongodb.com/docs/manual/tutorial/query-documents) et true pour un backend lié à une BD relationnelle
-        {...rProps}
         {...defaultObj(tableObj.datagrid)} //les props du datagrid lié à la table data
         exportToExcelIsAllowed={"{0}:exporttoexcel".sprintf(tableName)} //la permission pour l'export des données de la table data au format Excel, vous pouvez définir également une fonction de la forme : ()=><boolean>
         exportToPDFIsAllowed={"{0}:exporttopdf".sprintf(tableName)} //la permission pour l'export des données au format pdf, vous pouvez également définir une fonction de la forme : ()=><boolean>
@@ -26,6 +25,9 @@ const TableDataListLayoutComponent = forwardRef(
           if(typeof fetcher ==="function"){
             return fetcher(url,opts);
           }
+          if(typeof tableObj?.datagrid?.fetcher ==="function"){
+            return tableObj?.datagrid.fetcher(url,opts);
+          }
           delete opts.fields;
           delete opts?.fetchOptions?.fields;
           console.log(opts.fetchOptions," les options à utiliser pour effectuer le fetch distant des données");

package/bin/update.js

@@ -1,17 +1,22 @@
 const fs = require("fs");
 const path = require("path");
 const projectRoot = process.cwd();
-const {exec,writeFile} = require("@fto-consult/node-utils");
+const {exec,writeFile,isPlainObj} = require("@fto-consult/node-utils");
 const dependencies = require("./create-app/dependencies");
 const dependenciesArr = Object.keys(dependencies);
 const dependenciesPath = path.resolve(__dirname,"create-app","dependencies.js")
 const mainJSONPath = path.resolve(projectRoot,"package.json");
+const euiPackageJSON = require("../package.json");
+const euDevDependencies = isPlainObj(euiPackageJSON?.devDependencies) ? euiPackageJSON?.devDependencies : {};
 if(fs.existsSync(mainJSONPath)){
     const packageObj = JSON.parse(fs.readFileSync(mainJSONPath));
     const packageDev = typeof packageObj?.dependencies =="object" && packageObj?.dependencies || {};
+    const devDependencies = [];
     const filterdDObj = {};
     dependenciesArr.filter((v,index)=>{
-        if((!!packageDev[v] && v !=="expo") || ["expo-intent-launcher"].includes(v)){
+        if(euDevDependencies[packageDev[v]]){
+            devDependencies.push(packageDev[v]);
+        } else if((!!packageDev[v] && v !=="expo") || ["expo-intent-launcher"].includes(v)){
             filterdDObj[v] = true;
             return true;
         }
@@ -19,17 +24,13 @@ if(fs.existsSync(mainJSONPath)){
     });
     const filteredDeps = Object.keys(filterdDObj);
     if(filteredDeps.length){
-        exec(`npm install expo@latest`,{projectRoot}).finally(()=>{
-            let i = -1;
-            const next = ()=>{
-                return exec(`npx expo install ${filteredDeps.join(" ")}`,{projectRoot}); 
-                i++;
-                if(i>= filteredDeps.length) return Promise.resolve();
-                const script = filteredDeps[i];
-                return exec(`npx expo install ${script}`,{projectRoot}).finally(next);  
-            }
-            next().finally((i)=>{
-                //exec(`npm install`,{projectRoot}).finally(()=>{
+        exec(`npm install @fto-consult/expo-ui@latest expo@latest`,{projectRoot}).finally(()=>{
+            exec(`npx expo install ${filteredDeps.join(" ")}`,{projectRoot}).finally((i)=>{
+                (new Promise((resolve)=>{
+                    devDependencies.length ? exec(`npm uninstall ${devDependencies.join(" ")}`,{projectRoot}).finally(()=>{
+                        exec(`npm install -D ${devDependencies.join(" ")}`,{projectRoot}).finally(resolve);
+                    }) : resolve({});
+                })).finally(()=>{
                     const newPackageJS = JSON.parse(fs.readFileSync(mainJSONPath));
                     let hasChanged = false;
                     if(newPackageJS?.dependencies && typeof newPackageJS?.dependencies =="object"){
@@ -51,6 +52,7 @@ if(fs.existsSync(mainJSONPath)){
                         }
                     }
                 //})
+                })
             });    
         })
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.50.9",
+  "version": "8.51.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "react-native-paper-doc": "https://github.com/callstack/react-native-paper/tree/main/docs/docs/guides",
   "scripts": {
@@ -47,7 +47,7 @@
     "delete-node-modules": "rimraf ./**/node_modules",
     "dev": "npx expo start --no-dev --minify -c",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
-    "update": "npm i @fto-consult/common@latest @fto-consult/node-utils@latest react-native-web react-native-big-list@latest apexcharts@latest file-saver@latest google-libphonenumber@latest  react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-paper-dates@latest react-virtuoso@latest tippy.js@latest xlsx@latest && npm run update-apexchart && npm run find-licenses"
+    "update": "npm i @fto-consult/common@latest react-native-web react-native-big-list@latest apexcharts@latest file-saver@latest google-libphonenumber@latest  react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-paper-dates@latest react-virtuoso@latest tippy.js@latest xlsx@latest && npm run update-apexchart && npm run find-licenses && npm i -D @fto-consult/node-utils@latest"
   },
   "bin": {
     "expo-ui": "bin/index.js"
@@ -70,9 +70,7 @@
     "@emotion/react": "^11.11.1",
     "@faker-js/faker": "^8.0.2",
     "@fto-consult/common": "^4.36.0",
-    "@fto-consult/node-utils": "^1.7.1",
     "apexcharts": "^3.47.0",
-    "crypto-browserify": "^3.12.0",
     "file-saver": "^2.0.5",
     "google-libphonenumber": "^3.2.34",
     "html2canvas": "^1.4.1",
@@ -91,17 +89,19 @@
     "react-virtuoso": "^4.7.2",
     "readable-stream": "^4.5.2",
     "sanitize-filename": "^1.6.3",
-    "sharp-cli": "^2.1.0",
-    "stream-browserify": "^3.0.0",
     "tippy.js": "^6.3.7",
-    "vm": "^0.1.0",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
     "@expo/metro-config": "~0.17.1",
     "@expo/webpack-config": "^19.0.1",
+    "@fto-consult/node-utils": "^1.7.1",
     "babel-plugin-inline-dotenv": "^1.7.0",
-    "babel-plugin-module-resolver": "^5.0.0"
+    "babel-plugin-module-resolver": "^5.0.0",
+    "crypto-browserify": "^3.12.0",
+    "sharp-cli": "^2.1.1",
+    "stream-browserify": "^3.0.0",
+    "vm": "^0.1.0"
   }
 }