@fto-consult/expo-ui 2.0.4 → 2.0.6

package/babel.config.alias.js

@@ -12,6 +12,8 @@ module.exports = (opts)=>{
     const expo = require("./lookup-expo-ui-path")()?path.resolve(r.$src,"..","expo-ui","src") : path.resolve(dir,"src");
     r["$eauth"] = path.resolve(expo,"auth");
     r["$ecomponents"] = r["$expo-components"] = path.resolve(expo,"components");
+    r["$etableLink"] = r["$eTableLink"] = path.resolve(r["$ecomponents"],"TableLink");
+    r.$tableLink = r.$TableLink = r.$tableLink || r.$TableLink || path.resolve(r.$etableLink,"default");
     r["$components"] = r["$components"] || r["$ecomponents"];
     r["$elayouts"] = path.resolve(expo,"layouts");
     r["$emedia"] = path.resolve(expo,"media");

package/package.json

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

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

@@ -29,6 +29,7 @@ import i18n from "$i18n";
 import { makePhoneCall,canMakePhoneCall as canMakeCall} from "$makePhoneCall";
 import copyToClipboard from "$capp/clipboard";
 import { Pressable } from "react-native";
+import TableLink from "$TableLink";
 import appConfig from "$capp/config";
 
 export const arrayValueSeparator = ", ";
@@ -1497,7 +1498,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 _render = <Hashtag>{_render}</Hashtag>
              } else if(typeof columnDef.render === "function"){
                  _render = columnDef.render.call(this,renderArgs);
-             } else if(arrayValueExists( _type,["date","date2time","time"]) && isNonNullString(rowData[columnField])){
+             } else if(arrayValueExists( _type,["date","datetime","time"]) && isNonNullString(rowData[columnField])){
                  let _dd =DateLib.parse(rowData[columnField],_type === 'time'?DateLib.isoTimeFormat:DateLib.SQLDateFormat);
                  if(DateLib.isDateObj(_dd)){
                      _render = DateLib.format(_dd,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));
@@ -1512,6 +1513,22 @@ export default class CommonDatagridComponent extends AppComponent {
                  if(val === checkedValue){
                      _render = checkedLabel;
                  } else _render = uncheckedLabel;
+             }
+             ///le lien vers le table data se fait via une colonne de type selecttabledata ou select_tabledata ou potant l'une des propriétés foreignKeyTable ou linkToTable de type chaine de caractère non nulle
+             else if(arrayValueExists(['piece','selecttabledata','id'],_type) || isNonNullString(columnDef.linkToTable) || isNonNullString(columnDef.foreignKeyTable)){
+                let tableName = defaultStr(columnDef.linkToTable && columnDef.linkToTable,columnDef.foreignKeyTable && columnDef.foreignKeyTable,columnDef.tableName,columnDef.table).toUpperCase();
+                const id = rowData[columnField]?.toString();
+                if(isNonNullString(id)){
+                    _render = <TableLink 
+                        tableName = {tableName} 
+                        id = {id}
+                        data = {rowData}
+                        columnDef = {columnDef}
+                        columnField = {columnField}
+                    >
+                        {rowData[columnField]}
+                    </TableLink>             
+                }
              } else if((_type.contains('select'))){
                  let v1 = rowData[columnField];
                  _render = v1;

package/src/components/TableLink/default.js

@@ -0,0 +1,5 @@
+// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+export {default} from "./index";

package/src/components/TableLink/index.js

@@ -13,19 +13,22 @@ import {styles as _styles} from "$theme";
 import Tooltip from "$ecomponents/Tooltip";
 
 const TableLinKComponent = React.forwardRef((props,ref)=>{
-    let {disabled,labelProps,server,containerProps,testID,Component,routeName,routeParams,component,_id,primary,triggerProps,onPress,children, ...rest} = props;
+    let {disabled,labelProps,server,containerProps,id,columnDef,tableName,data,testID,Component,routeName,routeParams,component,primary,triggerProps,onPress,children, ...rest} = props;
     testID = defaultStr(testID,"RN_TableDataLinkContainer")
+    tableName = defaultStr(tableName).trim();
     rest = defaultObj(rest);
     containerProps = defaultObj(containerProps)
     labelProps = defaultObj(labelProps);
-    _id = defaultStr(_id);
-    if(!_id){
+    columnDef = defaultObj(columnDef);
+    data = defaultObj(data);
+    id = defaultStr(id);
+    if(!id){
         disabled = true;
     }
-    const pointerEvents = disabled || !_id? 'none' : 'auto';
+    const pointerEvents = disabled || !id? 'none' : 'auto';
     const onPressLink = (event)=>{
         React.stopEventPropagation(event);
-        const r = typeof onPress =='function'? onPress(event) : undefined;
+        const r = typeof onPress =='function'? onPress({...React.getOnPressArgs(event),...columnDef,tableName,table:tableName,data,id,value:id,}) : undefined;
         if(isPromise(r)){
             openPreloader("traitement de la requête...");
             r.finally(closePreloader);
@@ -49,7 +52,7 @@ TableLinKComponent.propTypes = {
     ///les props à utiliser pour afficher la table de données en cas de click sur le lien
     triggerProps : PropTypes.object,
     /*** l'id de la données à récupérer en cas de clic sur le lien */
-    _id : PropTypes.string.isRequired,
+    id : PropTypes.string,
     routeName : PropTypes.string,///la route via laquelle on devra naviguer
     routeParam : PropTypes.object,///les props à passer à la route en question
     children : PropTypes.node

package/src/layouts/Screen/ScreenWithOrWithoutAuthContainer.js

@@ -69,7 +69,7 @@ export default function MainScreenScreenWithOrWithoutAuthContainer(props) {
   ];
   options = defaultObj(options);
   appBarProps = defaultObj(appBarProps)
-  title = defaultVal(appBarProps.title,options.title,title);
+  title = defaultVal(title,appBarProps.title,options.title);
   subtitle = defaultVal(appBarProps.subtitle,options.subtitle,subtitle);
   const appBarRef = createAppBarRef();
   const navigation = useNavigation();