@firecms/core 3.3.0-canary.040c21c → 3.3.0-canary.1e1cce9

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/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.",
@@ -437,8 +437,8 @@ export const de: FireCMSTranslations = {
     cms_users: "CMS-Benutzer",
     roles_menu: "Rollen",
     project_settings: "Projekteinstellungen",
-    firestore_explorer: "Firestore-Explorer",
-    explore_your_firestore_data: "Deine Firestore-Daten durchsuchen",
+    firestore_manager: "Firestore-Manager",
+    manage_your_firestore_data: "Deine Firestore-Daten verwalten",
 
     // ─── FireCMS Cloud Login ──────────────────────────────────────
     build_admin_panel_in_minutes: "Erstellen Sie Ihr Firebase Admin Panel in wenigen Minuten",
@@ -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.",
@@ -445,8 +445,8 @@ export const en: FireCMSTranslations = {
     cms_users: "CMS Users",
     roles_menu: "Roles",
     project_settings: "Project settings",
-    firestore_explorer: "Firestore Explorer",
-    explore_your_firestore_data: "Explore your Firestore data",
+    firestore_manager: "Firestore Manager",
+    manage_your_firestore_data: "Manage your Firestore data",
 
     // ─── FireCMS Cloud Login ──────────────────────────────────────
     build_admin_panel_in_minutes: "Build Your Firebase Admin Panel in Minutes",
@@ -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.",
@@ -445,8 +445,8 @@ export const es: FireCMSTranslations = {
     cms_users: "Usuarios del CMS",
     roles_menu: "Roles",
     project_settings: "Ajustes del proyecto",
-    firestore_explorer: "Explorador de Firestore",
-    explore_your_firestore_data: "Explora tus datos de Firestore",
+    firestore_manager: "Gestor de Firestore",
+    manage_your_firestore_data: "Gestiona tus datos de Firestore",
 
     // ─── FireCMS Cloud Login ──────────────────────────────────────
     build_admin_panel_in_minutes: "Crea tu panel de administración de Firebase en minutos",
@@ -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.",
@@ -437,8 +437,8 @@ export const fr: FireCMSTranslations = {
     cms_users: "Utilisateurs du CMS",
     roles_menu: "Rôles",
     project_settings: "Paramètres du projet",
-    firestore_explorer: "Explorateur Firestore",
-    explore_your_firestore_data: "Explorez vos données Firestore",
+    firestore_manager: "Gestionnaire Firestore",
+    manage_your_firestore_data: "Gérez vos données Firestore",
 
     // ─── FireCMS Cloud Login ──────────────────────────────────────
     build_admin_panel_in_minutes: "Créez votre panneau d'administration Firebase en quelques minutes",
@@ -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 इंडेक्स आवश्यक है।",
@@ -437,8 +437,8 @@ export const hi: FireCMSTranslations = {
     cms_users: "CMS उपयोगकर्ता",
     roles_menu: "भूमिकाएँ",
     project_settings: "परियोजना सेटिंग",
-    firestore_explorer: "Firestore एक्सप्लोरर",
-    explore_your_firestore_data: "अपने Firestore डेटा का अन्वेषण करें",
+    firestore_manager: "Firestore मैनेजर",
+    manage_your_firestore_data: "अपने Firestore डेटा का प्रबंधन करें",
 
     // ─── FireCMS Cloud Login ──────────────────────────────────────
     build_admin_panel_in_minutes: "मिनटों में अपना Firebase एडमिन पैनल बनाएं",
@@ -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.",
@@ -437,8 +437,8 @@ export const it: FireCMSTranslations = {
     cms_users: "Utenti CMS",
     roles_menu: "Ruoli",
     project_settings: "Impostazioni del progetto",
-    firestore_explorer: "Esplora Firestore",
-    explore_your_firestore_data: "Esplora i tuoi dati Firestore",
+    firestore_manager: "Gestore Firestore",
+    manage_your_firestore_data: "Gestisci i tuoi dati Firestore",
 
     // ─── FireCMS Cloud Login ──────────────────────────────────────
     build_admin_panel_in_minutes: "Crea il tuo pannello di amministrazione Firebase in pochi minuti",
@@ -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",

package/src/locales/pt.ts

@@ -151,8 +151,8 @@ export const pt: FireCMSTranslations = {
     // ─── Error states ─────────────────────────────────────────────
     error: "Erro",
     error_uploading_file: "Erro ao carregar ficheiro",
-    error_deleting: "Erro ao eliminar",
-    error_before_delete: "Erro antes de eliminar",
+    error_deleting: "Erro ao eliminar: {{message}}",
+    error_before_delete: "Erro antes de eliminar: {{message}}",
     error_updating_asset: "Erro ao atualizar recurso",
     error_deleting_asset: "Erro ao eliminar recurso",
     error_firestore_index: "É necessário um índice Firestore para esta consulta.",
@@ -442,8 +442,8 @@ export const pt: FireCMSTranslations = {
     cms_users: "Utilizadores do CMS",
     roles_menu: "Funções",
     project_settings: "Definições do projeto",
-    firestore_explorer: "Explorador do Firestore",
-    explore_your_firestore_data: "Explore os seus dados do Firestore",
+    firestore_manager: "Gerenciador do Firestore",
+    manage_your_firestore_data: "Gerencie os seus dados do Firestore",
 
     // ─── FireCMS Cloud Login ──────────────────────────────────────
     build_admin_panel_in_minutes: "Construa o Seu Painel de Administração Firebase em Minutos",
@@ -519,10 +519,18 @@ export const pt: FireCMSTranslations = {
     auto_setup_collections_button: "Configurar coleções automaticamente",
     auto_setup_collections_title: "Configurar coleções automaticamente?",
     auto_setup_collections_desc: "Isto criará automaticamente configurações de coleção para coleções que <b>NÃO</b> estão já mapeadas",
-    this_can_take_a_minute: "Isto pode demorar um ou dois minutos",
+    setting_up_collections: "Configurando coleções",
+    setting_up_collection: "Configurando {{name}}",
     no_collections_found_to_setup: "Nenhuma coleção encontrada para configurar.",
     collections_have_been_setup: "As coleções foram configuradas automaticamente.",
     error_setting_up_collections: "Erro ao configurar coleções automaticamente",
+    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: "Adicione as suas",

package/src/types/collections.ts

@@ -261,6 +261,22 @@ export interface EntityCollection<M extends Record<string, any> = any, USER exte
      */
     initialFilter?: FilterValues<Extract<keyof M, string>>; // setting FilterValues<M> can break defining collections by code
 
+    /**
+     * Array of property keys that are allowed for filtering. Allowed filters will be displayed in the collection view, table row headers 
+     * and will be used to filter data.
+     * 
+     * If not specified, all properties that are filterable will be allowed.
+     * 
+     * If you specify this prop, the filters will be displayed in the collection view if they are filterable.
+     * 
+     * If you set it as an empty array, no filters will be displayed.
+     * 
+     * e.g. `allowedFilters: ["name", "category"]`
+     * 
+     * e.g. `allowedFilters: []`
+     */
+    allowedFilters?: (keyof M)[];
+
     /**
      * Default sort applied to this collection.
      * When setting this prop, entities will have a default order
@@ -725,6 +741,8 @@ export type EntityTableController<M extends Record<string, any> = any> = {
     dataLoadingError?: Error;
     filterValues?: FilterValues<Extract<keyof M, string>>;
     setFilterValues?: (filterValues: FilterValues<Extract<keyof M, string>>) => void;
+    allowedFilters?: (keyof M)[];
+    forcedFilters?: (keyof M)[];
     sortBy?: [Extract<keyof M, string>, "asc" | "desc"];
     setSortBy?: (sortBy?: [Extract<keyof M, string>, "asc" | "desc"]) => void;
     searchString?: string;

package/src/types/translations.ts

@@ -467,8 +467,8 @@ export interface FireCMSTranslations {
     cms_users: string;
     roles_menu: string;
     project_settings: string;
-    firestore_explorer: string;
-    explore_your_firestore_data: string;
+    firestore_manager: string;
+    manage_your_firestore_data: string;
 
     // ─── FireCMS Cloud Login ──────────────────────────────────────
     build_admin_panel_in_minutes: string;
@@ -544,10 +544,18 @@ export interface FireCMSTranslations {
     auto_setup_collections_button: string;
     auto_setup_collections_title: string;
     auto_setup_collections_desc: string;
-    this_can_take_a_minute: string;
+    setting_up_collections: string;
+    setting_up_collection: string;
     no_collections_found_to_setup: string;
     collections_have_been_setup: string;
     error_setting_up_collections: string;
+    setup_collections_title: string;
+    setup_collections_select_desc: string;
+    select_all: string;
+    deselect_all: string;
+    setup_collections_confirm: string;
+    collection_setup_success: string;
+    go_to_collection: string;
     
     // --- Home Suggestions ---
     add_your: string;

package/src/util/entities.ts

@@ -137,6 +137,9 @@ export function sanitizeData<M extends Record<string, any>>
 }
 
 export function getReferenceFrom<M extends Record<string, any>>(entity: Entity<M>): EntityReference {
+    if (!entity) {
+        throw new Error("getReferenceFrom: entity is null or undefined");
+    }
     return new EntityReference(entity.id, entity.path, entity.databaseId);
 }
 
@@ -196,3 +199,11 @@ export function traverseValueProperty(inputValue: any,
 
     return value;
 }
+
+export function isDataTypeFilterable(dataType: DataType, isPartOfArray = false) {
+    if (isPartOfArray) {
+        return ["string", "number", "date", "reference"].includes(dataType);
+    }
+    
+    return ["string", "number", "boolean", "date", "reference", "array"].includes(dataType);
+}

package/src/util/resolutions.ts

@@ -90,8 +90,11 @@ export const resolveCollection = <M extends Record<string, any>,>
         .map(([id, property]) => ({ [id]: property }))
         .reduce((a, b) => ({ ...a, ...b }), {});
 
+    const { properties: overrideProps, ...restOverrides } = collectionOverride ?? {};
+
     return {
         ...collection,
+        ...restOverrides,
         properties: cleanedProperties,
         originalCollection: collection
     } as ResolvedEntityCollection<M>;