@fto-consult/expo-ui 2.14.2 → 2.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.14.2",
+  "version": "2.15.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^1.21.1",
+    "@fto-consult/common": "^1.21.2",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

package/src/components/Datagrid/Checkbox.js

@@ -2,12 +2,14 @@ import {Checkbox} from "$ecomponents/Icon";
 import React from "$react";
 import {defaultObj,isObj} from "$utils";
 import PropTypes from "prop-types";
+import theme from "$theme";
 
 const DatagridCheckboxComponent = React.forwardRef((props,ref)=>{
     const {onChange,rowKey,rowData,row,rowIndex,index,rowsRefs,...rest} = props;
     return <Checkbox
         secondaryOnCheck
-        {...defaultObj(rest)}
+        {...rest}
+        style = {[rest.style,theme.styles.alignItemsCenter]}
         ref = {(el)=>{
             React.setRef(ref,el);
             if(isObj(rowsRefs) && rowKey){

package/src/components/Datagrid/SWRDatagrid.js

@@ -6,7 +6,7 @@
  *  @see : 
  */
 import Datagrid from "./IndexComponent";
-import {defaultStr,defaultObj,defaultVal,isObjOrArray,isObj,extendObj} from "$utils";
+import {defaultStr,defaultObj,defaultVal,isNonNullString,defaultNumber,isObjOrArray,isObj,extendObj} from "$utils";
 import {Pressable} from "react-native";
 import SimpleSelect from "$ecomponents/SimpleSelect";
 import React from "$react";
@@ -27,6 +27,26 @@ import PropTypes from "prop-types";
 import {isDesktopMedia} from "$dimensions";
 import ActivityIndicator from "$ecomponents/ActivityIndicator";
 import {Menu} from "$ecomponents/BottomSheet";
+import session from "$session";
+
+export const getSessionKey = ()=>{
+    return Auth.getSessionKey("swrDatagrid");
+}
+export const getSessionData = (key)=>{
+    const data = defaultObj(session.get(getSessionKey()));
+    return isNonNullString(key) ? data[key.trim()] : data;
+}
+
+export const setSessionData = (key,value)=>{
+    const d = getSessionData();
+    if(isObj(key)){
+        return session.set(getSessionKey(),extendObj({},d,key));
+    }
+    d[key] = value;
+    return session.set(getSessionKey(),d);
+}
+
+
 
 const timeout = 5000*60*60;
 export const swrOptions = {
@@ -110,7 +130,7 @@ 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(500);
+    const limitRef = React.useRef(defaultNumber(getSessionData("limit"),500));
     const isInitializedRef = React.useRef(false);
     testID = defaultStr(testID,"RNSWRDatagridComponent")
     const {error, isValidating,isLoading,refresh} = useSWR(fetchPath,{
@@ -254,7 +274,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                             style = {sStyle}
                             anchor = {(p)=>{
                                 return <Pressable style={[theme.styles.noMargin,theme.styles.noPadding]} {...p} testID={testID+"MenuSelectLimit"}>
-                                    <Label primary  testID={testID+"_Label"} style={[{fontSize:15}]}>
+                                    <Label primary testID={testID+"_Label"} fontSize={16}>
                                         {limitRef.current.formatNumber()}
                                     </Label>
                                 </Pressable>
@@ -268,6 +288,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                                     onPress : ()=>{
                                         if(item == limitRef.current) return;
                                         limitRef.current = item;
+                                        setSessionData("limit",limitRef.current);
                                         pageRef.current = firstPage;
                                         setTimeout(() => {
                                             doRefresh(true);

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

@@ -390,7 +390,8 @@ const styles = StyleSheet.create({
         flexDirection : 'row',
         width : '100%',
         justifyContent : 'flex-end',
-        alignItems : 'center'
+        alignItems : 'center',
+        paddingHorizontal : 10,
     },
     hidden : {
         display : 'none',

package/src/components/Form/Fields/Field.js

@@ -677,7 +677,7 @@ export default class Field extends AppComponent {
         return true;
     }
     onBlurField(event){
-        if(isFunction(this.props.onBlur) && this.props.onBlur({event,context:this}) === false){
+        if(isFunction(this.props.onBlur) && this.props.onBlur({event,value:this.getValue(),context:this}) === false){
             return;
         }
         if(this.isFilter()) return

package/src/components/Label/index.js

@@ -10,7 +10,7 @@ const defaultSelectable = canTextBeSelectable();
 
 export const EllipsizeMode = {'head':'head','middle':'middle', 'tail':'tail' , 'clip':'clip'}
 
-const LabelComponent = React.forwardRef(({ children,upperCase,testID,wrap,nativeID,wrapText,error,underlined,splitText,secondary,primary,bold,textBold,disabled,text,style,...rest},ref)=> {
+const LabelComponent = React.forwardRef(({ children,upperCase,fontSize,testID,wrap,nativeID,wrapText,error,underlined,splitText,secondary,primary,bold,textBold,disabled,text,style,...rest},ref)=> {
     children = defaultVal(children,text);
     let isText = false;
     if(!React.isValidElement(children) && Array.isArray(children) && children.length){
@@ -37,6 +37,7 @@ const LabelComponent = React.forwardRef(({ children,upperCase,testID,wrap,native
     if(underlined){
         r1.textDecorationLine = 'underline';
     }
+    
     style = Object.assign({},StyleSheet.flatten(style));
     testID = defaultStr(testID,"RN_LabelComponent");
     const restProps = {nativeID};
@@ -57,6 +58,9 @@ const LabelComponent = React.forwardRef(({ children,upperCase,testID,wrap,native
                 children = children.toUpperCase();
             }
         }
+        if(fontSize){
+            r1.fontSize = fontSize;
+        }
         return (<Text allowFontScaling = {true} ref = {ref} selectable={defaultSelectable} {...rest} {...restProps} testID={testID} disabled={disabled} style={[styles.label,splitText?styles.wrap:null,splitText?styles.w100:null,bold?styles.bold:null,r2,style,r1,styles.webFontFamilly]}>{children}</Text>)
     }
     let hasP = false;
@@ -91,6 +95,7 @@ LabelComponentExported.propTypes = {
     children : PropTypes.any,
     upperCase: PropTypes.bool,///si la transformation sera en majuscule
     text : PropTypes.any,
+    fontSize : PropTypes.number,
     wrap : PropTypes.bool, //si le texte sera splité vers la ligne suivantes
     wrapText : PropTypes.bool,///alias à wrap
     primary : PropTypes.bool,

package/src/layouts/Screen/TableData.js

@@ -21,6 +21,7 @@ import theme from "$theme";
 import cActions from "$cactions";
 import APP from "$capp/instance";
 import { generatedColumnsProperties } from "./utils";
+import i18n from "$i18n";
 
 
 const HIDE_PRELOADER_TIMEOUT = 300;
@@ -86,6 +87,39 @@ export default class TableDataScreenComponent extends FormDataScreen{
         Object.map(table.fields,(field,i)=>{
             if(isObj(field) && field.form !== false){
                 fields[i] = Object.clone(field);
+                const f = fields[i];
+                f.type = defaultStr(f.jsType,f.type).toLowerCase();
+                const name = f.field = defaultStr(f.field,i);
+                if((f.type =='id' || f.type =='piece' || f.unique === true) && f.unique !== false && f.disabled !== true && f.editable !== false && f.readOnly !== true){
+                    const {onBlur} = f;
+                    f.onBlur = (args)=>{
+                        args = {...f,...args,columnField:name,fieldName:name,id:args.value};
+                        const {context} = args;
+                        const r = typeof onBlur =='function'? onBlur (args) : undefined;
+                        if(r === false) return r;
+                        //on applique la validation seulement en cas de non mise à jour
+                        if(!this.isDocEditingRef.current && context && typeof context.onNoValidate =='function'){
+                            const cb = typeof field.fetchUniqueId =='function'? field.fetchUniqueId : typeof this.fetchUniqueId =='function'? this.fetchUniqueId : undefined;
+                            if(cb){
+                                const r2 = cb(args);
+                                if(isPromise(r2)){
+                                    r2.then((data)=>{
+                                        let message = data;
+                                        if(isObj(data) && Object.size(data,true)){
+                                            message = i18n.lang('validate_rule_field_must_be_unique')+ defaultStr(f.label,f.text);
+                                        }
+                                        if(isNonNullString(message)){
+                                            context.onNoValidate({...args,msg:message,message,context,validRule:context.getValidRule()});
+                                        }
+                                    }).catch((e)=>{
+
+                                    })
+                                } 
+                            }
+                        }
+                        return r;
+                    }
+                }
                 if(field.primaryKey === true){
                     primaryKeyFields[field.field || i] = true;
                 }
@@ -98,6 +132,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
             tableName : { value : defaultStr(table.table,table.tableName)},
             fields : {value : fields},
             table : {value : table},
+            isDocEditingRef : {value : {current:false}},
             validateDataBeforeSave : {value : mainProps.validateData},
             upsertDataToDB : {value : mainProps.upsertToDB},
             makePhoneCallProps : {value : mainProps.makePhoneCallProps},
@@ -105,6 +140,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
             titleProp : {value : mainProps.title},
             closeOnSaveProp : {value : mainProps.closeOnSave || mainProps.closeAfterSave },
             newActionProp : {value : mainProps.newAction},
+            fetchUniqueId : {value : mainProps.fetchUniqueId},
             //la liste des champ de type clé primaire associés à la table
             primaryKeyFields : {value : primaryKeyFields},
             cloneProp : {value : typeof mainProps.clone =='function' && mainProps.clone || undefined},
@@ -195,6 +231,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
         const tableName = this.tableName;
         const sessionName = this.INITIAL_STATE.sessionName = defaultStr(customSessionName,"table-form-data"+tableName);
         const isUpdated = this.isDocEditing(data);
+        this.isDocEditingRef.current = isUpdated;
         const isMobOrTab = isMobileOrTabletMedia();
         let archived = this.isArchived(); 
         this.INITIAL_STATE.archived = archived;
@@ -755,6 +792,8 @@ TableDataScreenComponent.propTypes = {
         table : PropTypes.string,
         fields : PropTypes.object,
     }),
+    unique : PropTypes.bool,//si la validation de type unique sur le champ sera effective
+    fetchUniqueId : PropTypes.func,//la fonction permettant de fetch un élément unique pour la validation de type uniqueID, liée aux champs de type piece et id
     validateData : PropTypes.func,// la fonction permettant de valider les données à enregistrer
     archivedPermsFilter : PropTypes.func,///le filtre des permissions archivées
     newElementLabel : PropTypes.string,//le titre du bouton nouveau pour l'ajout d'un nouvel élément