@fto-consult/expo-ui 2.34.4 → 2.35.1

package/package.json

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

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

@@ -166,6 +166,9 @@ export default class CommonDatagridComponent extends AppComponent {
         let {
             data,
             selectedRows,
+            chartAllowedPerm,
+            exportToPDFAllowedPerm,
+            exportToExcelAllowedPerm,
             ...rest
         } = props;
         if(this.bindResizeEvents()){
@@ -196,15 +199,27 @@ export default class CommonDatagridComponent extends AppComponent {
         });
         const disTypes = {};
         let hasFoundDisplayTypes = false;
+        const perm = isNonNullString(chartAllowedPerm)? Auth.isAllowedFromStr(chartAllowedPerm) : true;
+        const ePDFIsAllowed = isNonNullString(exportToPDFAllowedPerm)? Auth.isAllowedFromStr(exportToPDFAllowedPerm) : true;
+        const eExcelISAllowed = isNonNullString(exportToExcelAllowedPerm)? Auth.isAllowedFromStr(exportToExcelAllowedPerm) : true;
         Object.map(this.props.displayTypes,(dType,v)=>{
             if(isNonNullString(dType)){
                 dType = dType.toLowerCase().trim();
                 if(displayTypes[dType]){
+                    const dp = displayTypes[dType];
+                    if(dp.isChart && !perm){
+                        return;
+                    }
+                    hasFoundDisplayTypes = true;
                     disTypes[dType] = Object.clone(displayTypes[dType]);
                 }
-                hasFoundDisplayTypes = true;
             }
         });
+        const allowedDisplayTypes = {};
+        Object.map(displayTypes,(t,i)=>{
+            if(t.isChart && !perm) return;
+            allowedDisplayTypes[i] = Object.clone(t);
+        })
         Object.defineProperties(this,{
             layoutRef : {
                 value : React.createRef(null),
@@ -230,6 +245,9 @@ export default class CommonDatagridComponent extends AppComponent {
             isLoadingRef : {
                 value : {current:false}
             },
+            isChartAllowed : {value : perm},
+            isExcellExportAllowed : {value:eExcelISAllowed},
+            isPDFExportAllowed : {value: ePDFIsAllowed},
             currentFilteringColumns : {value:{}},
             emptySectionListHeaderValue : {value : uniqid("empty-section-list-header-val").toUpperCase()},
             getSectionListHeaderProp : {value : typeof this.props.getSectionListHeader =='function'? this.props.getSectionListHeader : undefined},
@@ -242,7 +260,7 @@ export default class CommonDatagridComponent extends AppComponent {
             ///la liste des fonctions d'aggregations supportées
             aggregatorFunctions : {value : extendAggreagatorFunctions(this.props.aggregatorFunctions)},
             ///les types d'affichage
-            displayTypes : {value : hasFoundDisplayTypes ? disTypes : Object.clone(displayTypes)},
+            displayTypes : {value : hasFoundDisplayTypes ? disTypes : allowedDisplayTypes},
             dateFields : {value : {}},
             sectionListColumnsSize : {value : {current:0}}, //la taille du nombre d'éléments de section dans les colonnes
             chartRef : {value : {current:null}},
@@ -372,6 +390,12 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         return this.state.sectionListColumns;
     }
+    canExportToPDF(){
+        return this.isPDFExportAllowed;
+    }
+    canExportToExcel (){
+        return this.isExcellExportAllowed;
+    }
     bindResizeEvents(){
         return false;
     }
@@ -1627,16 +1651,17 @@ export default class CommonDatagridComponent extends AppComponent {
             })
         }
         return <Menu
-            title = "Type d'affichage"
+            title = {"Type d'affichage ["+activeType.label+"]"}
             items = {m}
             anchor = {(p)=>{
                 return <Pressable {...p} style={[theme.styles.row]}>
                     <Icon
                         {...p}
                         name = {activeType.icon}
+                        color = {theme.colors.primaryOnSurface}
                         title = {"Les données s'affichent actuellement en {0}. Cliquez pour modifier le type d'affichage".sprintf(activeType.label)}
                     />
-                    {this.isDashboard() && <Label textBold>Type d'affichage</Label>||null}
+                    {this.isDashboard() && <Label textBold primaryOnSurface>{activeType.label||"Type d'affichage"}</Label>||null}
                 </Pressable>
             }}
         />
@@ -3533,6 +3558,12 @@ CommonDatagridComponent.propTypes = {
         /**** les series à utiliser pour l'affichage des données lorsque les colonnes sont groupées, ie les montant de totalisation sont utilisés */
         sectionListHeadersSeries : PropTypes.arrayOf(PropTypes.string),
     }),
+    /*** la permission autorisée pour l'export en pdf */
+    exportToPDFAllowedPerm : PropTypes.string,
+    /*** la permission autorisée pour l'export en excel*/
+    exportToExcelAllowedPerm : PropTypes.string,
+    /*** la permission que doit avoir l'utilisateur pour pouvoir visualiser les graphes à partir du diagrame */
+    chartAllowedPerm : PropTypes.string,
     displayType : chartDisplayType,
     /*** les types d'afichates supportés par l'application */
     displayTypes : PropTypes.arrayOf(chartDisplayType),

package/src/layouts/DatabaseStatistics/DatabaseStatistic.js

@@ -18,7 +18,7 @@ import fetch from "$capi/fetch";
 import Auth from "$auth";
 import Icon from "$ecomponents/Icon";
 
-export default function DatabaseStatisticContainer ({dashboardProps,fetchDataProps,table,fetchCount,index,testID,title,icon,onPress:customOnPress,columns,fetchData,withDashboard,...props}){
+export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll,fetchDataProps,table,fetchCount,index,testID,title,icon,onPress:customOnPress,columns,fetchData,withDashboard,...props}){
     dashboardProps = defaultObj(dashboardProps);
     const [count,setCount] = React.useState(0);
     const datagridRef = React.useRef(null);
@@ -44,6 +44,11 @@ export default function DatabaseStatisticContainer ({dashboardProps,fetchDataPro
     }
     const refreshingRef = React.useRef(null);
     const isMounted = React.useIsMounted();
+    const onRefreshAllItem = typeof onRefreshAll =='function'? {
+        text : "Tout actualiser",
+        onPress : onRefreshAll,
+        icon : "refresh-circle"
+    } : {}
     
     const [isLoading,setIsLoading] = React.useState(withDashboard?false:true);
     const refresh = ()=>{
@@ -148,7 +153,7 @@ export default function DatabaseStatisticContainer ({dashboardProps,fetchDataPro
                     </View>
                     <Menu
                         testID={testID+"_Menu"}
-                        items = {context.renderMenu()}
+                        items = {[...context.renderMenu(),onRefreshAllItem]}
                         anchor = {(p)=><Pressable {...p} style={[theme.styles.pl1]} testID={testID+"_MenuAnchor"}>
                             <Label
                                 textCenter
@@ -177,7 +182,8 @@ export default function DatabaseStatisticContainer ({dashboardProps,fetchDataPro
                         icon : "refresh",
                         onPress : refresh,
                         text : "Actualiser"
-                    }
+                    },
+                    onRefreshAllItem,
                 ]}
                 anchor = {(p)=><Avatar suffix={index} {...aProps} {...p} icon= {icon} size={40} label={title}/>}
             />

package/src/layouts/DatabaseStatistics/index.js

@@ -5,6 +5,7 @@ import React from "$react";
 import DatabaseStatistic from "./DatabaseStatistic";
 import theme from "$theme";
 import PropTypes from "prop-types";
+import Auth from "$cauth";
 
 export const title = 'Statistiques en BD';
 export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tableFilter,fetchCount,fetchData,title:customTitle,contentProps,containerProps,tables,Component,...props}){
@@ -12,6 +13,7 @@ export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tabl
         containerProps = defaultObj(containerProps);
         const title = containerProps.title = defaultStr(containerProps.title,DatabaseStatisticScreen.title);
         contentProps = defaultObj(contentProps);
+        const forceRender = React.useForceRender();
         if(Component == Cell){
             containerProps.desktopSize = defaultNumber(containerProps.desktopSize,12);
             containerProps.tabletSize = defaultNumber(containerProps.tabletSize,8);
@@ -28,6 +30,8 @@ export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tabl
                table = t;
             }
             if(table.databaseStatistic === false || table.databaseStatistics === false) return null;
+            const chartAllowedPerm =  defaultStr(table.chartAllowedPerm);
+            if(chartAllowedPerm && !Auth.isAllowedFromStr(chartAllowedPerm || !Auth.isTableDataAllowed({table:tableName}))) return null;
             content.push(<Cell elevation = {5} withSurface mobileSize={12} desktopSize={3} tabletSize={4} {...contentProps} key = {index} >
                 <DatabaseStatistic
                     icon = {table.icon}