data-primals-engine 1.2.6-rc3 → 1.2.6

package/client/package.json

@@ -13,17 +13,17 @@
   },
   "peerDependencies": {
     "@tiptap/react": "^2.11.5",
-    "react-router-dom": "^7.1.5",
-    "react-query": "^3.39.3",
-    "react-icons": "^5.0.1",
-    "react-tooltip": "^5.28.1",
-    "react-helmet": "^6.1.0",
-    "react-cookie": "^8.0.0",
-    "react-syntax-highlighter": "^15.6.1",
-    "react-international-phone": "^4.5.0",
     "react-chartjs-2": "^5.3.0",
     "react-code-blocks": "^0.1.6",
-    "react-ga": "^3.3.1"
+    "react-cookie": "^8.0.0",
+    "react-ga": "^3.3.1",
+    "react-helmet": "^6.1.0",
+    "react-icons": "^5.0.1",
+    "react-international-phone": "^4.5.0",
+    "react-query": "^3.39.3",
+    "react-router-dom": "^7.1.5",
+    "react-syntax-highlighter": "^15.6.1",
+    "react-tooltip": "^5.28.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
@@ -43,15 +43,16 @@
     "@uiw/react-codemirror": "^4.23.10",
     "chart.js": "^4.4.9",
     "chartjs-adapter-date-fns": "^3.0.0",
-    "react-dom": "^18.3.1",
-    "react-router": "^7.2.0",
-    "yet-another-react-lightbox": "^3.22.0",
-    "react": ">=18.0.0",
     "classnames": "^2.5.1",
     "date-fns": "^4.1.0",
     "express-rate-limit": "^7.5.1",
     "lowlight": "^3.3.0",
-    "uniqid": "^5.4.0"
+    "react": ">=18.0.0",
+    "react-dom": "^18.3.1",
+    "react-router": "^7.2.0",
+    "react-switch": "^7.1.0",
+    "uniqid": "^5.4.0",
+    "yet-another-react-lightbox": "^3.22.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.17.0",
@@ -67,4 +68,4 @@
     "sass-embedded": "^1.83.4",
     "vite": "^6.1.1"
   }
-}
+}

package/client/src/App.scss

@@ -421,6 +421,7 @@ input[type=number]::-webkit-outer-spin-button {
 form .field {
   width: 100%;
   .help {
+    width: 100%;
     color: #575757;
     padding: 4px;
   }

package/client/src/DataEditor.jsx

@@ -239,7 +239,7 @@ export const DataEditor = forwardRef(function MyDataEditor({
                                    onChange={(e) => handleChange({name: field.name, value: e})}/>
             case 'boolean':
                 return <CheckboxField
-                    help={value && t('field_' + model.name + '_' + field.name + '_hint', field.hint || '')}
+                    help={t('field_' + model.name + '_' + field.name + '_hint', field.hint || '')}
                     key={field.name} {...inputProps} checked={value}
                     onChange={(e) => handleChange({name: field.name, value: e.target.checked})}/>
             case 'string':

package/client/src/Field.jsx

@@ -34,7 +34,7 @@ import { docco } from 'react-syntax-highlighter/dist/esm/styles/hljs';
 import { PhoneInput } from 'react-international-phone';
 import 'react-international-phone/style.css';
 import {useAuthContext} from "./contexts/AuthContext.jsx";
-
+import Switch from "react-switch";
 export const Form = ({
   name,
   onValidate,
@@ -492,20 +492,6 @@ const CheckboxField = forwardRef(
     return (
         <>
             <div className={cn({field: true, "field-checkbox": true,"field-bg": true})}>
-                <div className="inline"><input
-                    aria-required={required}
-                    aria-readonly={readOnly}
-                    readOnly={readOnly}
-                    type="checkbox"
-                    checked={value}
-                    placeholder={placeholder}
-                    id={id}
-                    name={name}
-                    onChange={handleChange}
-                    minLength={minlength}
-                    maxLength={maxlength}
-                    {...rest}
-                />
                 {label && (
                     <label
                         contentEditable={editable}
@@ -522,7 +508,9 @@ const CheckboxField = forwardRef(
                         )}
                     </label>
                 )}
-                </div>
+                <Switch
+                    onChange={handleChange}
+                    checked={value} />
                 {help && <div className="flex help">{help}</div>}
             </div>
             {errors.length > 0 && (

package/client/src/translations.js

@@ -2,6 +2,9 @@
 export const websiteTranslations = {
     fr: {
         translation: {
+
+            "api.data.relationFilterFailed": "La valeur {{value}} pour le champ {{field}} ne respecte pas le filtre de relation défini.",
+
             "dataimporter.excelPreview":"Aperçu des données Excel",
             "dataimporter.previewNote": "Note: Ceci est un aperçu des premières lignes. Les cellules vides sont affichées comme \"(vide)\".",
             "dataimporter.nullValue": "(vide)",
@@ -567,6 +570,8 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.title": "Cooking Recipes",
             "suggested_prompt.recipes.prompt": "A collection of cooking recipes, with ingredients, instructions, and preparation time.",
 
+            "api.data.relationFilterFailed": "The value {{value}} for field {{field}} does not match the defined relationship filter.",
+
             "api.data.duplicateValue": "The value '{{value}}' already exists for the unique field '{{field}}'.",
             "api.model.invalidStructure": "The model is invalid. Some fields are incorrect.",
             "api.validate.fieldArray": "Field '{{0}}' must be an array.",
@@ -1975,6 +1980,7 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "Una colección de recetas de cocina, con ingredientes, instrucciones y tiempo de preparación.",
 
             "api.data.duplicateValue": "El valor '{{value}}' ya existe para el campo único '{{field}}'.",
+            "api.data.relationFilterFailed": "El valor {{value}} del campo {{field}} no coincide con el filtro de relación definido.",
             "api.model.invalidStructure": "El modelo no es válido. Algunos campos son incorrectos.",
             "api.validate.fieldArray": "El campo '{{0}}' debe ser un array.",
             "api.validate.invalidMimeType": "Tipo de archivo '{{type}}' no válido. Los tipos permitidos son: {{authorized}}.",
@@ -3388,6 +3394,7 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "Uma coleção de receitas culinárias, com ingredientes, instruções e tempo de preparação.",
 
             "api.data.duplicateValue": "O valor '{{value}}' já existe para o campo exclusivo '{{field}}'.",
+            "api.data.relationFilterFailed": "O valor {{value}} para o campo {{field}} não corresponde ao filtro de relacionamento definido.",
             "api.model.invalidStructure": "O modelo é inválido. Alguns campos estão incorretos.",
             "api.validate.fieldArray": "O campo '{{0}}' deve ser um array.",
             "api.validate.invalidMimeType": "Tipo de ficheiro inválido '{{type}}'. Os tipos permitidos são: {{authorized}}.",
@@ -4782,6 +4789,7 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "Eine Sammlung von Kochrezepten mit Zutaten, Anweisungen und Vorbereitungszeit.",
 
             "api.data.duplicateValue": "Der Wert '{{value}}' ist für das eindeutige Feld '{{field}}' bereits vorhanden.",
+            "api.data.relationFilterFailed": "Der Wert {{value}} für das Feld {{field}} entspricht nicht dem definierten Beziehungsfilter.",
             "api.model.invalidStructure": "Das Modell ist ungültig. Einige Felder sind fehlerhaft.",
             "api.validate.fieldArray": "Feld '{{0}}' muss ein Array sein.",
             "api.validate.invalidMimeType": "Ungültiger Dateityp '{{type}}'. Zulässige Typen sind: {{authorized}}.",
@@ -6185,6 +6193,7 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "Una raccolta di ricette di cucina, con ingredienti, istruzioni e tempi di preparazione.",
 
             "api.data.duplicateValue": "Il valore '{{value}}' esiste già per il campo univoco '{{field}}'.",
+            "api.data.relationFilterFailed": "Il valore {{value}} per il campo {{field}} non corrisponde al filtro di relazione definito.",
             "api.model.invalidStructure": "Il modello non è valido. Alcuni campi sono errati.",
             "api.validate.fieldArray": "Il campo '{{0}}' deve essere un array.",
             "api.validate.invalidMimeType": "Tipo di file '{{type}}' non valido. I tipi consentiti sono: {{authorized}}.",
@@ -7589,6 +7598,7 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "Sbírka receptů na vaření s ingrediencemi, návodem a přípravou čas.",
 
             "api.data.duplicateValue": "Hodnota '{{value}}' pro jedinečné pole '{{field}}' již existuje.",
+            "api.data.relationFilterFailed": "Hodnota {{value}} pro pole {{field}} neodpovídá definovanému filtru vztahů.",
             "api.model.invalidStructure": "Model je neplatný. Některá pole jsou nesprávná.",
             "api.validate.fieldArray": "Pole '{{0}}' musí být pole.",
             "api.validate.invalidMimeType": "Neplatný typ souboru '{{type}}'. Povolené typy jsou: {{authorized}}.",
@@ -8988,6 +8998,7 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "Коллекция кулинарных рецептов с ингредиентами, инструкциями и описанием приготовления. время.",
 
             "api.data.duplicateValue": "Значение '{{value}}' уже существует для уникального поля '{{field}}'.",
+            "api.data.relationFilterFailed": "Значение {{value}} для поля {{field}} не соответствует заданному фильтру связи.",
             "api.model.invalidStructure": "Модель недействительна. Некоторые поля неверны.",
             "api.validate.fieldArray": "Поле '{{0}}' должно быть массивом.",
             "api.validate.invalidMimeType": "Недопустимый тип файла '{{type}}'. Допустимые типы: {{authorized}}.",
@@ -10396,6 +10407,7 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "مجموعة من وصفات الطبخ، مع المكونات، والتعليمات، ومدة التحضير.",
 
             "api.data.duplicateValue": "القيمة '{{value}}' موجودة بالفعل للحقل الفريد '{{field}}'.",
+            "api.data.relationFilterFailed": "القيمة {{value}} للحقل {{field}} لا تتطابق مع مرشح العلاقة المحدد.",
             "api.model.invalidStructure": "النموذج غير صالح. بعض الحقول غير صحيحة.",
             "api.validate.fieldArray": "يجب أن يكون الحقل '{{0}}' مصفوفة.",
             "api.validate.invalidMimeType": "نوع الملف '{{type}}' غير صالح. الأنواع المسموح بها هي: {{authorized}}.",
@@ -11823,6 +11835,7 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "En samling matlagningsrecept, med ingredienser, instruktioner, och förberedelsetid.",
 
             "api.data.duplicateValue": "Värdet '{{value}}' finns redan för det unika fältet '{{field}}'.",
+            "api.data.relationFilterFailed": "Värdet {{value}} för fältet {{field}} matchar inte det definierade relationsfiltret.",
             "api.model.invalidStructure": "Modellen är ogiltig. Vissa fält är felaktiga.",
             "api.validate.fieldArray": "Fältet '{{0}}' måste vara en array.",
             "api.validate.invalidMimeType": "Ogiltig filtyp '{{type}}'. Tillåtna typer är: {{authorized}}.",
@@ -13222,6 +13235,8 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "Μια συλλογή συνταγών μαγειρικής, με υλικά, οδηγίες και χρόνο προετοιμασίας.",
 
             "api.data.duplicateValue": "Η τιμή '{{value}}' υπάρχει ήδη για το μοναδικό πεδίο '{{field}}'.",
+            "api.data.relationFilterFailed": "Η τιμή {{value}} για το πεδίο {{field}} δεν ταιριάζει με το καθορισμένο φίλτρο σχέσης.",
+
             "api.model.invalidStructure": "Το μοντέλο δεν είναι έγκυρο. Ορισμένα πεδία είναι λανθασμένα.",
             "api.validate.fieldArray": "Το πεδίο '{{0}}' πρέπει να είναι ένας πίνακας.",
             "api.validate.invalidMimeType": "Μη έγκυρος τύπος αρχείου '{{type}}'. Οι επιτρεπόμενοι τύποι είναι: {{authorized}}.",
@@ -14629,6 +14644,8 @@ export const websiteTranslations = {
             "suggested_prompt.recipes.prompt": "مجموعه‌ای از دستور پخت غذا، با مواد لازم، دستورالعمل و زمان آماده‌سازی.",
 
             "api.data.duplicateValue": "مقدار '{{value}}' از قبل برای فیلد منحصر به فرد '{{field}}' وجود دارد.",
+            "api.data.relationFilterFailed": "مقدار {{value}} برای فیلد {{field}} با فیلتر رابطه تعریف شده مطابقت ندارد.",
+
             "api.model.invalidStructure": "مدل نامعتبر است. برخی از فیلدها نادرست هستند.",
             "api.validate.fieldArray": "فیلد '{{0}}' باید یک آرایه باشد.",
             "api.validate.invalidMimeType": "نوع فایل '{{type}}' نامعتبر است. انواع مجاز عبارتند از: {{authorized}}.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-primals-engine",
-  "version": "1.2.6-rc3",
+  "version": "1.2.6",
   "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",

package/src/filter.js

@@ -175,15 +175,45 @@ 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)) {
         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 simpleCondition = {
-                [keys[0]]: {$eq: condition[keys[0]]}
-            };
-            return evaluateSingleCondition(model, simpleCondition, formData, allModels, user);
+            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;
+        }
+
+        // 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));
+            }
+
+            // Sinon vérifie si la valeur est dans le tableau
+            return values.includes(fieldValue);
         }
     }
 
@@ -218,4 +248,4 @@ 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/modules/data/data.core.js

@@ -1,8 +1,6 @@
 import NodeCache from "node-cache";
-import i18n from "../../i18n.js";
-import {allowedFields, maxStringLength} from "../../constants.js";
 import path from "node:path";
-
+import {Worker} from 'worker_threads';
 export const modelsCache = new NodeCache( { stdTTL: 100, checkperiod: 120 } );
 
 export const mongoDBWhitelist = [

package/src/modules/data/data.js

@@ -1,6 +1,6 @@
 import {Logger} from "../../gameObject.js";
 import {BSON, ObjectId} from "mongodb";
-import {promisify} from 'node:util';
+import util, {promisify} from 'node:util';
 import crypto from "node:crypto";
 import {exec, execFile} from 'node:child_process';
 import sanitizeHtml from 'sanitize-html';
@@ -67,7 +67,6 @@ import {
 import NodeCache from "node-cache";
 import AWS from 'aws-sdk';
 import checkDiskSpace from "check-disk-space";
-import {Worker} from 'worker_threads';
 import {addFile,  removeFile} from "../file.js";
 import {downloadFromS3, getUserS3Config, listS3Backups, uploadToS3} from "../bucket.js";
 import {
@@ -2042,22 +2041,41 @@ async function insertAndResolveRelations(doc, model, collection, me, idMap) {
 
     for (const field of model.fields) {
         if (field.type === 'relation' && field.relationFilter && docToProcess[field.name]) {
-            const relatedIds = Array.isArray(docToProcess[field.name]) ? docToProcess[field.name] : [docToProcess[field.name]];
-            for (const id of relatedIds) {
-                const targetCollection = await getCollectionForUser(me, field.targetModel);
-                const validationQuery = {
-                    _id: new ObjectId(id), // L'ID doit correspondre
-                    ...field.relationFilter // ET le document doit respecter le filtre
-                };
-                const relatedDoc = await targetCollection.findOne(validationQuery);
-                if (!relatedDoc) {
-                    // Si on ne trouve rien, c'est que l'ID est invalide ou ne respecte pas le filtre.
-                    throw new Error(`La valeur '${id}' pour le champ '${field.name}' ne respecte pas le filtre de relation défini.`);
-                }
+
+            const relatedIds = Array.isArray(docToProcess[field.name])
+                ? docToProcess[field.name]
+                : [docToProcess[field.name]];
+
+            // Préparer un filtre global : match si _id dans relatedIds ET respecte relationFilter
+            const validationQuery = {
+                $and: [
+                    { $in: ['$_id', relatedIds.map(id => ({ $toObjectId: id }))] },
+                    field.relationFilter
+                ]
+            };
+
+            const relatedDocs = await searchData({
+                filter: validationQuery,
+                model: field.relation,
+                limit: relatedIds.length
+            }, me);
+
+            if ((relatedDocs?.count || 0) !== relatedIds.length) {
+                const invalidIds = relatedIds.filter(id =>
+                    !relatedDocs.data.some(doc => doc._id.toString() === id.toString())
+                );
+                throw new Error(
+                    i18n.t(
+                        'api.data.relationFilterFailed',
+                        'Les valeurs {{values}} pour le champ {{field}} ne respectent pas le filtre de relation défini.',
+                        { field: field.name, values: invalidIds.join(', ') }
+                    )
+                );
             }
         }
     }
 
+
     // Insertion en conservant éventuellement l'ID original
     const result = docToProcess._id
         ? await collection.insertOne(docToProcess)
@@ -2297,28 +2315,37 @@ const internalEditOrPatchData = async (modelName, filter, data, files, user, isP
         }
 
         for (const field of model.fields) {
-            // On ne vérifie que si un champ de relation avec un filtre est en cours de modification.
-            if (field.type === 'relation' && field.relationFilter && updateData[field.name] !== undefined) {
+            if (field.type === 'relation' && field.relationFilter && updateData[field.name]) {
+
                 const relatedIds = Array.isArray(updateData[field.name])
                     ? updateData[field.name]
-                    : (updateData[field.name] ? [updateData[field.name]] : []);
-
-                for (const id of relatedIds) {
-                    if (!id || !isObjectId(id)) continue; // Ignorer les valeurs null/invalides
+                    : [updateData[field.name]];
 
-                    const targetCollection = await getCollectionForUser(user, field.relation);
-
-                    const validationQuery = {
-                        _id: new ObjectId(id),
-                        ...field.relationFilter
-                    };
+                // Préparer un filtre global : match si _id dans relatedIds ET respecte relationFilter
+                const validationQuery = {
+                    $and: [
+                        { $in: ['$_id', relatedIds.map(id => ({ $toObjectId: id }))] },
+                        field.relationFilter
+                    ]
+                };
 
-                    const relatedDoc = await targetCollection.findOne(validationQuery);
+                const relatedDocs = await searchData({
+                    filter: validationQuery,
+                    model: field.relation,
+                    limit: relatedIds.length
+                }, user);
 
-                    if (!relatedDoc) {
-                        // Si on ne trouve rien, c'est que l'ID est invalide ou ne respecte pas le filtre.
-                        throw new Error(`La valeur '${id}' pour le champ '${field.name}' ne respecte pas le filtre de relation défini.`);
-                    }
+                if ((relatedDocs?.count || 0) !== relatedIds.length) {
+                    const invalidIds = relatedIds.filter(id =>
+                        !relatedDocs.data.some(doc => doc._id.toString() === id.toString())
+                    );
+                    throw new Error(
+                        i18n.t(
+                            'api.data.relationFilterFailed',
+                            'Les valeurs {{values}} pour le champ {{field}} ne respectent pas le filtre de relation défini.',
+                            { field: field.name, values: invalidIds.join(', ') }
+                        )
+                    );
                 }
             }
         }

package/src/modules/mongodb.js

@@ -1,10 +1,12 @@
 
-import process from "process";
 import {Logger} from "../gameObject.js";
 import {MongoDatabase} from "../engine.js";
+import {ObjectId} from "mongodb";
 
 export let modelsCollection, datasCollection, filesCollection, packsCollection;
 
+export {ObjectId};
+
 let engine, logger;
 export async function onInit(defaultEngine) {
     engine = defaultEngine;