@fto-consult/expo-ui 6.68.2 → 6.69.1

package/package.json

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

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

@@ -268,6 +268,7 @@ export default class CommonDatagridComponent extends AppComponent {
             chartRef : {value : {current:null}},
             layoutRef : {value : {}},
             hidePreloaderOnRenderKey : {value : uniqid("hide-preloader-on-render")},
+            canRenderProgressBarKey : {value : uniqid("can-render-pgroessbar")},
             chartSeriesNamesColumnsMapping : {value : {}},//le mappage entre les index des series et les colonnes coorespondantes
         });
         this.setSelectedRows(selectedRows);
@@ -3030,6 +3031,7 @@ export default class CommonDatagridComponent extends AppComponent {
     }
    
     renderProgressBar(props){
+        if(this.props.renderProgressBar === false || !this.canRenderProgressBar()) return null;
         if(typeof props !=='object' || !props || Array.isArray(props)){
             props = {};
         }
@@ -3215,8 +3217,9 @@ export default class CommonDatagridComponent extends AppComponent {
         example common[articles], dans ce cas, la fonction fetchData, aura pour rôle de chercher toutes les données qui match
         la table dans la base common.
         Elle pourra éventuellement passer directement la limite et les filtres à la fonction fetchdata
+        si renderProgressBar est à false alors la progression ne sera pas affiché
     */
-    fetchData ({cb,callback,force,fetchOptions,...rest}){
+    fetchData ({cb,callback,force,renderProgressBar,fetchOptions,...rest}){
         const sData = this.INITIAL_STATE.data || (!this.isTableData() || typeof this.props.fetchData !='function') ? this.props.data : this.state.data;
         if(!this._isMounted()) return Promise.resolve(sData);
         if(this.isFetchingData) {
@@ -3227,6 +3230,7 @@ export default class CommonDatagridComponent extends AppComponent {
         };
         this.isFetchingData = true;
         cb = typeof cb =='function'? cb : typeof callback =='function'? callback : undefined;
+        this.toggleCanRenderProgressBar(renderProgressBar);
         this.fetchingPromiseData = new Promise((resolve,reject)=>{
             setTimeout(()=>{
                 if(typeof cb === 'boolean'){
@@ -3450,23 +3454,28 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         return maxHeight;
     }
+    /***
+        @param {boolean|object}
+        @param {function|object}
+    */
     refresh (force,cb){
+        const opts = isObj(force)? force : isObj(cb)? cb : {};
         if(isFunction(force)){
             let t = cb;
             cb = force;
             force = isBool(t)? t : true;
         }
+        opts.onSuccess = cb = typeof cb =="function"? cb : typeof opts.onSuccess =='function'? opts.onSuccess : undefined;
+        opts.force = defaultBool(force,opts.force,true)
         return new Promise((resolve,reject)=>{
-            setTimeout(()=>{
-                return this.fetchData({force:defaultBool(force,true)}).then((data)=>{
-                    if(isFunction(cb)){
-                        cb(data);
-                    }
-                    if(typeof this.props.onRefreshDatagrid ==='function'){
-                        this.props.onRefreshDatagrid({context:this,force});
-                    }
-                }).then(resolve).catch(reject);
-            },100);
+            return this.fetchData(opts).then((data)=>{
+                if(isFunction(cb)){
+                    cb(data,{...opts,context:this});
+                }
+                if(typeof this.props.onRefresh ==='function'){
+                    this.props.onRefresh({...opts,context:this});
+                }
+            }).then(resolve).catch(reject);
         })
     }
     onResizePage(){
@@ -3549,6 +3558,14 @@ export default class CommonDatagridComponent extends AppComponent {
         const cH = this[this.hidePreloaderOnRenderKey];
         return typeof cH =='boolean'? cH : true;
     }
+    toggleCanRenderProgressBar(toggle){
+        toggle = typeof toggle =='boolean'? toggle : true;
+        this[this.canRenderProgressBarKey] = toggle;
+        return toggle;
+    }
+    canRenderProgressBar(){
+        return this[this.canRenderProgressBarKey] !== false;
+    }
     toggleHidePreloaderOnRender(toggle){
         this[this.hidePreloaderOnRenderKey] = !!toggle;
     }
@@ -3967,7 +3984,11 @@ CommonDatagridComponent.propTypes = {
     */
     filter : PropTypes.func, 
     /*** la barre de progression */
-    renderProgressBar : PropTypes.node,
+    renderProgressBar : PropTypes.oneOfType([
+        PropTypes.node,
+        PropTypes.bool, //si false, alors le progress bar ne sera pas rendu
+        PropTypes.element,
+    ]),
     /*** fonction permettant de retourner l'unique clé des éléments du tableau */
     getRowKey : PropTypes.func,
     ///la fonction utilisée pour l'impression du datagrid
@@ -4080,6 +4101,7 @@ CommonDatagridComponent.propTypes = {
         PropTypes.func,
         PropTypes.bool,
     ]),
+    onRefresh : PropTypes.func,//lorsque la fonction refresh est appelée
     displayType : chartDisplayType,
     /*** les types d'afichates supportés par l'application */
     displayTypes : PropTypes.arrayOf(chartDisplayType),

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

@@ -26,11 +26,7 @@ export default class CommonTableDatagrid extends CommonDatagrid{
 
     /*** lorsque la données est modifiée */
     onUpsertData =(arg) =>{
-        if(!this._isMounted()) return;
-        this.isDataJustComeToUpsert = true; ///on empêche d'afficher le progress bar
-        this.fetchData({force:true}).finally(()=>{
-            this.isDataJustComeToUpsert = undefined;
-        });
+        return this.refresh({force:true,renderProgressBar:false});
     }
 
     componentDidMount(){
@@ -57,10 +53,6 @@ export default class CommonTableDatagrid extends CommonDatagrid{
     isTableData(){
         return true;
     }
-    renderProgressBar(props){
-        if(this.isDataJustComeToUpsert) return null;
-        return super.renderProgressBar(props);
-    }
 }
 
 CommonTableDatagrid.propTypes = {

package/src/components/Datagrid/SWRDatagrid.js

@@ -193,15 +193,27 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                 opts.showError = false;
             }
             if(typeof fetcher =='function'){
-                return fetcher(url,opts);
+                return fetcher(url,opts).then((r)=>{
+                    showProgressRef.current = false;
+                    return r;
+                }).catch((r)=>{
+                    showProgressRef.current = false;
+                    return r;
+                });
             }
-            return apiFetch(url,opts);
+            return apiFetch(url,opts).then((r)=>{
+                showProgressRef.current = false;
+                return r;
+            }).catch((r)=>{
+                showProgressRef.current = false;
+                return r;
+            });
         },
         swrOptions : getSWROptions(swrConfig.refreshTimeout)
     });
     const dataRef = React.useRef(null);
     const totalRef = React.useRef(0);
-    const loading = (customIsLoading === true || isLoading || isValidating);
+    const loading = (customIsLoading === true || isLoading || (isValidating && showProgressRef.current));
     const {data,total} = React.useMemo(()=>{
         if((loading && customIsLoading !== false) || !isObjOrArray(result)){
             return {data:dataRef.current,total:totalRef.current};
@@ -228,7 +240,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         },500);
     },[error]);
     const doRefresh = (showProgress)=>{
-        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : isLoading;
+        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : showProgressRef.current;
         refresh();
     }
     const canPaginate = ()=>{
@@ -391,7 +403,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             handleQueryLimit = {false}
             handlePagination = {false}
             autoSort = {canSortRemotely()? false : true}
-            isLoading = {loading /*&& !error*/ && showProgressRef.current && true || false}
+            isLoading = {loading && showProgressRef.current || false}
             beforeFetchData = {(args)=>{
                 if(typeof beforeFetchData =="function" && beforeFetchData(args)==false) return;
                 let {fetchOptions:opts,force} = args;