@fto-consult/expo-ui 2.36.2 → 2.36.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.36.2",
+  "version": "2.36.4",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {

package/src/components/Datagrid/Common/Common.js

@@ -43,7 +43,7 @@ import notify from "$cnotify";
 import FileSystem from "$file-system";
 import sprintf from "$cutils/sprintf";
 
-export const TIMEOUT = 200;
+export const TIMEOUT = 100;
 
 export const donutChart = {
     isChart : true,
@@ -1272,15 +1272,15 @@ export default class CommonDatagridComponent extends AppComponent {
         if(!isObj(this.state.sectionListColumns) || !Array.isArray(this.preparedColumns?.sectionListColumnsMenuItems))return;
         const menuItems = this.preparedColumns?.sectionListColumnsMenuItems;
         if(!menuItems.length) return;
-        const sectionListColumns = {...this.state.sectionListColumns};
-        if(enable !== true && isObj(sectionListColumns[columnName])){
-            delete sectionListColumns[columnName];
-        } else {
-            sectionListColumns[columnName] = {field:columnName};
-        }
         setTimeout(()=>{
-            const {sectionListColumns:pSListColumns} = this.prepareColumns({sectionListColumns});
             this.setIsLoading(true,()=>{
+                const sectionListColumns = {...this.state.sectionListColumns};
+                if(enable !== true && isObj(sectionListColumns[columnName])){
+                    delete sectionListColumns[columnName];
+                } else {
+                    sectionListColumns[columnName] = {field:columnName};
+                }
+                const {sectionListColumns:pSListColumns} = this.prepareColumns({sectionListColumns});
                 this.prepareData({data:this.INITIAL_STATE.data,sectionListColumns:pSListColumns},(state)=>{
                     this.setState({...state,sectionListColumns:pSListColumns},()=>{
                         this.setIsLoading(false,false);

package/src/components/Datagrid/SWRDatagrid.js

@@ -158,7 +158,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const fPathRef = React.useRef(defaultStr(fetchPathKey,uniqid("fetchPath")));
     fetchPath = defaultStr(fetchPath,table.queryPath,tableName.toLowerCase()).trim();
     if(fetchPath){
-        fetchPath = setQueryParams(fetchPath,fPathRef.current,fPathRef.current)
+        fetchPath = setQueryParams(fetchPath,"SWRFetchPathKey",fPathRef.current)
     }
     const innerRef = React.useRef(null);
     const showProgressRef = React.useRef(true);

package/src/layouts/DatabaseStatistics/DatabaseStatistic.js

@@ -23,7 +23,6 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
     const [count,setCount] = React.useState(0);
     const datagridRef = React.useRef(null);
     let {} = props;
-    title = defaultStr(title)
     table = defaultObj(table);
     const dbStatistics = defaultObj(table.databaseStatistics,table.databaseStatisticsProps);
     const databaseStatisticsFields = defaultObj(table.databaseStatisticsFields);
@@ -106,6 +105,8 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
     },[columns])();
     const counUpStyle = {fontSize:20,fontWeight:'bold',color:theme.colors.secondaryOnSurface};
     title =  React.isValidElement(title,true)?<Label splitText numberOfLines={1} color={theme.colors.primaryOnSurface} style={[{fontSize:15}]}>{title}</Label>: null;
+    const titleText = title && React.getTextContent(title) || null;
+    const titleItem = titleText && {text:titleText,icon,divider:true} || null;
     return withDashboard ? <Dashboard
         chartProps = {{
             stroke: {
@@ -154,7 +155,7 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
                     </View>
                     <Menu
                         testID={testID+"_Menu"}
-                        items = {[...context.renderMenu(),onRefreshAllItem]}
+                        items = {[titleItem,...context.renderMenu(),onRefreshAllItem]}
                         anchor = {(p)=><Pressable {...p} style={[theme.styles.pl1]} testID={testID+"_MenuAnchor"}>
                             <Label
                                 textCenter
@@ -179,6 +180,7 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
             return <Menu
                 testID={testID+"_Menu"}
                 items = {[
+                    titleItem,
                     {
                         icon : "refresh",
                         onPress : refresh,