@firecms/core 3.3.0-canary.3ea2cd2 → 3.3.0-canary.42ba35b

package/src/form/field_bindings/GeopointFieldBinding.tsx

@@ -0,0 +1,139 @@
+import React, { useEffect, useRef, useState } from "react";
+
+import { CloseIcon, IconButton, TextField } from "@firecms/ui";
+import { FieldProps, GeoPoint } from "../../types";
+import { FieldHelperText, LabelWithIcon } from "../components";
+import { PropertyIdCopyTooltip } from "../../components";
+import { useClearRestoreValue } from "../useClearRestoreValue";
+import { getIconForProperty } from "../../util";
+import { formatGeoPoint, getGeoPointCoordinates, parseGeoPoint } from "../../util/geopoint";
+
+type GeopointFieldBindingProps = FieldProps<GeoPoint>;
+
+export function GeopointFieldBinding({
+                                          propertyKey,
+                                          value,
+                                          setValue,
+                                          error,
+                                          showError,
+                                          disabled,
+                                          autoFocus,
+                                          property,
+                                          includeDescription,
+                                          size = "large"
+                                      }: GeopointFieldBindingProps) {
+
+    const coordinates = getGeoPointCoordinates(value);
+    const canClear = Boolean((property as any).clearable);
+    const [latitude, setLatitude] = useState<string>(coordinates ? coordinates.latitude.toString() : "");
+    const [longitude, setLongitude] = useState<string>(coordinates ? coordinates.longitude.toString() : "");
+    const [localError, setLocalError] = useState<string | undefined>();
+    const skipSyncRef = useRef(false);
+
+    useClearRestoreValue({
+        property,
+        value,
+        setValue
+    });
+
+    useEffect(() => {
+        if (skipSyncRef.current) {
+            skipSyncRef.current = false;
+            return;
+        }
+        const nextCoordinates = getGeoPointCoordinates(value);
+        setLatitude(nextCoordinates ? nextCoordinates.latitude.toString() : "");
+        setLongitude(nextCoordinates ? nextCoordinates.longitude.toString() : "");
+    }, [value]);
+
+    const updateGeoPoint = (nextLatitude: string, nextLongitude: string) => {
+        skipSyncRef.current = true;
+        setLatitude(nextLatitude);
+        setLongitude(nextLongitude);
+
+        const trimmedLatitude = nextLatitude.trim();
+        const trimmedLongitude = nextLongitude.trim();
+
+        if (!trimmedLatitude && !trimmedLongitude) {
+            setLocalError(undefined);
+            setValue(null);
+            return;
+        }
+
+        const parsed = parseGeoPoint(`${trimmedLatitude}, ${trimmedLongitude}`);
+
+        if (parsed.error) {
+            setLocalError(parsed.error);
+            setValue(null);
+            return;
+        }
+
+        setLocalError(undefined);
+        setValue(parsed.point);
+    };
+
+    const handleClear = (event?: React.MouseEvent) => {
+        if (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        }
+        updateGeoPoint("", "");
+    };
+
+    const resolvedError = localError ?? error;
+    const shouldShowError = Boolean(resolvedError) || Boolean(showError && error);
+
+    return (
+        <>
+            <PropertyIdCopyTooltip propertyKey={propertyKey}>
+                <div className="flex flex-col gap-2">
+                    <div className="mt-1">
+                        <LabelWithIcon
+                            icon={getIconForProperty(property, "small")}
+                            required={property.validation?.required}
+                            title={property.name}
+                            className={shouldShowError ? "text-red-500 dark:text-red-500" : "text-text-secondary dark:text-text-secondary-dark"}
+                        />
+                    </div>
+                    <div className="grid grid-cols-1 gap-2 md:grid-cols-2">
+                        <TextField
+                            size={size}
+                            value={latitude}
+                            onChange={(event) => updateGeoPoint(event.target.value, longitude)}
+                            autoFocus={autoFocus}
+                            label={"Latitude"}
+                            type="number"
+                            disabled={disabled}
+                            endAdornment={canClear ? (
+                                <IconButton onClick={handleClear}>
+                                    <CloseIcon />
+                                </IconButton>
+                            ) : undefined}
+                            error={shouldShowError && Boolean(resolvedError)}
+                        />
+                        <TextField
+                            size={size}
+                            value={longitude}
+                            onChange={(event) => updateGeoPoint(latitude, event.target.value)}
+                            label={"Longitude"}
+                            type="number"
+                            disabled={disabled}
+                            error={shouldShowError && Boolean(resolvedError)}
+                        />
+                    </div>
+                    {value && !resolvedError && (
+                        <div className="text-xs text-text-secondary dark:text-text-secondary-dark font-mono">
+                            {formatGeoPoint(value)}
+                        </div>
+                    )}
+                </div>
+            </PropertyIdCopyTooltip>
+
+            <FieldHelperText includeDescription={includeDescription}
+                             showError={shouldShowError}
+                             error={resolvedError}
+                             disabled={disabled}
+                             property={property}/>
+        </>
+    );
+}

package/src/form/index.tsx

@@ -11,6 +11,7 @@ export { StorageUploadFieldBinding } from "./field_bindings/StorageUploadFieldBi
 export { TextFieldBinding } from "./field_bindings/TextFieldBinding";
 export { SwitchFieldBinding } from "./field_bindings/SwitchFieldBinding";
 export { DateTimeFieldBinding } from "./field_bindings/DateTimeFieldBinding";
+export { GeopointFieldBinding } from "./field_bindings/GeopointFieldBinding";
 export { ReferenceFieldBinding } from "./field_bindings/ReferenceFieldBinding";
 export { ReferenceAsStringFieldBinding } from "./field_bindings/ReferenceAsStringFieldBinding";
 export { MapFieldBinding } from "./field_bindings/MapFieldBinding";

package/src/hooks/useBuildNavigationController.tsx

@@ -414,7 +414,11 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
         const baseCollection = getCollectionByPathOrId(removeInitialAndTrailingSlashes(idOrPath), collections);
 
         const userOverride = includeUserOverride ? userConfigPersistence?.getCollectionConfig(idOrPath) : undefined;
-        const overriddenCollection = baseCollection ? mergeDeep(baseCollection, userOverride ?? {}) : undefined;
+        let overriddenCollection = baseCollection;
+        if (baseCollection && userOverride) {
+            const { properties, ...rest } = userOverride;
+            overriddenCollection = mergeDeep(baseCollection, rest);
+        }
 
         let result: Partial<EntityCollection> | undefined = overriddenCollection;
 

package/src/i18n/FireCMSi18nProvider.tsx

@@ -8,6 +8,7 @@ import { fr } from "../locales/fr";
 import { it } from "../locales/it";
 import { hi } from "../locales/hi";
 import { pt } from "../locales/pt";
+import { pl } from "../locales/pl";
 import { FireCMSTranslations } from "../types/translations";
 
 const FIRECMS_NS = "firecms_core";
@@ -139,6 +140,7 @@ function buildResources(
         it: { [FIRECMS_NS]: { ...it } },
         hi: { [FIRECMS_NS]: { ...hi } },
         pt: { [FIRECMS_NS]: { ...pt } },
+        pl: { [FIRECMS_NS]: { ...pl } },
     };
 
     if (!translations) return resources;

package/src/internal/useBuildSideEntityController.tsx

@@ -13,6 +13,7 @@ import {
 import { getNavigationEntriesFromPath, NavigationViewInternal } from "../util/navigation_from_path";
 import { useLocation } from "react-router-dom";
 import {
+    encodeEntityId,
     removeInitialAndTrailingSlashes,
     resolveCollection,
     resolveDefaultSelectedView,
@@ -277,7 +278,7 @@ const propsToSidePanel = (props: EntitySidePanelProps,
     const collectionPath = removeInitialAndTrailingSlashes(props.path);
 
     const urlPath = props.entityId
-        ? buildUrlCollectionPath(`${collectionPath}/${props.entityId}${props.selectedTab ? "/" + props.selectedTab : ""}${locationSearch}#${SIDE_URL_HASH}`)
+        ? buildUrlCollectionPath(`${collectionPath}/${encodeEntityId(props.entityId)}${props.selectedTab ? "/" + props.selectedTab : ""}${locationSearch}#${SIDE_URL_HASH}`)
         : buildUrlCollectionPath(`${collectionPath}${locationSearch}#${NEW_URL_HASH}`);
 
     const resolvedPanelProps: EntitySidePanelProps<any> = {

package/src/locales/de.ts

@@ -146,8 +146,8 @@ export const de: FireCMSTranslations = {
     // ─── Error states ─────────────────────────────────────────────
     error: "Fehler",
     error_uploading_file: "Fehler beim Hochladen der Datei",
-    error_deleting: "Fehler beim Löschen",
-    error_before_delete: "Fehler vor dem Löschen",
+    error_deleting: "Fehler beim Löschen: {{message}}",
+    error_before_delete: "Fehler vor dem Löschen: {{message}}",
     error_updating_asset: "Fehler beim Aktualisieren des Assets",
     error_deleting_asset: "Fehler beim Löschen des Assets",
     error_firestore_index: "Für diese Abfrage ist ein Firestore-Index erforderlich.",
@@ -514,10 +514,18 @@ export const de: FireCMSTranslations = {
     auto_setup_collections_button: "Sammlungen automatisch einrichten",
     auto_setup_collections_title: "Sammlungen automatisch einrichten?",
     auto_setup_collections_desc: "Dadurch werden automatisch Sammlungskonfigurationen für Sammlungen erstellt, die noch <b>NICHT</b> zugeordnet sind.",
-    this_can_take_a_minute: "Dies kann ein bis zwei Minuten dauern",
+    setting_up_collections: "Sammlungen werden eingerichtet",
+    setting_up_collection: "{{name}} wird eingerichtet",
     no_collections_found_to_setup: "Keine einzurichtenden Sammlungen gefunden",
     collections_have_been_setup: "Sammlungen wurden automatisch eingerichtet",
     error_setting_up_collections: "Fehler beim automatischen Einrichten der Sammlungen",
+    setup_collections_title: "Set up collections",
+    setup_collections_select_desc: "Select which collections to automatically set up:",
+    select_all: "Select all",
+    deselect_all: "Deselect all",
+    setup_collections_confirm: "Set up ({{count}})",
+    collection_setup_success: "{{name}} has been set up",
+    go_to_collection: "Go to collection",
     add_your: "Fügen Sie Ihre",
     database_collections: "Datenbanksammlungen",
     to_firecms: "zu FireCMS hinzu",

package/src/locales/en.ts

@@ -154,8 +154,8 @@ export const en: FireCMSTranslations = {
     // ─── Error states ─────────────────────────────────────────────
     error: "Error",
     error_uploading_file: "Error uploading file",
-    error_deleting: "Error deleting",
-    error_before_delete: "Error before delete",
+    error_deleting: "Error deleting: {{message}}",
+    error_before_delete: "Error before delete: {{message}}",
     error_updating_asset: "Error updating asset",
     error_deleting_asset: "Error deleting asset",
     error_firestore_index: "A Firestore index is required for this query.",
@@ -522,10 +522,18 @@ export const en: FireCMSTranslations = {
     auto_setup_collections_button: "Automatically set up collections",
     auto_setup_collections_title: "Automatically set up collections?",
     auto_setup_collections_desc: "This will automatically create collection configs for collections that are <b>NOT</b> already mapped",
-    this_can_take_a_minute: "This can take a minute or two",
+    setting_up_collections: "Setting up collections",
+    setting_up_collection: "Setting up {{name}}",
     no_collections_found_to_setup: "No collections found to setup.",
     collections_have_been_setup: "Collections have been automatically setup.",
     error_setting_up_collections: "Error automatically setting up collections",
+    setup_collections_title: "Set up collections",
+    setup_collections_select_desc: "Select which collections to automatically set up:",
+    select_all: "Select all",
+    deselect_all: "Deselect all",
+    setup_collections_confirm: "Set up ({{count}})",
+    collection_setup_success: "{{name}} has been set up",
+    go_to_collection: "Go to collection",
 
     // --- Home Suggestions ---
     add_your: "Add your",

package/src/locales/es.ts

@@ -152,8 +152,8 @@ export const es: FireCMSTranslations = {
     // ─── Error states ─────────────────────────────────────────────
     error: "Error",
     error_uploading_file: "Error al subir archivo",
-    error_deleting: "Error al eliminar",
-    error_before_delete: "Error antes de eliminar",
+    error_deleting: "Error al eliminar: {{message}}",
+    error_before_delete: "Error antes de eliminar: {{message}}",
     error_updating_asset: "Error al actualizar recurso",
     error_deleting_asset: "Error al eliminar recurso",
     error_firestore_index: "Se requiere un índice de Firestore para esta consulta.",
@@ -522,10 +522,18 @@ export const es: FireCMSTranslations = {
     auto_setup_collections_button: "Configurar colecciones automáticamente",
     auto_setup_collections_title: "¿Configurar colecciones automáticamente?",
     auto_setup_collections_desc: "Esto creará automáticamente la configuración de las colecciones que <b>NO</b> estén mapeadas",
-    this_can_take_a_minute: "Esto puede tardar un minuto o dos",
+    setting_up_collections: "Configurando colecciones",
+    setting_up_collection: "Configurando {{name}}",
     no_collections_found_to_setup: "No se encontraron colecciones para configurar",
     collections_have_been_setup: "¡Tus colecciones han sido configuradas!",
     error_setting_up_collections: "Error al configurar colecciones",
+    setup_collections_title: "Set up collections",
+    setup_collections_select_desc: "Select which collections to automatically set up:",
+    select_all: "Select all",
+    deselect_all: "Deselect all",
+    setup_collections_confirm: "Set up ({{count}})",
+    collection_setup_success: "{{name}} has been set up",
+    go_to_collection: "Go to collection",
 
     // --- Home Suggestions ---
     add_your: "Añade tus",

package/src/locales/fr.ts

@@ -146,8 +146,8 @@ export const fr: FireCMSTranslations = {
     // ─── Error states ─────────────────────────────────────────────
     error: "Erreur",
     error_uploading_file: "Erreur lors du téléchargement du fichier",
-    error_deleting: "Erreur lors de la suppression",
-    error_before_delete: "Erreur avant la suppression",
+    error_deleting: "Erreur lors de la suppression: {{message}}",
+    error_before_delete: "Erreur avant la suppression: {{message}}",
     error_updating_asset: "Erreur lors de la mise à jour de l'actif",
     error_deleting_asset: "Erreur lors de la suppression de l'actif",
     error_firestore_index: "Un index Firestore est requis pour cette requête.",
@@ -514,10 +514,18 @@ export const fr: FireCMSTranslations = {
     auto_setup_collections_button: "Configurer les collections automatiquement",
     auto_setup_collections_title: "Configurer les collections automatiquement ?",
     auto_setup_collections_desc: "Cela créera automatiquement des configurations de collection pour les collections qui ne sont <b>PAS</b> déjà mappées",
-    this_can_take_a_minute: "Cela peut prendre une minute",
+    setting_up_collections: "Configuration des collections",
+    setting_up_collection: "Configuration de {{name}}",
     no_collections_found_to_setup: "Aucune collection à configurer trouvée",
     collections_have_been_setup: "Les collections ont été configurées",
     error_setting_up_collections: "Erreur lors de la configuration des collections",
+    setup_collections_title: "Set up collections",
+    setup_collections_select_desc: "Select which collections to automatically set up:",
+    select_all: "Select all",
+    deselect_all: "Deselect all",
+    setup_collections_confirm: "Set up ({{count}})",
+    collection_setup_success: "{{name}} has been set up",
+    go_to_collection: "Go to collection",
     add_your: "Ajoutez vos",
     database_collections: "collections de base de données",
     to_firecms: "à FireCMS",

package/src/locales/hi.ts

@@ -146,8 +146,8 @@ export const hi: FireCMSTranslations = {
     // ─── Error states ─────────────────────────────────────────────
     error: "त्रुटि",
     error_uploading_file: "फ़ाइल अपलोड करने में त्रुटि",
-    error_deleting: "हटाने में त्रुटि",
-    error_before_delete: "हटाने से पहले त्रुटि",
+    error_deleting: "हटाने में त्रुटि: {{message}}",
+    error_before_delete: "हटाने से पहले त्रुटि: {{message}}",
     error_updating_asset: "एसेट अपडेट करने में त्रुटि",
     error_deleting_asset: "एसेट हटाने में त्रुटि",
     error_firestore_index: "इस क्वेरी के लिए Firestore इंडेक्स आवश्यक है।",
@@ -514,10 +514,18 @@ export const hi: FireCMSTranslations = {
     auto_setup_collections_button: "संग्रहों को स्वचालित रूप से सेट करें",
     auto_setup_collections_title: "संग्रहों की स्वचालित सेटअप",
     auto_setup_collections_desc: "अपने मौजूदा Firestore डेटा के आधार पर संग्रहों को स्वचालित रूप से सेट करें। FireCMS को आपके लिए परफेक्ट CMS कॉन्फ़िगर करने दें।",
-    this_can_take_a_minute: "इसमें एक मिनट लग सकता है",
+    setting_up_collections: "संग्रह सेट किए जा रहे हैं",
+    setting_up_collection: "{{name}} सेट किया जा रहा है",
     no_collections_found_to_setup: "सेट करने के लिए कोई संग्रह नहीं मिला",
     collections_have_been_setup: "संग्रहों को सेट कर दिया गया है",
     error_setting_up_collections: "संग्रह सेट करने में त्रुटि",
+    setup_collections_title: "Set up collections",
+    setup_collections_select_desc: "Select which collections to automatically set up:",
+    select_all: "Select all",
+    deselect_all: "Deselect all",
+    setup_collections_confirm: "Set up ({{count}})",
+    collection_setup_success: "{{name}} has been set up",
+    go_to_collection: "Go to collection",
     add_your: "अपने",
     database_collections: "डेटाबेस संग्रह",
     to_firecms: "को FireCMS में जोड़ें",

package/src/locales/it.ts

@@ -146,8 +146,8 @@ export const it: FireCMSTranslations = {
     // ─── Error states ─────────────────────────────────────────────
     error: "Errore",
     error_uploading_file: "Errore durante il caricamento del file",
-    error_deleting: "Errore durante l'eliminazione",
-    error_before_delete: "Errore prima dell'eliminazione",
+    error_deleting: "Errore durante l'eliminazione: {{message}}",
+    error_before_delete: "Errore prima dell'eliminazione: {{message}}",
     error_updating_asset: "Errore durante l'aggiornamento dell'asset",
     error_deleting_asset: "Errore durante l'eliminazione dell'asset",
     error_firestore_index: "Per questa query è richiesto un indice Firestore.",
@@ -514,10 +514,18 @@ export const it: FireCMSTranslations = {
     auto_setup_collections_button: "Configura le collezioni automaticamente",
     auto_setup_collections_title: "Configurazione automatica delle collezioni",
     auto_setup_collections_desc: "Configura le collezioni automaticamente in base ai dati Firestore esistenti. Lascia che FireCMS configuri il CMS perfetto per te.",
-    this_can_take_a_minute: "Potrebbe richiedere qualche minuto",
+    setting_up_collections: "Configurazione delle collezioni",
+    setting_up_collection: "Configurazione di {{name}}",
     no_collections_found_to_setup: "Nessuna collezione trovata da configurare",
     collections_have_been_setup: "Le collezioni sono state configurate",
     error_setting_up_collections: "Errore durante la configurazione delle collezioni",
+    setup_collections_title: "Set up collections",
+    setup_collections_select_desc: "Select which collections to automatically set up:",
+    select_all: "Select all",
+    deselect_all: "Deselect all",
+    setup_collections_confirm: "Set up ({{count}})",
+    collection_setup_success: "{{name}} has been set up",
+    go_to_collection: "Go to collection",
     add_your: "Aggiungi le tue",
     database_collections: "collezioni del database",
     to_firecms: "a FireCMS",