@fto-consult/expo-ui 7.8.2 → 7.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.8.2",
+  "version": "7.8.5",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -71,8 +71,8 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.75.1",
-    "@fto-consult/electron-gen": "^1.3.4",
+    "@fto-consult/common": "^3.75.2",
+    "@fto-consult/electron-gen": "^1.3.5",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",

package/src/screens/Auth/Profile.js

@@ -11,7 +11,7 @@ import useContext from "$econtext/hooks";
 import PropTypes from "prop-types";
 import APP from "$capp/instance";
 import {isElectron} from "$cplatform";
-import {isValidUrl} from "$cutils/uri";
+import {isValidUrl} from "$cutils";
 import {screenName} from "./utils";
 
 export default function UserProfileScreen({fields,...p}){
@@ -34,6 +34,16 @@ export default function UserProfileScreen({fields,...p}){
     })
     const p2 = {...p,fields};
     const props = typeof profilePropsMutator =='function'? extendObj({},p,profilePropsMutator(p2)) : p2;
+    const {changeElectronAppUrlPerm} = props;
+    const changeElectronUrl = React.useMemo(()=>{
+        if(!isElectron() || !window?.ELECTRON || typeof ELECTRON?.setAppUrl !=='function' || typeof ELECTRON?.getAppUrl !=='function') return false;
+        if(typeof changeElectronAppUrlPerm ==='string'){
+            return Auth.isAllowedFromStr(changeElectronAppUrlPerm);
+        } else if(typeof changeElectronAppUrlPerm =='function'){
+            return !!changeElectronAppUrlPerm(props);
+        } 
+        return Auth.isMasterAdmin();
+    },[changeElectronAppUrlPerm]);
     const user = defaultObj(props.user,Auth.getLoggedUser());
     const testID = defaultStr(props.testID,"RN_UserProfile_FormData");
     const themeRef = React.useRef(defaultObj(user.theme));
@@ -67,7 +77,7 @@ export default function UserProfileScreen({fields,...p}){
         if(args.value === user.avatar) return;
         hasChangeRef.current = true;
     }
-    if(isElectron() && typeof ELECTRON !=='undefined' && window?.ELECTRON && ELECTRON.session && typeof ELECTRON.session?.get =='function'){
+    if(changeElectronUrl){
         fields.mainElectronAppUrl = {
             label : "Url de l'application",
             onValidatorValid : ({value})=>{
@@ -75,7 +85,7 @@ export default function UserProfileScreen({fields,...p}){
                     return "Vous devez spécifier une adresse url valide";
                 } 
             },
-            defaultValue : ELECTRON.appUrl,
+            defaultValue : ELECTRON.getAppUrl(),
         };
     }
     const onSaveProfile = ({data,goBack,...rest})=>{
@@ -83,8 +93,8 @@ export default function UserProfileScreen({fields,...p}){
         Preloader.open("Modification en cours...");
         const toSave = {...user,...data};
         return Auth.upsertUser(toSave,true).then((response)=>{
-            if(isValidUrl(data.mainElectronAppUrl) && isElectron()){
-                ELECTRON.appUrl = data.mainElectronAppUrl;
+            if(changeElectronUrl){
+                ELECTRON.setAppUrl(data.mainElectronAppUrl);
             }
             setTimeout(()=>{
                 APP.trigger(APP.EVENTS.UPDATE_THEME,user.theme);
@@ -95,6 +105,8 @@ export default function UserProfileScreen({fields,...p}){
                 return goBack(true);
             }
             navigate('Home');
+        }).catch(e=>{
+            console.log(e," settings profile data");
         }).finally(()=>{
             setTimeout(()=>{
                 Preloader.close();