@fto-consult/expo-ui 1.0.29 → 1.0.31

package/babel.config.alias.js

@@ -42,6 +42,17 @@ module.exports = (opts)=>{
     if(!r["$file-system"]){
         r["$file-system"] = r["$efile-system"];
     }
+    /*** cet alias est utilisé pour modifier les différents items par défaut, rendu par le composant Drawer
+     *  l'alias @drawerItems doit retourner en default, soit un tableau où un objet d'objet où une fonction
+     * si c'est une fonction, alors la function est exécutée pour obtenir la liste des items à utiliser par le drawer principal
+     */
+    if(!r["$drawerItems"]){
+        r["$drawerItems"] = path.resolve(expo,"navigation","Drawer","items","default")
+    }
+    ///si l'alias $navigation n'a pas été définie par défaut, alors celui cet allias prendra la même valeur que celle de $envigation
+    if(r["$navigation"] == r["$cnavigation"]){
+        r["$navigation"] = r["$enavigation"];
+    }
     if(typeof opts.mutator =='function'){
         opts.mutator(r);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -60,7 +60,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/metro-config": "^0.4.0",
     "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.1.6",
+    "@fto-consult/common": "^1.1.8",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/netinfo": "9.3.0",

package/src/App.js

@@ -12,7 +12,7 @@ import DialogProvider from "$ecomponents/Dialog/Provider";
 import { DialogProvider as FormDataDialogProvider } from '$eform/FormData';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { PreferencesContext } from './Preferences';
-import {AuthProvider} from '$cauth';
+import {AuthProvider} from '$eauth';
 import {PortalProvider } from '$ecomponents/Portal';
 import ErrorBoundary from "$ecomponents/ErrorBoundary";
 import ErrorBoundaryProvider from "$ecomponents/ErrorBoundary/Provider";

package/src/auth/index.js

@@ -1,3 +1,9 @@
 import AuthGuard from "$cauth/AuthGuard";
 import Login from "./Login";
-AuthGuard.Login = Login;
+AuthGuard.Login = Login;
+
+export * from "$cauth";
+
+export {default} from "$cauth";
+
+export {Login};

package/src/navigation/Drawer/ProfilAvatar/index.js

@@ -10,7 +10,7 @@ import defaultSource from "./defaultAvatar";
 import Button from "$ecomponents/Button";
 import Label from "$ecomponents/Label";
 import Icon from "$ecomponents/Icon";
-import {navigate} from "$enavigation/utils";
+import {navigate} from "$cnavigation";
 import theme from "$theme";
 import {isMobileNative} from "$cplatform";
 
@@ -34,7 +34,6 @@ const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>
                         return navigate({
                             //routeName : screenName,
                             params : {
-                                code : defaultStr(u.code),
                                 user : u,
                             }
                         })
@@ -49,7 +48,7 @@ const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>
                 }
             }
         ];
-      let pseudo = defaultStr(u.code);
+      let pseudo = defaultStr(u.code,u.pseudo,u.email);
       let pT = pseudo;
       if(pseudo.length > 8){
           pT = pseudo.substring(0,7)+".."
@@ -80,7 +79,7 @@ const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>
                                 } else {
                                     u.avatar = dataURL;
                                 }
-                                Auth.upsertUser({code:u.code,avatar:u.avatar},false);
+                                Auth.upsertUser({...u,avatar:u.avatar},false);
                             }
                         }
                         />}
@@ -96,7 +95,7 @@ const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>
                         }}
                     >
                     <View style={styles.labelContainer}>
-                        <Label splitText style={{color:theme.colors.primaryOnSurface}}>{u.code}</Label>
+                        <Label splitText style={{color:theme.colors.primaryOnSurface}}>{pseudo}</Label>
                         <Label splitText style={{fontSize:12,color:theme.colors.secondaryOnSurface,marginTop:6}}>
                             {u.label}
                         </Label>

package/src/navigation/Drawer/index.js

@@ -5,7 +5,7 @@ import items,{isItemActive,refresh as refreshItems} from "./items";
 import APP from "$capp/instance";
 import Auth from "$cauth";
 import Login from "$eauth/Login";
-import {navigate} from "$enavigation/utils";
+import {navigate} from "$cnavigation";
 
 const DrawerNavigator = React.forwardRef(({content,children,state,...props},ref)=>{
     const drawerRef = React.useRef(null);

package/src/navigation/Drawer/items/default.js

@@ -0,0 +1,5 @@
+// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+export default [];

package/src/navigation/Drawer/items/index.js

@@ -1,14 +1,54 @@
+// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 import { isRouteActive} from "$enavigation/utils";
-import items from "./items";
+import "$cutils";
+import APP from "$capp";
+///les items du drawer
+import items from "$drawerItems";
+
+export const getItems = (force)=>{
+    const name = APP.getName();
+    const itx = typeof items === "function" ? items() : items;
+    const r = [
+        {
+            label : name,
+            icon : 'view-dashboard',
+            title : 'Dashboard',
+            routeName : "Home",
+            divider : true,
+        },
+    ];
+    Object.map(itx,(item,i)=>{
+        if(isObj(item)){
+            r.push(item);
+        }
+    })
+    r.push({
+        key : 'dataHelp',
+        label : 'Aide',
+        section : true,
+        divider : false,
+        items : [
+            /*{
+                icon : 'timeline-help',
+                label : name+", Mises à jour",
+            },*/
+        ]
+    });
+    return r;
+}
+
 
 let CACHED_ITEMS = []
 
 export const refresh = ()=>{
-    CACHED_ITEMS = items();
+    CACHED_ITEMS = getItems();
     return CACHED_ITEMS;
 }
 
-export default function mainSidebarItems(options){
+export default function mainDrawerItems(options){
     if(!CACHED_ITEMS.length){
         refresh();
     }

package/src/navigation/index.js

@@ -1,7 +1,6 @@
-export * from "./utils";
 import initScreens from "$escreens";
 import {handleContent,sanitizeName} from '$escreens';
-import {Stack,setInitialRouteName } from "./utils";
+import {Stack,setInitialRouteName } from "$cnavigation";
 import React from "$react";
 import DrawerNavigator from "./Drawer";
 
@@ -42,4 +41,6 @@ export default function NavigationComponent (props){
                 </Stack.Group>
             </Stack.Navigator> }
     </DrawerNavigator>
-}
+}
+
+export * from "$cnavigation";

package/src/screens/utils.js

@@ -1,4 +1,4 @@
-export {sanitizeName} from "$cnavigation/utils";
+export {sanitizeName} from "$cnavigation";
 /**** les groupes d'écrans stack de l'application
  *  un écran peut appartenir à un seul ou plusieur groupe. cependant, le groupe préviée prend la priorité.
  * Ainsi, un écran ne peut être a la fois être public et privée. si tel est le cas, le groupe privée emporte

package/src/navigation/Drawer/items/SyncDataItem.js

@@ -1,20 +0,0 @@
-import Icon from "$ecomponents/Icon";
-import React from "$react";
-import sync from "$database/sync";
-//import SyncInfos from "$ecomponents/Data/SyncInfos";
-
-export default {
-    icon : 'cloud-sync',
-    label : 'Synchroniser',
-    /*right :  (props) => <Icon 
-        {...props}
-        icon ="information-outline" 
-        title="Cliquez pour afficher les informations relatives à la synchronisation des données." 
-    />,*/
-    onPress:(e)=>{
-        React.stopEventPropagation(e);
-        sync.run();
-        return false;
-        //mountDialog(<SyncInfos key={uniqid("sync-infos-k")}/>,"synch-data-dialog-id-mount")/>
-    } ,
-}

package/src/navigation/Drawer/items/items.js

@@ -1,31 +0,0 @@
-import APP from "$capp";
-
-const refresh = (force)=>{
-    const name = APP.getName();
-    return [
-        {
-            label : name,
-            icon : 'view-dashboard',
-            title : 'Dashboard',
-            routeName : "Home",
-            divider : true,
-        },
-        {
-            divider : true,
-        },
-        {
-            key : 'dataHelp',
-            label : 'Aide',
-            section : true,
-            divider : false,
-            items : [
-                /*{
-                    icon : 'timeline-help',
-                    label : name+", Mises à jour",
-                },*/
-            ]
-        }
-    ]
-}
-
-export default refresh;

package/src/navigation/utils.js

@@ -1 +0,0 @@
-export * from "$cnavigation/utils";