@firecms/core 3.3.0 → 3.4.0-canary.2575a08

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,
@@ -223,12 +224,14 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
     let sidePanel: EntitySidePanelProps<any> | undefined = undefined;
     let lastCollectionPath = "";
     let lastCollectionId: string | undefined = undefined;
+    let lastCollectionSegments: string[] | undefined = undefined;
     for (let i = 0; i < navigationViewsForPath.length; i++) {
         const navigationEntry = navigationViewsForPath[i];
 
         if (navigationEntry.type === "collection") {
             lastCollectionPath = navigationEntry.path;
             lastCollectionId = navigationEntry.collection.id;
+            lastCollectionSegments = navigationEntry.pathSegments;
         }
 
         const previousEntry = navigationViewsForPath[i - 1];
@@ -236,6 +239,7 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
             sidePanel = {
                 path: navigationEntry.path,
                 fullIdPath: navigationEntry.fullIdPath,
+                pathSegments: navigationEntry.pathSegments,
                 entityId: navigationEntry.entityId,
                 copy: false,
                 width: navigationEntry.parentCollection?.sideDialogWidth
@@ -258,6 +262,9 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
         sidePanel = {
             path: lastCollectionPath,
             fullIdPath: lastCollectionId,
+            // A new entity still needs unambiguous segments: it may be created inside a
+            // subcollection whose parent id contains "/".
+            pathSegments: lastCollectionSegments,
             copy: false
         }
     }
@@ -274,11 +281,17 @@ const propsToSidePanel = (props: EntitySidePanelProps,
     locationSearch: string
 ): SideDialogPanelProps => {
 
-    const collectionPath = removeInitialAndTrailingSlashes(props.path);
+    // The URL is the ESCAPED representation of the chain — it is what `buildSidePanelsFromUrl`
+    // and `FireCMSRoute` parse back on reload, on a deep link, and on every pathname change.
+    // `props.path` is the RAW datasource path, so a parent entity id containing "/" reads back
+    // there as extra collection/entity hops and resolves to a different entity entirely.
+    // `fullIdPath` carries the same chain with its ids already escaped, which is what it is
+    // threaded alongside `path` for.
+    const urlChain = removeInitialAndTrailingSlashes(props.fullIdPath ?? props.path);
 
     const urlPath = props.entityId
-        ? buildUrlCollectionPath(`${collectionPath}/${props.entityId}${props.selectedTab ? "/" + props.selectedTab : ""}${locationSearch}#${SIDE_URL_HASH}`)
-        : buildUrlCollectionPath(`${collectionPath}${locationSearch}#${NEW_URL_HASH}`);
+        ? buildUrlCollectionPath(`${urlChain}/${encodeEntityId(props.entityId)}${props.selectedTab ? "/" + props.selectedTab : ""}${locationSearch}#${SIDE_URL_HASH}`)
+        : buildUrlCollectionPath(`${urlChain}${locationSearch}#${NEW_URL_HASH}`);
 
     const resolvedPanelProps: EntitySidePanelProps<any> = {
         ...props,
@@ -287,10 +300,12 @@ const propsToSidePanel = (props: EntitySidePanelProps,
 
     const entityViewWidth = getEntityViewWidth(props, smallLayout, customizationController, authController);
     return {
-        key: `${props.path}/${props.entityId}`,
+        // Built from the escaped chain so that two different chains which happen to flatten
+        // to the same raw string are still two different panels.
+        key: `${urlChain}/${props.entityId ? encodeEntityId(props.entityId) : ""}`,
         component: undefined, // Lazy render in SideDialogs for better performance
         urlPath: urlPath,
-        parentUrlPath: buildUrlCollectionPath(collectionPath),
+        parentUrlPath: buildUrlCollectionPath(urlChain),
         width: entityViewWidth,
         onClose: props.onClose,
         additional: resolvedPanelProps

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.",
@@ -389,6 +389,7 @@ export const de: FireCMSTranslations = {
     download: "Herunterladen",
     large_number_of_documents: "Diese Sammlung hat eine große Anzahl von Dokumenten ({{count}}).",
     include_undefined_values: "Undefinierte Werte einschließen",
+    export_apply_filter_sort: "Nur Ergebnisse exportieren, die dem aktuellen Filter/der aktuellen Sortierung entsprechen",
     submit: "Einreichen",
 
     no_filterable_properties: "Keine filterbaren Eigenschaften verfügbar",
@@ -586,6 +587,10 @@ export const de: FireCMSTranslations = {
     order_property_not_found: "Eigenschaft \"{{property}}\" existiert nicht oder ist keine Zahlen-Eigenschaft. Bitte wählen Sie eine gültige Eigenschaft oder löschen Sie die Auswahl.",
     no_number_properties: "Keine Zahlen-Eigenschaften gefunden. Fügen Sie eine Zahlen-Eigenschaft hinzu, um die Sortierung zu aktivieren.",
     order_property_description: "Wählen Sie eine Zahlen-Eigenschaft, um die Reihenfolge der Elemente beizubehalten",
+    image_property: "Bild-Eigenschaft",
+    image_property_not_found: "Eigenschaft \"{{property}}\" existiert nicht oder ist keine Bild-Eigenschaft. Bitte wählen Sie eine gültige Eigenschaft oder löschen Sie die Auswahl.",
+    no_image_properties: "Keine Bild-Eigenschaften gefunden. Fügen Sie eine Speicher- oder Bild-URL-Eigenschaft hinzu, um sie als Vorschaubild zu verwenden.",
+    image_property_description: "Wählen Sie die Eigenschaft, die als Vorschaubild in den Ansichten Karten und Kanban verwendet wird. Wenn nicht festgelegt, wird automatisch die erste passende Bild-Eigenschaft verwendet.",
     display_settings: "Anzeigeeinstellungen",
     default_row_size: "Standard-Zeilengröße",
     side_dialog_width: "Seitendialog-Breite",

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.",
@@ -397,6 +397,7 @@ export const en: FireCMSTranslations = {
     download: "Download",
     large_number_of_documents: "This collections has a large number of documents ({{count}}).",
     include_undefined_values: "Include undefined values",
+    export_apply_filter_sort: "Only export results matching the current filter/sort",
     submit: "Submit",
 
     no_filterable_properties: "No filterable properties available",
@@ -598,6 +599,10 @@ export const en: FireCMSTranslations = {
     order_property_not_found: "Property \"{{property}}\" does not exist or is not a number property. Please select a valid property or clear the selection.",
     no_number_properties: "No number properties found. Add a number property to enable ordering.",
     order_property_description: "Select a number property to persist the order of items",
+    image_property: "Image Property",
+    image_property_not_found: "Property \"{{property}}\" does not exist or is not an image property. Please select a valid property or clear the selection.",
+    no_image_properties: "No image properties found. Add a storage or URL image property to use as a thumbnail.",
+    image_property_description: "Select the property used as the thumbnail image in Cards and Kanban view modes. If not set, the first matching image property will be used automatically.",
     display_settings: "Display settings",
     default_row_size: "Default row size",
     side_dialog_width: "Side dialog width",

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.",
@@ -397,6 +397,7 @@ export const es: FireCMSTranslations = {
     download: "Descargar",
     large_number_of_documents: "Esta colección posee un gran número de documentos ({{count}}).",
     include_undefined_values: "Incluir valores omitidos (undefined)",
+    export_apply_filter_sort: "Exportar solo los resultados que coinciden con el filtro/orden actual",
     submit: "Enviar",
 
     no_filterable_properties: "No hay propiedades filtrables disponibles",
@@ -598,6 +599,10 @@ export const es: FireCMSTranslations = {
     order_property_not_found: "La propiedad \"{{property}}\" no existe o no es una propiedad numérica. Selecciona una propiedad válida o borra la selección.",
     no_number_properties: "No se encontraron propiedades numéricas. Agrega una propiedad numérica para habilitar el ordenamiento.",
     order_property_description: "Selecciona una propiedad numérica para mantener el orden de los elementos",
+    image_property: "Propiedad de imagen",
+    image_property_not_found: "La propiedad \"{{property}}\" no existe o no es una propiedad de imagen. Selecciona una propiedad válida o borra la selección.",
+    no_image_properties: "No se encontraron propiedades de imagen. Agrega una propiedad de almacenamiento o URL de imagen para usarla como miniatura.",
+    image_property_description: "Selecciona la propiedad usada como miniatura en las vistas de Tarjetas y Kanban. Si no se establece, se usará automáticamente la primera propiedad de imagen que coincida.",
     display_settings: "Configuración de visualización",
     default_row_size: "Tamaño de fila predeterminado",
     side_dialog_width: "Ancho del diálogo lateral",

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.",
@@ -389,6 +389,7 @@ export const fr: FireCMSTranslations = {
     download: "Télécharger",
     large_number_of_documents: "Cette collection contient un grand nombre de documents ({{count}}).",
     include_undefined_values: "Inclure les valeurs non définies",
+    export_apply_filter_sort: "N'exporter que les résultats correspondant au filtre/tri actuel",
     submit: "Soumettre",
 
     no_filterable_properties: "Aucune propriété filtrable disponible",
@@ -586,6 +587,10 @@ export const fr: FireCMSTranslations = {
     order_property_not_found: "La propriété \"{{property}}\" n'existe pas ou n'est pas une propriété numérique. Veuillez sélectionner une propriété valide ou effacer la sélection.",
     no_number_properties: "Aucune propriété numérique trouvée. Ajoutez une propriété numérique pour activer le tri.",
     order_property_description: "Sélectionnez une propriété numérique pour conserver l'ordre des éléments",
+    image_property: "Propriété d'image",
+    image_property_not_found: "La propriété \"{{property}}\" n'existe pas ou n'est pas une propriété d'image. Veuillez sélectionner une propriété valide ou effacer la sélection.",
+    no_image_properties: "Aucune propriété d'image trouvée. Ajoutez une propriété de stockage ou d'URL d'image à utiliser comme miniature.",
+    image_property_description: "Sélectionnez la propriété utilisée comme miniature dans les vues Cartes et Kanban. Si elle n'est pas définie, la première propriété d'image correspondante sera utilisée automatiquement.",
     display_settings: "Paramètres d'affichage",
     default_row_size: "Taille de ligne par défaut",
     side_dialog_width: "Largeur du dialogue latéral",

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 इंडेक्स आवश्यक है।",
@@ -389,6 +389,7 @@ export const hi: FireCMSTranslations = {
     download: "डाउनलोड",
     large_number_of_documents: "इस संग्रह में बड़ी संख्या में दस्तावेज़ हैं ({{count}})।",
     include_undefined_values: "अपरिभाषित (undefined) मान शामिल करें",
+    export_apply_filter_sort: "केवल वर्तमान फ़िल्टर/सॉर्ट से मेल खाने वाले परिणाम निर्यात करें",
     submit: "सबमिट करें",
 
     no_filterable_properties: "कोई फ़िल्टर करने योग्य गुण उपलब्ध नहीं हैं",
@@ -586,6 +587,10 @@ export const hi: FireCMSTranslations = {
     order_property_not_found: "प्रॉपर्टी \"{{property}}\" मौजूद नहीं है या एक संख्या प्रॉपर्टी नहीं है। कृपया एक वैध प्रॉपर्टी चुनें या चयन साफ़ करें।",
     no_number_properties: "कोई संख्या प्रॉपर्टी नहीं मिली। क्रम सक्षम करने के लिए एक संख्या प्रॉपर्टी जोड़ें।",
     order_property_description: "आइटम का क्रम बनाए रखने के लिए एक संख्या प्रॉपर्टी चुनें",
+    image_property: "इमेज प्रॉपर्टी",
+    image_property_not_found: "प्रॉपर्टी \"{{property}}\" मौजूद नहीं है या एक इमेज प्रॉपर्टी नहीं है। कृपया एक वैध प्रॉपर्टी चुनें या चयन साफ़ करें।",
+    no_image_properties: "कोई इमेज प्रॉपर्टी नहीं मिली। थंबनेल के रूप में उपयोग करने के लिए एक स्टोरेज या URL इमेज प्रॉपर्टी जोड़ें।",
+    image_property_description: "कार्ड्स और कानबन व्यू मोड में थंबनेल इमेज के रूप में उपयोग की जाने वाली प्रॉपर्टी चुनें। यदि सेट नहीं किया गया है, तो पहली मिलान वाली इमेज प्रॉपर्टी स्वचालित रूप से उपयोग की जाएगी।",
     display_settings: "प्रदर्शन सेटिंग्स",
     default_row_size: "डिफ़ॉल्ट पंक्ति आकार",
     side_dialog_width: "साइड डायलॉग चौड़ाई",

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.",
@@ -389,6 +389,7 @@ export const it: FireCMSTranslations = {
     download: "Scarica",
     large_number_of_documents: "Questa collezione contiene un numero elevato di documenti ({{count}})",
     include_undefined_values: "Includi valori non definiti",
+    export_apply_filter_sort: "Esporta solo i risultati che corrispondono al filtro/ordinamento attuale",
     submit: "Invia",
 
     no_filterable_properties: "Nessuna proprietà filtrabile disponibile",
@@ -586,6 +587,10 @@ export const it: FireCMSTranslations = {
     order_property_not_found: "La proprietà \"{{property}}\" non esiste o non è una proprietà numerica. Seleziona una proprietà valida o cancella la selezione.",
     no_number_properties: "Nessuna proprietà numerica trovata. Aggiungi una proprietà numerica per abilitare l'ordinamento.",
     order_property_description: "Seleziona una proprietà numerica per mantenere l'ordine degli elementi",
+    image_property: "Proprietà immagine",
+    image_property_not_found: "La proprietà \"{{property}}\" non esiste o non è una proprietà immagine. Seleziona una proprietà valida o cancella la selezione.",
+    no_image_properties: "Nessuna proprietà immagine trovata. Aggiungi una proprietà di archiviazione o URL immagine da usare come miniatura.",
+    image_property_description: "Seleziona la proprietà utilizzata come miniatura nelle viste Schede e Kanban. Se non impostata, verrà utilizzata automaticamente la prima proprietà immagine corrispondente.",
     display_settings: "Impostazioni di visualizzazione",
     default_row_size: "Dimensione riga predefinita",
     side_dialog_width: "Larghezza del dialogo laterale",