data-primals-engine 1.3.3-rc.1 → 1.3.4

package/src/defaultModels.js

@@ -2,6 +2,7 @@
 export const defaultModels = {
     permission: {
         "name": "permission",
+        "icon": "FaKey",
         "description": "",
         "fields": [
             {
@@ -17,6 +18,7 @@ export const defaultModels = {
     },
     role: {
         name: 'role',
+        "icon": "FaUserTag",
         "description": "",
         fields: [
             { name: 'name', type: 'string_t', required: true, unique: true, color: '#363636' },
@@ -26,6 +28,7 @@ export const defaultModels = {
     user: {
         name: 'user',
         "description": "",
+        "icon": "FaUser",
         locked: true,
         fields: [
             { name: 'username', type: 'string', required: true, unique: true, color: '#3C7D08' },
@@ -47,6 +50,7 @@ export const defaultModels = {
         ]
     },
     userPermission: {
+        "icon": "FaUserCheck",
         "name": "userPermission",
         "description": "Gère les exceptions aux permissions des rôles pour un utilisateur (ajouts ou retraits, permanents ou temporaires).",
         "fields": [
@@ -81,6 +85,7 @@ export const defaultModels = {
     },
     token: {
         name: 'token',
+        "icon": "FaKey",
         "description": "",
         fields: [
             { name: 'name', type: 'string' },
@@ -90,6 +95,7 @@ export const defaultModels = {
     },
     translation: {
         name: 'translation',
+        "icon": "FaLanguage",
         locked: true,
         "description": "",
         fields: [
@@ -100,6 +106,7 @@ export const defaultModels = {
     },
     lang: {
         name: 'lang',
+        "icon": "FaGlobe",
         locked: true,
         "description": "",
         fields: [
@@ -109,6 +116,7 @@ export const defaultModels = {
     },
     currency: {
         name: 'currency',
+        "icon": "FaMoneyBill",
         "description": "",
         locked: true,
         fields: [
@@ -121,6 +129,7 @@ export const defaultModels = {
     },
     channel: {
         name: 'channel',
+        "icon": "FaComments",
         "description": "",
         fields: [
             { name: 'name', type: 'string_t', required: true, unique: true }, // Nom du canal (ex: "email", "SMS")
@@ -130,6 +139,7 @@ export const defaultModels = {
     },
     message: {
         name: 'message',
+        "icon": "FaEnvelope",
         "description": "",
         locked: true,
         fields: [
@@ -148,6 +158,7 @@ export const defaultModels = {
     },
     alert: {
         name: "alert",
+        "icon": "FaBell",
         description: "Définit les règles pour les alertes et les insights automatiques.",
         fields: [
             { name: "name", type: "string", required: true, asMain: true },
@@ -186,6 +197,7 @@ export const defaultModels = {
     },
     env: {
         name: "env",
+        "icon": "FaCog",
         description: "Définit les variables d'environnement qui seront accessibles dans vos scripts et webhooks.",
         fields: [
             { name: "name", type: "string", required: true, unique: true, asMain: true },
@@ -194,6 +206,7 @@ export const defaultModels = {
     },
     webpage: {
         name: 'webpage',
+        "icon": "FaFileAlt",
         locked: true,
         "description": "",
         fields: [
@@ -210,6 +223,7 @@ export const defaultModels = {
     },
     content: {
         name: 'content',
+        "icon": "FaFileAlt",
         "description": "",
         fields: [
             { name: 'lang', type: 'relation', relation: 'lang' },
@@ -240,6 +254,7 @@ export const defaultModels = {
     },
     resource: {
         name: 'resource',
+        "icon": "FaBoxOpen",
         "description": "",
         fields: [
             { name: "source", type: "url"},
@@ -248,6 +263,7 @@ export const defaultModels = {
     },
     taxonomy: {
         name: 'taxonomy',
+        "icon": "FaTags",
         "description": "",
         fields: [
             { name: 'name', type: 'string_t', required: true, color: '#71A314' },
@@ -261,6 +277,7 @@ export const defaultModels = {
     contact: {
         locked: true,
         name: 'contact',
+        "icon": "FaAddressBook",
         "description": "",
         fields: [
             { name: 'legalName', type: 'string', asMain: true, color: '#D9D9D9' },
@@ -274,6 +291,7 @@ export const defaultModels = {
 
     location: {
         "name": "location",
+        "icon": "FaMapMarkerAlt",
         locked: true,
         "description": "",
         "fields": [
@@ -332,6 +350,7 @@ export const defaultModels = {
 
     brand: {
         name: 'brand',
+        "icon": "FaTrademark",
         "description": "",
         fields: [
             { name: 'name', type: 'string', required: true },
@@ -342,6 +361,7 @@ export const defaultModels = {
 
     product: {
         name: 'product',
+        "icon": "FaShoppingBag",
         "description": "",
         fields: [
             { name: 'name', type: 'string_t', required: true },
@@ -359,6 +379,7 @@ export const defaultModels = {
     },
     productVariant: {
         name: 'productVariant',
+        "icon": "FaBox",
         "description": "",
         fields: [
             { name: 'product', type: 'relation', relation: 'product', required: true },
@@ -374,6 +395,7 @@ export const defaultModels = {
     },
     cart: {
         name: 'cart',
+        "icon": "FaShoppingCart",
         "description": "",
         fields: [
             { name: 'user', type: 'relation', relation: 'user', required: true },
@@ -385,6 +407,7 @@ export const defaultModels = {
     },
     cartItem: {
         name: 'cartItem',
+        "icon": "FaShoppingBasket",
         "description": "",
         fields: [
             { name: 'product', type: 'relation', relation: 'product', required: true },
@@ -394,6 +417,7 @@ export const defaultModels = {
     },
     discount: {
         name: "discount",
+        "icon": "FaTicketAlt",
         locked: true,
         "description": "",
         fields: [
@@ -411,6 +435,7 @@ export const defaultModels = {
     },
     order: {
         name: "order",
+        "icon": "FaClipboardList",
         locked: true,
         "description": "",
         fields: [
@@ -432,6 +457,7 @@ export const defaultModels = {
     },
     invoice: {
         name: 'invoice',
+        "icon": "FaFileInvoice",
         "description": "",
         fields: [
             { name: 'order', type: 'relation', relation: 'order', required: true },
@@ -443,6 +469,7 @@ export const defaultModels = {
     },
     userSubscription: {
         name: 'userSubscription',
+        "icon": "FaCalendarCheck",
         "description": "",
         locked: true,
         fields: [
@@ -463,6 +490,7 @@ export const defaultModels = {
     },
     stock: {
         name: 'stock',
+        "icon": "FaWarehouse",
         "description": "",
         fields: [
             { name: 'product', type: 'relation', relation: 'product', required: true },
@@ -474,6 +502,7 @@ export const defaultModels = {
     },
     stockAlert: {
         name: 'stockAlert',
+        "icon": "FaExclamationTriangle",
         "description": "",
         fields: [
             { name: 'user', type: 'relation', relation: 'user', required: true },
@@ -484,6 +513,7 @@ export const defaultModels = {
     },
     shipment: {
         name: 'shipment',
+        "icon": "FaTruck",
         "description": "",
         fields: [
             { name: 'order', type: 'relation', relation: 'order', required: true },
@@ -497,6 +527,7 @@ export const defaultModels = {
     warehouse: {
         name: 'warehouse',
         "description": "",
+        "icon": "FaWarehouse",
         fields: [
             { name: 'name', type: 'string_t', required: true },
             { name: 'location', type: 'relation', relation: 'location' },
@@ -506,6 +537,7 @@ export const defaultModels = {
     'return': {
         name: "return",
         "description": "",
+        "icon": "FaUndo",
         fields: [
             { "name": "order", "type": "relation", "relation": "order", "required": true },
             { "name": "user", "type": "relation", relation: "user" },
@@ -519,6 +551,7 @@ export const defaultModels = {
     },
     returnItem: {
         name: 'returnItem',
+        "icon": "FaBoxOpen",
         "description": "",
         fields: [
             { name: 'return', type: 'relation', relation: 'return', required: true },
@@ -530,6 +563,7 @@ export const defaultModels = {
     },
     ticket: {
         name: 'ticket',
+        "icon": "FaTicketAlt",
         "description": "",
         locked: true,
         fields: [
@@ -547,6 +581,7 @@ export const defaultModels = {
     },
     review: {
         name: "review",
+        "icon": "FaStar",
         "description": "",
         fields: [
             { "name": "user", "type": "relation", relation: "user" },
@@ -559,6 +594,7 @@ export const defaultModels = {
     },
     device: {
         name: "device",
+        "icon": "FaMobile",
         "description": "",
         fields: [
             { "name": "location", "type": "relation", relation: 'location' },
@@ -568,6 +604,7 @@ export const defaultModels = {
     // Modèle pour l'exercice comptable et l'entreprise
     accountingExercise: {
         name: 'accountingExercise',
+        "icon": "FaBook",
         description: "Représente un exercice comptable pour une entreprise donnée.",
         fields: [
             { name: 'name', type: 'string_t', 'required': true, unique: true, hint: "Intitulé de l'exercice comptable" },
@@ -581,6 +618,7 @@ export const defaultModels = {
     // Modèle pour définir la structure des lignes comptables (le "plan")
     accountingLineItem: {
         name: 'accountingLineItem',
+        "icon": "FaListAlt",
         description: "Définit une ligne/catégorie dans un document comptable.",
         locked: true, // Probablement géré par l'application, pas par l'utilisateur final
         fields: [
@@ -610,6 +648,7 @@ export const defaultModels = {
     },
     accountingEntry: {
         "name": "accountingEntry",
+        "icon": "FaPenAlt",
         "description": "",
         "fields": [
             {
@@ -679,6 +718,7 @@ export const defaultModels = {
     },
     employee: {
         "name": "employee",
+        "icon": "FaUserTie",
         "description": "",
         "fields": [
             {
@@ -819,6 +859,7 @@ export const defaultModels = {
     },
     workflow: {
         name: 'workflow',
+        "icon": "FaProjectDiagram",
         description: "Defines an automated process.",
         fields: [
             { name: 'name', type: 'string_t', required: true, hint: "Unique name for the workflow (e.g., 'Order Validation', 'Low Stock Notification')." },
@@ -828,6 +869,7 @@ export const defaultModels = {
     },
     workflowTrigger: {
         name: 'workflowTrigger',
+        "icon": "FaPlay",
         description: "Represents an event that can initiate a workflow.",
         fields: [
             { name: 'workflow', type: 'relation', relation: 'workflow', required: true, hint: "The workflow this step belongs to." },
@@ -879,6 +921,7 @@ export const defaultModels = {
     },
     workflowStep: {
         name: 'workflowStep',
+        "icon": "FaStepForward",
         description: "A single step within a workflow process.",
         fields: [
             { name: 'workflow', type: 'relation', relation: 'workflow', required: true, hint: "The workflow this step belongs to." },
@@ -892,6 +935,7 @@ export const defaultModels = {
     },
     workflowAction: {
         name: 'workflowAction',
+        "icon": "FaCogs",
         description: "Defines a specific operation to be performed by a workflow step.",
         fields: [
             { name: 'name', type: 'string_t', required: true, hint: "Name of the action (e.g., 'Update Order Status', 'Send Email', 'Call Payment API')." },
@@ -991,6 +1035,7 @@ export const defaultModels = {
 
     workflowRun: {
         name: 'workflowRun',
+        "icon": "FaRunning",
         description: "Tracks a specific execution instance of a workflow.",
         fields: [
             { name: 'workflow', type: 'relation', relation: 'workflow', required: true, hint: "The workflow definition that was executed." },
@@ -1013,6 +1058,7 @@ export const defaultModels = {
     },
     dashboard:{
         name: 'dashboard', // Nom technique du modèle
+        "icon": "FaTachometerAlt",
         description: "Configuration d'un tableau de bord personnalisé par l'utilisateur.", // Description du modèle
         locked: false, // Indique si le modèle peut être modifié par l'utilisateur (false = modifiable)
         fields: [
@@ -1052,6 +1098,7 @@ export const defaultModels = {
     },
     'request': {
         name: 'request',
+        "icon": "FaExchangeAlt",
         description: "Journal des requêtes reçues par l'API.",
         locked: true, // Géré par le système, non modifiable directement par l'utilisateur via l'UI standard
         fields: [
@@ -1137,6 +1184,7 @@ export const defaultModels = {
 
     kpi : {
         name: 'kpi',
+        "icon": "FaChartLine",
         description: "Configuration d'un Indicateur Clé de Performance (KPI)",
         fields: [
             { name: 'name', type: 'string_t', required: true, hint: "Nom affiché du KPI (ex: Chiffre d'affaires total)" },
@@ -1200,6 +1248,7 @@ export const defaultModels = {
     },
     imageGallery: {
         name: 'imageGallery',
+        "icon": "FaImages",
         description: "Représente une galerie d'images avec un titre et une description.",
         locked: false, // Les utilisateurs peuvent créer/gérer leurs galeries
         fields: [
@@ -1241,6 +1290,7 @@ export const defaultModels = {
     },
     budget: {
         name: 'budget',
+        "icon": "FaMoneyCheck",
         description: "Un budget permet de lister vos transactions personnelles.",
         fields: [
             {
@@ -1312,6 +1362,7 @@ export const defaultModels = {
     },
     event: {
         "name": "event",
+        "icon": "FaCalendar",
         "description": "A model for managing events, conferences, meetups, and gatherings.",
         "fields": [
             {
@@ -1424,6 +1475,7 @@ export const defaultModels = {
     },
     endpoint: {
         name: "endpoint",
+        "icon": "FaCode",
         description: "Defines custom API endpoints that execute a server-side script.",
         fields: [
             {

package/src/filter.js

@@ -1,3 +1,4 @@
+import safeRegex from 'safe-regex';
 /**
  * Evaluates a single condition against form data.
  * @param {object} currentModelDef - The definition of the current model.
@@ -139,8 +140,8 @@ const evaluateSingleCondition = (currentModelDef, condition, formData, allModels
     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 '$eq': return targetValue === processedConditionValue;
+            case '$ne': return targetValue !== processedConditionValue;
             case '$gt': return targetValue > processedConditionValue;
             case '$lt': return targetValue < processedConditionValue;
             case '$gte': return targetValue >= processedConditionValue;
@@ -149,8 +150,11 @@ const evaluateSingleCondition = (currentModelDef, condition, formData, allModels
                 if (typeof targetValue !== 'string') return false;
                 if (typeof processedConditionValue !== 'string') return false;
                 try {
-                    const regex = new RegExp(processedConditionValue, 'i');
-                    return regex.test(targetValue);
+                    if( safeRegex(processedConditionValue)) {
+                        const regex = new RegExp(processedConditionValue, 'i');
+                        return regex.test(targetValue);
+                    }
+                    return false;
                 } catch (e) {
                     logClientEvalWarning(`Invalid regex pattern: ${processedConditionValue}`, condition);
                     return false;
@@ -175,63 +179,70 @@ export const isConditionMet = (model, cond, formData, allModels, user) => {
 
     if (!condition) return true;
 
-    // Cas 0: Condition est une valeur primitive (string, number, boolean)
-    // On la considère comme toujours vraie (comportement de searchData)
     if (typeof condition !== 'object' || condition === null) {
         return true;
     }
 
-    // Cas 1: Condition simple {field: value} → transformée en {field: {$eq: value}}
-    if (typeof condition === 'object' && !Array.isArray(condition)) {
+    // Cas spécial: Évaluation sans modèle (ex: pour les webhooks où la condition est déjà résolue)
+    // Dans ce mode, la condition doit être un objet avec un seul opérateur.
+    if (!model) {
         const keys = Object.keys(condition);
-
-        // Cas spécial pour les conditions de type {field: value} (pas d'opérateur $)
-        if (keys.length === 1 && !keys[0].startsWith('$') &&
-            typeof condition[keys[0]] !== 'object') {
-            const fieldName = keys[0];
-            const value = condition[fieldName];
-
-            // Si la valeur est null/undefined, on vérifie simplement l'existence
-            if (value === null || value === undefined) {
-                return formData[fieldName] === value;
-            }
-
-            // Sinon on fait une comparaison d'égalité simple
-            return formData[fieldName] == value;
+        if (keys.length !== 1 || !keys[0].startsWith('$')) {
+            console.warn('[isConditionMet] Condition invalide pour une évaluation sans modèle. Attendu : { "$opérateur": [...] }. Reçu :', condition);
+            return false; // Plus sûr que true pour éviter les faux positifs
         }
 
-        // Cas spécial pour les tableaux - vérifie si la valeur est incluse
-        if (keys.length === 1 && !keys[0].startsWith('$') &&
-            Array.isArray(condition[keys[0]])) {
-            const fieldName = keys[0];
-            const values = condition[fieldName];
-            const fieldValue = formData[fieldName];
-
-            // Si le champ est aussi un tableau, vérifie l'intersection
-            if (Array.isArray(fieldValue)) {
-                return fieldValue.some(v => values.includes(v));
-            }
+        const operator = keys[0];
+        const operands = condition[operator];
+
+        switch (operator) {
+        // Opérateurs logiques (récursifs)
+        case '$and':
+            return Array.isArray(operands) && operands.every(sub => isConditionMet(null, sub, formData, allModels, user));
+        case '$or':
+            return Array.isArray(operands) && operands.some(sub => isConditionMet(null, sub, formData, allModels, user));
+        case '$not':
+            return !isConditionMet(null, operands, formData, allModels, user);
+        case '$nor':
+            return Array.isArray(operands) && !operands.some(sub => isConditionMet(null, sub, formData, allModels, user));
+
+        // Opérateurs de comparaison (terminaux)
+        case '$eq':
+            return Array.isArray(operands) && operands[0] === operands[1];
+        case '$ne':
+            return Array.isArray(operands) && operands[0] !== operands[1];
+        case '$in':
+            return Array.isArray(operands) && Array.isArray(operands[1]) && operands[1].includes(operands[0]);
+        case '$nin':
+            return Array.isArray(operands) && Array.isArray(operands[1]) && !operands[1].includes(operands[0]);
+        case '$gt':
+            return Array.isArray(operands) && operands[0] > operands[1];
+        case '$gte':
+            return Array.isArray(operands) && operands[0] >= operands[1];
+        case '$lt':
+            return Array.isArray(operands) && operands[0] < operands[1];
+        case '$lte':
+            return Array.isArray(operands) && operands[0] <= operands[1];
 
-            // Sinon vérifie si la valeur est dans le tableau
-            return values.includes(fieldValue);
+        default:
+            console.warn(`[isConditionMet] Opérateur non supporté '${operator}' pour une évaluation sans modèle.`);
+            return false;
         }
     }
 
-    // Cas 2: Opérateurs logiques ($and, $or, $not, $nor)
+    // --- Logique existante pour l'évaluation AVEC modèle ---
+
     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));
@@ -246,6 +257,5 @@ export const isConditionMet = (model, cond, formData, allModels, user) => {
         }
     }
 
-    // Cas 4: Tous les autres cas (conditions normales avec opérateurs)
     return evaluateSingleCondition(model, condition, formData, allModels, user);
 };

package/src/i18n.js

@@ -1,5 +1,5 @@
 import i18n from "i18next";
-import {Trans, useTranslation, initReactI18next} from "react-i18next";
+import {Trans, useTranslation,I18nextProvider, initReactI18next} from "react-i18next";
 import LanguageDetector from "i18next-browser-languagedetector";
 
 export const translations = {
@@ -12441,5 +12441,5 @@ i18n
         }
     });
 
-export {Trans, useTranslation};
+export {Trans, useTranslation, I18nextProvider};
 export default i18n;

package/src/modules/data/data.js

@@ -1075,7 +1075,8 @@ export const editModel = async (user, id, data) => {
 export async function middlewareEndpointAuthenticator(req, res, next) {
     const { path } = req.params;
     const method = req.method.toUpperCase();
-    const datasCollection = getCollection('datas');
+    const user = await engine.userProvider.findUserByUsername(req.query._user || req.params.user || req.me.username);
+    const datasCollection = await getCollectionForUser(user);
 
     try {
         const endpointDef = await datasCollection.findOne({
@@ -1137,7 +1138,9 @@ export async function handleCustomEndpointRequest(req, res) {
         // 2. Préparer le contexte pour le script
         const contextData = {
             request: {
-                body: req.fields,
+                // MODIFICATION: Utiliser req.body si disponible (pour les requêtes JSON comme les webhooks Stripe),
+                // sinon, utiliser req.fields (pour les données de formulaire).
+                body: (req.body && Object.keys(req.body).length > 0) ? req.body : (req.fields || {}),
                 query: req.query,
                 params: req.params,
                 headers: req.headers
@@ -1276,7 +1279,7 @@ export async function onInit(defaultEngine) {
 
         const objectKeys = Object.keys(modelStructure);
 
-        if( objectKeys.find(o => !["name", "_user", "history", "locked", "_id", "description", "maxRequestData", "fields"].includes(o)) ){
+        if( objectKeys.find(o => !["name", "_user", "icon", "history", "locked", "_id", "description", "maxRequestData", "fields"].includes(o)) ){
             throw new Error(i18n.t('api.model.invalidStructure'));
         }
 

package/src/modules/data/data.routes.js

@@ -161,7 +161,8 @@ export async function registerRoutes(engine){
 
     logger = engine.getComponent(Logger);
 
-    engine.all('/api/actions/:path', [middlewareEndpointAuthenticator, userInitiator], handleCustomEndpointRequest);
+    engine.all('/api/actions/:user/:path', [middlewareEndpointAuthenticator, userInitiator], handleCustomEndpointRequest);
+    engine.all('/api/actions/:path', [middlewareAuthenticator, middlewareEndpointAuthenticator, userInitiator], handleCustomEndpointRequest);
     engine.post('/api/demo/initialize', [middlewareAuthenticator, userInitiator], handleDemoInitialization);
 
     engine.post('/api/magnets', [middlewareAuthenticator, userInitiator], async (req, res) => {
@@ -872,7 +873,7 @@ export async function registerRoutes(engine){
                 await cancelAlerts(req.me);
 
                 await getPromise();
-                await Event.Trigger('jobAddUserData', req.me.username);
+                await Event.Trigger('OnDemoUserAdded', req.me.username);
             }else{
                 await getPromise();
             }