@fto-consult/expo-ui 6.74.4 → 6.74.7

package/package.json

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

package/src/components/Datagrid/SWRDatagrid.js

@@ -169,7 +169,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     testID = defaultStr(testID,"RNSWRDatagridComponent");
     React.useEffect(()=>{
         showProgressRef.current = false;
-    });
+    },[showProgressRef.current.current]);
     const {error, isValidating,isLoading,data:result,refresh} = useSWR(fetchPath,{
         fetcher : (url,opts)=>{
             if(!isInitializedRef.current) {
@@ -232,7 +232,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         },500);
     },[error]);
     const doRefresh = (showProgress)=>{
-        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : showProgressRef.current;
+        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : false;
         refresh();
     }
     const canPaginate = ()=>{
@@ -407,6 +407,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                 if(force){
                     pageRef.current = firstPage;
                 }
+                console.log("will fetch ",force,props);
                 doRefresh(force);
                 return false;
             }}

package/src/layouts/Screen/TableData.js

@@ -710,7 +710,12 @@ export default class TableDataScreenComponent extends FormDataScreen{
             if(isPromise(upToDB)){
                 upToDB.then((upserted)=>{
                     const willCloseAfterSave =  action === 'save2close' || !hasManyData;
-                    let savedData = this.isDocEditing(upserted)? upserted : data;
+                    let hasUpserted = this.isDocEditing(upserted);
+                    if(!hasUpserted && isObj(upserted) && isObj(upserted.data) && this.isDocEditing(upserted.data)){
+                        upserted = upserted.data;
+                        hasUpserted = true;
+                    }
+                    const savedData = hasUpserted? upserted : data;
                     const newArgs = {tableName,actionName:action,action,table:this.table,data:savedData,result:upserted,context};
                     APP.trigger(cActions.upsert(tableName),newArgs);
                     if(this.onSaveTableData(newArgs) === false || (isFunction(this.props.onSave)&& this.props.onSave(newArgs) === false)){
@@ -739,6 +744,15 @@ export default class TableDataScreenComponent extends FormDataScreen{
                     } else {
                         notify('Données modifiée avec succès!!','success');
                     }
+                    if(hasUpserted){
+                        if(this.state.hasManyData && Array.isArray(this.state.datas)){
+                            const sData = [...this.state.datas];
+                            sData[this.state.currentIndex] = savedData;
+                            return this.setState({data:upserted,datas:sData},closePreloader);
+                        } else {
+                            return this.setState({data:savedData},closePreloader);
+                        }
+                    }
                     closePreloader();
                 }).catch((e)=>{
                     console.log('error on saving table data ',e);