@fto-consult/expo-ui 6.74.0 → 6.74.2

package/package.json

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

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

@@ -45,11 +45,13 @@ export const renderRowCell = (arg)=>{
         } else if(typeof columnDef.render === "function"){
             _render = columnDef.render.call(context,renderArgs);
         } else if(arrayValueExists( _type,["date","datetime","time"])){
-            const sqlFormat =_type === 'time'? undefined : _type ==="datetime" ? DateLib.SQLDateTimeFormat : DateLib.SQLDateFormat;
-            let _dd =DateLib.parse(rowData[columnField],sqlFormat);
-            if(DateLib.isDateObj(_dd)){
-                const eFormat = defaultStr(columnDef.format,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));
-                _render = DateLib.format(_dd,eFormat);
+            if(rowData[columnField]){
+                const sqlFormat =_type === 'time'? undefined : _type ==="datetime" ? DateLib.SQLDateTimeFormat : DateLib.SQLDateFormat;
+                let _dd =DateLib.parse(rowData[columnField],sqlFormat);
+                if(DateLib.isDateObj(_dd)){
+                    const eFormat = defaultStr(columnDef.format,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));
+                    _render = DateLib.format(_dd,eFormat);
+                }
             }
             if(!_render) _render = rowData[columnField]
         } else if(arrayValueExists(_type,['switch','checkbox'])){

package/src/components/Datagrid/SWRDatagrid.js

@@ -101,15 +101,16 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         defaultSortColumn,
         defaultSortOrder,
         isLoading : customIsLoading,
+        icon : cIcon,
         ...rest
     } = props;
     const {swrConfig} = useContext();
     rest = defaultObj(rest);
     rest.exportTableProps = defaultObj(rest.exportTableProps)
     const firstPage = 1;
-    const tableName = defaultStr(table.tableName,table.table).trim().toUpperCase();
-    defaultSortColumn = defaultStr(defaultSortColumn,table.defaultSortColumn);
-    defaultSortOrder = defaultStr(defaultSortOrder,table.defaultSortOrder).toLowerCase().trim();
+    const tableName = defaultStr(table?.tableName,table?.table).trim().toUpperCase();
+    defaultSortColumn = defaultStr(defaultSortColumn,table?.defaultSortColumn);
+    defaultSortOrder = defaultStr(defaultSortOrder,table?.defaultSortOrder).toLowerCase().trim();
     sort = isNonNullString(sort)? {column:sort} : isObj(sort)?sort : {};
     const sColumn = defaultStr(sort.column,defaultSortColumn);
     if(sColumn){
@@ -120,26 +121,28 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     } else {
         delete sort.column;
     }
-    canMakePhoneCall = defaultBool(canMakePhoneCall,table.canMakePhoneCall);
-    makePhoneCallProps = isValidMakePhoneCallProps(makePhoneCallProps) && makePhoneCallProps || isValidMakePhoneCallProps(rest.makePhoneCallProps) && rest.makePhoneCallProps ||  isValidMakePhoneCallProps(table.makePhoneCallProps) && table.makePhoneCallProps || {};
-    rowKey = defaultStr(rowKey,table.rowKey,table.primaryKeyColumnName);
-    const title = React.isValidElement(customTitle,true) && customTitle || defaultStr(table.label,table.text)
-    columns = table.fields;
+    canMakePhoneCall = defaultBool(canMakePhoneCall,table?.canMakePhoneCall);
+    makePhoneCallProps = isValidMakePhoneCallProps(makePhoneCallProps) && makePhoneCallProps || isValidMakePhoneCallProps(rest.makePhoneCallProps) && rest.makePhoneCallProps ||  isValidMakePhoneCallProps(table?.makePhoneCallProps) && table?.makePhoneCallProps || {};
+    rowKey = defaultStr(rowKey,table?.rowKey,table?.primaryKeyColumnName);
+    const title = React.isValidElement(customTitle,true) && customTitle || defaultStr(table?.label,table?.text)
+    columns = (isObj(columns) || Array.isArray(columns)) && Object.size(columns,true) && columns || table?.fields;
     const fetchFields = [];
     Object.map(columns,(column,i)=>{
         if(isObj(column)){
             fetchFields.push(defaultStr(column.field,i));
         }
-    })
-    actions = defaultVal(table.actions,actions);
-    for(let i in Datagrid.propTypes){
-        if(i in table){
-            rest[i] = isObj(rest[i])? extendObj(true,{},rest[i],table[i]) : table[i];
+    });
+    actions = defaultVal(table?.actions,actions);
+    if(isObj(table) && isObj(table?.datagrid)){
+        for(let i in Datagrid.propTypes){
+            if(i in table){
+                rest[i] = isObj(rest[i])? extendObj({},rest[i],table[i]) : table[i];
+            }
         }
     }
     rest.actions = actions;
     rest.columns = columns || [];
-    const icon = defaultStr(table.icon);
+    const icon = defaultStr(cIcon,table?.icon);
     rest.tableName = tableName;
     rest.canMakePhoneCall = canMakePhoneCall;
     rest.makePhoneCallProps = makePhoneCallProps;
@@ -151,7 +154,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     },rest.exportTableProps.pdf);
     const fetchOptionsRef = React.useRef(defaultObj(customFetchOptions));
     const fPathRef = React.useRef(defaultStr(fetchPathKey,uniqid("fetchPath")));
-    fetchPath = defaultStr(fetchPath,table.queryPath,tableName.toLowerCase()).trim();
+    fetchPath = defaultStr(fetchPath,table?.queryPath,tableName.toLowerCase()).trim();
     if(fetchPath){
         fetchPath = setQueryParams(fetchPath,"SWRFetchPathKey",fPathRef.current)
     }
@@ -292,7 +295,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     return (
         <Datagrid 
             testID = {testID}
-            {...defaultObj(table.datagrid)} 
+            {...defaultObj(table?.datagrid)} 
             {...rest}
             title = {customTitle || title || undefined}
             sort = {sort}
@@ -448,7 +451,7 @@ SWRDatagridComponent.propTypes = {
             PropTypes.objectOf(PropTypes.object),
             PropTypes.arrayOf(PropTypes.object),
         ])
-    }).isRequired,
+    }),
 }
 
 const styles = StyleSheet.create({

package/src/components/Filter/index.js

@@ -137,7 +137,7 @@ export default class Filter extends AppComponent {
       type = defaultStr(type,this.type,this.props.type).toLowerCase();
       if(type.contains('select')){
           return "$in";
-      } if(type !== 'date2time' && type !== 'time' && type !== 'number' && type !== 'decimal'){
+      } if(type !== 'date2time' && type !=="date" && type !== 'time' && type !== 'number' && type !== 'decimal'){
           return '$regexcontains';
       }
       return '$eq';