@firecms/collection_editor 3.1.0-canary.1df3b2c → 3.1.0-canary.7d91b7c

package/dist/ui/collection_editor/AICollectionGeneratorPopover.d.ts

@@ -29,5 +29,9 @@ export interface AICollectionGeneratorPopoverProps {
      * Whether to show the label text
      */
     showLabel?: boolean;
+    /**
+     * Optional analytics callback
+     */
+    onAnalyticsEvent?: (event: string, params?: object) => void;
 }
-export declare function AICollectionGeneratorPopover({ existingCollection, onGenerated, generateCollection, trigger, size, showLabel }: AICollectionGeneratorPopoverProps): import("react/jsx-runtime").JSX.Element;
+export declare function AICollectionGeneratorPopover({ existingCollection, onGenerated, generateCollection, trigger, size, showLabel, onAnalyticsEvent }: AICollectionGeneratorPopoverProps): import("react/jsx-runtime").JSX.Element;

package/dist/ui/collection_editor/CollectionEditorDialog.d.ts

@@ -48,6 +48,10 @@ export interface CollectionEditorDialogProps {
      * The plugin is API-agnostic - the consumer provides the implementation.
      */
     generateCollection?: CollectionGenerationCallback;
+    /**
+     * Optional analytics callback
+     */
+    onAnalyticsEvent?: (event: string, params?: object) => void;
 }
 export declare function CollectionEditorDialog(props: CollectionEditorDialogProps): import("react/jsx-runtime").JSX.Element;
 export declare function CollectionEditor(props: CollectionEditorDialogProps & {

package/dist/ui/collection_editor/CollectionEditorWelcomeView.d.ts

@@ -1,12 +1,13 @@
 import React from "react";
 import { EntityCollection } from "@firecms/core";
 import { CollectionGenerationCallback } from "../../api/generateCollectionApi";
-export declare function CollectionEditorWelcomeView({ path, parentCollection, onContinue, existingCollectionPaths, generateCollection }: {
+export declare function CollectionEditorWelcomeView({ path, parentCollection, onContinue, existingCollectionPaths, generateCollection, onAnalyticsEvent }: {
     path: string;
     parentCollection?: EntityCollection;
     onContinue: (importData?: object[], propertiesOrder?: string[]) => void;
     existingCollectionPaths?: string[];
     generateCollection?: CollectionGenerationCallback;
+    onAnalyticsEvent?: (event: string, params?: object) => void;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function TemplateButton({ title, subtitle, icon, onClick }: {
     title: string;

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.1.0-canary.1df3b2c",
+  "version": "3.1.0-canary.7d91b7c",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "./dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/data_export": "^3.1.0-canary.1df3b2c",
-    "@firecms/data_import": "^3.1.0-canary.1df3b2c",
-    "@firecms/data_import_export": "^3.1.0-canary.1df3b2c",
-    "@firecms/formex": "^3.1.0-canary.1df3b2c",
-    "@firecms/schema_inference": "^3.1.0-canary.1df3b2c",
-    "@firecms/ui": "^3.1.0-canary.1df3b2c",
+    "@firecms/data_export": "^3.1.0-canary.7d91b7c",
+    "@firecms/data_import": "^3.1.0-canary.7d91b7c",
+    "@firecms/data_import_export": "^3.1.0-canary.7d91b7c",
+    "@firecms/formex": "^3.1.0-canary.7d91b7c",
+    "@firecms/schema_inference": "^3.1.0-canary.7d91b7c",
+    "@firecms/ui": "^3.1.0-canary.7d91b7c",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.4.1"
   },
   "peerDependencies": {
-    "react": ">=18.0.0",
-    "react-dom": ">=18.0.0",
+    "react": ">=18.3.1 || >=19.0.0",
+    "react-dom": ">=18.3.1 || >=19.0.0",
     "react-router": "^6.28.0",
     "react-router-dom": "^6.28.0"
   },
@@ -50,8 +50,8 @@
   },
   "devDependencies": {
     "@jest/globals": "^30.2.0",
-    "@types/react": "^18.3.24",
-    "@types/react-dom": "^18.3.7",
+    "@types/react": "^19.2.3",
+    "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^4.7.0",
     "babel-plugin-react-compiler": "^19.0.0-beta-af1b7da-20250417",
     "eslint-plugin-react-compiler": "^19.1.0-rc.2",
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5074584b15be0d0507a4dadc148f03d82e9fe495"
+  "gitHead": "c444882e108a37a1e90dff02c1c4d58e891ef054"
 }

package/src/ConfigControllerProvider.tsx

@@ -272,6 +272,7 @@ export const ConfigControllerProvider = React.memo(
                         extraView={extraView}
                         getUser={getUser}
                         generateCollection={generateCollection}
+                        onAnalyticsEvent={onAnalyticsEvent}
                         handleClose={(collection) => {
                             if (currentDialog?.redirect) {
                                 if (collection && currentDialog?.isNewCollection && !currentDialog.parentCollectionIds.length) {

package/src/ui/collection_editor/AICollectionGeneratorPopover.tsx

@@ -48,6 +48,11 @@ export interface AICollectionGeneratorPopoverProps {
      * Whether to show the label text
      */
     showLabel?: boolean;
+
+    /**
+     * Optional analytics callback
+     */
+    onAnalyticsEvent?: (event: string, params?: object) => void;
 }
 
 export function AICollectionGeneratorPopover({
@@ -56,7 +61,8 @@ export function AICollectionGeneratorPopover({
     generateCollection,
     trigger,
     size = "small",
-    showLabel = true
+    showLabel = true,
+    onAnalyticsEvent
 }: AICollectionGeneratorPopoverProps) {
     const [menuOpen, setMenuOpen] = useState(false);
     const [prompt, setPrompt] = useState("");
@@ -74,6 +80,9 @@ export function AICollectionGeneratorPopover({
         setLoading(true);
         setError(null);
 
+        const mode = existingCollection ? "modify" : "create";
+        onAnalyticsEvent?.("ai_collection_generate_start", { mode });
+
         try {
             const collectionsContext = existingCollections.map(c => ({
                 path: c.path,
@@ -100,6 +109,10 @@ export function AICollectionGeneratorPopover({
             onGenerated(result.collection, result.operations);
             setMenuOpen(false);
             setPrompt("");
+            onAnalyticsEvent?.("ai_collection_generate_success", {
+                mode,
+                operationsCount: result.operations?.length
+            });
             snackbarController.open({
                 type: "success",
                 message: existingCollection
@@ -112,6 +125,10 @@ export function AICollectionGeneratorPopover({
                 ? e.message
                 : "Failed to generate collection. Please try again.";
             setError(errorMessage);
+            onAnalyticsEvent?.("ai_collection_generate_error", {
+                mode,
+                error: errorMessage
+            });
             snackbarController.open({
                 type: "error",
                 message: errorMessage

package/src/ui/collection_editor/CollectionDetailsForm.tsx

@@ -8,6 +8,7 @@ import {
     Container,
     DebouncedTextField,
     Dialog,
+    HistoryIcon,
     IconButton,
     Select,
     SelectItem,
@@ -375,9 +376,9 @@ export function CollectionDetailsForm({
                             position={"start"}
                             size={"large"}
                             allowIndeterminate={true}
-                            label={values.history === null || values.history === undefined ? "Document history revisions enabled if enabled globally" : (
+                            label={<span className="flex items-center gap-2"><HistoryIcon size={"smallest"} />{values.history === null || values.history === undefined ? "Document history revisions enabled if enabled globally" : (
                                 values.history ? "Document history revisions ENABLED" : "Document history revisions NOT enabled"
-                            )}
+                            )}</span>}
                             onValueChange={(v) => setFieldValue("history", v)}
                             value={values.history === undefined ? null : values.history}
                         />

package/src/ui/collection_editor/CollectionEditorDialog.tsx

@@ -106,6 +106,10 @@ export interface CollectionEditorDialogProps {
      * The plugin is API-agnostic - the consumer provides the implementation.
      */
     generateCollection?: CollectionGenerationCallback;
+    /**
+     * Optional analytics callback
+     */
+    onAnalyticsEvent?: (event: string, params?: object) => void;
 }
 
 export function CollectionEditorDialog(props: CollectionEditorDialogProps) {
@@ -290,7 +294,8 @@ function CollectionEditorInternal<M extends Record<string, any>>({
     existingEntities,
     initialView: initialViewProp,
     expandKanban,
-    generateCollection
+    generateCollection,
+    onAnalyticsEvent
 }: CollectionEditorDialogProps & {
     handleCancel: () => void,
     setFormDirty: (dirty: boolean) => void,
@@ -630,6 +635,7 @@ function CollectionEditorInternal<M extends Record<string, any>>({
                             existingCollection={values}
                             onGenerated={handleAIGenerated}
                             generateCollection={generateCollection}
+                            onAnalyticsEvent={onAnalyticsEvent}
                         />
                     )}
                     <Tabs value={currentView}
@@ -669,7 +675,8 @@ function CollectionEditorInternal<M extends Record<string, any>>({
                             onContinue={onWelcomeScreenContinue}
                             existingCollectionPaths={existingPaths}
                             parentCollection={parentCollection}
-                            generateCollection={generateCollection} />}
+                            generateCollection={generateCollection}
+                            onAnalyticsEvent={onAnalyticsEvent} />}
 
                     {currentView === "import_data_mapping" && importConfig &&
                         <CollectionEditorImportMapping importConfig={importConfig}
@@ -867,7 +874,9 @@ function applyPropertyConfigs<M extends Record<string, any> = any>(collection: P
     const propertiesResult: PropertiesOrBuilders<any> = {};
     if (properties) {
         Object.keys(properties).forEach((key) => {
-            propertiesResult[key] = applyPropertiesConfig(properties[key] as PropertyOrBuilder, propertyConfigs);
+            const prop = properties[key];
+            if (prop == null) return;
+            propertiesResult[key] = applyPropertiesConfig(prop as PropertyOrBuilder, propertyConfigs);
         });
     }
 
@@ -879,7 +888,7 @@ function applyPropertyConfigs<M extends Record<string, any> = any>(collection: P
 
 function applyPropertiesConfig(property: PropertyOrBuilder, propertyConfigs: Record<string, PropertyConfig<any>>) {
     let internalProperty = property;
-    if (propertyConfigs && typeof internalProperty === "object" && internalProperty.propertyConfig) {
+    if (propertyConfigs && internalProperty && typeof internalProperty === "object" && internalProperty.propertyConfig) {
         const propertyConfig = propertyConfigs[internalProperty.propertyConfig];
         if (propertyConfig && isPropertyBuilder(propertyConfig.property)) {
             internalProperty = propertyConfig.property;

package/src/ui/collection_editor/CollectionEditorWelcomeView.tsx

@@ -18,13 +18,15 @@ export function CollectionEditorWelcomeView({
     parentCollection,
     onContinue,
     existingCollectionPaths,
-    generateCollection
+    generateCollection,
+    onAnalyticsEvent
 }: {
     path: string;
     parentCollection?: EntityCollection;
     onContinue: (importData?: object[], propertiesOrder?: string[]) => void;
     existingCollectionPaths?: string[];
     generateCollection?: CollectionGenerationCallback;
+    onAnalyticsEvent?: (event: string, params?: object) => void;
 }) {
 
     const { pathSuggestions } = useCollectionEditorController();
@@ -99,6 +101,7 @@ export function CollectionEditorWelcomeView({
                                     onContinue();
                                 }}
                                 generateCollection={generateCollection}
+                                onAnalyticsEvent={onAnalyticsEvent}
                                 trigger={
                                     <Button
                                         variant="outlined"

package/src/ui/collection_editor/GeneralSettingsForm.tsx

@@ -17,7 +17,9 @@ import {
     DebouncedTextField,
     Dialog,
     ExpandablePanel,
+    HistoryIcon,
     IconButton,
+    SearchIcon,
     Select,
     SelectItem,
     TextField,
@@ -179,10 +181,10 @@ export function GeneralSettingsForm({
                     {/* Collection ID */}
                     <div className={"col-span-12"}>
                         <Field name={"id"}
-                               as={DebouncedTextField}
-                               disabled={!isNewCollection}
-                               label={"Collection ID"}
-                               error={showErrors && Boolean(errors.id)} />
+                            as={DebouncedTextField}
+                            disabled={!isNewCollection}
+                            label={"Collection ID"}
+                            error={showErrors && Boolean(errors.id)} />
                         <FieldCaption error={touched.id && Boolean(errors.id)}>
                             {touched.id && Boolean(errors.id) ? errors.id : "This ID identifies this collection. Typically the same as the path."}
                         </FieldCaption>
@@ -218,9 +220,9 @@ export function GeneralSettingsForm({
                             position={"start"}
                             size={"large"}
                             allowIndeterminate={true}
-                            label={values.history === null || values.history === undefined ? "Document history revisions enabled if enabled globally" : (
+                            label={<span className="flex items-center gap-2"><HistoryIcon size={"smallest"} />{values.history === null || values.history === undefined ? "Document history revisions enabled if enabled globally" : (
                                 values.history ? "Document history revisions ENABLED" : "Document history revisions NOT enabled"
-                            )}
+                            )}</span>}
                             onValueChange={(v) => setFieldValue("history", v)}
                             value={values.history === undefined ? null : values.history}
                         />
@@ -283,7 +285,7 @@ export function GeneralSettingsForm({
                         <BooleanSwitchWithLabel
                             position={"start"}
                             size={"large"}
-                            label="Enable text search for this collection"
+                            label={<span className="flex items-center gap-2"><SearchIcon size={"smallest"} />Enable text search for this collection</span>}
                             onValueChange={(v) => setFieldValue("textSearchEnabled", v)}
                             value={values.textSearchEnabled ?? false}
                         />

package/src/ui/collection_editor/PropertyEditView.tsx

@@ -313,7 +313,7 @@ export function PropertyFormDialog({
     onOkClicked?: () => void;
     onCancel?: () => void;
 }) {
-    const formexRef = useRef<FormexController<PropertyWithId>>();
+    const formexRef = useRef<FormexController<PropertyWithId>>(undefined);
     const getController = (helpers: FormexController<PropertyWithId>) => {
         formexRef.current = helpers;
     };