data-primals-engine 1.4.2 → 1.4.3

package/client/src/Field.jsx

@@ -482,6 +482,7 @@ const CheckboxField = forwardRef(
       minlength,
       maxlength,
       checked,
+        checkbox=false,
         ...rest
     },
     ref,
@@ -531,16 +532,19 @@ const CheckboxField = forwardRef(
                     </label>
                 )}
                 {help && <div className="flex help">{help}</div>}
-                <Switch
+                {!checkbox && (<Switch
                     id={id}
                     onChange={handleChange}
-                    checked={value} />
+                    checked={value} />)}
+                {checkbox && (
+                    <input type={"checkbox"} id={id} onChange={handleChange} checked={value} />
+                )}
             </div>
             {errors.length > 0 && (
                 <ul className="error">
                     {errors.map((e, key) => (
                         <li key={key} aria-live="assertive" role="alert">
-                            {e}
+                            {JSON.stringify(e, null, 2)}
                         </li>
                     ))}
                 </ul>

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/ModelCreatorField.jsx

@@ -117,6 +117,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"},

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

@@ -60,11 +60,11 @@ export const profiles = {
         "models": ['alert','endpoint','request','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;

package/client/src/translations.js

@@ -2,6 +2,7 @@
 export const websiteTranslations = {
     fr: {
         translation: {
+            "field.geolocation": "Géolocalisation",
             "time.minute": "Minute",
             "time.hour": "Heure",
             "time.day": "Jour",
@@ -55,8 +56,6 @@ export const websiteTranslations = {
             "history.revertSuccess": "Document restauré avec succès. L'historique va maintenant être mis à jour.",
             "history.revertError": "Erreur lors de la restauration : {{error}}",
 
-            "field_endpoint_isPublic": "Accès public",
-            "field_endpoint_isPublic_hint": "Si coché, ce point d'accès sera accessible sans authentification. Le script s'exécutera avec les droits du propriétaire du point d'accès.",
 
             "packs.manualInstall": "Importer",
             "packs.manualInstall.title": "Installation manuelle de pack",
@@ -606,6 +605,7 @@ export const websiteTranslations = {
     },
     en: {
         translation: {
+            "field.geolocation": "Geolocation",
             "time.minute":"Minute",
             "time.hour":"Hour",
             "time.day":"Day",
@@ -2084,6 +2084,7 @@ export const websiteTranslations = {
     },
     es: {
         translation: {
+            "field.geolocation": "Geolocalización",
             "time.minute": "Minuto",
             "time.hour": "Hora",
             "time.day": "Día",
@@ -3564,6 +3565,7 @@ export const websiteTranslations = {
     },
     pt: {
         translation: {
+            "field.geolocation": "Geolocalização",
             "time.minute":"Minuto",
             "time.hour":"Hora",
             "time.day":"Dia",
@@ -5039,6 +5041,7 @@ export const websiteTranslations = {
     },
     de: {
         translation: {
+            "field.geolocation": "Geolokalisierung",
             "time.minute":"Minute",
             "time.hour":"Stunde",
             "time.day":"Tag",
@@ -6499,6 +6502,7 @@ export const websiteTranslations = {
     },
     it: {
         translation: {
+            "field.geolocation": "Geolocalizzazione",
             "time.minute":"Minuto",
             "time.hour":"Ora",
             "time.day":"Giorno",
@@ -7972,6 +7976,7 @@ export const websiteTranslations = {
     },
     cs: {
         translation: {
+            "field.geolocation": "Geolokace",
             "time.minute":"Minuta",
             "time.hour":"Hodina",
             "time.day":"Den",
@@ -9439,6 +9444,7 @@ export const websiteTranslations = {
     },
     ru: {
         translation: {
+            "field.geolocation": "Геолокация",
             "time.minute":"Минута",
             "time.hour":"Час",
             "time.day":"День",
@@ -10918,6 +10924,7 @@ export const websiteTranslations = {
     },
     ar: {
         translation: {
+            "field.geolocation": "تحديد الموقع الجغرافي",
             "الدقيقة الزمنية": "الدقيقة", "الساعة الزمنية": "الساعة", "اليوم الزمني": "اليوم", "الأسبوع الزمني": "الأسبوع", "الشهر الزمني": "الشهر", "السنة الزمنية": "السنة",
             "packs.myPack": "حزمتي",
             "packs.public": "عامة",
@@ -12407,6 +12414,7 @@ export const websiteTranslations = {
     },
     sv: {
         translation: {
+            "field.geolocation": "Geolocation",
             "time.minute":"Minut",
             "time.hour":"Timme",
             "time.day":"Dag",
@@ -13874,6 +13882,7 @@ export const websiteTranslations = {
     },
     el: {
         translation: {
+            "field.geolocation": "Γεωγραφική τοποθεσία",
             "time.minute":"Λεπτό",
             "time.hour":"Ώρα",
             "time.day":"Ημέρα",
@@ -15350,6 +15359,7 @@ export const websiteTranslations = {
     },
     fa: {
         "translation": {
+            "field.geolocation": "موقعیت جغرافیایی",
             "time.minute":"دقیقه",
             "time.hour":"ساعت",
             "time.day":"روز",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-primals-engine",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "data-primals-engine is a package responsible from handling large amount of data using MongoDB in a practical and performant way. It can also get workflow models working (for automation), and fully supports internationalisation. It also has integrated AI assistant.",
   "main": "src/engine.js",
   "type": "module",