@firecms/core 3.3.0-canary.ae3fdc5 → 3.3.0

package/dist/types/translations.d.ts

@@ -481,10 +481,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;
     add_your: string;
     database_collections: string;
     to_firecms: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.3.0-canary.ae3fdc5",
+  "version": "3.3.0",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -53,8 +53,8 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
-    "@firecms/formex": "^3.3.0-canary.ae3fdc5",
-    "@firecms/ui": "^3.3.0-canary.ae3fdc5",
+    "@firecms/formex": "^3.3.0",
+    "@firecms/ui": "^3.3.0",
     "@floating-ui/dom": "^1.7.4",
     "@radix-ui/react-portal": "^1.1.10",
     "@radix-ui/react-slot": "^1.2.4",

package/src/app/Scaffold.tsx

@@ -70,7 +70,13 @@ export const Scaffold = React.memo<PropsWithChildren<ScaffoldProps>>(
         const includeDrawer = drawerChildren.length > 0;
         const largeLayout = useLargeLayout();
 
-        const [drawerOpen, setDrawerOpen] = React.useState(false);
+        const [drawerOpen, setDrawerOpen] = React.useState(() => {
+            try {
+                return localStorage.getItem("firecms_drawer_open") === "true";
+            } catch {
+                return false;
+            }
+        });
         const [onHover, setOnHover] = React.useState(false);
 
         const setOnHoverTrue = useCallback(() => setOnHover(true), []);
@@ -78,10 +84,16 @@ export const Scaffold = React.memo<PropsWithChildren<ScaffoldProps>>(
 
         const handleDrawerOpen = useCallback(() => {
             setDrawerOpen(true);
+            try {
+                localStorage.setItem("firecms_drawer_open", "true");
+            } catch { /* ignore */ }
         }, []);
 
         const handleDrawerClose = useCallback(() => {
             setDrawerOpen(false);
+            try {
+                localStorage.setItem("firecms_drawer_open", "false");
+            } catch { /* ignore */ }
         }, []);
 
         const computedDrawerOpen: boolean = drawerOpen || Boolean(largeLayout && autoOpenDrawer && onHover);

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -178,7 +178,9 @@ export const EntityCollectionView = React.memo(
 
         const collection = useMemo(() => {
             const userOverride = userConfigPersistence?.getCollectionConfig<M>(fullPath);
-            return (userOverride ? mergeDeep(collectionProp, userOverride) : collectionProp) as EntityCollection<M>;
+            if (!userOverride) return collectionProp;
+            const { properties, ...rest } = userOverride;
+            return mergeDeep(collectionProp, rest) as EntityCollection<M>;
         }, [collectionProp, fullPath, userConfigPersistence?.getCollectionConfig]);
 
         const openEntityMode = collection?.openEntityMode ?? DEFAULT_ENTITY_OPEN_MODE;
@@ -507,7 +509,8 @@ export const EntityCollectionView = React.memo(
             path: fullPath,
             propertyConfigs: customizationController.propertyConfigs,
             authController,
-        }), [collection, fullPath]);
+            userConfigPersistence,
+        }), [collection, fullPath, userConfigPersistence]);
 
         // Check if Kanban view is possible (collection has at least one string enum property)
         const hasEnumProperty = useMemo(() => {

package/src/components/HomePage/NavigationCardBinding.tsx

@@ -1,6 +1,6 @@
 import { useNavigate } from "react-router-dom";
 
-import { useCustomizationController, useFireCMSContext } from "../../hooks";
+import { useCustomizationController, useFireCMSContext, useTranslation } from "../../hooks";
 import { NavigationEntry, PluginHomePageActionsProps } from "../../types";
 import { IconForView } from "../../util";
 import { useUserConfigurationPersistence } from "../../hooks/useUserConfigurationPersistence";
@@ -38,6 +38,7 @@ export function NavigationCardBinding({
 }) {
 
     const userConfigurationPersistence = useUserConfigurationPersistence();
+    const { t } = useTranslation();
     const collectionIcon = <IconForView collectionOrView={collection ?? view}/>;
 
     const navigate = useNavigate();
@@ -92,15 +93,17 @@ export function NavigationCardBinding({
         {actionsArray}
     </>
 
+    const translatedName = t(name);
+
     if (type === "admin") {
         return <SmallNavigationCard icon={collectionIcon}
-                                    name={name}
+                                    name={translatedName}
                                     url={url}/>;
     }
 
     return <NavigationCard
         icon={collectionIcon}
-        name={name}
+        name={translatedName}
         description={description}
         actions={actions}
         onClick={() => {

package/src/core/DefaultDrawer.tsx

@@ -128,7 +128,7 @@ export function DefaultDrawer({
                             }}
                             key={entry.id}>
                             {<IconForView collectionOrView={entry.view} />}
-                            {t(entry.name as any)}
+                            {t(entry.name)}
                         </MenuItem>)}
 
                 </Menu>}

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/translations.ts

@@ -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/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>;