@fto-consult/expo-ui 2.7.12 → 2.8.0

package/expo-ui-path.js

@@ -6,26 +6,34 @@ const fs = require("fs");
 const path = require("path");
 const { hideBin } = require('yargs/helpers')
 const yargs = require('yargs/yargs');
+let pathRef = {current:null};
+const metroConfig = "metro.config";
 ///retourne le chemin vers le package @expo-ui
 module.exports = function (...args){
-    const argv = yargs(hideBin(process.argv)).argv
-    let isBuild = false;
-    const expoUIPath = "@fto-consult/expo-ui";
-    if(typeof argv == 'object' && argv && !Array.isArray(argv)){
+    const argv = yargs(hideBin(process.argv)).argv;
+    const suffix = path.join(...args);
+    const isMetroConfig = suffix && suffix.toLowerCase().includes(metroConfig);
+    let isBuild = isMetroConfig ? false : pathRef.current ? true : false;
+    let expoUIPath = isBuild ? pathRef.current : "@fto-consult/expo-ui";
+    if(isMetroConfig && typeof argv == 'object' && argv && !Array.isArray(argv)){
         for(let i in argv){
             let v = argv[i];
             if(typeof v !='string' || !v) continue;
             v = v.toLowerCase(); 
             i = (i+'').toLocaleLowerCase();
-            if(i.includes("export") || v.includes('build') || v.includes('production') || v.includes('export') || v.includes('android')){
-                isBuild = true;
-                break;
+            if(i != '$0'){
+                if(v.includes('production') || v.includes('export') || v.includes('android')){
+                    isBuild = true;
+                    break;
+                }
             }
         }
     }
-    const suffix = path.join(...args);
     const sep = path.sep;
     if(isBuild){
+        if(isMetroConfig){
+            pathRef.current = expoUIPath;
+        }
         const pp = suffix ? path.join(expoUIPath,suffix).replace(sep,"/") : expoUIPath;
         return pp;
     }
@@ -34,6 +42,9 @@ module.exports = function (...args){
         const rootPath = path.resolve(p,"..");
         const src = path.resolve(rootPath,"src");
         if(fs.existsSync(src) && fs.existsSync((path.resolve(rootPath,"babel.config.js")))){
+            if(isMetroConfig){
+                pathRef.current = path.resolve(p);
+            }
             return path.resolve(p,suffix).replace(sep,(sep+sep));
         }
     }

package/package.json

@@ -1,115 +1,115 @@
-{
-  "name": "@fto-consult/expo-ui",
-  "version": "2.7.12",
-  "description": "Bibliothèque de composants UI Expo,react-native",
-  "main": "index.js",
-  "resolutions": {
-    "@expo/cli": "xxx"
-  },
-  "scripts": {
-    "publish1": "npm publish --access=public",
-    "unpublish": "npm -f unpublish @fto-consult/expo-ui",
-    "build-web": "",
-    "dev": "npx expo start -c --no-minify",
-    "start": "npx expo start --dev --no-minify",
-    "start-d": "npx expo start -c --no-dev --no-minify",
-    "start-p": "npm run start-d",
-    "expo-start-client": "npx expo start --dev --no-minify --dev-client",
-    "start-m": "npx expo start - c--dev--no -minify",
-    "android": "npx expo start --android -c",
-    "ios": "npx expo start --ios",
-    "web": "npx expo start --web",
-    "web-c": "npx expo start --web -c",
-    "eject": "expo eject",
-    "emulator": "npm run android-emulator",
-    "web-server": "npx serve web-build",
-    "build-android": "eas build --clear-cache -p android --profile preview",
-    "build-android-local": "eas build --platform android --local",
-    "build-android-dist": "eas build --clear-cache -p android",
-    "build-ios": "eas build --clear-cache -p ios --profile preview",
-    "build-ios-dist": "eas build --clear-cache -p ios",
-    "install-apk": "adb -s emulator-5554 install myapp.apk",
-    "android-emulator": "emulator -avd EMULATOR",
-    "flipper": "npx cross-env METRO_SERVER_PORT=19000 E:\\Studies\\react-native\\debugger\\Flipper-win\\Flipper.exe",
-    "build-electron": "electron-webpack && electron-builder --dir -c.compression=store",
-    "test:build": "electron-webpack && electron-builder --dir -c.compression=store -c.mac.identity=null",
-    "compile-electron": "webpack --config ./electron/webpack.config.js",
-    "compile-electron-p": "webpack --config ./electron/webpack.config.js --mode=production",
-    "electron": "electron ./electron",
-    "logcat": "adb -d logcat com.ftc.apps.salite1:E > errors.txt",
-    "logcat-export": "adb -d logcat com.ftc.apps.salite1 *:S > logcat.txt",
-    "electron-c": "npm run compile-electron && npm run electron",
-    "electron-p": "npm run compile-electron-p && npm run electron",
-    "update-app-version": "node ./update-app-version.js",
-    "find-licenses": "node ./find-licenses.js",
-    "fix-dependencies": "expo doctor --fix-dependencies",
-    "delete-node-modules": "rimraf ./**/node_modules"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/borispipo/expo-ui.git"
-  },
-  "keywords": [
-    "Expo",
-    "React-Native"
-  ],
-  "author": "Boris Fouomene",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/borispipo/expo-ui/issues"
-  },
-  "homepage": "https://github.com/borispipo/expo-ui#readme",
-  "dependencies": {
-    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-    "@babel/preset-react": "^7.18.6",
-    "@emotion/native": "^11.10.0",
-    "@expo/html-elements": "^0.2.0",
-    "@expo/metro-config": "^0.4.0",
-    "@expo/vector-icons": "^13.0.0",
-    "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.13.1",
-    "@gorhom/portal": "^1.0.14",
-    "@react-native-async-storage/async-storage": "~1.17.3",
-    "@react-native-community/datetimepicker": "6.5.2",
-    "@react-native-community/netinfo": "9.3.5",
-    "@react-navigation/native": "^6.0.13",
-    "@react-navigation/native-stack": "^6.9.1",
-    "@shopify/flash-list": "1.3.1",
-    "babel-plugin-inline-dotenv": "^1.7.0",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-inline-environment-variables": "^0.4.4",
-    "expo": "^47.0.8",
-    "expo-camera": "~13.1.0",
-    "expo-clipboard": "~4.0.1",
-    "expo-font": "~11.0.1",
-    "expo-image-picker": "~14.0.2",
-    "expo-linking": "~3.2.3",
-    "expo-sqlite": "~11.0.0",
-    "expo-status-bar": "~1.4.2",
-    "expo-system-ui": "~2.0.1",
-    "expo-web-browser": "~12.0.0",
-    "google-libphonenumber": "^3.2.31",
-    "htmlparser2-without-node-native": "^3.9.2",
-    "mongo-parse": "^2.1.0",
-    "parent-package-json": "^2.0.1",
-    "prop-types": "^15.8.1",
-    "react": "18.1.0",
-    "react-apexcharts": "^1.4.0",
-    "react-content-loader": "^6.2.0",
-    "react-dom": "18.1.0",
-    "react-native": "0.70.5",
-    "react-native-big-list": "^1.5.5",
-    "react-native-gesture-handler": "~2.8.0",
-    "react-native-paper": "^4.12.5",
-    "react-native-paper-dates": "^0.9.2",
-    "react-native-reanimated": "~2.12.0",
-    "react-native-safe-area-context": "4.4.1",
-    "react-native-screens": "~3.18.0",
-    "react-native-svg": "13.4.0",
-    "react-native-web": "~0.18.7",
-    "react-native-webview": "11.23.1",
-    "sharp-cli": "^2.1.0",
-    "tippy.js": "^6.3.7",
-    "yargs": "^17.1.1-candidate.0"
-  }
-}
+{
+  "name": "@fto-consult/expo-ui",
+  "version": "2.8.0",
+  "description": "Bibliothèque de composants UI Expo,react-native",
+  "main": "index.js",
+  "resolutions": {
+    "@expo/cli": "xxx"
+  },
+  "scripts": {
+    "publish1": "npm publish --access=public",
+    "unpublish": "npm -f unpublish @fto-consult/expo-ui",
+    "build-web": "",
+    "dev": "npx expo start -c --no-minify",
+    "start": "npx expo start --dev --no-minify",
+    "start-d": "npx expo start -c --no-dev --no-minify",
+    "start-p": "npm run start-d",
+    "expo-start-client": "npx expo start --dev --no-minify --dev-client",
+    "start-m": "npx expo start - c--dev--no -minify",
+    "android": "npx expo start --android -c",
+    "ios": "npx expo start --ios",
+    "web": "npx expo start --web",
+    "web-c": "npx expo start --web -c",
+    "eject": "expo eject",
+    "emulator": "npm run android-emulator",
+    "web-server": "npx serve web-build",
+    "build-android": "eas build --clear-cache -p android --profile preview",
+    "build-android-local": "eas build --platform android --local",
+    "build-android-dist": "eas build --clear-cache -p android",
+    "build-ios": "eas build --clear-cache -p ios --profile preview",
+    "build-ios-dist": "eas build --clear-cache -p ios",
+    "install-apk": "adb -s emulator-5554 install myapp.apk",
+    "android-emulator": "emulator -avd EMULATOR",
+    "flipper": "npx cross-env METRO_SERVER_PORT=19000 E:\\Studies\\react-native\\debugger\\Flipper-win\\Flipper.exe",
+    "build-electron": "electron-webpack && electron-builder --dir -c.compression=store",
+    "test:build": "electron-webpack && electron-builder --dir -c.compression=store -c.mac.identity=null",
+    "compile-electron": "webpack --config ./electron/webpack.config.js",
+    "compile-electron-p": "webpack --config ./electron/webpack.config.js --mode=production",
+    "electron": "electron ./electron",
+    "logcat": "adb -d logcat com.ftc.apps.salite1:E > errors.txt",
+    "logcat-export": "adb -d logcat com.ftc.apps.salite1 *:S > logcat.txt",
+    "electron-c": "npm run compile-electron && npm run electron",
+    "electron-p": "npm run compile-electron-p && npm run electron",
+    "update-app-version": "node ./update-app-version.js",
+    "find-licenses": "node ./find-licenses.js",
+    "fix-dependencies": "expo doctor --fix-dependencies",
+    "delete-node-modules": "rimraf ./**/node_modules"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/borispipo/expo-ui.git"
+  },
+  "keywords": [
+    "Expo",
+    "React-Native"
+  ],
+  "author": "Boris Fouomene",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/borispipo/expo-ui/issues"
+  },
+  "homepage": "https://github.com/borispipo/expo-ui#readme",
+  "dependencies": {
+    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+    "@babel/preset-react": "^7.18.6",
+    "@emotion/native": "^11.10.0",
+    "@expo/html-elements": "^0.2.0",
+    "@expo/metro-config": "^0.4.0",
+    "@expo/vector-icons": "^13.0.0",
+    "@expo/webpack-config": "^0.17.2",
+    "@fto-consult/common": "^1.14.15",
+    "@gorhom/portal": "^1.0.14",
+    "@react-native-async-storage/async-storage": "~1.17.3",
+    "@react-native-community/datetimepicker": "6.5.2",
+    "@react-native-community/netinfo": "9.3.5",
+    "@react-navigation/native": "^6.0.13",
+    "@react-navigation/native-stack": "^6.9.1",
+    "@shopify/flash-list": "1.3.1",
+    "babel-plugin-inline-dotenv": "^1.7.0",
+    "babel-plugin-module-resolver": "^4.1.0",
+    "babel-plugin-transform-inline-environment-variables": "^0.4.4",
+    "expo": "^47.0.8",
+    "expo-camera": "~13.1.0",
+    "expo-clipboard": "~4.0.1",
+    "expo-font": "~11.0.1",
+    "expo-image-picker": "~14.0.2",
+    "expo-linking": "~3.2.3",
+    "expo-sqlite": "~11.0.0",
+    "expo-status-bar": "~1.4.2",
+    "expo-system-ui": "~2.0.1",
+    "expo-web-browser": "~12.0.0",
+    "google-libphonenumber": "^3.2.31",
+    "htmlparser2-without-node-native": "^3.9.2",
+    "mongo-parse": "^2.1.0",
+    "parent-package-json": "^2.0.1",
+    "prop-types": "^15.8.1",
+    "react": "18.1.0",
+    "react-apexcharts": "^1.4.0",
+    "react-content-loader": "^6.2.0",
+    "react-dom": "18.1.0",
+    "react-native": "0.70.5",
+    "react-native-big-list": "^1.5.5",
+    "react-native-gesture-handler": "~2.8.0",
+    "react-native-paper": "^4.12.5",
+    "react-native-paper-dates": "^0.9.2",
+    "react-native-reanimated": "~2.12.0",
+    "react-native-safe-area-context": "4.4.1",
+    "react-native-screens": "~3.18.0",
+    "react-native-svg": "13.4.0",
+    "react-native-web": "~0.18.7",
+    "react-native-webview": "11.23.1",
+    "sharp-cli": "^2.1.0",
+    "tippy.js": "^6.3.7",
+    "yargs": "^17.1.1-candidate.0"
+  }
+}

package/src/auth/Login.js

@@ -86,7 +86,7 @@ export default function LoginComponent(props){
             },1000)
         }
     },[withPortal])
-    const {header,withScrollView:customWithScrollView,children,initialize,contentTop,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,mutateData,canSubmit:canSubmitForm,onStepChange,...loginProps} = defaultObj(getProps({
+    const {header,withScrollView:customWithScrollView,children,initialize,contentTop,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,mutateData,beforeSubmit:beforeSubmitForm,canSubmit:canSubmitForm,onStepChange,...loginProps} = defaultObj(getProps({
         ...state,
         setState,
         state,
@@ -119,6 +119,7 @@ export default function LoginComponent(props){
      * par défaut, on envoie les données lorssqu'on est à l'étappe 2
      * **/
     const canSubmit = typeof canSubmitForm =='function'? canSubmitForm : ({step})=>step >= 2;
+    const beforeSubmit = typeof beforeSubmitForm =='function'? beforeSubmitForm : x=> true;
     const goToNext = ()=>{
         let step = state.step;
         const data = getData();
@@ -149,7 +150,7 @@ export default function LoginComponent(props){
             nextButtonRef.current?.enable();
         }
         if(step > 1){
-            if(canSubmit(args)){
+            if(canSubmit(args) && beforeSubmit(args) !== false){
                 ///pour modifier automatiquement la données à mettre à jour
                 if(typeof mutateData =='function'){
                     mutateData(data);
@@ -178,7 +179,7 @@ export default function LoginComponent(props){
             else {
                 loginFields[i] = Object.clone(field);
                 hasLoginFields = true;
-                if("autoFocusOnStep" in loginFields[i]){
+                if("autoFocusOnStep" in loginFields[i] && typeof loginFields[i].autoFocus !=='boolean'){
                     loginFields[i].autoFocus = !!loginFields[i].autoFocusOnStep;    
                 }
             }

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

@@ -11,7 +11,7 @@ import {notify,showConfirm} from "$ecomponents/Dialog";
 import Label from "$ecomponents/Label";
 import Image from "$ecomponents/Image";
 import Icon,{COPY_ICON} from "$ecomponents/Icon";
-import filterUtils from "$ecomponents/Filter/utils";
+import filterUtils from "$cfilters";
 import Hashtag from "$ecomponents/Hashtag";
 import {sortBy,isDecimal,extendObj,isObjOrArray,defaultNumber,defaultStr,isFunction,defaultBool,defaultArray,defaultObj,isNonNullString,defaultDecimal} from "$utils";
 import {Datagrid as DatagridContentLoader} from "$ecomponents/ContentLoader";
@@ -900,7 +900,7 @@ export default class CommonDatagridComponent extends AppComponent {
             field = header.field = defaultStr(header.field,field,headerIndex);
             delete restCol.filter;
             
-            const type = defaultStr(header.type).toLowerCase();
+            const type = defaultStr(header.jsType,header.type,"text").toLowerCase();
             sortType = defaultStr(sortType,type).toLowerCase();
             width = defaultDecimal(width);
             if(width <COLUMN_WIDTH/2){
@@ -929,6 +929,7 @@ export default class CommonDatagridComponent extends AppComponent {
             });
             restCol.field = header.field;
             restCol.label = defaultStr(header.text,header.label) ;
+            restCol.type = type;
             if(!restCol.label){
                 console.error(header," has not label or text in datagrid",columns,this.props)
             }
@@ -957,6 +958,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 delete restCol.sortable;
                 filterProps = {
                     ...restCol,
+                    type,
                     columnIndex,
                     visibleColumnIndex,
                     sortable:isColumnSortable,
@@ -986,6 +988,7 @@ export default class CommonDatagridComponent extends AppComponent {
             }
             this.prepareColumn({
                 visible,
+                type,
                 columnIndex,
                 visibleColumnIndex,
                 sortable:isColumnSortable,
@@ -1493,6 +1496,7 @@ export default class CommonDatagridComponent extends AppComponent {
         if(!isObj(rowData)) return {render:null,extra:{}};
          let _render = null;
          columnDef = defaultObj(columnDef);
+         let _type = defaultStr(columnDef.jsType,columnDef.type).trim().toLowerCase();
          if(this.isSelectableColumn(columnDef,columnField)){
              rowKey = rowKey ? rowKey : this.getRowKey(rowData,rowIndex);
              return {render :handleSelectableColumn === false ? null : this.renderSelectableCheckboxCell({
@@ -1528,7 +1532,6 @@ export default class CommonDatagridComponent extends AppComponent {
             _render = defaultDecimal(columnDef.multiplicater({...renderArgs,value:rowData[columnField]}),rowData[columnField]);
         } else {
              _render = defaultValue;
-             let _type = defaultStr(columnDef.type).trim().toLowerCase();
              if(defaultStr(columnDef.format).toLowerCase() === 'hashtag'){
                 _render = <Hashtag>{_render}</Hashtag>
              } else if(typeof columnDef.render === "function"){

package/src/components/Filter/index.js

@@ -2,7 +2,7 @@
 
 import DateLib from "$lib/date";
 import {isNonNullString,defaultStr,isNullOrEmpty,debounce,uniqid} from "$utils";
-import {regexParser,regexActions,getFilterStateValues} from "./utils";
+import {regexParser,regexActions,operators as _operators,actions as _actions,periodActions, inActions as _inActions,getFilterStateValues,getSessionData,setSessionData} from "$cfilters";
 import {parseDecimal} from "$ecomponents/TextField";
 import notify from "$notify";
 import PropTypes from "prop-types";
@@ -15,41 +15,12 @@ import React,{Component as AppComponent} from "$react";
 import theme from "$theme";
 import {isMobileMedia} from "$cplatform/dimensions";
 import { ActivityIndicator } from "react-native-paper";
-import { getSessionData,setSessionData } from "./session";
 import DialogProvider from "$components/Form/FormData/DialogProvider";
 
 const manualRunKey = "manual-run";
 
-export * from "./utils";
+export * from "$cfilters";
 
- const _actions = {
-  '$eq' : 'Egal à',
-  "$ne" : 'Défférent de',
-  '$gt' : 'Supérieur à',
-  '$gte' : 'Supérieur ou égal',
-  '$lt' : 'Inférieur à',
-  '$lte' : 'Inférieur où égal à',
-}
-
-const _inActions = {
-  '$in'  :'Est inc ds la liste', //Array of JSON values	The document field must exist in the list provided.
-  '$nin' : 'N\'est pas inc ds la liste', //Array of JSON values	The document field not must exist in the list provided.
-}
- 
-
-const _operators = {
-   '$and' : 'Et', //Array	Matches if all the selectors in the array match.
-   '$or' : 'Ou', //Array	Matches if any of the selectors in the array match. All selectors must use the same index.
-}
-
-const periodActions = {
-  $yesterday : "Hier",
-  $today:"Aujourd'hui",
-  $prevWeek:"Semaine passée",
-  $week:'Cette semaine',
-  $month:'Ce mois',
-  $period:"Période"
-}
   
 /***** Coposant Filter, pour les filtres de données */
 export default class Filter extends AppComponent {

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

@@ -863,7 +863,7 @@ export default class Field extends AppComponent {
         delete rest.archivable;
 
         this.___formattedField = undefined;
-        let _type = this.type = defaultStr(this.props.type,this.type,"text").trim().toLowerCase();
+        let _type = this.type = defaultStr(this.props.jsType,this.props.type,this.type,"text").trim().toLowerCase();
         format = defaultStr(format).toLowerCase().trim();
         tooltip = defaultVal(tooltip,title);
 
@@ -959,6 +959,7 @@ Field.propTypes = {
         PropTypes.node,
         PropTypes.func,
     ]),
+    jsType : PropTypes.string,
     usePlaceholderWhenEmpty : PropTypes.bool,//si la valeur du placeholder sera utilée, lorsque la valeur du champ de type formatable est nulle ou égale à la valeur vide
     responsive : PropTypes.bool,
     responsiveProps : PropTypes.object,

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

@@ -191,7 +191,7 @@ export default class FormDataComponent extends AppComponent{
                 content.push(<Divider key = {index} style={theme.styles.w100}/>)
             } else if(isObj(field) && field.form !== false) {
                 const name = defaultStr(field.name,field.field,index);
-                const type = defaultStr(field.type,"text").trim().toLowerCase().replaceAll("_","");
+                const type = defaultStr(field.jsType,field.type,"text").trim().toLowerCase().replaceAll("_","");
                 const Component = componentTypes[type] || componentTypes.default;
                 let {defaultValue,useDefaultValueFromData,hidden,renderFormDataField,getMediaQueryStyle,printLabels,queryLimit,selected,value,visible,dataFilesInterest,perm,ignore,form,responsiveProps:customResponsiveProps,...rest} = field;
                 rest = Object.assign({},rest);

package/src/components/Icon/Font.js

@@ -61,12 +61,16 @@ const FontIcon = React.forwardRef(({icon,name,testID,color,iconStyle,backgroundC
         console.warn("Icone non définie pour le composant FontIcon, icon [{0}], merci de spécifier une icone supportée par la liste du module https://github.com/expo/vector-icons/MaterialCommunityIcons".sprintf(icon),props);
         return null;
     }
-    const iconName = icon.ltrim("")
+    const iconName = icon.ltrim("material-")
+                    .ltrim("fa-").ltrim("ant-").ltrim("fontisto-")
+                    .ltrim("foundation-").ltrim("ionic-").ltrim("octicons-")
+                    .ltrim("simple-line-").ltrim("zocial-").trim();
+
     return <Icon {...props} 
         ref = {ref}
         testID = {testID}
         color={color}
-        name = {icon}
+        name = {iconName}
         backgroundColor = {backgroundColor}
     />
 });
@@ -94,7 +98,7 @@ export const isIcon = (name,iconSet)=>{
     if(!isNonNullString(name) || !isNonNullString(iconSet)) return false;
     name = name.toLowerCase();
     iconSet = iconSet.toLowerCase().trim();
-    return name.startsWith(iconSet+"-") || name.startsWith(iconSet+"s"+"-") ? true : false;
+    return name.startsWith(iconSet+"-") /*|| name.startsWith(iconSet+"s"+"-")*/ ? true : false;
 }
 
 export default theme.withStyles(FontIcon,{displayName:FontIcon.displayName,mode:'normal'});

package/src/components/Table/index.js

@@ -160,7 +160,7 @@ const TableComponent = React.forwardRef(({containerProps,renderEmpty,isRowSelect
     const scrollContentContainerStyle = {flex:1,width:listWidth,minWidth:totalWidths,height:'100%'};
     const scrollEventThrottle = isMobileNative()?200:50;
     const scrollViewFlexGrow = {flexGrow:0};
-    const maxScrollheight = f.length && fFilters.length ? 170  : f.length || fFilters.length ? 120 : 80;
+    const maxScrollheight = f.length && fFilters.length ? 170  : f.length ?120 :  fFilters.length ? 140 : 80;
     const allScrollViewProps = {
         scrollEventThrottle,
         horizontal : true,

package/src/navigation/Drawer/items/index.js

@@ -28,8 +28,8 @@ export const getItems = (force)=>{
             r.push(item);
         }
     })
-    r.push({divider:true});
     if(handleHelp){
+        r.push({divider:true});
         const dataHelp = {
             key : 'dataHelp',
             label : 'Aide',

package/src/components/Filter/session.js

@@ -1,18 +0,0 @@
-import session from "$session";
-import {getLoggedUserCode} from "$cauth";
-const sKey = "FILTER-ITEM-KEY";
-const sessionKey = ()=> defaultStr(getLoggedUserCode())+"-"+sKey;
-import {defaultObj,defaultStr,isNonNullString} from "$utils";
-
-export const getSessionData = (key)=>{
-  const data = defaultObj(session.get(sessionKey()));
-  return isNonNullString(key)? data [key] : data;
-}
-export const setSessionData = (key,value)=>{
-  const data = getSessionData();
-  if(isNonNullString(key)){
-    data[key] = value;
-    return session.set(sessionKey(),data);
-  }
-  return false;
-}

package/src/components/Filter/utils.js

@@ -1,552 +0,0 @@
-
-import {isNonNullString,defaultStr,defaultArray,isObjOrArray,isObj} from "$utils";
-import DateLib from "$date";
-import mangoParser from "mongo-parse";
-
-export const filterTextTypes = ['text','number','email','search','tel','url','password',"id","idfield",'piecefield','piece'];
-
-export const regexActions = {
-    $regexequals : 'Egal à',
-    $regexcontains : 'Contient',
-    $regexnotcontains : 'Ne contient pas',
-    $regexnotequals : 'Différent de',
-    $regexstartswith : 'Commence par',
-    $regexendswith : 'Se termine par'
- }
-export const escapeRegexChars = (value)=>{
-    //if(value === undefined || value ===null || value === '' || value ==='undefined') return '';
-    //value+='';
-    if(!isNonNullString(value)) return '';
-    let escapeChars = ['!', '^', '$', '(', ')', '[', ']', '{', '}', '?', '+', '*', '.', '/', '\\', '|']
-    for(var i in escapeChars){
-        value.replace(escapeChars[i],'\\'+escapeChars[i]);
-    }
-    return value.toString();
-}
-
-export const getFilterStateValues = (state)=>{
-    state = defaultObj(state);
-    const r = {};
-    ['defaultValue','action','actions','operator','operators','ignoreCase','value','manualRun'].map((v)=>{
-      r[v] = state[v];
-    })
-    return r;
-  
-}
-
-/**** si le filtre peut être pris en compte */
-export const canHandleFilter = (f)=>{
-    if(!isObj(f)) return false;
-    if(!isNonNullString(f.operator) || !isNonNullString(f.action)) {
-        return false;
-    }
-    if(f.value === undefined || f.value === 'undefined' || f.value ==='' || f.value ===null) {
-        return false;
-    }
-    if(f.value instanceof RegExp){
-        return true;
-    }
-    if(isObjOrArray(f.value) && Object.size(f.value,true) <=0) return false;
-    return true;                    
-
-}
-
-export const regexExpressions = {
-    notcontains : {
-        left : "^((?!(",
-        right : ")).)*$",
-        /***@see : https://www.w3schools.com/sql/sql_like.asp */
-        sql : (string)=>{
-            return "%"+defaultStr(string).ltrim("%").rtrim("%")+"%";
-        }
-    },
-    notequals : {
-        left : "^(?!",
-        right : "$).*$",
-    },
-    equals : {
-        left : "/^",
-        right : '$/'
-    },
-    startswith : {
-        left : "/^",
-        right : '/',
-        sql : (string)=>{
-            return defaultStr(string).rtrim("%")+"%";
-        }
-    },
-    endswith : {
-        left : "",
-        right : '$/',
-        sql : (string)=>{
-            return "%"+defaultStr(string).ltrim("%");
-        }
-    },
-    contains : {
-        left : "/",
-        right : '/',
-        sql : (string)=>{
-            return "%"+defaultStr(string).ltrim("%").rtrim("%")+"%";
-        }
-    },
-}
-/**** prend en paramètre une chaine de caractère et un nom d'opérateur et génère 
- *  la chaine de caracètre mango regex correspondant
- */
-const toMangoRegex = (val,operator)=>{
-    if(!isNonNullString(val) || !isNonNullString(operator) || !regexExpressions[operator]) return "";
-    const rOp = regexExpressions[operator];
-    return rOp.left+escapeRegexChars(val)+rOp.right;
-}
-export const regexParser = {
-    equals : (val)=> {
-        return toMangoRegex(val,"equals");
-    },
-    startswith : (val) => {
-        return toMangoRegex(val,"startswith");
-    },
-    endswith : (val) => {
-        return toMangoRegex(val,"endswith");
-    },
-    contains : (val) => {
-        return toMangoRegex(val,"contains");
-    },
-    notequals : (val) => {
-       return toMangoRegex(val,"notequals");
-    },
-    notcontains : (val) =>{
-       return toMangoRegex(val,"notcontains");
-    }
-}
-/*** prend une expression regulière et le convertis en operateur, valeur 
- * @param {string} la valeur otenue au format regex
-*/
-export const regexDeparser = (regexValue)=>{
-    if(!regexValue) return null;
-    regexValue = regexValue.toString();
-    if(regexValue.endsWith("/i")){
-        regexValue = regexValue.rtrim("/i")+"/";
-    }
-    if(!isNonNullString(regexValue)) return null;
-    for(let i in regexExpressions){
-        const p = regexExpressions[i];
-        let rVal = regexValue.ltrim("/").rtrim("/");
-        const pLeft = p.left.ltrim("/"),pRight = p.right.rtrim("/");
-        if(rVal.startsWith(pLeft) && rVal.endsWith(pRight)){
-            return {
-                operator : i,
-                value : rVal.ltrim(pLeft).rtrim(pRight),
-                regexValue : rVal,
-            }
-        }
-    }
-    return null;
-}
-export const matchPouchDBOperator = (operator,value)=>{
-    if(!isNonNullString(operator)) return null;
-    if(!(value) && !isDecimal(value)) return null;
-    switch(operator){
-        case "MATCH":
-            if(isDecimal(value)) value +="";
-            return {operator:"$regex",value:RegExp(defaultStr(regexParser.contains(value)).ltrim("/").rtrim("/"),'i')}
-        case "NOTMATCH": 
-          if(isDecimal(value)) value +="";
-           return {operator:"$regex",value:RegExp(defaultStr(regexParser.notcontains(value)).ltrim("/").rtrim("/"),'i')}
-        case "EQ" : 
-            return {operator:'$eq',value}
-        case "NEQ" : 
-            return {operator:"$ne",value}
-        case "GT":
-          return {operator:"$gt",value}
-        case "GTE":
-            return {operator:"$gte",value}
-        case "LT":
-          return {operator:"$lt",value}
-        case "LTE":
-          return {operator:"$lte",value}
-        case "IN":
-            return {operator:"$in",value}
-        case "NOT IN":
-            return {operator:"$in",value}
-    }
-  }
-
-let Operators = {
-    NONE: null,
-    MATCH: {
-        name: 'contient',
-        func: function(value, term) {
-            if(value) {
-                return value.toString().search(utils.isRegExp(term) ? term : new RegExp(term, 'i')) >= 0;
-            } else {
-                return !(!!term);
-            }
-        },
-        regexpSupported: true
-    },
-    NOTMATCH: {
-        name: 'ne contient pas',
-        func: function(value, term) {
-            if(value) {
-                return value.toString().search(utils.isRegExp(term) ? term : new RegExp(term, 'i')) < 0;
-            } else {
-                return !!term;
-            }
-        },
-        regexpSupported: true
-    },
-    EQ: {
-        name: '=',
-        func: function(value, term) {
-            return value == term;
-        },
-        regexpSupported: false
-    },
-    NEQ: {
-        name: '<>',
-        func: function(value, term) {
-            return value != term;
-        },
-        regexpSupported: false
-    },
-    GT: {
-        name: '>',
-        func: function(value, term) {
-            return value > term;
-        },
-        regexpSupported: false
-    },
-    GTE: {
-        name: '>=',
-        func: function(value, term) {
-            return value >= term;
-        },
-        regexpSupported: false
-    },
-    LT: {
-        name: '<',
-        func: function(value, term) {
-            return value < term;
-        },
-        regexpSupported: false
-    },
-    LTE: {
-        name: '<=',
-        func: function(value, term) {
-            return value <= term;
-        },
-        regexpSupported: false
-    }
-};
- const utils = {
-    ALL: '#All#',
-    NONE: '#None#',
-    BLANK: '#Blank#"',
-    expressionFilter : function(operator, term, staticValue, excludeStatic) {
-        var self = this;
-    
-        this.operator = Operators.get(operator);
-        this.regexpMode = false;
-        this.term = term || null;
-        if(this.term && this.operator && this.operator.regexpSupported) {
-            if(utils.isRegExp(this.term)) {
-                this.regexpMode = true;
-                if(!this.term.ignoreCase) {
-                    this.term = new RegExp(this.term.source, 'i');
-                }
-            }
-        }
-    
-        this.staticValue = staticValue;
-        this.excludeStatic = excludeStatic;
-    
-        this.test = function(value) {
-            if(Array.isArray(self.staticValue)) {
-                var found = self.staticValue.indexOf(value) >= 0;
-                return (self.excludeStatic && !found) || (!self.excludeStatic && found);            
-            } else if(self.term) {
-                return self.operator.func(value, self.term);
-            } else if(self.staticValue === true || self.staticValue === utils.ALL) {
-                return true;
-            } else if(self.staticValue === false || self.staticValue === utils.NONE) {
-                return false;
-            } else {
-                return true;
-            }
-        };
-    
-        this.isAlwaysTrue = function() {
-            return !(self.term || Array.isArray(self.staticValue) || self.staticValue === utils.NONE || self.staticValue === false);
-        };
-    },
-    defaultOperator : 'MATCH',
-    Operators,
-    constants : {},
-    items : {
-        EQ: Operators.EQ.name,
-        MATCH : Operators.MATCH.name,
-        NOTMATCH : Operators.NOTMATCH.name,
-        NEQ : Operators.NEQ.name,
-        GT : Operators.GT.name,
-        GTE : Operators.GTE.name,
-        LT : Operators.LT.name,
-        LTE : Operators.LTE.name
-    },
-    isRegExp: function(obj) {
-        return Object.prototype.toString.apply(obj) === '[object RegExp]';
-    },
-    /**
-     * Escapes all RegExp special characters.
-     */
-     escapeRegex: function(re) {
-        return re.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-    },
-    /**** vérifie si la valeur {value}, match la valeur {filterText} 
-     * @param {object : {
-     *      value : la valeur à vérifier
-     *      filterText : le texte à vérifier si value le match
-     *      operateur : chaine de caractère dans la liste des opérateurs :, props Operators, ci-desous
-     *      useRegex : Spécifie si l'expression régulière sera utilisée pour la recherche
-     * }}
-    */
-    match : ({value,filterText,operator,useRegex})=>{
-        if(isNonNullString(operator)){
-            operator = Operators[operator]
-        }
-        filterText = defaultStr(filterText);
-        operator = defaultObj(operator);
-        let isSearchMode = filterText !== '';
-        if(operator && isFunction(operator.func)){
-            let opterm = operator.regexpSupported && isSearchMode ? (useRegex ? filterText : utils.escapeRegex(filterText)) : filterText;
-            return !isSearchMode || operator.func(value, opterm)
-        }
-        return !isSearchMode ? true : defaultStr(value).toLowerCase().contains(filterText.toLowerCase());
-    },
-    /**
-     * Returns the first element in the array that satisfies the given predicate
-     * @param  {Array} array     the array to search
-     * @param  {function} predicate Function to apply to each element until it returns true
-     * @return {Object}           The first object in the array that satisfies the predicate or undefined.
-     */
-    findInArray: function(array, predicate) {
-        if (this.isArray(array) && predicate) {
-            for (var i = 0; i < array.length; i++) {
-                var item = array[i];
-                if (predicate(item)) {
-                    return item;
-                }
-            }
-        }
-        return undefined;
-    },
-    /**
-     * Returns a JSON string represenation of an object
-     * @param {object} obj
-     * @return {string}
-     */
-    jsonStringify: function(obj, censorKeywords) {
-        function censor(key, value) {
-            return censorKeywords && censorKeywords.indexOf(key) > -1 ? undefined : value;
-        }
-        return JSON.stringify(obj, censor, 2);
-    }
- }
- 
-for(let i in utils.items){
-    utils.constants[i] = i;
-}
-
-/*** prend en paramètre un objet de filtres et les prépare pour la requête distante
- * @param {object} filtersToPrepare les filtres à exploiter pour la requête distante 
- * le tableau des filtres 
- * @param {function|object} filter|options, la méthode utilisée pour effectuer un filtre sur les les élément à prendre en compte
- * 
-*/
-export const prepareFilters = (filtersToPrepare,opts)=>{
-    if(typeof opts =='function'){
-        opts = {filter:opts};
-    }
-    let {filter,convertToSQL:convToSQL} = opts;
-    const filters = {}
-    filter = typeof filter =='function'? filter : x=>true;
-    Object.map(filtersToPrepare,(f,i)=>{
-        if(!isObj(f) || !filter(f) || !isNonNullString(f.operator) || !isNonNullString(f.action)) {
-            return;
-        }
-        f.field = defaultStr(f.field,i).trim();
-        f.action = defaultStr(f.action).toLowerCase().trim();
-        if(f.action =="$today"){
-            f.operator = "$and";
-            f.action = "$eq"
-        }
-        filters[f.operator] = defaultArray(filters[f.operator]);
-        const ob = {};
-        ob[f.field] = {}
-        if(f.action == "$period"){
-            let sp = defaultStr(f.value);
-            if(sp){
-                sp = sp.split("=>");
-                const isValid1 = DateLib.isValidSQLDate(sp[0]) || DateLib.isValidSQLDateTime(sp[0]);
-                const isValid2 = DateLib.isValidSQLDate(sp[1]) || DateLib.isValidSQLDateTime(sp[1]);
-                if(isValid1 && isValid2){
-                    filters[f.operator].push({
-                        [f.field] : {$gte:sp[0]}
-                    })
-                    filters[f.operator].push({
-                        [f.field] : {$lte:sp[1]}
-                    })        
-                }
-            }
-        } else {
-            ob[f.field][f.action] = f.value;
-            filters[f.operator].push(ob)
-        }
-    });
-    return convToSQL ? convertToSQL(filters) : filters;
-}
-
-/*** la liste des actions supportés par les filtres 
- * @see : https://github.com/cloudant/mango from mango query mapping
- *  
-*/
-export const actions = ["$lt", "$gt", "$lte", "$gte", "$eq", "$exists", "$type", "$in", "$nin", "$all", "$size", "$or", "$nor", "$not", "$mod", "$regex", "$elemMatch"]
-
-export default utils;
-
-/*** convertis les filtres pris au format mangoesQuey, au format de sortie SQL
- * @see : https://github.com/gordonBusyman/mongo-to-sql-converter
- * @param {object} filters, les filtres au format mango query à convertir au format SQL
- */
-export const convertToSQL = (filters)=>{
-    if(!isObjOrArray(filters)) return [];
-    const whereParsed = mangoParser.parse(filters)
-    return whereParsed.parts.reduce((prev, curr) => {
-        const c = whereClauseToSQL(curr);
-        return c ? [...prev,c] : prev;
-    }, []).map((filter)=>{
-        if(filter.field === MANGO_QUERY_OPERATOR){
-            delete filter.field;
-        }
-        return filter;
-    });
-}
-export const MANGO_QUERY_OPERATOR = "MANGO_QUERY_OPERATOR";
-const whereClauseToSQL = (currentMongoParserElement) => {
-    let { field, operator, operand } = currentMongoParserElement;
-    if(!isNonNullString(operator) || !operatorsMap[operator]) return null;
-    operator = operatorsMap[operator]
-    if(operator == 'LIKE'){
-        const deparsed = regexDeparser(operand);
-        if(!isObj(deparsed)){
-            return null;
-        }
-        operand = deparsed.value;
-        const deparsedOp = deparsed.operator;
-        if(deparsedOp =='notcontains'){
-            operator = "NOT LIKE";
-        }
-        if(deparsedOp =='equals'){
-            operator = operatorsMap.$eq;
-        } else if(deparsedOp =='notequals'){
-            operator = operatorsMap.$ne;
-        } else{
-            const opMap = regexExpressions[deparsedOp];
-            if(!opMap || typeof opMap.sql !=='function') return null;
-            operand = opMap.sql(operand);
-        }
-    }
-    // AND or OR operators with nested elements
-    if (typeof field === 'undefined') {
-      // parse nested elements
-      const nested = operand.reduce((prev, curr) => {
-        const parsed = mangoParser.parse(curr);
-        const prepared = whereClauseToSQL(parsed.parts[0]);
-        if(prepared){
-            return [...prev,prepared]
-        }
-        return prev;
-      }, [])
-  
-      // nested WHERE element
-      return {
-        field: MANGO_QUERY_OPERATOR,
-        operator,
-        operand: nested
-      }
-    }
-    // simple WHERE element
-    return {
-      field,
-      operator,
-      operand
-    }
-  }
-
-  // map mongoDB -> SQL operators
-const operatorsMap = {
-    $or: 'OR',
-    $and: 'AND',
-    $lt: '<',
-    $lte: '<=',
-    $gt: '>',
-    $gte: '>=',
-    $ne: '!=',
-    $in: 'IN',
-    $nin : 'NOT IN',
-    $eq: '=',
-    $regex : "LIKE"
-  }
-
-  /**
- *
- * @param {*} operand
- * @param {*} operator
- * @param {*} field
- *
- * Return the operand in right format
- */
-export const getTyppedOperand = (operand, operator, field) => {
-    if (typeof operand === 'string') { // wrap strings in double quots
-      return "'" +(operand) + "'"
-    } else if (operator === 'IN' || operator =='NOT IN') { // wrap IN arguments in brackers
-      operand = Array.isArray(operand)? operand.map(op => getTyppedOperand(op, null, null))
-      .join(', '): operand;
-      return '(' + operand + ')'
-    } else if (!isNonNullString(field) && Array.isArray(operand)) { // AND or OR elements
-      // recursively call 'buildWhereElement' for nested elements
-      // join each element with operator AND or OR
-      return operand.reduce((prev, curr) => {
-        return [...prev, buildWhereElement(curr)]
-      }, []).join(' ' + operator + ' ')
-    } else {
-      return operand
-    }
-}
-  
-  /**
-   *
-   * @param {*} elem
-   *
-   * Return element of WHERE clause
-   */
-  export const buildWhereElement = (elem) => {
-    const { field, operator, operand } = elem
-    if (!isNonNullString(field)) { // nested WHERE element
-      return '(' + getTyppedOperand(operand, operator, field) + ')'
-    } else { // simple WHERE element
-      return field + ' ' + operator + ' ' + getTyppedOperand(operand, operator, field)
-    }
-  }
-  
-  /**** construit une requête Where à partir des filtres préparé dans le tableau whereClausePrepared
-   * @see : https://github.com/gordonBusyman/mongo-to-sql-converter
-   * @parm {array} whereClausePrepared, les filtres préparés avec la méthode prepareFilters puis convertis avec la fonction convertToSQL
-     @return {string}, la requête Where correspondante
-  */
-  export const buildWhere = (whereClausePrepared)=>{
-    if(!Array.isArray(whereClausePrepared)) return null;
-    // build WHERE string clause by adding each element of array to it, separated with AND
-    return whereClausePrepared.reduce((prev, curr) => [
-        ...prev, buildWhereElement(curr)
-    ], []).join(' AND ');
-  }