@fto-consult/expo-ui 4.2.0 → 4.3.0

package/babel.config.alias.js

@@ -140,7 +140,7 @@ module.exports = (opts)=>{
     }
     const jsonPath = path.resolve(base,'package.json');
     if(fs.existsSync(jsonPath)){
-        require("./electron/utils/copy")(jsonPath,path.resolve(dir,"electron","package.json"));
+        require("./electron/utils/copy")(jsonPath,path.resolve(dir,"electron","package.app.json"));
     }
     ///on sauvegarde les chemins des fichiers utiles, qui seront utilisées par la variable electron plus tard
     writeFile(path.resolve(dir,"electron","paths.json"),JSON.stringify(electronPaths));

package/bin/init.js

@@ -7,6 +7,7 @@ const writeFile = require("../electron/utils/writeFile");
 const copy = require("../electron/utils/copy");
 const electronDir = path.resolve(__dirname,"..","electron");
 const createIndexFile = require("../electron/create-index-file");
+const appSuffix = " Desktop";
 
 module.exports = ({
     projectRoot,
@@ -30,6 +31,11 @@ module.exports = ({
             "package" : "npx expo-ui electron package",
             "compile2package" : "npx expo-ui electron package compile"
         }
+        projectRootPackage.realAppName = typeof projectRootPackage.realAppName =="string" && projectRootPackage.realAppName || projectRootPackage.name;
+        projectRootPackage.name = projectRootPackage.name.trim();
+        if(!projectRootPackage.name.endsWith(appSuffix)){
+            projectRootPackage.name +=appSuffix;
+        }
         writeFile(electronProjectRootPackage,JSON.stringify(projectRootPackage,null,'\t'));
         if(!fs.existsSync(electronProjectRootPackage)){
             throw `unable to create ${electronProjectRootPackage} file`;

package/electron/dependencies.js

@@ -2,7 +2,8 @@ module.exports = {
     "main" : {
 		"conf": "^10.2.0",
 		"node-machine-id": "latest",
-        "fs-extra" : "latest"
+        "fs-extra" : "latest",
+		"node-sqlite" : "latest",
 	},
 	"dev" : {
 		"electron": "^22.2.0",

package/electron/package.app.json

@@ -0,0 +1,56 @@
+{
+  "name": "sage-ftc",
+  "version": "1.0.0",
+  "description": "Accès distant aux données commerciales et comptables Sage100C de partout",
+  "main": "index.js",
+  "devMail": "sage-ftc@fto-consulting.com",
+  "devWebsite": "http://fto-consulting.com/sage-ftc/",
+  "copyRight": "FTO consulting@Août 2022",
+  "id": "com.ftc.apps.sage.ftc",
+  "theme": {
+    "ligth": {
+      "primary": "#3D8B5F",
+      "secondary": "#354448"
+    }
+  },
+  "convertDatagridFiltersToSQL": true,
+  "scripts": {
+    "test": "test",
+    "start": "npx expo start",
+    "start-c": "npx expo start -c",
+    "build": "npx expo export:web",
+    "electron": "node ./expo-ui/bin start electron url=http://localhost:19006/",
+    "build-android": "eas build --clear-cache -p android --profile preview",
+    "delete-node-modules": "rimraf ./**/node_modules",
+    "package": "node ./expo-ui/bin package compile2"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/borispipo/sage-ftc.git"
+  },
+  "keywords": [
+    "XposeFTC",
+    "Sage100C",
+    "Accès",
+    "distant"
+  ],
+  "author": "BorisFouomene@fto-consulting",
+  "license": "UNLICENCED",
+  "bugs": {
+    "url": "https://github.com/borispipo/sage-ftc/issues"
+  },
+  "homepage": "./",
+  "dependencies": {
+    "@fto-consult/expo-ui": "^4.2.0",
+    "react-native": "0.70.5"
+  },
+  "devDependencies": {
+    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+    "@babel/preset-react": "^7.18.6",
+    "@expo/metro-config": "^0.5.2",
+    "@expo/webpack-config": "^0.17.4",
+    "babel-plugin-inline-dotenv": "^1.7.0",
+    "babel-plugin-module-resolver": "^4.1.0",
+    "babel-plugin-transform-inline-environment-variables": "^0.4.4"
+  }
+}

package/index.js

@@ -1,36 +1,16 @@
 import { registerRootComponent } from "expo";
 import {Platform } from 'react-native';
-import { createRoot } from 'react-dom/client';
-import appConfig from "$capp/config";
 import { activateKeepAwake } from 'expo-keep-awake';
-//import { startNetworkLogging } from 'react-native-network-logger';
+import App from "./src/App";
 if (__DEV__) {
     activateKeepAwake();
 }
 const isWeb = Platform.OS === "web";
-/**** initialise l'application expoUI avec les paramètres de configuration
- * les options sont de la forme : 
- * {
- *      config {object}, le fichier de configuration de l'application
- * }
- */
-export default function ExpoUIApp (options){
+export default function registerApp (options){
     options = options && typeof options =='object' && !Array.isArray(options)? options : {};
-    const {initConfig,...opts} = options;
-    appConfig.current = options.config;
-    if(typeof initConfig ==='function'){
-        initConfig({appConfig,config:appConfig});
-    }
-    const App = require('./src/App').default(opts);
-    if (false) {
-        const root = createRoot(document.getElementById("root") || document.getElementById("main"));
-    } else {
-        registerRootComponent(App);
-    }
-}
-
-if(__DEV__ && !isWeb){
-    //startNetworkLogging();
+    registerRootComponent(function(props){
+        return <App {...props} {...options}/>
+    });
 }
 
 ///fix bug lié au fait que l'application stuck on splashscreen en environnement mobile

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^2.18.0",
+    "@fto-consult/common": "^2.20.12",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

package/src/App.js

@@ -40,10 +40,8 @@ Object.map(Utils,(v,i)=>{
      window[i] = v;
   }
 });
-export default function getIndex(options){
-  const {App,onMount,onUnmount,preferences:appPreferences} = defaultObj(options);
-  return function MainIndexComponent() {
-    const isScreenFocusedRef = React.useRef(true);
+export default function getIndex({App,onMount,onUnmount,preferences:appPreferences}){
+  const isScreenFocusedRef = React.useRef(true);
     ///garde pour chaque écran sa date de dernière activité
     const screensRef = React.useRef({});//la liste des écrans actifs
     const activeScreenRef = React.useRef('');
@@ -202,7 +200,6 @@ export default function getIndex(options){
         </GestureHandlerRootView>
       </SWRConfig>
     );
-  }
 };
 
 setDeviceIdRef.current = ()=>{

package/src/components/Countries/Flag.js

@@ -6,26 +6,26 @@ import View from "$ecomponents/View"
 import theme from "$theme";
 import Label from "$components/Label";
 
-export default function CountryFlagComponent({code,label,withName,withCode,text,containerProps,labelProps,withLabel,tesID,...props}){
+export default function CountryFlagComponent({code,label,withName,withCode,text,containerProps,labelProps,withLabel,testID,...props}){
     if(!isNonNullString(code)) return null;
     const country = getCountry(code);
-    tesID = defaultStr(tesID,"RN_CountryFlagComponent");
-    if(!country) return <Label tesID={tesID+"_NotFoundCode"}>{code}</Label>;
+    testID = defaultStr(testID,"RN_CountryFlagComponent");
+    if(!country) return <Label testID={testID+"_NotFoundCode"}>{code}</Label>;
     //console.log(country," is county");
     containerProps = Object.assign({},containerProps);
     labelProps = Object.assign({},labelProps);
-    return <View  {...containerProps} testID={tesID} style={[theme.styles.row,containerProps.style]}>
+    return <View  {...containerProps} testID={testID} style={[theme.styles.row,containerProps.style]}>
         {(isNonNullString(country.image) || isNumber(country.image)) ? 
             <Image  
             accessibilityIgnoresInvertColors 
-            tesID ={tesID+"Image"}
+            testID ={testID+"Image"}
             editable = {false}
             {...props}
             size = {25} 
             style={[props.style]} 
             src={country.image}
         /> : null}
-        {<Label tesID={tesID+"_Label"} {...labelProps} style={[labelProps.style,{marginLeft:5}]}>
+        {<Label testID={testID+"_Label"} {...labelProps} style={[labelProps.style,{marginLeft:5}]}>
             {withName || withLabel ? country.name : withCode ? country.code.toUpperCase() : null}
         </Label>}
     </View>

package/src/navigation/utils.js

@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 import {navigate,sanitizeName} from "$cnavigation";
 import {isNonNullString,defaultStr,defaultObj,isObj} from "$utils";
+
+
 export const tableDataRouteName = 'TableData';
 
 export const navigateToTableData = function(tableName,params,actionType){
@@ -69,3 +71,4 @@ export const navigateToTableDataList = function (tableName,params){
     return false;
 }
 
+export * from "$cnavigation";

package/electron/package.json

@@ -1,32 +0,0 @@
-{
-	"name": "sage-ftc",
-	"version": "1.0.0",
-	"description": "Accès distant aux données commerciales et comptables Sage100C de partout",
-	"main": "./index.js",
-	"scripts": {
-		"test": "test",
-		"start": "npx expo start",
-		"start-c": "npx expo start -c",
-		"build": "npx expo export:web",
-		"electron": "node ./expo-ui/bin start electron url=http://localhost:19006/",
-		"build-android": "eas build --clear-cache -p android --profile preview",
-		"delete-node-modules": "rimraf ./**/node_modules",
-		"package": "node ./expo-ui/bin package compile2"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/borispipo/sage-ftc.git"
-	},
-	"keywords": [
-		"XposeFTC",
-		"Sage100C",
-		"Accès",
-		"distant"
-	],
-	"author": "BorisFouomene@fto-consulting",
-	"license": "UNLICENCED",
-	"bugs": {
-		"url": "https://github.com/borispipo/sage-ftc/issues"
-	},
-	"homepage": "./"
-}