data-primals-engine 1.1.4 → 1.1.6

package/client/src/filter.js

@@ -7,6 +7,12 @@ export const MONGO_CALC_OPERATORS = {
         multi: false,
         isFindOperator: true // Nouvelle propriété pour identifier les opérateurs $find
     },
+    '$regexMatch': {
+        label: 'Find by regex',
+        description: 'Find a string matching a regular expression (Ecmascript)',
+        args: 2, // input et regex
+        specialStructure: true // Indique une structure spéciale
+    },
     $and: { label: 'Et (and)', description: 'Renvoie vrai si toutes les conditions sont vérifiées', args: 1, multi: true },
     $or: { label: 'Ou (or)', description: 'Renvoie vrai si au moins une des conditions est vérifiée.', args: 1, multi: true },
     $not: { label: 'Non (not)', description: 'Inverse la condition (ex: non égal à).', args: 1, multi: true },
@@ -57,7 +63,7 @@ export const MONGO_CALC_OPERATORS = {
     $toBool: { label: 'toBool', multi: false, converter: true },
     $toString: { label: 'toString', multi: false, converter: true },
     $toInt: { label: 'toInt', multi: false, converter: true },
-    $toDouble: { label: 'toDouble', multi: false, converter: true },
+    $toDouble: { label: 'toDouble', multi: false, converter: true }
 };
 
 export const convertInputValue = (value) => {
@@ -219,4 +225,37 @@ export const buildRootFromExpr = (query) => {
     if (parsedRoot.$and || parsedRoot.$or) return parsedRoot;
 
     return { $and: [parsedRoot] };
+};
+
+export const pagedFilterToMongoConds = (pagedFilters, model) => {
+    const modelFilter = pagedFilters?.[model.name] || {};
+    const filterKeys = Object.keys(modelFilter);
+
+    // Si le filtre est vide, on retourne un tableau vide.
+    if (filterKeys.length === 0) {
+        return [];
+    }
+
+    // Détecte si c'est un filtre avancé (contient des opérateurs logiques de haut niveau comme $and, $or, etc.)
+    const isAdvancedFilter = filterKeys.some(key => key.startsWith('$'));
+
+    if (isAdvancedFilter) {
+        // C'est un filtre avancé du ConditionBuilder.
+        // Il est déjà une condition MongoDB complète. On le met dans un tableau pour l'insérer dans le $and global.
+        // Si le filtre avancé est vide (ex: { $and: [] }), on le retourne quand même pour que le ConditionBuilder puisse s'initialiser correctement.
+        return [modelFilter];
+    } else {
+        // C'est un filtre simple (par colonne).
+        // On transforme { champ1: cond1, champ2: cond2 } en [{ champ1: cond1 }, { champ2: cond2 }]
+        const c = [];
+        filterKeys.forEach(fieldName => {
+            if (model.fields.some(f => f.name === fieldName)) {
+                const condition = modelFilter[fieldName];
+                if (condition && typeof condition === 'object' && Object.keys(condition).length > 0) {
+                    c.push(condition);
+                }
+            }
+        });
+        return c;
+    }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-primals-engine",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "data-primals-engine is the package responsible from handling large amount of data in a practical and performant way. It can handle large amount of data in a practical and performant way. It can also get workflow models working (for automation), and fully supports internationalisation.",
   "main": "src/engine.js",
   "type": "module",
@@ -44,7 +44,8 @@
   },
   "peerDependencies": {
     "react": ">=18.0.0",
-    "react-query": ">=3.0.0"
+    "react-query": ">=3.0.0",
+    "express": "^5.1.0"
   },
   "dependencies": {
     "@langchain/core": "^0.3.66",
@@ -60,15 +61,13 @@
     "cookie-parser": "^1.4.7",
     "cronstrue": "^3.2.0",
     "csv-parse": "^6.1.0",
-    "data-primals-engine": "^1.0.11",
+    "data-primals-engine": "^1.0.14",
     "date-fns": "^4.1.0",
-    "express": "^5.1.0",
     "express-csrf-double-submit-cookie": "^2.0.0",
     "express-formidable": "^1.2.0",
     "express-mongo-sanitize": "^2.2.0",
     "express-rate-limit": "^8.0.1",
     "express-session": "^1.18.2",
-    "i18next": "^25.3.2",
     "i18next-browser-languagedetector": "^8.2.0",
     "juice": "^11.0.1",
     "mathjs": "^14.6.0",

package/server.js

@@ -6,6 +6,7 @@
 import process from "node:process";
 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("middlewares", []);
@@ -14,8 +15,8 @@ const bench = GameObject.Create("Benchmark");
 const timer = bench.addComponent(BenchmarkTool);
 timer.start();
 
-
-const engine = await Engine.Create();
+const app = express();
+const engine = await Engine.Create({app});
 
 if (process.argv.length === 3) {
     let arg = process.argv[2];

package/src/constants.js

@@ -64,6 +64,8 @@ export const emailDefaultConfig = {
     pass: 'password'
 }
 
+export const useAI = true;
+
 /**
  * Maximum number of models per user
  * @type {number}
@@ -212,7 +214,19 @@ export const maxTotalPrivateFilesSize = 250 * megabytes;
  */
 export const timeoutVM = 5000;
 
-export const defaultMaxRequestData = 50000;
+/**
+ * Default maximum number of data per request
+ * @type {number}
+ */
+export const defaultMaxRequestData = 500;
+
+/**
+ * Database connections pool size for MongoDB access
+ * @type {number}
+ */
+export const databasePoolSize = 30;
+
+
 /**
  * Options for the HTML sanitizer
  * @type {{allowedSchemesByTag: {}, selfClosing: string[], allowedSchemes: string[], enforceHtmlBoundary: boolean, disallowedTagsMode: string, allowProtocolRelative: boolean, allowedAttributes: {a: string[], img: string[], code: string[]}, allowedTags: string[], allowedSchemesAppliedToAttributes: string[]}}

package/src/core.js

@@ -11,6 +11,11 @@ export function escapeRegex(string) {
 
 export const isDate = dt => String(new Date(dt)) !== 'Invalid Date'
 
+export const safeAssignObject = (obj, key, value) => {
+    if( !["__proto__", "constructor"].includes(key)){
+        obj[key] = value;
+    }
+}
 export function debounce(callback, delay=300){
     var timer;
     return function(){
@@ -176,9 +181,53 @@ function splitmix32(a) {
 
 export const getRand = () =>splitmix32(seed);
 
-export const getRandom = (minInclusive,maxInclusive) => {
-    return Math.floor(Math.random() * (maxInclusive - minInclusive + 1) + minInclusive);
-};
+const MAX_RANGE_SIZE = 2n ** 64n
+const buffer = new BigUint64Array(512)
+let offset = buffer.length
+
+/**
+ * Returns a cryptographically secure random integer between min and max, inclusive.
+ *
+ * @param {number} min - the lowest integer in the desired range (inclusive)
+ * @param {number} max - the highest integer in the desired range (inclusive)
+ * @returns {number} Random number
+ */
+
+export function getRandom(min, max) {
+    if (!(Number.isSafeInteger(min) && Number.isSafeInteger(max))) {
+        throw Error("min and max must be safe integers")
+    }
+    if (min > max) {
+        throw Error("min must be less than or equal to max")
+    }
+    const bmin = BigInt(min)
+    const rangeSize = BigInt(max) - bmin + 1n
+    const rejectionThreshold = MAX_RANGE_SIZE - (MAX_RANGE_SIZE % rangeSize)
+    let result;
+    do {
+        if (offset >= buffer.length) {
+            crypto.getRandomValues(buffer)
+            offset = 0
+        }
+        result = buffer[offset++]
+    } while (result >= rejectionThreshold)
+    return Number(bmin + result % rangeSize)
+}
+
+/**
+ * Returns a cryptographically secure random integer between min and max, inclusive.
+ *
+ * @param {number} minInclusive - the lowest integer in the desired range (inclusive)
+ * @param {number} maxInclusive - the highest integer in the desired range (inclusive)
+ * @returns {number} Random number
+ */
+
+export function getBrowserRandom(minInclusive, maxInclusive) {
+    const randomBuffer = new Uint32Array(1);
+    (window.crypto || window.msCrypto).getRandomValues(randomBuffer);
+    const r = ( randomBuffer[0] / (0xffffffff + 1) );
+    return Math.floor(r * (maxInclusive - minInclusive + 1) + minInclusive);
+}
 
 export function randomDate(start, end) {
     return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));

package/src/engine.js

@@ -4,7 +4,7 @@ import fs from 'node:fs'
 import express from 'express'
 import {MongoClient as InternalMongoClient} from 'mongodb'
 import process from "process";
-import {cookiesSecret, dbName} from "./constants.js";
+import {cookiesSecret, databasePoolSize, dbName} from "./constants.js";
 import http from "http";
 import cookieParser from "cookie-parser";
 import requestIp from 'request-ip';
@@ -13,20 +13,41 @@ import {defaultModels} from "./defaultModels.js";
 import {DefaultUserProvider} from "./providers.js";
 import formidableMiddleware from 'express-formidable';
 import sirv from "sirv";
+import * as tls from "node:tls";
 
 // Constants
 const isProduction = process.env.NODE_ENV === 'production'
 
+let caFile, certFile, keyFile;
+try {
+    if (process.env.CA_CERT)
+        caFile = fs.readFileSync(process.env.CA_CERT  || './ca');
+} catch (e) {}
+try {
+    if (process.env.CERT)
+        certFile = fs.readFileSync(process.env.CERT || '');
+}catch (e) {}
+try{
+    if (process.env.CERT_KEY)
+        keyFile = fs.readFileSync(process.env.CERT_KEY || './k');
+} catch (e) {}
+
+const secureContext = tls.createSecureContext({
+    ca: caFile, cert: certFile, key: keyFile
+});
+
+const isTlsActive = !(!process.env.TLS || ["0", "false"].includes(process.env.TLS.toLowerCase()));
+
 // Connection URL
 export const dbUrl = process.env.CI ? 'mongodb://mongodb:27017' : (process.env.MONGO_DB_URL || 'mongodb://127.0.0.1:27017');
-export const MongoClient = new InternalMongoClient(dbUrl, { maxPoolSize: 20 });
+export const MongoClient = new InternalMongoClient(dbUrl, { maxPoolSize: databasePoolSize, tls: isTlsActive, secureContext });
 
 // Database Name
 export const MongoDatabase = MongoClient.db(dbName);
 
 
 export const Engine = {
-    Create: async (options) => {
+    Create: async (options = { app : null}) => {
         const engine = GameObject.Create("Engine");
         console.log("Creating engine", Config.Get('modules'));
         engine.addComponent(Logger);
@@ -38,8 +59,11 @@ export const Engine = {
             engine.getComponent(Logger).info(`Custom UserProvider '${providerInstance.constructor.name}' has been set.`);
         };
 
+        if (!options.app) {
+            options.app = express();
+        }
 
-        const app = express();
+        const { app }  = options;
         // Allows you to set port in the project properties.
         app.set('port', process.env.PORT || 3000);
         app.set('engine', engine);
@@ -106,12 +130,8 @@ export const Engine = {
             engine._modules = e;
             return Promise.resolve();
         });
-        let server;
 
-        app.use(sirv('client/dist', {
-            single: true,
-            dev: process.env.NODE_ENV === 'development'
-        }));
+        let server;
 
         engine.start = async (port, cb) =>{
             // Use connect method to connect to the server
@@ -132,6 +152,18 @@ export const Engine = {
             if (cb)
                 await cb();
 
+            engine.get('/api/health', (req, res) => {
+                res.status(200).json({
+                    status: 'ok',
+                    timestamp: new Date().toISOString()
+                });
+            });
+
+            app.use(sirv('client/dist', {
+                single: true,
+                dev: process.env.NODE_ENV === 'development'
+            }));
+
             process.on('uncaughtException', function (exception) {
                 console.error(exception);
                 fs.appendFile('issues.txt', JSON.stringify({ code: exception.code, message: exception.message, stack: exception.stack }), function (err) {
@@ -139,7 +171,7 @@ export const Engine = {
                         throw err;
                     }
                 });
-                process.exit(0);
+                process.exit(1);
             });
         }
 
@@ -171,12 +203,6 @@ export const Engine = {
         engine.resetModels = async () => {
             await deleteModels();
         };
-        engine.get('/api/health', (req, res) => {
-            res.status(200).json({
-                status: 'ok',
-                timestamp: new Date().toISOString()
-            });
-        });
         return engine;
     }
 }

package/src/i18n.js

@@ -5,7 +5,13 @@ import LanguageDetector from "i18next-browser-languagedetector";
 export const translations = {
     fr: {
         translation: {
+            "datatable.advancedFilter.title": "Filtre avancé (MongoDB)",
+            "datatable.advancedFilter.desc": "Créez de toute pièce vos filtres avancés, avec les opérateurs d'aggrégation de MongoDB disponibles ici.",
 
+            "editData": "Éditer dans {{0}}",
+            "btns.duplicate": "Dupliquer",
+            "btns.edit": "Modifier",
+            "btns.delete": "Supprimer",
             "field_return_status_hint": "Le statut actuel de la demande de retour (ex: Demandé, Approuvé, Remboursé).",
             "field_workflowRun_completedAt_hint": "Horodatage de la fin de l'exécution (réussie ou échouée).",
             "field_employee_socialSecurityNumber_hint": "Numéro de sécurité sociale de l'employé.",
@@ -1235,6 +1241,13 @@ export const translations = {
     en: {
         translation: {
 
+            "datatable.advancedFilter.title": "Advanced Filter (MongoDB)",
+            "datatable.advancedFilter.desc": "Create your own advanced filters from scratch, using MongoDB's aggregation operators available here.",
+
+            "editData": "Edit in {{0}}",
+            "btns.duplicate": "Duplicate",
+            "btns.edit": "Edit",
+            "btns.delete": "Delete",
             "field_workflowRun_completedAt_hint": "Timestamp of when the execution ended (successfully or failed).",
             "field_employee_socialSecurityNumber_hint": "Employee's social security number.",
 
@@ -2462,6 +2475,13 @@ export const translations = {
     },
     es: {
         translation: {
+            "datatable.advancedFilter.title": "Filtro avanzado (MongoDB)",
+            "datatable.advancedFilter.desc": "Cree sus propios filtros avanzados desde cero, utilizando los operadores de agregación de MongoDB disponibles aquí.",
+
+            "editData": "Editar en {{0}}",
+            "btns.duplicate": "Duplicar",
+            "btns.edit": "Editar",
+            "btns.delete": "Eliminar",
             "field_return_status_hint": "El estado actual de la solicitud de devolución (ej: Solicitado, Aprobado, Reembolsado).",
             "field_workflowRun_completedAt_hint": "Marca de tiempo del final de la ejecución (exitosa o fallida).",
             "field_employee_socialSecurityNumber_hint": "Número de seguridad social del empleado.",
@@ -3724,6 +3744,13 @@ export const translations = {
     },
     pt: {
         translation: {
+            "datatable.advancedFilter.title": "Filtro Avançado (MongoDB)",
+            "datatable.advancedFilter.desc": "Crie os seus próprios filtros avançados a partir do zero, utilizando os operadores de agregação do MongoDB disponíveis aqui.",
+
+            "editData": "Editar em {{0}}",
+            "btns.duplicate": "Duplicar",
+            "btns.edit": "Editar",
+            "btns.delete": "Apagar",
             "assistant.type": "Digite sua mensagem...",
             "assistant.welcome": "Olá! Como posso ajudá-lo com seus dados?",
             "assistant.named": "Assistente {{named}}",
@@ -3789,6 +3816,12 @@ export const translations = {
     },
     de: {
         translation: {
+            "datatable.advancedFilter.title": "Erweiterter Filter (MongoDB)",
+            "datatable.advancedFilter.desc": "Erstellen Sie Ihre eigenen erweiterten Filter von Grund auf mit den hier verfügbaren Aggregationsoperatoren von MongoDB.",
+            "editData": "Bearbeiten in {{0}}",
+            "btns.duplicate": "Duplizieren",
+            "btns.edit": "Bearbeiten",
+            "btns.delete": "Löschen",
             "field_workflowRun_completedAt_hint": "Zeitstempel des Abschlusses (erfolgreich oder fehlgeschlagen).",
             "field_employee_socialSecurityNumber_hint": "Sozialversicherungsnummer des Mitarbeiters.",
             "field_shipment_order_hint": "Die mit dieser Sendung verknüpfte Bestellung.",
@@ -4931,6 +4964,12 @@ export const translations = {
     },
     it: {
         translation: {
+            "datatable.advancedFilter.title": "Filtro avanzato (MongoDB)",
+            "datatable.advancedFilter.desc": "Crea i tuoi filtri avanzati da zero, utilizzando gli operatori di aggregazione di MongoDB disponibili qui.",
+            "editData": "Modifica in {{0}}",
+            "btns.duplicate": "Duplica",
+            "btns.edit": "Modifica",
+            "btns.delete": "Elimina",
             "field_workflowRun_completedAt_hint": "Timestamp del termine dell'esecuzione (successo o fallimento).",
             "field_employee_socialSecurityNumber_hint": "Numero di previdenza sociale del dipendente.",
             "field_shipment_order_hint": "L'ordine associato a questa spedizione.",
@@ -6126,6 +6165,12 @@ export const translations = {
     },
     cs: {
         translation: {
+            "datatable.advancedFilter.title": "Rozšířený filtr (MongoDB)",
+            "datatable.advancedFilter.desc": "Vytvořte si vlastní pokročilé filtry od nuly pomocí agregačních operátorů MongoDB dostupných zde.",
+            "editData": "Upravit v {{0}}",
+            "btns.duplicate": "Duplikovat",
+            "btns.edit": "Upravit",
+            "btns.delete": "Smazat",
             "field_return_status_hint": "Aktuální stav žádosti o vrácení (např.: Požadováno, Schváleno, Vráceno).",
             "field_workflowRun_completedAt_hint": "Časové razítko dokončení provedení (úspěšného nebo neúspěšného).",
             "field_employee_socialSecurityNumber_hint": "Rodné číslo zaměstnance.",
@@ -6966,6 +7011,12 @@ export const translations = {
     },
     ru: {
         translation: {
+            "datatable.advancedFilter.title": "Расширенный фильтр (MongoDB)",
+            "datatable.advancedFilter.desc": "Создайте свои собственные расширенные фильтры с нуля, используя операторы агрегации MongoDB, доступные здесь",
+            "editData": "Редактировать в {{0}}",
+            "btns.duplicate": "Дублировать",
+            "btns.edit": "Редактировать",
+            "btns.delete": "Удалить",
             "field_workflowRun_completedAt_hint": "Метка времени завершения выполнения (успешного или неудачного).",
             "field_employee_socialSecurityNumber_hint": "Номер социального страхования сотрудника.",
             "field_shipment_order_hint": "Заказ, связанный с этой отгрузкой.",
@@ -8161,7 +8212,12 @@ export const translations = {
     },
     ar: {
         translation: {
-
+            "datatable.advancedFilter.title": "مرشح متقدم (MongoDB)",
+            "datatable.advancedFilter.desc": "أنشئ مرشحاتك المتقدمة من الصفر، باستخدام عوامل تجميع MongoDB المتوفرة هنا",
+            "editData": "تعديل في {{0}}",
+            "btns.duplicate": "تكرار",
+            "btns.edit": "تعديل",
+            "btns.delete": "حذف",
             "field_return_status_hint": "الحالة الحالية لطلب الإرجاع (مثال: مطلوب، معتمد، تم استرداده).",
             "field_workflowRun_completedAt_hint": "طابع زمني لانتهاء التنفيذ (نجاحًا أو فشلًا).",
             "field_employee_socialSecurityNumber_hint": "رقم الضمان الاجتماعي للموظف.",
@@ -9407,7 +9463,12 @@ export const translations = {
     },
     sv: {
         translation: {
-
+            "datatable.advancedFilter.title": "Avancerat filter (MongoDB)",
+            "datatable.advancedFilter.desc": "Skapa dina egna avancerade filter från grunden med hjälp av MongoDBs aggregeringsoperatorer som finns här.",
+            "editData": "Redigera i {{0}}",
+            "btns.duplicate": "Duplicera",
+            "btns.edit": "Redigera",
+            "btns.delete": "Ta bort",
             "field_return_status_hint": "Den aktuella statusen för returförfrågan (t.ex. Begärd, Godkänd, Återbetald).",
             "field_workflowRun_completedAt_hint": "Tidsstämpel för när körningen avslutades (lyckad eller misslyckad).",
             "field_employee_socialSecurityNumber_hint": "Anställds personnummer.",
@@ -10551,6 +10612,12 @@ export const translations = {
     },
     el: {
         translation: {
+            "datatable.advancedFilter.title": "Προηγμένο Φίλτρο (MongoDB)",
+            "datatable.advancedFilter.desc": "Δημιουργήστε τα δικά σας προηγμένα φίλτρα από την αρχή, χρησιμοποιώντας τους τελεστές συνάθροισης της MongoDB που είναι διαθέσιμοι εδώ.",
+            "editData": "Επεξεργασία στο {{0}}",
+            "btns.duplicate": "Διπλότυπο",
+            "btns.edit": "Επεξεργασία",
+            "btns.delete": "Διαγραφή",
             "field_workflowRun_completedAt_hint": "Χρονική σήμανση της ολοκλήρωσης της εκτέλεσης (επιτυχής ή αποτυχημένη).",
             "field_employee_socialSecurityNumber_hint": "Ο αριθμός κοινωνικής ασφάλισης του υπαλλήλου.",
             "field_shipment_order_hint": "Η παραγγελία που σχετίζεται με αυτήν την αποστολή.",
@@ -11680,6 +11747,12 @@ export const translations = {
     },
     fa: {
         translation: {
+            "datatable.advancedFilter.title": "فیلتر پیشرفته (MongoDB)",
+            "datatable.advancedFilter.desc": "با استفاده از عملگرهای تجمیع MongoDB که در اینجا موجود است، فیلترهای پیشرفته خود را از ابتدا ایجاد کنید.",
+            "editData": "ویرایش در {{0}}",
+            "btns.duplicate": "کپی",
+            "btns.edit": "ویرایش",
+            "btns.delete": "حذف",
             "field_return_status_hint": "وضعیت فعلی درخواست مرجوعی (مثال: درخواست شده، تأیید شده، مسترد شده).",
             "field_workflowRun_completedAt_hint": "مهر زمانی پایان اجرا (موفق یا ناموفق).",
             "field_employee_socialSecurityNumber_hint": "شماره تأمین اجتماعی کارمند.",

package/src/migrate.js

@@ -3,16 +3,15 @@
 import process from "node:process";
 import fs from "node:fs/promises";
 import path from "node:path";
-// FIX: Import 'pathToFileURL' instead of 'fileURLToPath'
 import { pathToFileURL } from 'node:url';
 import { Engine, MongoDatabase } from "./engine.js";
 import { Logger } from "./gameObject.js";
 import { Config } from "./config.js";
-import chalk from "chalk"; // Pour une sortie plus lisible. Assurez-vous que 'chalk' est dans vos dépendances.
+import chalk from "chalk";
 
 // Configuration de base
 Config.Set("modules", ["mongodb"]);
-const MIGRATIONS_DIR = path.resolve(process.cwd(), 'server', 'src', 'migrations');
+const MIGRATIONS_DIR = path.resolve(process.cwd(), 'migrations');
 const MIGRATIONS_COLLECTION = 'migrations_log';
 
 const engine = await Engine.Create();

package/src/modules/data.js

@@ -1635,9 +1635,9 @@ export async function onInit(defaultEngine) {
     engine.put('/api/model/:id', [middlewareAuthenticator, userInitiator, setTimeoutMiddleware(15000)], async (req, res) => {
         const result = await editModel(req.me, req.params.id, req.fields);
         if( result.success){
-            return res.status(result.statusCode || '200').json(result);
+            return res.status(result.statusCode || 200).json(result);
         }else{
-            return res.status(result.statusCode || '500').json(result);
+            return res.status(result.statusCode || 500).json(result);
         }
     });
 
@@ -4038,9 +4038,18 @@ export const searchData = async ({user, query}) => {
                                                 {$eq: ["$_model", fi.relation]},
                                                 {$eq: ["$_user", user.username]},
                                                 fi.multiple ? {
-                                                    $in: [{$toString: "$_id"}, {$ifNull: ['$$convertedId', []]}]
+                                                    $in: [{ $toString: "$_id" }, {
+                                                        $map: {
+                                                            input: { $ifNull: ["$$convertedId", []] }, // On utilise le tableau d'IDs, ou un tableau vide s'il est null
+                                                            as: "relationId",
+                                                            in: { $toString: "$$relationId" }
+                                                        }
+                                                    }]
                                                 } : {
-                                                    $eq: [{$toString: "$_id"}, '$$convertedId']
+                                                    $eq: [
+                                                        { $toString: "$_id" },
+                                                        { $convert: { input: '$$convertedId', to: "string", onError: '' } }
+                                                    ]
                                                 }
                                             ]
                                         ]
@@ -4315,6 +4324,7 @@ export const searchData = async ({user, query}) => {
             } else if (fi.type === 'array') {
                 // Handle array filtering here
                 if (data[fi.name]) {
+                    console.log('array filtering', data[fi.name]);
                     pipelines.push({
                         $match: {
                             $expr: {
@@ -4350,6 +4360,7 @@ export const searchData = async ({user, query}) => {
 
     let pipelines = [];
     if( allIds.length ){
+        console.log({allIds});
         const id = {$in: ["$_id", allIds.map(m => new ObjectId(m))]};
         pipelines.push({
             $match: { $expr: id }

package/src/modules/mongodb.js

@@ -13,15 +13,6 @@ export async function onInit(defaultEngine) {
 
     const isProduction = process.env.NODE_ENV === 'production'
 
-    let ca, cert, key;
-    try {
-        ca = fs.readFileSync('certs/mongodb-cert.crt');
-        cert = fs.readFileSync('certs/mongodb.pem');
-        key = fs.readFileSync(`certs/mongodb-cert.key`);
-    } catch (e) {
-
-    }
-
     modelsCollection = MongoDatabase.collection("models");
     datasCollection = MongoDatabase.collection("datas");
     filesCollection = MongoDatabase.collection("files");

package/src/packs.js

@@ -390,8 +390,9 @@ export const getAllPacks = async () => {
                         return {
                             name: m.name,
                             permissions: {
-                                "$find": {
-                                    "$in": ["$name", m.perms]
+                                "$link": {
+                                    "$in": ["$name", m.perms],
+                                    "_model": "permission"
                                 }
                             }
                         }
@@ -407,7 +408,7 @@ export const getAllPacks = async () => {
                         "code": "fr"
                     }],
                     "translation": [
-                        { "lang": { "$find": { "$eq": ["$code", "fr"]}}, "key": "Visitor alerts", "value": "Alertes visiteurs" }
+                        { "lang": { "$link": { "$eq": ["$code", "fr"]}, "_model": "lang"}, "key": "Visitor alerts", "value": "Alertes visiteurs" }
                     ]
                 }
             }

package/src/migrations/20240522143000-content.js

@@ -1,20 +0,0 @@
-/**
- * Migration: setting content field to 'fr' in 'content' model
- * Created at: 2024-05-21T10:00:00.000Z
- */
-
-export const up = async (db) => {
-    const datasCollection = db.collection("datas");
-    const content = await datasCollection.find({ _model:"content"}).toArray();
-    await Promise.all(content.map(async (doc) => {
-        if (typeof(doc.html)==='string') {
-            const c = { "fr" : doc.html };
-            await datasCollection.updateOne({_id: doc._id}, {$set: {html: c}});
-        }
-    }));
-    console.log("Migration UP: setting content field to 'fr' in 'content' model");
-};
-
-export const down = async (db) => {
-    console.log("Migration DOWN: noting to do");
-};