data-primals-engine 1.3.0 → 1.3.2

package/client/src/HistoryDialog.scss

@@ -0,0 +1,320 @@
+.history-dialog {
+
+  .dialog-content {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    padding: 0; // Le padding sera sur le content wrapper
+  }
+}
+
+.history-dialog-content {
+  overflow-y: auto;
+  padding: 1rem;
+  background-color: #f4f4f4;
+}
+
+.history-list {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.history-entry {
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #fff;
+  box-shadow: 0 1px 3px rgba(0,0,0,0.05);
+
+  .history-entry-header {
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+    padding: 0.5rem 1rem;
+    background-color: #f9f9f9;
+    border-bottom: 1px solid #eee;
+    font-size: 0.9em;
+    color: #333;
+
+    .op-badge {
+      padding: 0.2rem 0.6rem;
+      border-radius: 12px;
+      color: white;
+      font-weight: bold;
+      font-size: 0.8em;
+      text-transform: uppercase;
+    }
+
+    .op-insert { background-color: #28a745; } // green
+    .op-update { background-color: #007bff; } // blue
+    .op-delete { background-color: #dc3545; } // red
+
+    .history-version {
+      margin-left: auto;
+      font-weight: bold;
+    }
+  }
+
+  .history-entry-data {
+    padding: 1rem;
+    
+    pre {
+      white-space: pre-wrap;
+      word-wrap: break-word;
+      background-color: #2d2d2d;
+      color: #f8f8f2;
+      padding: 1rem;
+      border-radius: 4px;
+      margin: 0;
+      font-family: 'Courier New', Courier, monospace;
+      font-size: 0.85em;
+    }
+  }
+}
+
+// In C:/Dev/data-primals-engine/client/src/HistoryDialog.scss
+
+.history-dialog .dialog-content {
+  // The new layout handles its own padding and structure.
+  padding: 0;
+}
+
+.history-dialog-content-split {
+  display: flex;
+  gap: 1rem;
+  height: 65vh; /* Adjust height as needed */
+  max-height: 700px;
+}
+
+.history-list-container {
+  flex: 1;
+  overflow-y: auto;
+  border-right: 1px solid #e2e2e2;
+  padding: 0 1rem 1rem 0;
+  min-width: 300px;
+}
+
+.history-preview-container {
+  flex: 0.8; /* Give preview a bit more space */
+  display: flex;
+  flex-direction: column;
+  min-width: 300px;
+  
+  .preview-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 0.5rem;
+    padding-bottom: 0.5rem;
+    border-bottom: 1px solid #e2e2e2;
+
+    h4 {
+      margin: 0;
+      padding: 0;
+      border: none;
+    }
+
+    .btn-revert {
+      padding: 0.3rem 0.8rem;
+      font-size: 0.85em;
+      background-color: #ffc107; // A warning color like amber
+      color: black;
+      border: 1px solid #e0a800;
+
+      &:hover:not(:disabled) {
+        background-color: #e0a800;
+      }
+
+      &:disabled {
+        background-color: #ffca2c;
+        opacity: 0.7;
+        cursor: not-allowed;
+      }
+    }
+  }
+}
+
+.history-preview-area {
+  flex-grow: 1;
+  overflow-y: auto;
+  background-color: #f9f9f9;
+  padding: 0.75rem;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+
+  pre {
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    margin: 0;
+  }
+
+  .placeholder {
+    color: #666;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    text-align: center;
+  }
+}
+
+.history-entry {
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  margin-bottom: 0.75rem;
+  padding: 0.75rem;
+  transition: border-color 0.2s, box-shadow 0.2s;
+
+  &.selected {
+    border-color: #007bff;
+    box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.25);
+  }
+}
+
+.history-entry-header {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 0.5rem 1rem;
+  margin-bottom: 0.5rem;
+
+  .btn-preview {
+    margin-left: auto;
+    padding: 0.2rem 0.6rem;
+    font-size: 0.8em;
+  }
+}
+
+.history-entry-data pre {
+  background-color: #f0f0f0;
+  padding: 0.5rem;
+  border-radius: 4px;
+  max-height: 150px;
+  overflow-y: auto;
+  margin: 0;
+}
+
+/* Dark Theme Adjustments */
+.dark .history-list-container { border-right-color: #3f3f3f;
+}
+.dark .history-preview-container .preview-header {
+  border-bottom-color: #3f3f3f;
+  .btn-revert {
+    background-color: #d8a100;
+    border-color: #b38600;
+    color: white;
+    &:hover:not(:disabled) {
+      background-color: #b38600;
+    }
+  }
+}
+.dark .history-preview-area { background-color: #2a2a2a; border-color: #3f3f3f; }
+.dark .history-entry { border-color: #3f3f3f; }
+.dark .history-entry.selected { border-color: #58a6ff; box-shadow: 0 0 0 2px rgba(88, 166, 255, 0.25); }
+.dark .history-entry-data pre { background-color: #2a2a2a; }
+
+/* Styles for human-friendly history data display */
+.history-entry-data {
+  padding: 0.75rem 1rem;
+  font-size: 0.9em;
+  background-color: #fdfdfd;
+  border-top: 1px solid #f0f0f0;
+
+  /* The new implementation doesn't use <pre> here anymore */
+  pre {
+    display: none;
+  }
+}
+
+.changes-list, .snapshot-list {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.change-detail, .snapshot-item {
+  display: grid;
+  grid-template-columns: minmax(100px, 150px) 1fr;
+  gap: 0.5rem;
+  align-items: start;
+}
+
+.change-field-name, .snapshot-key {
+  font-weight: 600;
+  color: #333;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding-top: 4px; /* Align with value */
+}
+
+.change-values {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  background-color: #f0f0f0;
+  padding: 0.25rem 0.5rem;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.change-arrow {
+  color: #888;
+  font-weight: bold;
+}
+
+.value-from {
+  text-decoration: line-through;
+  color: #d9534f; /* red-ish */
+}
+
+.value-to {
+  color: #5cb85c; /* green-ish */
+  font-weight: 500;
+}
+
+.snapshot-value, .value-from, .value-to {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: block; /* Ensure it takes up the block for ellipsis */
+}
+
+.value-empty {
+  color: #999;
+  font-style: italic;
+}
+
+.value-object, .value-boolean {
+  font-family: 'Courier New', Courier, monospace;
+  background-color: #e9e9e9;
+  padding: 0.1rem 0.3rem;
+  border-radius: 3px;
+  display: inline-block;
+}
+
+.no-changes-text {
+  color: #777;
+  font-style: italic;
+  padding: 0.5rem 0;
+}
+
+/* Dark Theme Adjustments */
+.dark .history-entry-data {
+  background-color: #2c2c2c;
+  border-top-color: #3a3a3a;
+}
+.dark .change-field-name, .dark .snapshot-key {
+  color: #e0e0e0;
+}
+.dark .change-values {
+  background-color: #3a3a3a;
+}
+.dark .value-from { color: #ff7b7b; }
+.dark .value-to { color: #73d173; }
+.dark .value-object, .dark .value-boolean {
+  background-color: #444;
+}
+.dark .no-changes-text, .dark .value-empty {
+  color: #888;
+}

package/client/src/ModelCreator.jsx

@@ -41,6 +41,7 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
     const [modelName, setModelName] = useState(initialModel?.name || ''); // Utilisation de initialModel
     const [modelMaxRequestData, setModelMaxRequestData] = useState(initialModel?.maxRequestData || ''); // Utilisation de initialModel
     const [modelDescription, setModelDescription] = useState(initialModel?.name ? t(`model_description_${initialModel?.name}`, initialModel?.description) : '');
+    const [modelHistory, setModelHistory] = useState(!!initialModel?.history || undefined);
     const [fields, setFields] = useState([]);
     const [changed, setChanged] = useState(false);
 
@@ -53,6 +54,7 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
             setModelMaxRequestData(initialModel.maxRequestData || defaultMaxRequestData);
             setModelDescription(initialModel.name ? t(`model_description_${initialModel.name}`, initialModel.description) : '');
             setFields([...(initialModel.fields || []).map(m => ({...m}))]);
+            setModelHistory(initialModel.history);
         } else {
             // Mode création : on réinitialise tout pour une nouvelle génération
             setModelName('');
@@ -60,6 +62,7 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
             setFields([]);
             setUseAI(true); // On active l'IA par défaut
             setModelVisible(false);
+            setModelHistory(false);
         }
     }, [initialModel]);
 
@@ -130,6 +133,7 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
                     setModelDescription('');
                     setModelMaxRequestData(defaultMaxRequestData);
                     setFields([{ name: '', type: 'string' }]);
+                    setModelHistory(undefined);
                 }
                 setDatasToLoad(datas=>[...datas, modelName]);
 
@@ -208,6 +212,7 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
             name: modelName,
             description: modelDescription,
             maxRequestData: modelMaxRequestData,
+            history: modelHistory,
             fields: (fields || []).map((field) => {
                 delete field['_isNewField'];
                 let otherFields = [];
@@ -312,8 +317,8 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
     }
 
     const handleRenameField = (fi, oldVal) => {
-        const prompted = prompt(t('core.renameFields', 'Renommer le champ'), oldVal);
-        if (prompted !== oldVal) {
+        const prompted = window.prompt(t('core.renameFields', 'Renommer le champ'), oldVal);
+        if (prompted && prompted !== oldVal) {
             mutationRename.mutateAsync({oldName: oldVal, newName: prompted}).then(e =>{
                 const newFields = [...fields];
                 const field = newFields[fi];
@@ -542,21 +547,22 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
                                     </div>
 
                                     <div className="field">
-                                        <div className="flex field-bg">
-                                            <label htmlFor="modelDescription"><Trans i18nKey={"modelcreator.description"}>Description:</Trans></label>
+                                        <div className="checkbox-label flex flex-1">
+                                            <CheckboxField
+                                                label={<Trans i18nKey={"history.title"}>Historique</Trans>}
+                                                disabled={modelLocked || (isLocalUser(me) && field.locked)}
+                                                checked={field.required}
+                                                onChange={(e) => {
+                                                    const newFields = [...fields];
+                                                    newFields[index].history = e ? { enabled: true } : undefined;
+                                                    setFields(newFields);
+                                                }}
+                                                help={field.required && t('modelcreator.history.hint')}
+                                            />
                                         </div>
-                                        <TextField
-                                            multiline
-                                            help={t('modelcreator.field.description')}
-                                            id="modelDescription"
-                                            disabled={modelLocked}
-                                            value={modelDescription}
-                                            onChange={(e) => {
-                                                setModelDescription(e.target.value);
-                                                setChanged(true)
-                                            }}
-                                        />
                                     </div>
+
+
                                     <h3><Trans i18nKey={"modelcreator.fields"}>Champs du modèle :</Trans></h3>
                                     {fields.map((field, index) => <ModelCreatorField
                                         key={initialModel?.name + '_field_' + index}
@@ -601,6 +607,21 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
                                 setChanged(true)
                             }}
                         />
+
+                        <div className="flex flex-no-wrap">
+                            <div className="checkbox-label flex flex-1">
+                                <CheckboxField
+                                    label={<Trans i18nKey={"history"}>Historique</Trans>}
+                                    help={t('modelcreator.field.history', '')}
+                                    disabled={modelLocked}
+                                    checked={!!modelHistory}
+                                    onChange={(e) => {
+                                        setModelHistory(e? { enabled: true }: false);
+                                    }}
+                                />
+                            </div>
+                        </div>
+
                         <h3><Trans i18nKey={"modelcreator.fields"}>Champs du modèle :</Trans></h3>
                         {fields.map((field, index) => <ModelCreatorField
                             key={initialModel?.name + '_field_' + index}

package/client/src/ModelCreatorField.jsx

@@ -74,11 +74,10 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                             }}
                             help={t('modelcreator.name.hint')}
                             required
+                            after={!(!modelLocked && isLocalUser(me) && field.locked) && !field._isNewField && (
+                                <Button type={"button"} className={"btn-form btn-last"}
+                            onClick={() => handleRenameField(index, field.name)}><FaEdit/></Button>)}
                         />
-                        {!(!modelLocked && isLocalUser(me) && field.locked) && !field._isNewField && (
-                            <Button type={"button"} className={"btn-form btn-last"}
-                                    onClick={() => handleRenameField(index, field.name)}><FaEdit/></Button>)}
-
                     </div>
 
                 </div>
@@ -449,11 +448,11 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                             </div>
 
                             {!['file', 'relation', 'array', 'calculated'].includes(field.type) && (<div
-                                className="flex flex-no-wrap field-bg mg-item">
+                                className="flex flex-no-wrap mg-item">
 
                                 {['string_t', 'string', 'richtext', 'password', 'url', 'phone', 'email'].includes(field.type) && (<>
                                     {hint('modelcreator.default.hint')}
-                                    <div className="flex flex-1">
+                                    <div className="flex flex-1 field-bg">
                                         <TextField
                                             className="flex-1"
                                             value={field.default}

package/client/src/ViewSwitcher.jsx

@@ -8,9 +8,9 @@ import { Tooltip } from 'react-tooltip';
 
 import "./ViewSwitcher.scss"
 const viewOptions = [
-    { id: 'table', icon: <FaTable />, labelKey: 'views.table' },
-    { id: 'kanban', icon: <FaColumns />, labelKey: 'views.kanban' },
-    //{ id: 'calendar', icon: <FaRegCalendarAlt />, labelKey: 'views.calendar' },
+    { id: 'table', icon: <FaTable />, labelKey: 'views.table', defaultLabel: 'Tableau' },
+    { id: 'kanban', icon: <FaColumns />, labelKey: 'views.kanban', defaultLabel: 'Kanban' },
+    { id: 'calendar', icon: <FaRegCalendarAlt />, labelKey: 'views.calendar', defaultLabel: 'Calendrier' },
 ];
 
 const ViewSwitcher = ({ currentView, onViewChange, configuredViews, onConfigureView }) => {
@@ -27,10 +27,10 @@ const ViewSwitcher = ({ currentView, onViewChange, configuredViews, onConfigureV
                         <Button
                             onClick={() => onViewChange(view.id)}
                             className={`btn-view ${isActive ? 'active' : ''}`}
-                            title={t(view.labelKey, view.id)}
+                            title={t(view.labelKey, view.defaultLabel)}
                         >
                             {view.icon}
-                            <span className="hidden md:inline-block ml-2">{t(view.labelKey, view.id)}</span>
+                            <span className="hidden md:inline-block ml-2">{t(view.labelKey, view.defaultLabel)}</span>
                         </Button>
                         {/* AJOUT : Bouton de configuration pour la vue active */}
                         {isActive && view.id !== 'table' && (
@@ -38,7 +38,7 @@ const ViewSwitcher = ({ currentView, onViewChange, configuredViews, onConfigureV
                                 onClick={onConfigureView}
                                 className="btn-view-settings"
                                 data-tooltip-id="view-settings-tooltip"
-                                data-tooltip-content={t('views.configure', { view: t(view.labelKey) })}
+                                data-tooltip-content={t('views.configure', 'Configurer la vue {{view}}', { view: t(view.labelKey, view.defaultLabel) })}
                             >
                                 <FaCog />
                             </Button>

package/client/src/hooks/useTutorials.jsx

@@ -195,7 +195,7 @@ export const useTutorials = () => {
 
     // Écoute les événements de modification de données pour vérifier la progression en arrière-plan.
     useEffect(() => {
-        const handleDataChange = (payload) => {
+        const handleDataChange = async (payload) => {
             console.log(`[Tutoriels] Événement de données reçu.`, payload);
             if (me?.activeTutorial) {
                 triggerTutorialCheck();