@fto-consult/expo-ui 2.36.0 → 2.36.2

package/package.json

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

package/src/components/Avatar/Image.js

@@ -55,6 +55,7 @@ const AvatarImage = React.forwardRef(({
           borderRadius,
         },
         flattenedStyle,
+        !isRounded && {borderRadius:0},
       ]}
       {...rest}
     >

package/src/components/Avatar/index.js

@@ -19,9 +19,13 @@ const defaultSize = 40;
  */
 const AvatarComponent = React.forwardRef((props,ref)=>{
     let Component = undefined;
-    let {image,icon,testID,color,title,toolip,src,onPress,containerProps,useSuffix,suffix,size,children,label,source,text,...rest} = props;
-    label = defaultVal(label,text,children);
-	if(typeof label =='number') label = label+"";
+    let {image,icon,testID,color,title,toolip,src,onPress,containerProps,withLabel,useSuffix,suffix,size,children,label,source,text,...rest} = props;
+    if(withLabel === false){
+        label = null;
+    } else {
+        label = defaultVal(label,text,children);
+	    if(typeof label =='number') label = label+"";
+    }
     rest = defaultObj(rest);
     containerProps = defaultObj(containerProps);
     size = defaultDecimal(size,defaultSize);

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

@@ -89,10 +89,6 @@ const DatagridFactory = (Factory)=>{
             const formatValue = this.formatValue.bind(this);
             return {...this.getActionsArgs(),valueFormatter:formatValue,formatValue,abreviateValues:this.state.abreviateValues,row:item,items:this.state.data,item,rowData:item,index,rowIndex:index,rowCounterIndex:rowIndexCount,rowIndexCount};
         }
-        toggleAbreviateValues(){
-            this.renderingItemsProps = {};
-            return super.toggleAbreviateValues(true);
-        }
         getRenderingItemProps ({item,rowKey,numColumns,index}){
             const rKey = rowKey;
             this.renderingItemsProps = isObj(this.renderingItemsProps)? this.renderingItemsProps : {};

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

@@ -1357,15 +1357,16 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         return this.aggregatorFunctions[Object.keys(this.aggregatorFunctions)[0]];
    }
-   toggleAbreviateValues(resetData){
+   toggleAbreviateValues(){
         setTimeout(()=>{
             this.setIsLoading(true,()=>{
-                const abreviateValues = !this.state.abreviateValues;
-                const state = resetData ===true ? {data : [...this.state.data]} : {};
-                this.setState({abreviateValues,...state},()=>{
-                    this.setIsLoading(false,false);
-                    this.setSessionData("abreviateValues",abreviateValues);
-                })
+                this.prepareData({data:this.INITIAL_STATE.data},(state)=>{
+                    const abreviateValues = !this.state.abreviateValues;
+                    this.setState({abreviateValues,...state},()=>{
+                        this.setIsLoading(false,false);
+                        this.setSessionData("abreviateValues",abreviateValues);
+                    })
+                });
             },true);
         },TIMEOUT);
    }

package/src/components/Drawer/DrawerItems/index.js

@@ -1,5 +1,5 @@
 import React from '$react';
-import {isObj} from "$utils";
+import {isObj,isNonNullString} from "$utils";
 import ExpandableItem from './ExpandableItem';
 import DrawerItem from './DrawerItem';
 import DrawerSection from "./DrawerSection"
@@ -11,6 +11,7 @@ export * from "./utils";
 
 const DrawerItemsComponent = React.forwardRef((props,ref)=> {
   let {items:_items,minimized} = props;
+  const hasAuth = typeof window.Auth !=='undefined' && Auth && Auth.isAllowedFromStr ? true : false;
   _items = typeof _items ==='function'? _items(props) : _items;
   if(React.isValidElement(_items)){
      return _items;
@@ -18,6 +19,7 @@ const DrawerItemsComponent = React.forwardRef((props,ref)=> {
   const r = React.useMemo(()=>{
     let items = []
     const renderExpandableOrSection = ({item,key,items})=>{
+          if(hasAuth && isNonNullString(item.perm) && !Auth.isAllowedFromStr(item.perm)) return null;
           const {section,items:itx2,...rest} = item;
           if(section){
             return <DrawerSection 
@@ -50,16 +52,19 @@ const DrawerItemsComponent = React.forwardRef((props,ref)=> {
           Object.map(item.items,(it,j)=>{
               if(!isObj(it)) return ;
               getDefaultProps(it);
-              const r = renderItem({minimized,renderExpandableOrSection,items:item.items,item:it,key:i+j,props});
+              const r = renderItem({minimized,hasAuth,renderExpandableOrSection,items:item.items,item:it,key:i+j,props});
               if(r){
                 itx.push(r);
               }
           });
           if(itx.length){
-              items.push(renderExpandableOrSection({items:itx,key:i,item}))
+              const rr = renderExpandableOrSection({items:itx,key:i,item});
+              if(rr){
+                items.push(rr);
+              }
           }
       } else {
-          const r = renderItem({minimized,renderExpandableOrSection,items:_items,item,key:i+"",props});
+          const r = renderItem({minimized,hasAuth,renderExpandableOrSection,items:_items,item,key:i+"",props});
           if(r){
             items.push(r);
           }
@@ -114,13 +119,14 @@ const getDefaultProps = function(item){
   return item;
 }
 
-const renderItem = ({item,minimized,renderExpandableOrSection,index,key})=>{
+const renderItem = ({item,minimized,hasAuth,renderExpandableOrSection,index,key})=>{
   key = key||index;
   if(React.isValidElement(item)){
     return <React.Fragment key={key}>
         {item}
     </React.Fragment>
   } else {
+    if(hasAuth && isNonNullString(item.perm) && !Auth.isAllowedFromStr(item.perm)) return null;
     if(!item.label && !item.text && !item.icon) {
         if(item.divider === true){
           const {divider,...rest} = item;

package/src/components/Form/FormData/componentsTypes.js

@@ -17,7 +17,6 @@ const componentTypes =  {
     selectdateformat : Fields.SelectDateFormat,
     selectcurrency : Fields.SelectCurrency,
     currencyformat : Fields.CurrencyFormat,
-    currencyFormat : Fields.CurrencyFormat,
     dateformat : Fields.SelectDateFormat,
     date : Fields.Date,
     time : Fields.Time,
@@ -70,12 +69,8 @@ export const getFilterComponentProps = (_props)=>{
     props = defaultObj(props);
     let component = Fields.TextField;
     type = defaultStr(jsType,type,'text').toLowerCase().replaceAll("_","").replaceAll("-","").trim();
+    const sanitizedType = type.replaceAll("_","").toLowerCase().trim();
     props = defaultObj(props);
-    /*if(type =='datafile'){
-        type = 'select';
-        props = {...selectFieldProps,items : dataFileManager.getAll(),...props};
-        label = defaultStr(label,dataFileManager.dataFileText);
-    }*/
     if(type.startsWith("select")){
         props.inputProps = Object.assign({},props.inputProps);
         props.inputProps.placeholder = defaultStr(props.inputProps.placeholder,i18n.lang("search.."))
@@ -104,16 +99,13 @@ export const getFilterComponentProps = (_props)=>{
         component = Fields.SelectDateFormat;
     } else if(React.isComponent(componentTypes[type])) {
         component = componentTypes[type];
-    } else if(React.isComponent(componentTypes[type.replaceAll("_","")])){
-        component = componentTypes[type.replaceAll("_","")];
     } else if(isNonNullString(props.foreignKeyColumn) && isNonNullString(props.foreignKeyTable)) {
         component = Fields.SelectTableData;
         props.multiple = true;
         type = "select";
     }else {
-        const tt = type.replaceAll("_","").toLowerCase();
-        if(React.isComponent(componentTypes[tt])){
-            component = componentTypes[tt];
+        if(React.isComponent(componentTypes[sanitizedType])){
+            component = componentTypes[sanitizedType];
         } 
         delete props.dbName;
         delete props.tableName;

package/src/components/Image/index.js

@@ -67,7 +67,7 @@ export default function ImageComponent(props){
     disabled = defaultVal(disabled,false);
     readOnly = defaultBool(readOnly,false);
     menuProps = defaultObj(menuProps);
-    round = defaultBool(round,rounded,true);
+    rounded = defaultBool(rounded,round,true);
     containerProps = defaultObj(containerProps);
     drawProps = defaultObj(drawProps);
     const flattenStyle = StyleSheet.flatten(props.style) || {};
@@ -271,7 +271,7 @@ export default function ImageComponent(props){
                             imageProps = {imageProps}
                             {...props}
                             style = {[rest.style]}
-                            rounded = {round}
+                            rounded = {rounded}
                             image = {true}
                             source = {source}
                         />}

package/src/components/SelectCurrency/Format.js

@@ -2,19 +2,39 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 import React from "$react";
-import TextField from "$components/TextField";
+import TextField from "$ecomponents/TextField";
 import appConfig from "$capp/config";
 import {isNonNullString,defaultStr} from "$cutils";
+import Icon from "$ecomponents/Icon";
+import {styles} from "$theme";
 
-const CurrencyFormat = React.forwardRef((props,ref)=>{
-    const defaultValue = isNonNullString(props.defaultValue) && props.defaultValue.contains("v" && props.defaultValue || defaultStr(appConfig.currencyFormat,"%v %s"))
+const CurrencyFormat = React.forwardRef(({disabled,readOnly,right,isFilter,editable,...props},ref)=>{
+    const isEditable = disabled !== true && readOnly !== true && editable !== false;
+    const defaultValue = isNonNullString(props.defaultValue) && props.defaultValue.contains("v" && props.defaultValue) && props.defaultValue || defaultStr(appConfig.currencyFormat,"%v %s");
+    const title = "Format d'affichage des valeurs numériques : une chaine de caractère constitué des lettre %v et %s où %v représente la valeur du montant et %s représente la devise : exemple %s%v => $10 et %s %v => 10 $";
     return <TextField      
         affix = {false}
         enableCopy = {false}
         {...props}
+        disabled = {disabled}
+        readOnly = {readOnly}
+        editable = {isEditable}
         defaultValue = {defaultValue}
+        right = {!isEditable || isFilter ? right : (rP)=>{
+            const r = typeof right =='function'? right(rP) : right;
+            return <>
+                  <Icon
+                        {...rP}
+                        size = {25}
+                        style = {[styles.ml0,styles.mr0]}
+                        name = "alpha-f-box"
+                        title={title}
+                  />
+                 {React.isValidElement(r) && r || null}
+            </>
+        }}
         ref = {ref}
-        title="Format d'affichage des valeurs numériques : de la forme %v%s ou %v représente la valeur du montant et %s représente la devise : exemple %s%v => $10 et %s %v => 10 $"
+        title={title}
     />  
 });