data-primals-engine 1.1.3 → 1.1.5

package/client/package.json

@@ -1,70 +1,70 @@
-{
-  "name": "client",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build --mode development",
-    "build:ssr-client": "vite build --ssrManifest --outDir dist/client --mode development",
-    "build:ssr-server": "vite build --ssr src/entry-server.jsx --outDir dist/server --mode development",
-    "lint": "eslint .",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.24.7",
-    "@codeium/react-code-editor": "^1.0.12",
-    "@codemirror/lang-javascript": "^6.2.3",
-    "@tiptap/extension-code": "^2.12.0",
-    "@tiptap/extension-code-block": "^2.12.0",
-    "@tiptap/extension-code-block-lowlight": "^2.12.0",
-    "@tiptap/extension-color": "^2.11.5",
-    "@tiptap/extension-hard-break": "^2.12.0",
-    "@tiptap/extension-image": "^2.12.0",
-    "@tiptap/extension-link": "^2.12.0",
-    "@tiptap/extension-list-item": "^2.11.5",
-    "@tiptap/extension-text-style": "^2.11.5",
-    "@tiptap/pm": "^2.11.5",
-    "@tiptap/react": "^2.11.5",
-    "@tiptap/starter-kit": "^2.11.5",
-    "@uiw/react-codemirror": "^4.23.10",
-    "chart.js": "^4.4.9",
-    "chartjs-adapter-date-fns": "^3.0.0",
-    "classnames": "^2.5.1",
-    "date-fns": "^4.1.0",
-    "express-rate-limit": "^7.5.1",
-    "lowlight": "^3.3.0",
-    "react-chartjs-2": "^5.3.0",
-    "react-code-blocks": "^0.1.6",
-    "react-cookie": "^8.0.0",
-    "react-dom": "^18.3.1",
-    "react-ga": "^3.3.1",
-    "react-icons": "^5.0.1",
-    "react-international-phone": "^4.5.0",
-    "react-router": "^7.2.0",
-    "react-router-dom": "^7.1.5",
-    "react-syntax-highlighter": "^15.6.1",
-    "react-tooltip": "^5.28.1",
-    "uniqid": "^5.4.0",
-    "yet-another-react-lightbox": "^3.22.0",
-    "data-primals-engine": "^1.0.11",
-    "react-query": "^3.39.3"
-  },
-  "peerDependencies": {
-    "react": ">=18.0.0"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.17.0",
-    "@types/react": "^18.3.18",
-    "@types/react-dom": "^18.3.5",
-    "@vitejs/plugin-react": "^4.3.4",
-    "eslint": "^9.17.0",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.0.0",
-    "eslint-plugin-react-refresh": "^0.4.16",
-    "globals": "^15.14.0",
-    "process": "^0.11.10",
-    "sass-embedded": "^1.83.4",
-    "vite": "^6.1.1"
-  }
+{
+  "name": "client",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build --mode development",
+    "build:ssr-client": "vite build --ssrManifest --outDir dist/client --mode development",
+    "build:ssr-server": "vite build --ssr src/entry-server.jsx --outDir dist/server --mode development",
+    "lint": "eslint .",
+    "preview": "vite preview"
+  },
+  "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"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.24.7",
+    "@codeium/react-code-editor": "^1.0.12",
+    "@codemirror/lang-javascript": "^6.2.3",
+    "@tiptap/extension-code": "^2.12.0",
+    "@tiptap/extension-code-block": "^2.12.0",
+    "@tiptap/extension-code-block-lowlight": "^2.12.0",
+    "@tiptap/extension-color": "^2.11.5",
+    "@tiptap/extension-hard-break": "^2.12.0",
+    "@tiptap/extension-image": "^2.12.0",
+    "@tiptap/extension-link": "^2.12.0",
+    "@tiptap/extension-list-item": "^2.11.5",
+    "@tiptap/extension-text-style": "^2.11.5",
+    "@tiptap/pm": "^2.11.5",
+    "@tiptap/starter-kit": "^2.11.5",
+    "@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"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.17.0",
+    "@types/react": "^18.3.18",
+    "@types/react-dom": "^18.3.5",
+    "@vitejs/plugin-react": "^4.3.4",
+    "eslint": "^9.17.0",
+    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-react-refresh": "^0.4.16",
+    "globals": "^15.14.0",
+    "process": "^0.11.10",
+    "sass-embedded": "^1.83.4",
+    "vite": "^6.1.1"
+  }
 }

package/client/src/APIInfo.jsx

@@ -3,16 +3,13 @@ import {useModelContext} from './contexts/ModelContext';
 import {useAuthContext} from "./contexts/AuthContext.jsx";
 import Button from "./Button.jsx";
 import {Trans, useTranslation} from "react-i18next";
-import {getDefaultForType} from "data-primals-engine/data";
+import {getDefaultForType} from "../../src/data.js";
 import { CodeBlock, tomorrowNightBright } from 'react-code-blocks';
-import {getObjectHash, shuffle} from "data-primals-engine/core";
-import {mainFieldsTypes} from "data-primals-engine/constants";
-import {end} from "express-mongo-sanitize";
+import {mainFieldsTypes} from "../../src/constants.js";
 import {FaFile, FaPlay, FaRunning} from "react-icons/fa";
 import {Tooltip} from "react-tooltip";
 import {CodeField} from "./Field.jsx";
 import {useMutation} from "react-query";
-import {FaF} from "react-icons/fa6";
 import {getHost} from "./constants.js";
 
 const Test= ({endpoint, lang, index, headers= {}}) =>  {

package/client/src/App.jsx

@@ -52,11 +52,11 @@ import {
 import {Helmet} from "react-helmet";
 import {useCookies, CookiesProvider} from "react-cookie";
 
-import { translations as allTranslations} from "data-primals-engine/i18n";
-import {getRandom} from "data-primals-engine/core";
-import {getUserHash} from "data-primals-engine/data";
+import { translations as allTranslations} from "../../src/i18n.js";
+import {getRandom} from "../../src/core.js";
+import {getUserHash} from "../../src/data.js";
 import {seoTitle} from "./constants.js";
-import {host} from "../../src/constants.js";
+import {host, useAI} from "../../src/constants.js";
 import i18next from "i18next";
 import {websiteTranslations} from "./translations.js";
 
@@ -138,8 +138,8 @@ function Layout ({header, translationMutation, routes, body, footer}) {
                 const availableKeys = response.data;
 
                 const newConfig = {
-                    openai: availableKeys.find(key => key.name === 'OPENAI_API_KEY')?.value,
-                    google: availableKeys.find(key => key.name === 'GOOGLE_API_KEY')?.value
+                    openai: availableKeys.find(key => key.name === 'OPENAI_API_KEY')?.value || (useAI ? process.env.OPENAI_API_KEY : undefined),
+                    google: availableKeys.find(key => key.name === 'GOOGLE_API_KEY')?.value || (useAI ? process.env.GOOGLE_API_KEY : undefined),
                 };
 
 
@@ -495,7 +495,12 @@ function UserPage({notifs,triggerSignin, onAuthenticated}) {
                 position: 'bottom',
             },
         ],
-        datapacks: [
+        guides: [
+            {
+                selector: '.tourStep-tutorials',
+                content: t('tourpoint.tutorials'),
+                position: 'bottom'
+            },
             {
                 selector: '.tourStep-import-datapack',
                 content: t('tourpoint.importDatapack'),

package/client/src/CalculationBuilder.jsx

@@ -1,9 +1,9 @@
 import React, {useState, useEffect, useCallback, useRef} from 'react';
 import { FaPlus, FaTrash, FaEquals } from 'react-icons/fa';
-import {object_equals} from "data-primals-engine/core"; // Assuming this is a deep equality check
+import {object_equals} from "../../src/core.js"; // Assuming this is a deep equality check
 import CalculationStepRow from "./CalculationStepRow.jsx";
 import {getFieldDefinitionFromPath, isAtomicDateOperator} from "./core/data.js";
-import {MONGO_OPERATORS, OPERAND_TYPES} from "../src/constants.js";
+import {MONGO_OPERATORS, OPERAND_TYPES} from "./constants.js";
 
 // --- Helper Functions & Constants ---
 const generateId = () => `step_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;

package/client/src/ConditionBuilder.scss

@@ -563,6 +563,8 @@
   padding: 8px;
   border: 1px solid #ddd;
   border-radius: 4px;
+  width: 100%;
+  box-sizing: border-box;
 }
 
 .switch-to-expr {
@@ -669,4 +671,26 @@
   margin-left: 20px;
   border-left: 2px solid #eee;
   padding-left: 10px;
+}
+
+.special-structure-block {
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  padding: 10px;
+  margin: 5px 0;
+}
+
+.special-structure-args {
+  margin-top: 10px;
+}
+
+.special-arg {
+  margin-bottom: 8px;
+}
+
+.special-arg label {
+  display: block;
+  font-weight: bold;
+  margin-bottom: 4px;
+  color: #555;
 }

package/client/src/ConditionBuilder2.jsx

@@ -86,6 +86,14 @@ const ExpressionField = ({ value, onChange, path = [], fieldNames, isRoot = fals
         }else if (operator === '$find') {
             // Cas spécial pour $find qui prend une expression de recherche
             newValue = { [operator]: { $eq: ["", ""] } };
+        }else if (operator === '$regexMatch') {
+            // Structure spéciale pour $regexMatch
+            newValue = {
+                [operator]: {
+                    input: "",
+                    regex: ""
+                }
+            };
         }else if (opConfig.converter || (!opConfig.multi && !opConfig.args)) {
             newValue = { [operator]: "" };
         } else {
@@ -418,6 +426,54 @@ const ExpressionField = ({ value, onChange, path = [], fieldNames, isRoot = fals
                 </div>
             );
         }
+
+        if (opConfig.specialStructure) {
+            // Cas spécial pour les opérateurs comme $regexMatch
+            return (
+                <div className="expression-block special-structure-block">
+                    <div className="expression-header">
+                        <span className="operator">{operator}</span>
+                        {editing && (
+                            <div className="operator-selector-overlay">
+                                <OperatorSelector onSelect={handleOperatorSelect}/>
+                                <button type="button" onClick={() => setEditing(false)}>Annuler</button>
+                            </div>
+                        )}
+                        <div className="expression-actions">
+                            <button type="button" onClick={() => setEditing(!editing)}><FaRepeat/></button>
+                            <button type="button" onClick={() => openDoc(operator.substring(1))}><FaInfoCircle/></button>
+                            <button
+                                type="button"
+                                onClick={() => onChange(null, path)}
+                                className="remove-expr"
+                                title={i18n.t("cb.deleteBlock")}
+                            >
+                                <FaTrash/>
+                            </button>
+                        </div>
+                    </div>
+                    <div className="special-structure-args">
+                        {Object.entries(args).map(([key, val]) => (
+                            <div key={key} className="special-arg">
+                                <label>{key}</label>
+                                <ExpressionField
+                                    value={val}
+                                    onChange={(newVal) => {
+                                        const newArgs = {...args, [key]: newVal};
+                                        onChange({[operator]: newArgs}, path);
+                                    }}
+                                    fieldNames={fieldNames}
+                                    path={[...path, operator, key]}
+                                    models={models}
+                                    currentModelFields={currentModelFields}
+                                    isInFindContext={isInFindContext}
+                                />
+                            </div>
+                        ))}
+                    </div>
+                </div>
+            );
+        }
         // Rendu pour les opérateurs avec nombre d'arguments fixe
         if (isFixedArgs) {
             return (

package/client/src/Dashboard.jsx

@@ -10,8 +10,8 @@ import { SelectField } from "./Field.jsx";
 import {DashboardView} from "./DashboardView.jsx";
 import {useModelContext} from "./contexts/ModelContext.jsx";
 import {useParams, useSearchParams} from "react-router-dom";
-import {getObjectHash} from "data-primals-engine/core";
-import {getUserHash, getUserId} from "data-primals-engine/data";
+import {getObjectHash} from "../../src/core.js";
+import {getUserHash, getUserId} from "../../src/data.js";
 
 // --- DashboardsPage (Reste inchangé) ---
 export function DashboardsPage() {

package/client/src/DashboardChart.jsx

@@ -14,7 +14,7 @@ import i18n from 'i18next';
 
 import 'chartjs-adapter-date-fns';
 import {useModelContext} from "./contexts/ModelContext.jsx";
-import {isDate} from "data-primals-engine/core";
+import {isDate} from "../../src/core.js";
 import useWindowSize from "./hooks/useWindowSize.js";
 import useDebounce from "./hooks/useDebounce.js";
 

package/client/src/DashboardFlexViewItem.jsx

@@ -4,7 +4,7 @@ import {useTranslation} from "react-i18next";
 import {useAuthContext} from "./contexts/AuthContext.jsx";
 import React, {useEffect, useMemo, useRef} from "react";
 import {useQuery} from "react-query";
-import {conditionToApiSearchFilter} from "data-primals-engine/data";
+import {conditionToApiSearchFilter} from "../../src/data.js";
 import {FaSpinner} from "react-icons/fa";
 import {DisplayFlexNodeRenderer} from "./DisplayFlexNodeRenderer.jsx";
 

package/client/src/DashboardView.jsx

@@ -15,7 +15,7 @@ import { useAuthContext } from "./contexts/AuthContext.jsx";
 import { DialogProvider } from "./Dialog.jsx";
 import {useModelContext} from "./contexts/ModelContext.jsx";
 import FlexDataRenderer from "./FlexDataRenderer.jsx";
-import {conditionToApiSearchFilter} from "data-primals-engine/data";
+import {conditionToApiSearchFilter} from "../../src/data.js";
 // --- MODIFICATION : Import de la fonction cssProps ---
 import { cssProps } from 'data-primals-engine/core';
 import {DashboardFlexViewItem} from "./DashboardFlexViewItem.jsx";

package/client/src/DataEditor.jsx

@@ -1,5 +1,5 @@
 import React, {forwardRef, useEffect, useState} from "react"; // Ajout de useEffect
-import {conditionToApiSearchFilter, getDefaultForType} from "data-primals-engine/data";
+import {conditionToApiSearchFilter, getDefaultForType} from "../../src/data.js";
 import { Trans, useTranslation } from "react-i18next";
 import {FaCode, FaLanguage, FaMinus, FaPlus, FaSitemap} from "react-icons/fa";
 import Button from "./Button.jsx";
@@ -15,7 +15,7 @@ import {
     SelectField,
     TextField
 } from "./Field.jsx";
-import i18n from "data-primals-engine/i18n";
+import i18n from "../../src/i18n.js";
 import ConditionBuilder from "./ConditionBuilder.jsx";
 import {useModelContext} from "./contexts/ModelContext.jsx";
 import {useAuthContext} from "./contexts/AuthContext.jsx";
@@ -508,7 +508,7 @@ export const DataEditor = forwardRef(function MyDataEditor({
         return <p>Sélectionnez un modèle pour afficher le formulaire.</p>;
     }
 
-    const title = record ? t('btns.editModel', `Edit ${model.name}`) : `${t('add_in_model')} ${t(`model_${model.name}`, model.name)}`;
+    const title = record ? t('editData', 'Edit {{0}}', [model.name]) : `${t('add_in_model')} ${t(`model_${model.name}`, model.name)}`;
 
     const hint = (model, field) => <div className="hint-icon"><FaCircleInfo data-field={t(`field_${model.name}_${field.name}`, field.name)} data-tooltip-id={`tooltipHint`} data-tooltip-content={i18n.t(`field_${model.name}_${field.name}_hint`, field.hint || '')} /></div>
 

package/client/src/DataLayout.jsx

@@ -14,7 +14,7 @@ import {
     maxBytesPerSecondThrottleData,
     maxFileSize,
     maxRequestData, metaModels
-} from "data-primals-engine/constants";
+} from "../../src/constants.js";
 import {
     FaArrowDown,
     FaArrowUp, FaBell,
@@ -27,20 +27,14 @@ import {
     FaPlus,
     FaTrash
 } from "react-icons/fa";
-import {getDefaultForType, getUserId} from "data-primals-engine/data";
+import {getDefaultForType, getUserId} from "../../src/data.js";
 import {Trans, useTranslation} from "react-i18next";
 
-import {debounce, escapeRegExp, event_trigger, getObjectHash, isGUID} from "data-primals-engine/core";
+import {debounce, escapeRegExp, event_trigger, getObjectHash, isGUID} from "../../src/core.js";
 import Button from "./Button.jsx";
 import {useAuthContext} from "./contexts/AuthContext.jsx";
-import {RTE} from "./RTE.jsx";
 import APIInfo from "./APIInfo.jsx";
-import {xt256} from "react-code-blocks";
-import {isList} from "@tiptap/react";
 import {useNotificationContext} from "./NotificationProvider.jsx";
-import modelCreator from "./ModelCreator.jsx";
-import RelationField from "./RelationField.jsx";
-import RelationValue from "./RelationValue.jsx";
 import {ModelImporter} from "./ModelImporter.jsx";
 import {DataTable} from "./DataTable.jsx";
 import {ModelList} from "./ModelList.jsx";
@@ -217,6 +211,10 @@ function DataLayout() {
                         mainPartRef.current.scrollIntoView({behavior: "smooth"});
                         handleAddData(model);
                     }}
+                    onDuplicateData={(data) => {
+                        mainPartRef.current.scrollIntoView({behavior: "smooth"});
+                        handleAddData(selectedModel, data);
+                    }}
                     onShowAPI={() => {
                         setAPIInfoVisible(true);
                         setDataEditorVisible(false);
@@ -482,18 +480,23 @@ function DataLayout() {
         }
     };
 
-    const handleAddData = (model)=>{
+    const handleAddData = (model, data)=>{
 
         handleModelSelect(model);
-        const t = model ? [...model.fields].reduce((acc, field) => {
-            if( field.type === "relation"){
-                acc[field.name] = field.multiple ? [] : null;
-            }else {
-                acc[field.name] = getDefaultForType(field);
-            }
-            return acc;
-        }, {}) : [];
-        setFormData(t)
+
+        if( data ){
+            setFormData(data);
+        }else {
+            const t = model ? [...model.fields].reduce((acc, field) => {
+                if (field.type === "relation") {
+                    acc[field.name] = field.multiple ? [] : null;
+                } else {
+                    acc[field.name] = getDefaultForType(field);
+                }
+                return acc;
+            }, {}) : [];
+            setFormData(t)
+        }
         setEditionMode(false);
         setDataEditorVisible(true);
         setAPIInfoVisible(false);
@@ -545,7 +548,7 @@ function DataLayout() {
         // Si un modèle est sélectionné...
         if (selectedModel) {
             // Récupérer les étapes du tour "datapacks"
-            const datapacksSteps = allTourSteps.datapacks;
+            const datapacksSteps = allTourSteps.guides;
             // S'assurer que ce tour existe et a des étapes
             if (datapacksSteps && datapacksSteps.length > 0) {
                 // 1. Définir les étapes du tour qui doit être affiché