data-primals-engine 1.4.2 → 1.5.0

package/client/src/FlexDataRenderer.jsx

@@ -33,8 +33,10 @@ const formatDate = (value, type, t) => {
 
 const FlexDataRenderer = ({ value, fieldDefinition,data }) => {
     const { t, i18n } = useTranslation();
+    const lang = (i18n.resolvedLanguage || i18n.language).split(/[-_]/)?.[0];
     const {models} = useModelContext()
     const {me} = useAuthContext()
+
     // 'translatedLabel' is added by getFieldDefinitionByPath
     const field = fieldDefinition;
     const translatedLabel = t('model_'+field.name, field.name);

package/client/src/FlexTreeUtils.js

@@ -36,7 +36,7 @@ export const createNewNode = (type) => {
         return {
             ...baseNode,
             type: 'item',
-            itemStyle: { width: '100px', height: '50px' },
+            itemStyle: {  },
             content: { type: 'placeholder' }
         };
     }

package/client/src/GeolocationField.jsx

@@ -0,0 +1,94 @@
+import React, { useState, useEffect } from 'react';
+import { MapContainer, TileLayer, Marker, useMapEvents, Popup } from 'react-leaflet';
+import 'leaflet/dist/leaflet.css';
+import L from 'leaflet';
+
+// Fix for default marker icon issue with webpack/parcel
+delete L.Icon.Default.prototype._getIconUrl;
+
+L.Icon.Default.mergeOptions({
+    iconRetinaUrl: 'https://unpkg.com/leaflet@1.7.1/dist/images/marker-icon-2x.png',
+    iconUrl: 'https://unpkg.com/leaflet@1.7.1/dist/images/marker-icon.png',
+    shadowUrl: 'https://unpkg.com/leaflet@1.7.1/dist/images/marker-shadow.png'
+});
+
+
+const LocationMarker = ({ position, setPosition, name, onChange, value }) => {
+    const map = useMapEvents({
+        click(e) {
+            const { lat, lng } = e.latlng;
+            const newPos = [lat, lng];
+            setPosition(newPos);
+            map.flyTo(newPos, map.getZoom());
+            onChange({
+                name: name,
+                value: {
+                    type: 'Point',
+                    coordinates: [lng, lat]
+                }
+            });
+        },
+        locationfound(e) {
+            const { lat, lng } = e.latlng;
+            const newPos = [lat, lng];
+            setPosition(newPos);
+            map.flyTo(newPos, map.getZoom());
+            onChange({
+                name: name,
+                value: {
+                    type: 'Point',
+                    coordinates: [lng, lat]
+                }
+            });
+        },
+    });
+
+    useEffect(() => {
+        // If there's no value, try to locate user
+        if (!value) {
+             map.locate();
+        }
+    }, [map, value]);
+
+
+    return position === null ? null : (
+        <Marker position={position}>
+            <Popup>Selected location</Popup>
+        </Marker>
+    );
+}
+
+const GeolocationField = ({ value, onChange, name }) => {
+    // Default to a central location if no value is provided, e.g., Paris
+    const initialPosition = (value && value.coordinates && value.coordinates.length === 2)
+        ? [value.coordinates[1], value.coordinates[0]] // Leaflet uses [lat, lng], GeoJSON uses [lng, lat]
+        : [48.8566, 2.3522]; // Default to Paris
+
+    const [position, setPosition] = useState(initialPosition);
+
+    useEffect(() => {
+        if (value && value.coordinates && value.coordinates.length === 2) {
+            const newPos = [value.coordinates[1], value.coordinates[0]];
+            if (position[0] !== newPos[0] || position[1] !== newPos[1]) {
+                setPosition(newPos);
+            }
+        } else {
+            // If value is cleared, reset to default. The map.locate() will try to find the user.
+            setPosition([48.8566, 2.3522]);
+        }
+    }, [value]);
+
+    return (
+        <div style={{ height: '300px', width: '100%' }}>
+            <MapContainer center={position} zoom={13} scrollWheelZoom={true} style={{ height: '100%', width: '100%' }}>
+                <TileLayer
+                    attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+                    url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+                />
+                <LocationMarker position={position} setPosition={setPosition} name={name} onChange={onChange} value={value} />
+            </MapContainer>
+        </div>
+    );
+};
+
+export default GeolocationField;

package/client/src/KPIDialog.jsx

@@ -1,11 +1,16 @@
 import React, { useState } from 'react';
 import { Dialog } from './Dialog.jsx'; // Assure-toi que Dialog est importé
 import { useTranslation } from 'react-i18next';
+import {FaAd, FaPlus} from "react-icons/fa";
+import {getUserHash} from "../../src/data.js";
+import {useNavigate} from "react-router-dom";
+import {useAuthContext} from "./contexts/AuthContext.jsx";
 
 function KPIDialog({ availableKpis = [], onAddKpi, onClose }) {
     const { t } = useTranslation();
     const [searchTerm, setSearchTerm] = useState('');
-
+    const nav = useNavigate()
+    const {me} = useAuthContext()
     const filteredKpis = (availableKpis || []).filter(kpi =>
         kpi.name.value.toLowerCase().includes(searchTerm.toLowerCase())
     );
@@ -32,6 +37,11 @@ function KPIDialog({ availableKpis = [], onAddKpi, onClose }) {
                     <li>{t('dashboards.no_kpi_found', 'Aucun KPI disponible ou correspondant.')}</li>
                 )}
             </ul>
+            <div className={"flex mg-2"}>
+                <button onClick={() => {
+                    nav(`/user/${getUserHash(me)}/?model=kpi`);
+                }} className={"btn"}><FaPlus />{t('dashboards.addKpi', 'Nouvel indicateur KPI')}</button>
+            </div>
         </Dialog>
     );
 }

package/client/src/ModelCreator.jsx

@@ -660,11 +660,10 @@ const ModelCreator = forwardRef(({ initialPrompt = '', onModelGenerated, autoGen
                 {/* Boutons d'action, visibles si un modèle est affiché ou en mode manuel */}
                 {(showModel || !useAI || initialModel) && (
                     <div className="actions flex">
-                        {initialModel && (
+                        
                             <Button type="button" onClick={handleAddField}>
                                 <FaPlus /> <Trans i18nKey={"btns.addField"}>Ajouter un champ</Trans>
                             </Button>
-                        )}
 
                         <Button type="submit">
                             <FaSave />

package/client/src/ModelCreatorField.jsx

@@ -72,7 +72,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                 newFields[index].name = e.target.value;
                                 setFields(newFields);
                             }}
-                            help={t('modelcreator.name.hint')}
                             required
                             after={!(!modelLocked && isLocalUser(me) && field.locked) && !field._isNewField && (
                                 <Button type={"button"} className={"btn-form btn-last"}
@@ -117,6 +116,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                 {label: t("field.array"), value: "array"},
                                 {label: t("field.relation"), value: "relation"},
                                 {label: t("field.file"), value: "file"},
+                                {label: t("field.geolocation"), value: "geolocation"},
                                 {label: t("field.code"), value: "code"},
                                 {label: t("field.calculated", "calculated data"), value: "calculated"},
                                 {label: t("field.cronSchedule", "task schedule"), value: "cronSchedule"},
@@ -211,10 +211,10 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
 
                         <div className="flex flex-no-wrap">
                             {hint('modelcreator.relationFilter.hint')}
-                            <label className="checkbox-label flex flex-1"><Trans
-                                i18nKey={"modelcreator.relationFilter"}>Filtre</Trans> :
-                                <input
-                                    type="checkbox"
+                            <div className="checkbox-label flex flex-1">
+                                <CheckboxField
+                                    label={<Trans
+                                        i18nKey={"modelcreator.relationFilter"}>Filtre</Trans>}
                                     disabled={modelLocked || (isLocalUser(me) && field.locked)}
                                     checked={field.relationFilter !== undefined}
                                     onChange={(e) => {
@@ -227,7 +227,7 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                         setFields(newFields);
                                     }}
                                 />
-                            </label>
+                            </div>
                         </div>)}
 
 
@@ -285,7 +285,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                             newFields[index].multiline = e;
                                             setFields(newFields);
                                         }}
-                                        help={field.multiline && t('modelcreator.multiline.hint')}
                                     />
                                 </div>
                             </div>
@@ -294,28 +293,26 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
 
                     {['string', 'string_t', 'richtext', 'richtext_t', 'email', 'phone', 'url', 'password', 'code'].includes(field.itemsType || field.type) && (
                         <>
-                            <div className={"flex flex-no-wrap"}>
+                            <div className={"flex flex-no-wrap field-bg"}>
                                 {hint('modelcreator.maxlength.hint')}
-                                <label className={"flex flex-1"}>
-                                    <Trans i18nKey={"modelcreator.maxlength"}>Longueur
-                                        maximale :</Trans>
-                                    <NumberField
+                                <div className={"flex-1"}><NumberField
                                         disabled={modelLocked || (isLocalUser(me) && field.locked)}
                                         step={1}
                                         min={0}
+                                        label={<Trans i18nKey={"modelcreator.maxlength"}>Longueur
+                                            maximale :</Trans>}
                                         className={"flex-1"}
                                         value={field.maxlength}
                                         onChange={(e) => {
                                             const newFields = [...fields];
-                                            const val = parseInt(e, 10);
-                                            if (!val)
+                                            const val = parseInt(e.target.value, 10);
+                                            if (isNaN(val))
                                                 newFields[index].maxlength = undefined;
                                             else
                                                 newFields[index].maxlength = val;
                                             setFields(newFields);
                                         }}
-                                    />
-                                </label>
+                                    /></div>
                             </div>
                         </>
                     )}
@@ -437,7 +434,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                             newFields[index].required = e;
                                             setFields(newFields);
                                         }}
-                                        help={field.required && t('modelcreator.required.hint')}
                                     />
                                 </div>
                             </div>
@@ -455,7 +451,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                             newFields[index].unique = e;
                                             setFields(newFields);
                                         }}
-                                        help={field.unique && t('modelcreator.unique.hint')}
                                     />
                                 </div>
                             </div>
@@ -554,7 +549,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                         disabled={modelLocked || (isLocalUser(me) && field.locked)}
                                         onChange={(e) => {
                                             const newFields = [...fields];
-
                                             newFields[index].default = e.value;
                                             setFields(newFields);
                                         }}
@@ -625,10 +619,12 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
 
                             {(['datetime', 'date'].includes(field.itemsType || field.type)) && (
                                 <>
-                                    <div className="flex flex-no-wrap mg-item">
+                                    <div
+                                        className="flex flex-no-wrap mg-item">
                                         {hint('modelcreator.min.hint')}
-                                        <label className={"flex-1"}><Trans i18nKey={"modelcreator.min"}>Valeur minimale :</Trans></label>
-                                        <div className="flex flex-1 field-bg "><input
+                                        <div className="flex field-bg flex-1">
+                                            <label className={"flex-1"}><Trans i18nKey={"modelcreator.min"}>Valeur minimale :</Trans></label>
+                                            <input
                                             className={"flex-1"}
                                             disabled={modelLocked || (isLocalUser(me) && field.locked)}
                                             type={field.type === 'datetime' ? 'datetime-local' : field.type}
@@ -642,13 +638,16 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                                 }
                                                 setFields(newFields);
                                             }}
-                                        /></div>
+                                            />
+                                        </div>
                                     </div>
 
                                     <div className="flex flex-no-wrap mg-item">
                                         {hint('modelcreator.max.hint')}
-                                        <label className={"flex-1"}><Trans i18nKey={"modelcreator.max"}>Valeur maximale :</Trans></label>
-                                        <div className="flex flex-1 field-bg "><input
+                                        <div className="flex field-bg flex-1">
+                                            <label className={"flex-1"}><Trans i18nKey={"modelcreator.max"}>Valeur maximale :</Trans></label>
+                                            <input
+                                                className={"flex-1"}
                                             disabled={modelLocked || (isLocalUser(me) && field.locked)}
                                             type={field.type === 'datetime' ? 'datetime-local' : field.type}
                                             value={field.type === "number" ? (field.max + '').replace('.', ',') : field.max}
@@ -806,7 +805,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                             newFields[index].asMain = e;
                                             setFields(newFields);
                                         }}
-                                        help={field.asMain && t('modelcreator.asMain.hint')}
                                     />
                                 </div>
                             </div>)}
@@ -857,7 +855,6 @@ const ModelCreatorField = ({model, handleRenameField, handleRemoveField, handleU
                                             newFields[index].hiddenable = e;
                                             setFields(newFields);
                                         }}
-                                        help={field.unique && t('modelcreator.hiddenable.hint')}
                                     />
                                 </div>
                             </div>

package/client/src/ModelList.jsx

@@ -190,7 +190,7 @@ export function ModelList({ onModelSelect, onCreateModel, onImportModel, onEditM
                                         key={'modelist' + model.name} onClick={() => generatedModels.some(g => g.name === model.name) ? onEditModel(model) : onModelSelect(model)}>
                                         <div className="flex flex-center flex-fw">
                                             <div
-                                                className="flex flex-1 flex-no-wrap break-word">
+                                                className="flex flex-1 flex-no-wrap break-word gap-2">
                                                 <div className={"icon"}>{IconComponent ? IconComponent : <></>}</div>
                                                 <div>{t(`model_${model.name}`, model.name)} {generatedModels.some(f => f.name === model.name) ? '(tmp)' : (mods.some(f => f.mod === model.name) ? `(${mods.find(f => f.mod === model.name).count})` : '')}</div></div>
                                             <div className="btns">

package/client/src/RelationField.jsx

@@ -43,14 +43,14 @@ const RelationField = ({ field, help, onFocus, onBlur, onChange, value = null })
                 // Recherche sur les champs principaux (asMain)
                 model.fields.forEach(f => {
                     if (f.asMain && mainFieldsTypes.includes(f.type)) {
-                        orConditions.push({ [f.name]: { "$regex": searchValue, "$options": "i" } });
+                        orConditions.push({"$regexMatch": {input: "$" + f.name, regex: searchValue}});
                     }
                 });
                 // Si aucun champ principal, recherche sur les champs texte
                 if (orConditions.length === 0) {
                     model.fields.forEach(f => {
                         if (["string", "string_t", "richtext", "url"].includes(f.type)) {
-                            orConditions.push({ [f.name]: { "$regex": searchValue, "$options": "i" } });
+                            orConditions.push({"$regexMatch": {input: "$" + f.name, regex: searchValue}});
                         }
                     });
                 }

package/client/src/constants.js

@@ -57,14 +57,14 @@ export const profiles = {
     }, // budget,
     'developer': {
         "packs": ["Multilingual starter pack", "Website Starter Pack"],
-        "models": ['alert','endpoint','request','webpage', 'content', 'taxonomy', 'resource', 'translation', 'contact', 'location', 'channel', 'lang', 'token', 'message', 'ticket', 'user', 'permission', 'role']
+        "models": ['alert','endpoint','request','kpi','webpage', 'content', 'taxonomy', 'resource', 'translation', 'contact', 'location', 'channel', 'lang', 'token', 'message', 'ticket', 'user', 'permission', 'role']
     },
     'company': {
-        "packs": ["E-commerce Starter Kit"],
+        "packs": ["Multilingual starter pack", "E-commerce Starter Kit"],
         "models": ['alert','request','location', 'order', 'currency', 'product', 'cart', 'cartItem', 'invoice', 'message', 'user', 'role', 'permission', 'token','translation', 'lang', 'webpage', 'content', 'taxonomy', 'contact', 'resource', 'accountingExercise', 'accountingLineItem', 'accountingEntry', 'employee', 'kpi', 'dashboard']
     },
     'engineer':  {
-        "packs": ["AI Content Generation - Starter Pack"],
+        "packs": ["Multilingual starter pack", "AI Content Generation - Starter Pack"],
         "models":['alert','endpoint','request','dashboard', 'kpi', 'user', 'role', 'token', 'permission', 'workflow', 'workflowRun', 'workflowStep', "channel", "message", 'workflowAction', 'workflowTrigger']
     }
 }

package/client/src/filter.js

@@ -1,159 +1,4 @@
 
-export const MONGO_CALC_OPERATORS = {
-    $find: {
-        label: 'Find in relation',
-        description: 'Recherche dans une relation/tableau',
-        supportsNesting: true,
-        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 },
-    $nor: { label: 'Ou Non (nor)', description: 'Renvoie vrai si aucune des conditions n\'est vérifiée', args: 1, multi: true },
-    $eq: { label: '=', multi: false, args: 2 },
-    $ne: { label: '!=', multi: false, args: 2 },
-    $gt: { label: '>', multi: false, args: 2 },
-    $gte: { label: '>=', multi: false, args: 2 },
-    $lt: { label: '<', multi: false, args: 2 },
-    $lte: { label: '<=', multi: false, args: 2 },
-    $in: { label: 'in', multi: true, args: 2 },
-    $nin: { label: 'nin', multi: true, args: 2 },
-    $all: { label: 'afll', multi: true },
-    $size: {
-        label: 'size',
-        multi: false,
-        description: 'Renvoie le nombre d\'éléments dans un tableau',
-        disableAdvancedValue: true
-    },
-    $elemMatch: { label: 'elemMatch', multi: true },
-    $type: {
-        label: 'type',
-        description: 'Renvoie le type BSON de l\'élément',
-        multi: false,
-        disableAdvancedValue: true
-    },
-    $add: { label: '+', multi: true },
-    $subtract: { label: '-', multi: false, args: 2 },
-    $multiply: { label: '*', multi: true },
-    $divide: { label: '/', multi: false, args: 2 },
-    $mod: { label: '%', multi: false, args: 2 },
-    $pow: { label: 'pow', multi: false },
-    $sqrt: { label: 'sqrt', multi: false },
-    $exp: { label: 'exp', multi: false },
-    $abs: { label: 'abs', multi: false },
-    $ceil: { label: 'ceil', multi: false },
-    $floor: { label: 'floor', multi: false },
-    $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 },
-    $hour: { label: 'hour', multi: false, isDate: true },
-    $minute: { label: 'minute', multi: false, isDate: true },
-    $second: { label: 'second', multi: false, isDate: true },
-    $millisecond: { label: 'ms', multi: false, isDate: true },
-    // Date operators
-    $dateAdd: {
-        label: 'Add to date',
-        description: 'Adds a duration to a date',
-        isDate: true,
-        specialStructure: true,
-        args: [
-            { name: 'startDate', label: 'Start Date', type: 'date' },
-            { name: 'unit', label: 'Unit', type: 'select', options: ['year', 'month', 'day', 'hour', 'minute', 'second'] },
-            { name: 'amount', label: 'Amount', type: 'number' },
-            { name: 'timezone', label: 'Timezone', type: 'text', optional: true }
-        ]
-    },
-    $dateSubtract: {
-        label: 'Subtract from date',
-        description: 'Subtracts a duration from a date',
-        isDate: true,
-        specialStructure: true,
-        args: [
-            { name: 'startDate', label: 'Start Date', type: 'date' },
-            { name: 'unit', label: 'Unit', type: 'select', options: ['year', 'month', 'day', 'hour', 'minute', 'second'] },
-            { name: 'amount', label: 'Amount', type: 'number' },
-            { name: 'timezone', label: 'Timezone', type: 'text', optional: true }
-        ]
-    },
-    $dateDiff: {
-        label: 'Date Difference',
-        description: 'Calculates the difference between two dates in specified units',
-        isDate: true,
-        specialStructure: true,
-        args: [
-            {
-                name: 'startDate',
-                label: 'Start Date',
-                type: 'date',
-                description: 'The starting date (inclusive)'
-            },
-            {
-                name: 'endDate',
-                label: 'End Date',
-                type: 'date',
-                description: 'The ending date (exclusive)'
-            },
-            {
-                name: 'unit',
-                label: 'Unit',
-                type: 'select',
-                options: ['year', 'month', 'week', 'day', 'hour', 'minute', 'second'],
-                description: 'The unit for the result'
-            },
-            {
-                name: 'timezone',
-                label: 'Timezone',
-                type: 'text',
-                optional: true,
-                description: 'The timezone (e.g. "Europe/Paris")'
-            }
-        ]
-    },
-    $dateToString: {
-        label: 'Format date as string',
-        description: 'Formats a date as a string',
-        isDate: true,
-        specialStructure: true,
-        args: [
-            {
-                name: 'date',
-                label: 'Date',
-                type: 'date'
-            },
-            {
-                name: 'format',
-                label: 'Format',
-                optional: true,
-                type: 'text'
-            },
-            {
-                name: 'timezone',
-                label: 'Timezone',
-                type: 'text',
-                optional: true,
-                description: 'The timezone (e.g. "Europe/Paris")'
-            }
-        ]
-    },
-
-    // Converters
-    $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 }
-};
 
 export const convertInputValue = (value) => {
     if (typeof value !== 'string') return value;