@fto-consult/expo-ui 2.18.0 → 2.18.2

package/src/components/Datagrid/Footer/index.js

@@ -5,7 +5,7 @@ import memoize from "$react/memoize";
 export {default as FooterItem} from "./Footer";
 import {parseDecimal} from "$utils";
 
-export const evalSingleValue = ({data,columnDef,field,result,displayLabel,onlyVisible})=>{
+export const evalSingleValue = ({data,columnDef,field,result,withLabel,displayLabel,onlyVisible})=>{
     data = data || {}
     if(!isNonNullString(field) || !isObj(columnDef)) return result;
     onlyVisible = defaultBool(onlyVisible,true);
@@ -22,7 +22,7 @@ export const evalSingleValue = ({data,columnDef,field,result,displayLabel,onlyVi
         currentResult = defaultObj(currentResult);
         if(!isObj(currentResult[field])){
             let label = defaultStr(columnDef.label,columnDef.text);
-            if(!label && displayLabel !== false) return currentResult;
+            if(!label && displayLabel !== false && withLabel !== false) return currentResult;
             currentResult[field] = {
                 label,
                 visible : columnDef.visible,
@@ -39,12 +39,12 @@ export const evalSingleValue = ({data,columnDef,field,result,displayLabel,onlyVi
     })
     return result;
 }
-export const evalValues = memoize(({data,columns,onlyVisible,displayLabel})=>{
+export const evalValues = memoize(({data,columns,onlyVisible,withLabel,displayLabel})=>{
     let result = {};
     Object.map(data,(rowData,i)=>{
         if(!isObj(rowData)) return result;
         Object.map(columns,(columnDef,field)=>{
-            result = evalSingleValue({data:rowData,columnDef,field,result,displayLabel,onlyVisible})
+            result = evalSingleValue({data:rowData,columnDef,field,result,withLabel,displayLabel,onlyVisible})
         })
     })
     return result;
@@ -94,4 +94,6 @@ export default function DGGridFooters (props){
             }
         })}
     </Component>
-}
+}
+
+export {_Footer as Footer};

package/src/components/Datagrid/SWRDatagrid.js

@@ -83,6 +83,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         ListFooterComponent,
         testID,
         autoSort,
+        handleQueryLimit,
         ...rest
     } = props;
     rest = defaultObj(rest);
@@ -130,7 +131,8 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const totalRef = React.useRef(0);
     const isFetchingRef = React.useRef(false);
     const pageRef = React.useRef(1);
-    const limitRef = React.useRef(defaultNumber(getSessionData("limit"),500));
+    const canHandleLimit = handleQueryLimit !== false ? true : false;
+    const limitRef = React.useRef(!canHandleLimit ?0 : defaultNumber(getSessionData("limit"),500));
     const isInitializedRef = React.useRef(false);
     testID = defaultStr(testID,"RNSWRDatagridComponent")
     const {error, isValidating,isLoading,refresh} = useSWR(fetchPath,{
@@ -142,8 +144,14 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             opts = extendObj({},opts,fetchOptionsRef.current);
             opts.queryParams = defaultObj(opts.queryParams);
             opts.queryParams.withTotal = true;
-            opts.queryParams.limit = limitRef.current;
-            opts.queryParams.page = pageRef.current -1;
+            if(canHandleLimit){
+                opts.queryParams.limit = limitRef.current;
+                opts.queryParams.page = pageRef.current -1;
+            } else {
+                delete opts.queryParams.limit;
+                delete opts.queryParams.page;
+                delete opts.queryParams.offset;
+            }
             if(isObj(opts.sort)){
                 opts.queryParams.sort = opts.sort;
             }
@@ -197,17 +205,17 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         };
         refresh();
     }
-    const canPagninate = ()=>{
-        if(typeof totalRef.current !=='number' || typeof pageRef.current !='number' || typeof limitRef.current !='number') return false;
+    const canPaginate = ()=>{
+        if(canHandleLimit && typeof totalRef.current !=='number' || typeof pageRef.current !='number' || typeof limitRef.current !='number') return false;
         if(limitRef.current <= 0) return false;
         return true;
     }
     const getTotalPages = ()=>{
-        if(!canPagninate()) return false;
+        if(!canPaginate()) return false;
         return Math.ceil(totalRef.current / limitRef.current);;
     };
     const getNextPage = ()=>{
-        if(!canPagninate()) return false;
+        if(!canPaginate()) return false;
         const totalPages = getTotalPages();
         let nPage = pageRef.current+1;
         if(nPage > totalPages){
@@ -218,7 +226,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         }
         return nPage;
     },getPrevPage = ()=>{
-        if(!canPagninate()) return false;
+        if(!canPaginate()) return false;
         let pPage = pageRef.current - 1;
         if(pPage < firstPage){
             pPage  = firstPage;
@@ -228,7 +236,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         }
         return pPage;
     }, canSortRemotely = ()=>{
-        if(!canPagninate() || autoSort === true) return false;
+        if(!canPaginate() || autoSort === true) return false;
         ///si le nombre total d'élements est inférieur au nombre limite alors le trie peut être fait localement
         return totalRef.current > limitRef.current && true || false;
     }
@@ -260,7 +268,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                 return false;
             }}
             renderCustomPagination = {({context})=>{
-                if(!canPagninate()) return null;
+                if(!canPaginate()) return null;
                 const page = pageRef.current, totalPages = getTotalPages(), prevPage = getPrevPage(),nextPage = getNextPage();
                 const iconProp = {
                     size : 25,

package/src/components/Datagrid/Table/index.js

@@ -112,7 +112,8 @@ const DatagridFactory = (Factory)=>{
             }
         }
         render(){
-            let {title,testID,actions,selectableMultiple,
+            let {title,testID,actions,
+                selectableMultiple,
                 sortable,
                 autoSort,
                 exportable,
@@ -144,7 +145,7 @@ const DatagridFactory = (Factory)=>{
             exportable = defaultBool(exportable,true);
             let isMobile = isMobileOrTabletMedia();
             selectable = defaultVal(selectable,true);
-            selectableMultiple = defaultBool(selectableMultiple,true);
+            selectableMultiple = this.isSelectableMultiple();
             pagin = defaultVal(pagin,true)
             showPagination = defaultVal(showPagination,true);
 
@@ -167,10 +168,9 @@ const DatagridFactory = (Factory)=>{
             let _progressBar = this.getProgressBar();
             const pointerEvents = isLoading? "none":"auto"; 
 
-            let selectAllRowsToggleTitle = isAllRowsSelected?"Tout Déselec":"Tout Select"
             let restItems = [];
             let max = this.getMaxSelectableRows();
-            if(selectableMultiple && max && defaultBool(this.props.selectableMultiple,true)){
+            if(selectableMultiple && max){
                 max = max.formatNumber();
                 restItems = [
                     ...this.renderCustomMenu(),
@@ -190,6 +190,7 @@ const DatagridFactory = (Factory)=>{
                     }] : [])
                 ]
             }   
+            const {width,height} = Dimensions.get("window");
             const rPagination = showPagination ? <View style={[styles.paginationContainer]}>
                 <ScrollView horizontal showsHorizontalScrollIndicator={!isLoading} style={styles.paginationContainerStyle} contentContainerStyle={styles.minW100}>
                     <View style={[styles.paginationContent]}>
@@ -307,16 +308,16 @@ const DatagridFactory = (Factory)=>{
                     </View>
                 </ScrollView>
             </View> : null;
-            return <View style={[styles.container]} pointerEvents={pointerEvents}>
+            return <View style={[styles.container,{maxHeight:height-100}]} pointerEvents={pointerEvents}>
                 <View ref={this.layoutRef}>
-                    <DatagridActions 
+                    {this.props.showActions !== false ? <DatagridActions 
                         pointerEvents = {pointerEvents}
                         title = {title}
                         context = {this}
                         selectedRows = {Object.assign({},this.selectedRows)}
                         selectedRowsActions = {this.renderSelectedRowsActions.bind(this)}
                         actions = {actions}
-                    />
+                    /> : null}
                     {rPagination}
                     {_progressBar}  
                 </View>

package/src/components/Table/index.js

@@ -364,7 +364,8 @@ const ColumnType = PropTypes.shape({
 const RowType = PropTypes.shape({
 
 });
-const styles = StyleSheet.create({
+
+export const styles = StyleSheet.create({
     datagrid : {
         flex:1,
     },