data-primals-engine 1.1.8 → 1.2.1

package/client/src/ModelCreatorField.jsx

@@ -61,7 +61,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
             </div>
             <div className="flex flex-row flex-stretch">
 
-                <div className="flex fieldName">{hint('modelcreator.name.hint')}
+                <div className="flex fieldName field-bg">{hint('modelcreator.name.hint')}
                     <div className="flex flex-no-gap flex-no-wrap flex-1">
                         <TextField
                             label={t('modelcreator.fieldName')}
@@ -88,7 +88,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
 
                 <div className="flex">
                     {hint('modelcreator.type.hint')}
-                    <div className="flex flex-1 flex-stretch flex-no-gap">
+                    <div className="flex flex-1 flex-stretch field-bg flex-no-gap">
 
                         <SelectField
                             label={t('modelcreator.type', 'Type de champ')}
@@ -453,16 +453,15 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                             </div>
 
                             {!['file', 'relation', 'array', 'calculated'].includes(field.type) && (<div
-                                className="flex flex-no-wrap">
-                                {hint('modelcreator.default.hint')}
+                                className="flex flex-no-wrap field-bg mg-item">
 
                                 {['string_t', 'string', 'richtext', 'password', 'url', 'phone', 'email'].includes(field.type) && (<>
-                                    <label className="flex flex-1">
-                                        <Trans i18nKey={"modelcreator.default"}>Valeur par défaut :</Trans>
-                                        <input
-                                            type="text"
+                                    {hint('modelcreator.default.hint')}
+                                    <div className="flex flex-1">
+                                        <TextField
                                             className="flex-1"
                                             value={field.default}
+                                            label={<Trans i18nKey={"modelcreator.default"}>Valeur par défaut :</Trans>}
                                             disabled={modelLocked || (isLocalUser(me) && field.locked)}
                                             onChange={(e) => {
                                                 const newFields = [...fields];
@@ -470,9 +469,10 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                                 setFields(newFields);
                                             }}
                                         />
-                                    </label>
+                                    </div>
                                 </>)}
                                 {['number'].includes(field.type) && (<>
+                                    {hint('modelcreator.default.hint')}
                                     <NumberField
                                         label={<Trans i18nKey={"modelcreator.default"}>Valeur par défaut :</Trans>}
                                         type="number"
@@ -491,6 +491,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                     />
                                 </>)}
                                 {['enum'].includes(field.type) && (<>
+                                    {hint('modelcreator.default.hint')}
                                     <SelectField
                                         label={<Trans i18nKey={"modelcreator.default"}>Valeur par défaut :</Trans>}
                                         value={field.default}
@@ -505,6 +506,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                     />
                                 </>)}
                                 {['code'].includes(field.type) && (<>
+                                    {hint('modelcreator.default.hint')}
                                     <CodeField
                                         label={<Trans i18nKey={"modelcreator.default"}>Valeur par défaut :</Trans>}
                                         value={field.language === 'json' ? JSON.stringify(field.default, 2, null) : field.default}
@@ -516,6 +518,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                     />
                                 </>)}
                                 {['boolean'].includes(field.type) && (<>
+                                    {hint('modelcreator.default.hint')}
                                     <div className="checkbox-label flex flex-1">
                                         <CheckboxField
                                             label={<Trans i18nKey={"modelcreator.default"}>Valeur par défaut :</Trans>}
@@ -530,6 +533,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                     </div>
                                 </>)}
                                 {['color'].includes(field.type) && (<>
+                                    {hint('modelcreator.default.hint')}
                                     <ColorField
                                         label={<Trans i18nKey={"modelcreator.default"}>Valeur par défaut :</Trans>}
                                         value={field.default || null} name={field.name}
@@ -543,6 +547,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                     />
                                 </>)}
                                 {['date', 'datetime'].includes(field.type) && (<>
+                                    {hint('modelcreator.default.hint')}
                                     <label className="flex flex-1">
                                         <Trans i18nKey={"modelcreator.default"}>Valeur par défaut :</Trans>
                                         <input
@@ -562,7 +567,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
 
 
                             {(['number', 'datetime', 'date'].includes(field.itemsType || field.type)) && (
-                                <><label className="flex">
+                                <><label className="flex field-bg mg-item">
                                     {hint('modelcreator.min.hint')}
                                     <span><Trans
                                         i18nKey={"modelcreator.min"}>Valeur minimale :</Trans></span>
@@ -581,7 +586,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                         }}
                                     /></div>
                                 </label>
-                                    <label className="flex">
+                                    <label className="flex field-bg mg-item">
                                         {hint('modelcreator.max.hint')}
                                         <span><Trans i18nKey={"modelcreator.max"}>Valeur maximale :</Trans></span>
                                         <div className="flex flex-1"><input
@@ -601,13 +606,12 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                     </label>
                                 </>
                             )}
-                            <div className="flex flex-no-wrap">
+                            <div className="flex flex-no-wrap mg-item">
                                 {hint('modelcreator.condition.hint')}
 
-                                <label className="checkbox-label flex flex-1"><Trans
-                                    i18nKey={"modelcreator.condition"}>Condition</Trans> :
-                                    <input
-                                        type="checkbox"
+                                    <CheckboxField
+                                        label={<Trans
+                                            i18nKey={"modelcreator.condition"}>Condition</Trans>}
                                         disabled={modelLocked || (isLocalUser(me) && field.locked)}
                                         checked={field.condition !== undefined}
                                         onChange={(e) => {
@@ -620,7 +624,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                             setFields(newFields);
                                         }}
                                     />
-                                </label>
                             </div>
                             {field.condition !== undefined && (
                                 <div className={"condition-details flex flex-start"}>
@@ -691,10 +694,10 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
 
 
                             {mainFieldsTypes.includes(field.itemsType || field.type) && (<div
-                                className="flex flex-no-wrap"
+                                className="flex flex-no-wrap mg-item"
                                 title={t("modelcreator.field.asMain", "Une information principale sera affichée dans le titre de l'enregistrement")}>
                                 {hint('modelcreator.asMain.hint')}
-                                <label className="checkbox-label flex flex-1">
+                                <div className="flex flex-1">
 
                                     <CheckboxField
                                         label={<Trans i18nKey={"modelcreator.asMain"}>Information principale :</Trans>}
@@ -707,7 +710,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                         }}
                                         help={field.asMain && t('modelcreator.asMain.hint')}
                                     />
-                                </label>
+                                </div>
                             </div>)}
 
                             <div className="flex flex-row flex-stretch">
@@ -729,7 +732,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                             </div>
 
 
-                            <label className="flex">
+                            <label className="flex mg-item ">
                                 {hint('modelcreator.color.hint')}
                                 <Trans i18nKey={"field.color"}>Color :</Trans>
                                 <ColorField
@@ -763,19 +766,16 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
 
                             <div className={"flex flex-no-wrap"}>
                                 {hint('modelcreator.anonymized.hint')}
-                                <label className={"checkbox-label flex flex-1"}>
-                                    <Trans i18nKey={"modelcreator.anonymized"}>Donnée anonymisée :</Trans>
-                                    <input
-                                        type="checkbox"
-                                        disabled={modelLocked || (isLocalUser(me) && field.locked)}
-                                        checked={field.anonymized}
-                                        onChange={(e) => {
-                                            const newFields = [...fields];
-                                            newFields[index].anonymized = e.target.checked;
-                                            setFields(newFields);
-                                        }}
-                                    />
-                                </label>
+                                <CheckboxField
+                                    label={<Trans i18nKey={"modelcreator.anonymized"}>Donnée anonymisée :</Trans>}
+                                    disabled={modelLocked || (isLocalUser(me) && field.locked)}
+                                    checked={field.anonymized}
+                                    onChange={(e) => {
+                                        const newFields = [...fields];
+                                        newFields[index].anonymized = e.target.checked;
+                                        setFields(newFields);
+                                    }}
+                                />
                             </div>
 
 

package/client/src/RTE.jsx

@@ -28,6 +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";
 // create a lowlight instance
 const lowlight = createLowlight(all)
 
@@ -43,7 +44,7 @@ const code = (c) => {
     const doc = document.createElement('div');
     doc.innerHTML = c;
     doc.querySelectorAll('code').forEach(cc =>{
-        cc.innerHTML = cc.textContent
+        cc.innerHTML = escapeHtml(cc.textContent)
             .replace(/\r\n|\n/g, "<br />")
             .replace(/\t/g, "&nbsp;&nbsp;&nbsp;&nbsp;");
     })

package/client/src/RestoreDialog.jsx

@@ -1,4 +1,3 @@
-// C:/Dev/hackersonline-engine/client/src/RestoreDialog.jsx
 
 import React, { useState, useEffect } from 'react';
 import { useSearchParams, useNavigate } from 'react-router-dom';

package/client/src/TourSpotlight.jsx

@@ -1,4 +1,3 @@
-// C:/Dev/hackersonline-engine/client/src/TourSpotlight.jsx
 
 import React, { useState, useEffect, useRef, useCallback } from 'react';
 import './TourSpotlight.scss';

package/client/src/filter.js

@@ -53,6 +53,8 @@ export const MONGO_CALC_OPERATORS = {
     $ln: { label: 'ln', multi: false },
     $log10: { label: 'log', multi: false },
     $concat: { label: 'concat', multi: true },
+
+    // Date-specific
     $year: { label: 'year', multi: false, isDate: true },
     $month: { label: 'month', multi: false, isDate: true },
     $dayOfMonth: { label: 'dayOfMonth', multi: false, isDate: true },

package/client/src/hooks/useDragAndDrop.js

@@ -1,4 +1,3 @@
-// C:/Dev/hackersonline-engine/client/src/hooks/useDragAndDrop.js
 import { useState, useRef, useCallback } from 'react';
 
 const useDragAndDrop = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-primals-engine",
-  "version": "1.1.8",
+  "version": "1.2.1",
   "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",
@@ -30,7 +30,8 @@
   "resolutions": {
     "tar-fs": "3.0.9",
     "on-headers": "1.1.0",
-    "brace-expansion": "2.0.2"
+    "brace-expansion": "2.0.2",
+    "prismjs": "1.30.0"
   },
   "repository": {
     "type": "git",

package/src/constants.js

@@ -6,6 +6,12 @@ import {event_trigger} from "./core.js";
  */
 export const install = true;
 
+/**
+ * Maximum reflective steps to be used by the AI (looping over own research)
+ * @type {number}
+ */
+export const maxAIReflectiveSteps = 4;
+
 /**
  * Database name
  * @type {string}

package/src/core.js

@@ -9,6 +9,12 @@ export function escapeRegex(string) {
     return string.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
 }
 
+export function escapeHtml(string){
+    return string.replace(/(javascript|data|vbscript):/gi, '').replace(/[^\w-_. ]/gi, function (c) {
+        return `&#${c.charCodeAt(0)};`;
+    });
+}
+
 export const isDate = dt => String(new Date(dt)) !== 'Invalid Date'
 
 export const safeAssignObject = (obj, key, value) => {

package/src/data.js

@@ -50,7 +50,6 @@ export function getUserId(user) {
 export const getUserName = (user) => {
     return isLocalUser(user) ? user._id + '_'+user._user : user.username;
 }
-// C:/Dev/hackersonline-engine/src/data.js
 
 /**
  * Crée une fonction de génération de nombres pseudo-aléatoires basée sur une graine (seed).
@@ -255,7 +254,6 @@ function buildNestedFindStructure(pathSegments, finalPayload) {
         }
     };
 }
-// C:/Dev/hackersonline-engine/src/data.js
 // ... (imports and other functions) ...
 
 /**

package/src/defaultModels.js

@@ -46,6 +46,39 @@ export const defaultModels = {
             { name: 'tokens', type: 'relation', multiple: true, relation: 'token' }
         ]
     },
+    userPermission: {
+        "name": "userPermission",
+        "description": "Gère les exceptions aux permissions des rôles pour un utilisateur (ajouts ou retraits, permanents ou temporaires).",
+        "fields": [
+            {
+                "name": "user",
+                "type": "relation",
+                "relation": "user",
+                "required": true,
+                "index": true
+            },
+            {
+                "name": "permission",
+                "type": "relation",
+                "relation": "permission",
+                "required": true,
+                "index": true
+            },
+            {
+                "name": "isGranted",
+                "type": "boolean",
+                "required": true,
+                "hint": "True pour accorder la permission, False pour la révoquer explicitement."
+            },
+            {
+                "name": "expiresAt",
+                "type": "datetime",
+                "required": false,
+                "index": true,
+                "hint": "Si défini, l'exception (l'octroi ou la révocation) est temporaire."
+            }
+        ]
+    },
     token: {
         name: 'token',
         "description": "",

package/src/migrate.js

@@ -1,4 +1,3 @@
-// C:/Dev/hackersonline-engine/server/src/migrate.js
 
 import process from "node:process";
 import fs from "node:fs/promises";