data-primals-engine 1.2.2 → 1.2.4

package/client/src/DataEditor.jsx

@@ -25,6 +25,7 @@ import Draggable from "./Draggable.jsx";
 import CronBuilder from "./CronBuilder.jsx";
 import RTETrans from "./RTETrans.jsx";
 import uniqid from "uniqid";
+import {isConditionMet} from "../../src/filter";
 
 // ... (fonction getInputType) ...
 // Fonction pour obtenir le type d'input HTML basé sur le type de champ du modèle
@@ -52,208 +53,6 @@ const getInputType = (fieldType) => {
     }
 };
 
-/**
- * Evaluates a single condition against form data.
- * @param {object} currentModelDef - The definition of the current model.
- * @param {object} condition - The condition to evaluate.
- * @param {object} formData - The form data.
- * @param {object[]} allModels - An array of all model definitions.
- * @param {object} user - The current user.
- * @returns {boolean} - True if the condition is met, false otherwise.
- */
-const evaluateSingleCondition = (currentModelDef, condition, formData, allModels, user) => {
-    // Condition est directement un filtre MongoDB, donc on l'applique
-    // en utilisant les opérateurs et les valeurs qu'il contient.
-
-    if (!condition || typeof condition !== 'object') {
-        console.warn("[Client Eval] Condition is not an object:", condition);
-        return true; // Permissive default
-    }
-
-    // Si la condition contient des opérateurs logiques, on les gère ici
-    if (condition.$and || condition.$or || condition.$not || condition.$nor) {
-        console.warn("[Client Eval] Condition logique détectée dans evaluateSingleCondition, ce n'est pas attendu. Devrait être géré par isConditionMet.");
-        return true; // Permissive default
-    }
-
-    if (condition.$find) {
-        const fieldName = Object.keys(condition)[0];
-        const fieldValue = formData[fieldName];
-        const findCondition = condition.$find;
-
-        if (!Array.isArray(fieldValue)) return false;
-
-        return fieldValue.some(item => {
-            // Gestion spéciale pour la syntaxe $eq: ["$$this.field", value]
-            if (findCondition.$eq && Array.isArray(findCondition.$eq)) {
-                const [fieldPath, value] = findCondition.$eq;
-                if (fieldPath.startsWith("$$this.")) {
-                    const fieldToCheck = fieldPath.replace("$$this.", "");
-                    return item[fieldToCheck] == value;
-                }
-            }
-
-            // Sinon, évaluation normale
-            const tempData = { ...item };
-            return evaluateSingleCondition(currentModelDef, findCondition, tempData, allModels, user);
-        });
-    }
-
-    // Si la condition contient un opérateur $exists, on le gère ici
-    if (condition.$exists !== undefined) {
-        const fieldName = Object.keys(condition)[0]; // Récupérer le nom du champ
-        const shouldExist = condition.$exists; // Récupérer la valeur de $exists (true ou false)
-        const exists = Object.prototype.hasOwnProperty.call(formData, fieldName) && formData[fieldName] !== undefined && formData[fieldName] !== null;
-        return exists === shouldExist;
-    }
-
-    // Si la condition contient un opérateur $find, on le gère ici
-    if (condition.$find) {
-        // Récupérer le nom du champ
-        const fieldName = Object.keys(condition)[0];
-        const fieldValue = formData[fieldName];
-        try {
-            // Assuming evaluateSingleCondition handles $find
-            return evaluateSingleCondition(currentModelDef, condition.$find, formData, allModels, user);
-        } catch (error) {
-            console.error("Error evaluating $find condition:", condition, error);
-            return false;
-        }
-    }
-
-    // Récupérer le nom du champ et la condition
-    const fieldName = Object.keys(condition)[0];
-    const fieldValue = condition[fieldName];
-
-    // Récupérer la définition du champ
-    const fieldDef = currentModelDef?.fields.find(f => f.name === fieldName);
-
-    // Si la définition du champ n'est pas trouvée, on retourne true
-    if (!fieldDef) {
-        console.warn(`[Client Eval] Field definition not found for field: ${fieldName}`);
-        return true; // Permissive default
-    }
-
-    let targetValue = formData[fieldName];
-    let processedConditionValue = fieldValue;
-
-    // 1. Handle $exists (on the first field)
-    // 2. Convert condition value based on operator's expected input type
-    const fieldType = fieldDef?.type; // Type of the first field
-
-    try {
-        processedConditionValue = convertValueType(fieldValue, fieldType);
-    } catch (e) {
-        logClientEvalWarning(`Error converting value type: ${e.message}`, condition);
-        return false;
-    }
-
-    return evaluateComparison(fieldValue, targetValue, processedConditionValue, condition);
-
-    function logClientEvalWarning(message, details) {
-        console.warn(`[Client Eval] ${message}:`, details);
-    }
-
-    function convertValueType(value, inputType) {
-        switch (inputType) {
-            case 'number':
-                const numValue = parseFloat(value);
-                if (isNaN(numValue)) {
-                    throw new Error(`Invalid number value: ${value}`);
-                }
-                return numValue;
-            case 'boolean':
-                return String(value).toLowerCase() === 'true';
-            case 'csv':
-                return String(value).split(',').map(item => item.trim()).filter(Boolean);
-            case 'text':
-            default:
-                return String(value);
-        }
-    }
-
-    function evaluateComparison(operator, targetValue, processedConditionValue, condition) {
-        try {
-            switch (typeof operator === 'object' ? Object.keys(operator)[0] : null) {
-                case '$eq': return targetValue == processedConditionValue;
-                case '$ne': return targetValue != processedConditionValue;
-                case '$gt': return targetValue > processedConditionValue;
-                case '$lt': return targetValue < processedConditionValue;
-                case '$gte': return targetValue >= processedConditionValue;
-                case '$lte': return targetValue <= processedConditionValue;
-                case '$regex':
-                    if (typeof targetValue !== 'string') return false;
-                    if (typeof processedConditionValue !== 'string') return false;
-                    try {
-                        const regex = new RegExp(processedConditionValue, 'i');
-                        return regex.test(targetValue);
-                    } catch (e) {
-                        logClientEvalWarning(`Invalid regex pattern: ${processedConditionValue}`, condition);
-                        return false;
-                    }
-                case '$in':
-                    return Array.isArray(processedConditionValue) && processedConditionValue.includes(String(targetValue));
-                case '$nin':
-                    return !Array.isArray(processedConditionValue) || !processedConditionValue.includes(String(targetValue));
-                default:
-                    logClientEvalWarning(`Unhandled operator in client evaluation logic: ${operator}`, condition);
-                    return true; // Permissive default
-            }
-        } catch (evalError) {
-            logClientEvalWarning(`Error during client condition evaluation: ${operator}, targetValue=${targetValue}, processedConditionValue=${processedConditionValue}`, condition);
-            return false;
-        }
-    }
-};
-
-export const isConditionMet = (model, cond, formData, allModels, user) => {
-    const isNode = (v) => typeof v === 'object' && v !== null;
-
-    const condition = cond;
-
-    if (!condition) return true;
-
-    if (condition.$and && Array.isArray(condition.$and)) {
-        if (condition.$and.length === 0) return true;
-        return condition.$and.every(sub => isConditionMet(model, sub, formData, allModels, user));
-    }
-
-    if (condition.$or && Array.isArray(condition.$or)) {
-        if (condition.$or.length === 0) return false;
-        return condition.$or.some(sub => isConditionMet(model, sub, formData, allModels, user));
-    }
-
-    if (condition.$not) {
-        return !isConditionMet(model, condition.$not, formData, allModels, user);
-    }
-
-    if (condition.$nor && Array.isArray(condition.$nor)) {
-        if (condition.$nor.length === 0) return true;
-        return !condition.$nor.some(sub => isConditionMet(model, sub, formData, allModels, user));
-    }
-
-    if (condition.$find) {
-        try {
-            // Assuming evaluateSingleCondition handles $find
-            return evaluateSingleCondition(model, condition, formData, allModels, user);
-        } catch (error) {
-            console.error("Error evaluating $find condition:", condition, error);
-            return false;
-        }
-    }
-
-    if (condition.path && condition.op) {
-        try {
-            return evaluateSingleCondition(model, condition, formData, allModels, user);
-        } catch (error) {
-            console.error("Error evaluating condition:", condition, error);
-            return false;
-        }
-    }
-
-    console.warn("Unknown condition format:", condition);
-    return true;
-};
 
 export const DataEditor = forwardRef(function MyDataEditor({
    isLoading,
@@ -263,7 +62,6 @@ export const DataEditor = forwardRef(function MyDataEditor({
    formData,
    setFormData, record, setRecord}, ref){
 
-    const [focusedField, setFocusedField] = useState({});
     const {me} = useAuthContext()
     const {models} = useModelContext()
 
@@ -304,7 +102,7 @@ export const DataEditor = forwardRef(function MyDataEditor({
             case 'textarea':
                 return <textarea key={field.name} {...inputProps} />
             case 'richtext':
-                return <RTE help={focusedField?.name === field.name ? t('field_'+model.name+'_'+field.name+'_hint', field.hint || '') : ''} onFocus={() => setFocusedField(field)} onBlur={() => setFocusedField(null)}  key={field.name} {...inputProps} field={field} name={formData._id} />;
+                return <RTE help={t('field_'+model.name+'_'+field.name+'_hint', field.hint || '')} key={field.name} {...inputProps} field={field} name={formData._id} />;
             case 'richtext_t':
                 return <RTETrans
                     key={field.name}
@@ -345,7 +143,6 @@ export const DataEditor = forwardRef(function MyDataEditor({
                             // C'est un nom de modèle statique
                             builderModelName = field.targetModel;
                         }
-                        console.log({builderModelName})
                     }
                     return <div className={"flex flex-1"} style={{width:'100%'}} key={field.name}>
                         {currentViewMode !== 'builder' && ( <div className="condition-builder-toggle">
@@ -420,10 +217,10 @@ export const DataEditor = forwardRef(function MyDataEditor({
                     inputProps["min"] = field.min;
                 if( field.max)
                     inputProps["max"] = field.max;
-                return <NumberField help={focusedField?.name === field.name ? t('field_'+model.name+'_'+field.name+'_hint', field.hint || '') : ''} onFocus={() => setFocusedField(field)} onBlur={() => setFocusedField(null)} unit={field.unit} key={field.name} {...inputProps} onChange={(e) => handleChange({name: field.name, value: parseFloat(e.target.value.replace(',', '.'))})}  />
+                return <NumberField help={t('field_'+model.name+'_'+field.name+'_hint', field.hint || '')}  unit={field.unit} key={field.name} {...inputProps} onChange={(e) => handleChange({name: field.name, value: parseFloat(e.target.value.replace(',', '.'))})}  />
             case 'relation':
                 return (
-                    <RelationField  onFocus={() => setFocusedField(field)} onBlur={() => setFocusedField(null)} help={focusedField?.name === field.name ? t('field_'+model.name+'_'+field.name+'_hint', field.hint || '') : ''} key={field.name} model={model} field={field} value={value} onChange={(e) => {
+                    <RelationField help={t('field_'+model.name+'_'+field.name+'_hint', field.hint || '')} key={field.name} model={model} field={field} value={value} onChange={(e) => {
                         handleChange(e)
                     }} refreshTime={refreshTime} />
                 );
@@ -456,8 +253,8 @@ export const DataEditor = forwardRef(function MyDataEditor({
                     const displayValue = (typeof value === 'object' && value !== null) ? value.key : (value || '');
 
                     return <TextField
-                        help={focusedField?.name === field.name ? t('field_' + model.name + '_' + field.name + '_hint', field.hint || '') : ''}
-                        onFocus={() => setFocusedField(field)} onBlur={() => setFocusedField(null)} key={field.name}
+                        help={t('field_' + model.name + '_' + field.name + '_hint', field.hint || '')}
+                         key={field.name}
                         type={getInputType(field.type)} {...inputProps}
                         value={displayValue}
                         onChange={(e) => handleChange({name: field.name, value: e.target.value})}  />
@@ -467,9 +264,9 @@ export const DataEditor = forwardRef(function MyDataEditor({
             case 'color':
                 return <ColorField help={t('field_'+model.name+'_'+field.name+'_hint', field.hint || '')} key={field.name} name={field.name} value={value} onChange={handleChange} />
             case 'email':
-                return <EmailField onFocus={() => setFocusedField(field)} onBlur={() => setFocusedField(null)} help={focusedField?.name === field.name ? t('field_'+model.name+'_'+field.name+'_hint', field.hint || '') : ''} key={field.name} type={getInputType(field.type)} {...inputProps} onChange={(e) => handleChange({name: field.name, value: e.target.value})} />
+                return <EmailField  help={t('field_'+model.name+'_'+field.name+'_hint', field.hint || '')} key={field.name} type={getInputType(field.type)} {...inputProps} onChange={(e) => handleChange({name: field.name, value: e.target.value})} />
             default:
-                return <TextField onFocus={() => setFocusedField(field)} onBlur={() => setFocusedField(null)} help={focusedField?.name === field.name ? t('field_'+model.name+'_'+field.name+'_hint', field.hint || '') : ''} key={field.name} type={getInputType(field.type)} {...inputProps} onChange={(e) => handleChange({name: field.name, value: e.target.value})} />
+                return <TextField  help={t('field_'+model.name+'_'+field.name+'_hint', field.hint || '')} key={field.name} type={getInputType(field.type)} {...inputProps} onChange={(e) => handleChange({name: field.name, value: e.target.value})} />
         }
     }
 

package/client/src/DataLayout.jsx

@@ -97,7 +97,6 @@ function DataLayout() {
 
     // --- MODIFICATION : Logique de changement de vue mise à jour ---
     const handleSwitchView = (viewName) => {
-        console.log({viewName})
         if (viewName === 'table') {
             setCurrentView('table');
             return;

package/client/src/DataTable.jsx

@@ -43,7 +43,6 @@ import RelationValue from "./RelationValue.jsx";
 import {FaGear, FaPencil, FaTriangleExclamation} from "react-icons/fa6";
 import RestoreConfirmationModal from "./RestoreConfirmationModal.jsx";
 import {event_trigger, isLightColor} from "../../src/core.js";
-import {isConditionMet} from "./DataEditor.jsx";
 import {Tooltip} from "react-tooltip";
 import ExportDialog from "./ExportDialog.jsx";
 import Captions from "yet-another-react-lightbox/plugins/captions";
@@ -58,6 +57,7 @@ import PackGallery from "./PackGallery.jsx";
 import {HiddenableCell} from "./HiddenableCell.jsx";
 import ConditionBuilder from "./ConditionBuilder.jsx";
 import {pagedFilterToMongoConds} from "./filter.js";
+import {isConditionMet} from "../../src/filter";
 
 // Ajoutez cette constante pour la clé de sessionStorage
 const SESSION_STORAGE_IMPORT_JOBS_KEY = 'activeImportJobs';
@@ -685,10 +685,8 @@ export function DataTable({
                     />
                     <ExportDialog isOpen={showExportDialog} onClose={() => {
                         setExportDialogVisible(false);
-                        console.log("close")
                     }} availableModels={models} currentModel={selectedModel.name} hasSelection={true} onExport={(data)=>{
                         exportMutation(data);
-                        console.log(data);
                     }} />
                     {showPackGallery && (
                         <Dialog isClosable={true} isModal={true} onClose={() => setShowPackGallery(false)}>

package/client/src/Field.jsx

@@ -33,9 +33,7 @@ import { docco } from 'react-syntax-highlighter/dist/esm/styles/hljs';
 
 import { PhoneInput } from 'react-international-phone';
 import 'react-international-phone/style.css';
-import CodeMirror, {basicSetup} from "@uiw/react-codemirror";
 import {useAuthContext} from "./contexts/AuthContext.jsx";
-import {maxStringLength} from "data-primals-engine/constants";
 
 export const Form = ({
   name,
@@ -893,7 +891,6 @@ const FileField = ({ inputProps, value, onChange, name, mimeTypes, maxSize, mult
         }
     }, [value]);
 
-    console.log(fileInfos)
     return (
         <div className="field field-file">
             <input
@@ -1421,12 +1418,10 @@ export const ModelField = ({field, disableable=false, showModel=true, value, fie
     const itemsFields = [...models.find(f=>f.name === modelValue && me?.username === f._user)?.fields.map(m => ({label: m.name, value: m.name})) || []];
 
     useEffect(() => {
-        console.log({value})
         setModelValue(value)
     }, [value]);
 
     useEffect(() => {
-        console.log(modelValue)
         onChange({name: field.name, value: modelValue});
     }, [modelValue]);
 

package/client/src/FlexBuilder.jsx

@@ -19,7 +19,7 @@ import {
     clearMappingsRecursive
 } from './FlexTreeUtils.js';
 import {Dialog, DialogProvider} from "./Dialog.jsx";
-import {safeAssignObject} from "data-primals-engine/core";
+import {safeAssignObject} from "../../src/core";
 
 const FlexBuilder = ({ initialConfig = null, models = [], onChange, data = [], lang = 'fr' }) => {
     const { me: user } = useAuthContext();

package/client/src/ModelCreatorField.jsx

@@ -43,7 +43,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
     const [showMore, setMoreVisible] = useState(false);
     const hint = (description) => t(description, '') && <div className="hint-icon"><FaCircleInfo data-tooltip-id={`tooltipHint`} data-tooltip-content={description} /></div>
 
-    const [focusedField, setFocusedField] = useState({});
     return (
         <div className="field-edit">
 
@@ -73,9 +72,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                 newFields[index].name = e.target.value;
                                 setFields(newFields);
                             }}
-                            help={focusedField?.name === field.name && t('modelcreator.name.hint')}
-                            onFocus={() => setFocusedField(field)}
-                            onBlur={() => setFocusedField(null)}
+                            help={t('modelcreator.name.hint')}
                             required
                         />
                         {!(!modelLocked && isLocalUser(me) && field.locked) && !field._isNewField && (
@@ -206,7 +203,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                 initialSteps={field.calculation?.steps || []}
                                 onCalculationChange={(calc) => {
                                     const newFields = [...fields];
-                                    console.log({calc});
                                     newFields[index].calculation = calc; // 'index' est l'index du champ calculé dans 'fields'
                                     setFields(newFields);
                                 }}

package/client/src/RTE.jsx

@@ -28,7 +28,7 @@ import css from 'highlight.js/lib/languages/css'
 import js from 'highlight.js/lib/languages/javascript'
 import ts from 'highlight.js/lib/languages/typescript'
 import html from 'highlight.js/lib/languages/xml'
-import {escapeHtml, escapeRegex} from "data-primals-engine/core";
+import {escapeHtml} from "../../src/core";
 // create a lowlight instance
 const lowlight = createLowlight(all)
 
@@ -293,11 +293,6 @@ export const ExtendedImage = Image.extend({
     }
 })
 
-const CodeBlockComponent = ({children, ...rest}) => {
-    console.log(rest);
-    return children;
-};
-
 const extensions = [
     HardBreak,
     CodeBlock,

package/client/src/RTETrans.jsx

@@ -1,8 +1,6 @@
-// Dans C:/Dev/hackersonline-engine/client/src/RTETrans.jsx (Nouveau fichier)
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RTE } from './RTE.jsx';
-import {useModelContext} from "./contexts/ModelContext.jsx";
 import {useQuery} from "react-query";
 import {getUserId} from "../../src/data.js";
 import {useAuthContext} from "./contexts/AuthContext.jsx";

package/client/src/RelationField.jsx

@@ -3,7 +3,7 @@ import { useQuery, useQueryClient } from 'react-query';
 import { useModelContext } from './contexts/ModelContext.jsx';
 import { TextField } from './Field.jsx';
 import { useAuthContext } from './contexts/AuthContext.jsx';
-import { getDataAsString, getUserId } from 'data-primals-engine/data';
+import { getDataAsString } from '../../src/data.js';
 import { FaEdit, FaTrash } from 'react-icons/fa';
 import Button from './Button.jsx';
 import { mainFieldsTypes } from "../../src/constants.js";

package/client/src/RelationValue.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { useQuery } from 'react-query';
 import { useModelContext } from './contexts/ModelContext.jsx';
-import {getDataAsString, getUserId} from 'data-primals-engine/data';
+import {getDataAsString, getUserId} from '../../src/data.js';
 import { Trans, useTranslation } from 'react-i18next';
 import {Dialog, DialogProvider} from './Dialog.jsx';
 import {FaMagnifyingGlass} from "react-icons/fa6";
@@ -133,7 +133,6 @@ const RelationValue = ({ field, data, align }) => {
                 } catch (e) {
                     console.log(e);
                 }
-                //console.log(model, rel, displayValue)
                 const bgColor = // Returns a bright color in RGB
                     randomColor({
                         seed: rel._hash+rel._id,

package/client/src/TourSpotlight.jsx

@@ -61,8 +61,6 @@ function TourSpotlight({ name, steps = [], isOpen, onComplete, onClose, initialS
     useEffect(() => {
         if (!isOpen || !name) return;
 
-
-        console.log({currentStep})
         if (!currentStep?.selector) {
             console.warn(`[TourSpotlight] Élément cible non défini pour le tour ${name}`);
             return;

package/client/src/constants.js

@@ -53,7 +53,7 @@ export const MONGO_OPERATORS = {
 export const profiles = {
     'personal': ['contact', 'location', 'imageGallery', 'budget', 'currency', 'taxonomy'], // budget,
     'developer': ['alert','endpoint','request','webpage', 'content', 'taxonomy', 'resource', 'translation', 'contact', 'location', 'channel', 'lang', 'token', 'message', 'ticket', 'user', 'permission', 'role'],
-    'company': ['alert','request','location', 'campaign', 'order', 'currency', 'product', 'cart', 'cartItem', 'invoice', 'message', 'user', 'role', 'permission', 'token','translation', 'lang', 'webpage', 'content', 'taxonomy', 'contact', 'resource', 'accountingExercise', 'accountingLineItem', 'accountingEntry', 'employee', 'kpi', 'dashboard'],
+    'company': ['alert','request','location', 'order', 'currency', 'product', 'cart', 'cartItem', 'invoice', 'message', 'user', 'role', 'permission', 'token','translation', 'lang', 'webpage', 'content', 'taxonomy', 'contact', 'resource', 'accountingExercise', 'accountingLineItem', 'accountingEntry', 'employee', 'kpi', 'dashboard'],
     'engineer': ['alert','endpoint','request','dashboard', 'kpi', 'user', 'role', 'token', 'permission', 'workflow', 'workflowRun', 'workflowStep', "channel", "message", 'workflowAction', 'workflowTrigger']
 }
 

package/client/src/filter.js

@@ -62,6 +62,93 @@ export const MONGO_CALC_OPERATORS = {
     $minute: { label: 'minute', multi: false, isDate: true },
     $second: { label: 'second', multi: false, isDate: true },
     $millisecond: { label: 'ms', multi: false, isDate: true },
+    // Date operators
+    $dateAdd: {
+        label: 'Add to date',
+        description: 'Adds a duration to a date',
+        isDate: true,
+        specialStructure: true,
+        args: [
+            { name: 'startDate', label: 'Start Date', type: 'date' },
+            { name: 'unit', label: 'Unit', type: 'select', options: ['year', 'month', 'day', 'hour', 'minute', 'second'] },
+            { name: 'amount', label: 'Amount', type: 'number' },
+            { name: 'timezone', label: 'Timezone', type: 'text', optional: true }
+        ]
+    },
+    $dateSubtract: {
+        label: 'Subtract from date',
+        description: 'Subtracts a duration from a date',
+        isDate: true,
+        specialStructure: true,
+        args: [
+            { name: 'startDate', label: 'Start Date', type: 'date' },
+            { name: 'unit', label: 'Unit', type: 'select', options: ['year', 'month', 'day', 'hour', 'minute', 'second'] },
+            { name: 'amount', label: 'Amount', type: 'number' },
+            { name: 'timezone', label: 'Timezone', type: 'text', optional: true }
+        ]
+    },
+    $dateDiff: {
+        label: 'Date Difference',
+        description: 'Calculates the difference between two dates in specified units',
+        isDate: true,
+        specialStructure: true,
+        args: [
+            {
+                name: 'startDate',
+                label: 'Start Date',
+                type: 'date',
+                description: 'The starting date (inclusive)'
+            },
+            {
+                name: 'endDate',
+                label: 'End Date',
+                type: 'date',
+                description: 'The ending date (exclusive)'
+            },
+            {
+                name: 'unit',
+                label: 'Unit',
+                type: 'select',
+                options: ['year', 'month', 'week', 'day', 'hour', 'minute', 'second'],
+                description: 'The unit for the result'
+            },
+            {
+                name: 'timezone',
+                label: 'Timezone',
+                type: 'text',
+                optional: true,
+                description: 'The timezone (e.g. "Europe/Paris")'
+            }
+        ]
+    },
+    $dateToString: {
+        label: 'Format date as string',
+        description: 'Formats a date as a string',
+        isDate: true,
+        specialStructure: true,
+        args: [
+            {
+                name: 'date',
+                label: 'Date',
+                type: 'date'
+            },
+            {
+                name: 'format',
+                label: 'Format',
+                optional: true,
+                type: 'text'
+            },
+            {
+                name: 'timezone',
+                label: 'Timezone',
+                type: 'text',
+                optional: true,
+                description: 'The timezone (e.g. "Europe/Paris")'
+            }
+        ]
+    },
+
+    // Converters
     $toBool: { label: 'toBool', multi: false, converter: true },
     $toString: { label: 'toString', multi: false, converter: true },
     $toInt: { label: 'toInt', multi: false, converter: true },

package/client/src/hooks/data.js

@@ -1,10 +1,8 @@
 import {useQuery} from "react-query";
-import {getObjectHash} from "data-primals-engine/core";
 import {useAuthContext} from "../contexts/AuthContext.jsx";
-import {getUserHash, getUserId} from "../../../src/data";
+import {getUserId} from "../../../src/data";
 import {useTranslation} from "react-i18next";
 import {useEffect, useState} from "react";
-import {useUI} from "../contexts/UIContext.jsx";
 import {useNotificationContext} from "../NotificationProvider.jsx";
 
 export const useData = (model, filter, options) => {

package/client/src/hooks/useTutorials.jsx

@@ -138,7 +138,6 @@ export const useTutorials = () => {
                 const tutorial = tutorials.find(t => t._id === currentActiveState.id);
                 if (!tutorial) break;
 
-                console.log({currentActiveState})
                 const stageConfig = tutorial.stages.find(s => s.stage === currentActiveState.stage);
                 if (!stageConfig) {
                     console.log('[Tutoriels] Fin du tutoriel, attribution des récompenses.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-primals-engine",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "data-primals-engine is a package responsible from handling large amount of data using MongoDB in a practical and performant way. It can also get workflow models working (for automation), and fully supports internationalisation. It also has integrated AI assistant.",
   "main": "src/engine.js",
   "type": "module",
@@ -39,7 +39,7 @@
   },
   "exports": {
     ".": "./src/index.js",
-    "./modules/*": "./src/modules/*.js",
+    "./modules/*": "./src/modules/*/index.js",
     "./client": "./client/index.js",
     "./*": "./src/*.js"
   },
@@ -50,6 +50,7 @@
   },
   "dependencies": {
     "@langchain/core": "^0.3.66",
+    "@langchain/deepseek": "^0.1.0",
     "@langchain/google-genai": "^0.2.16",
     "@langchain/openai": "^0.6.3",
     "archiver": "^7.0.1",
@@ -62,7 +63,6 @@
     "cookie-parser": "^1.4.7",
     "cronstrue": "^3.2.0",
     "csv-parse": "^6.1.0",
-    "data-primals-engine": "^1.0.14",
     "date-fns": "^4.1.0",
     "express-csrf-double-submit-cookie": "^2.0.0",
     "express-formidable": "^1.2.0",

package/server.js

@@ -8,7 +8,7 @@ import {Config, Engine, BenchmarkTool, GameObject, Logger} from "./src/index.js"
 import sirv from "sirv";
 import express from "express";
 
-Config.Set("modules", ["mongodb", "data", "file", "bucket", "workflow","user", "assistant", "swagger"])
+Config.Set("modules", ["data", "mongodb", "file", "bucket", "workflow","user", "assistant", "swagger"])
 Config.Set("middlewares", []);
 
 const bench = GameObject.Create("Benchmark");
@@ -30,7 +30,7 @@ if (process.argv.length === 3) {
 const port = process.env.PORT || 7633;
 engine.start(port, async (r) => {
     const logger = engine.getComponent(Logger);
-    console.log("Server started on port" + port);
+    console.log("Server started on port " + port);
     timer.stop();
 
 });

package/src/constants.js

@@ -66,7 +66,7 @@ export const awsDefaultConfig = {
 export const emailDefaultConfig = {
     from: "Support - data@primals.net <data@primals.net>",
     host: 'smtp.mydomain.tld',
-    port: 2500,
+    port: 587,
     secure: false,
     user: 'user',
     pass: 'password'
@@ -288,7 +288,7 @@ metaModels['messaging'] = { load: ['alert','ticket', 'message', 'channel'], 'req
 metaModels['eshopping'] = { load: [
     'order', 'currency', 'product', 'productVariant', 'discount', 'cart', 'cartItem',
     'brand', 'return', 'review', 'stock', 'returnItem', 'userSubscription',
-    'warehouse', 'shipment', 'campaign', 'stockAlert', 'invoice'],
+    'warehouse', 'shipment', 'stockAlert', 'invoice'],
 'require': ['i18n', 'users', 'messaging'] };
 metaModels['workflow'] = { load: ['env', 'workflow', 'workflowRun', 'workflowAction', 'workflowStep', 'workflowTrigger']};
 metaModels['erp'] = { load: [ 'accountingExercise', 'accountingLineItem', 'accountingEntry', 'employee', 'dashboard', 'kpi'] };