@firecms/core 3.0.0-alpha.47 → 3.0.0-alpha.49

package/dist/util/join_collections.d.ts

@@ -2,8 +2,8 @@ import { EntityCollection, ModifyCollectionProps } from "../types";
 /**
  *
  */
-export declare function joinCollectionLists(targetCollections: EntityCollection[], sourceCollections: EntityCollection[] | undefined, parentPaths?: string[], modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | undefined): EntityCollection[];
+export declare function joinCollectionLists(targetCollections: EntityCollection[], sourceCollections: EntityCollection[] | undefined, parentPaths?: string[], modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void): EntityCollection[];
 /**
  *
  */
-export declare function mergeCollection(target: EntityCollection, source: EntityCollection, parentPaths?: string[], modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | undefined): EntityCollection;
+export declare function mergeCollection(target: EntityCollection, source: EntityCollection, parentPaths?: string[], modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void): EntityCollection;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@firecms/core",
-    "version": "3.0.0-alpha.47",
+    "version": "3.0.0-alpha.49",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -133,7 +133,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "1c2310776f2da9bba46ba352e9a5244118dcdc3f",
+    "gitHead": "c9502da4e2caa2c3c896fbae55a7fe788cd0b840",
     "publishConfig": {
         "access": "public"
     }

package/src/components/EntityCollectionTable/EntityCollectionTable.tsx

@@ -142,6 +142,7 @@ export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>
         const onRowClick = useCallback(({ rowData }: {
             rowData: Entity<M>
         }) => {
+            console.debug("EntityCollectionTable click");
             if (inlineEditing)
                 return;
             return onEntityClick && onEntityClick(rowData);

package/src/components/ReferenceSelectionInner.tsx

@@ -19,6 +19,7 @@ import { useEntityCollectionTableController } from "./EntityCollectionTable/useE
 import { AddIcon } from "../icons";
 import { useColumnIds } from "./EntityCollectionView/useColumnsIds";
 import { useSideDialogContext } from "../core";
+import { useTraceUpdate } from "../util/useTraceUpdate";
 
 /**
  * @group Components
@@ -99,6 +100,8 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
         maxSelection
     }: ReferenceSelectionInnerProps<M>) {
 
+    console.log("ReferenceSelectionInner");
+
     const sideDialogContext = useSideDialogContext();
     const sideEntityController = useSideEntityController();
     const navigation = useNavigationController();
@@ -142,7 +145,7 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
         };
     }, [dataSource, fullPath, selectedEntityIdsProp, collection, selectionController.setSelectedEntities]);
 
-    const onClear = useCallback(() => {
+    const onClear = () => {
         context.onAnalyticsEvent?.("reference_selection_clear", {
             path: fullPath
         });
@@ -152,9 +155,10 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
         } else if (onMultipleEntitiesSelected) {
             onMultipleEntitiesSelected([]);
         }
-    }, [multiselect, onMultipleEntitiesSelected, onSingleEntitySelected]);
+    };
 
-    const toggleEntitySelection = useCallback((entity: Entity<any>) => {
+    const toggleEntitySelection = (entity: Entity<any>) => {
+        console.debug("ReferenceSelectionInner toggleEntitySelection", entity);
         let newValue;
         const selectedEntities = selectionController.selectedEntities;
 
@@ -176,9 +180,10 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
             if (onMultipleEntitiesSelected)
                 onMultipleEntitiesSelected(newValue);
         }
-    }, [onMultipleEntitiesSelected, selectionController.selectedEntities]);
+    };
 
-    const onEntityClick = useCallback((entity: Entity<any>) => {
+    const onEntityClick = (entity: Entity<any>) => {
+        console.debug("ReferenceSelectionInner onEntityClick", entity);
 
         if (!multiselect && onSingleEntitySelected) {
             context.onAnalyticsEvent?.("reference_selected_single", {
@@ -190,32 +195,31 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
         } else {
             toggleEntitySelection(entity);
         }
-    }, [sideDialogContext, multiselect, onSingleEntitySelected, toggleEntitySelection]);
+    };
 
     // create a new entity from within the reference dialog
-    const onNewClick = useCallback(() => {
-            context.onAnalyticsEvent?.("reference_selection_new_entity", {
-                path: fullPath
-            });
-            sideEntityController.open({
-                path: fullPath,
-                collection,
-                updateUrl: true,
-                onUpdate: ({ entity }) => {
-                    setEntitiesDisplayedFirst([entity, ...entitiesDisplayedFirst]);
-                    onEntityClick(entity);
-                },
-                closeOnSave: true
-            });
-        },
-        [sideEntityController, fullPath, collection, entitiesDisplayedFirst, onEntityClick]);
-
-    const tableRowActionsBuilder = useCallback(({
-                                                    entity,
-                                                    size,
-                                                    width,
-                                                    frozen
-                                                }: {
+    const onNewClick = () => {
+        context.onAnalyticsEvent?.("reference_selection_new_entity", {
+            path: fullPath
+        });
+        sideEntityController.open({
+            path: fullPath,
+            collection,
+            updateUrl: true,
+            onUpdate: ({ entity }) => {
+                setEntitiesDisplayedFirst([entity, ...entitiesDisplayedFirst]);
+                onEntityClick(entity);
+            },
+            closeOnSave: true
+        });
+    };
+
+    const tableRowActionsBuilder = ({
+                                        entity,
+                                        size,
+                                        width,
+                                        frozen
+                                    }: {
         entity: Entity<any>,
         size: CollectionSize,
         width: number,
@@ -234,7 +238,7 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
             fullPath={fullPath}
             selectionController={selectionController}/>;
 
-    }, [multiselect, selectionController.selectedEntities, toggleEntitySelection, collection?.hideIdFromCollection]);
+    };
 
     const onDone = useCallback((event: React.SyntheticEvent) => {
         event.stopPropagation();

package/src/components/VirtualTable/VirtualTableRow.tsx

@@ -15,16 +15,18 @@ export const VirtualTableRow = React.memo<VirtualTableRowProps<any>>(
                                     size,
                                     style,
                                     hoverRow,
-                                    rowClassName,
+                                    rowClassName
                                 }: VirtualTableRowProps<T>) {
 
-        const onClick = useCallback((event: React.SyntheticEvent) => onRowClick
-            ? onRowClick({
-                rowData,
-                rowIndex,
-                event
-            })
-            : undefined, [onRowClick, rowData, rowIndex]);
+        const onClick = useCallback((event: React.SyntheticEvent) => {
+            console.debug("VirtualTableRow click");
+            if (onRowClick)
+                onRowClick({
+                    rowData,
+                    rowIndex,
+                    event
+                })
+        }, [onRowClick, rowData, rowIndex]);
 
         return (
             <div

package/src/util/join_collections.ts

@@ -10,25 +10,45 @@ import { mergeDeep } from "./objects";
 import { sortProperties } from "./collections";
 import { isPropertyBuilder } from "./entities";
 
+function applyModifyFunction(modifyCollection: ((props: ModifyCollectionProps) => (EntityCollection | void)) | undefined,
+                             collection: EntityCollection,
+                             parentPaths: string[]) {
+    if (modifyCollection) {
+        const modified = modifyCollection({
+            collection,
+            parentPaths
+        });
+        const resCollection = modified ?? collection;
+        if (resCollection.subcollections) {
+            resCollection.subcollections = resCollection.subcollections.map((subcollection) => {
+                return applyModifyFunction(modifyCollection, subcollection, [...parentPaths, collection.path]);
+            });
+        }
+        return resCollection;
+    } else {
+        return collection;
+    }
+}
+
 /**
  *
  */
 export function joinCollectionLists(targetCollections: EntityCollection[],
                                     sourceCollections: EntityCollection[] | undefined,
                                     parentPaths: string[] = [],
-                                    modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | undefined): EntityCollection[] {
+                                    modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void): EntityCollection[] {
 
     // merge collections that are in both lists
     const updatedCollections = (sourceCollections ?? [])
-        .map((codedCollection) => {
-            const storedCollection = targetCollections?.find((collection) => {
-                return collection.id === codedCollection.id;
+        .map((sourceCol) => {
+            const targetCol = targetCollections?.find((collection) => {
+                return collection.id === sourceCol.id;
                 // return collection.path === codedCollection.path || collection.id && codedCollection.id;
             });
-            if (!storedCollection) {
-                return codedCollection;
+            if (!targetCol) {
+                return applyModifyFunction(modifyCollection, sourceCol, parentPaths);
             } else {
-                return mergeCollection(storedCollection, codedCollection, parentPaths, modifyCollection);
+                return mergeCollection(targetCol, sourceCol, parentPaths, modifyCollection);
             }
         });
 
@@ -37,8 +57,7 @@ export function joinCollectionLists(targetCollections: EntityCollection[],
         .filter((col) => !updatedCollections.map(c => c.id).includes(col.id))
         .map((col) => {
             if (modifyCollection) {
-                const modified = modifyCollection({ collection: col, parentPaths });
-                return modified ?? col;
+                return applyModifyFunction(modifyCollection, col, parentPaths);
             } else {
                 return col;
             }
@@ -53,7 +72,7 @@ export function joinCollectionLists(targetCollections: EntityCollection[],
 export function mergeCollection(target: EntityCollection,
                                 source: EntityCollection,
                                 parentPaths: string[] = [],
-                                modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | undefined
+                                modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void
 ): EntityCollection {
 
     const subcollectionsMerged = joinCollectionLists(
@@ -86,7 +105,10 @@ export function mergeCollection(target: EntityCollection,
         entityViews: mergedEntityViews
     };
     if (modifyCollection) {
-        const modifiedCollection = modifyCollection({ collection: resultCollection, parentPaths });
+        const modifiedCollection = modifyCollection({
+            collection: resultCollection,
+            parentPaths
+        });
         if (modifiedCollection)
             resultCollection = modifiedCollection;
     }
@@ -112,9 +134,17 @@ function mergePropertyOrBuilder(target: Property, source: PropertyOrBuilder): Pr
                 if (property)
                     mergedProperties[key] = mergePropertyOrBuilder(property, sourceProperties[key] as PropertyOrBuilder);
             });
-            return { ...mergedProperty, editable: targetEditable && sourceEditable, properties: mergedProperties, propertiesOrder: mergedPropertiesOrder } as MapProperty;
+            return {
+                ...mergedProperty,
+                editable: targetEditable && sourceEditable,
+                properties: mergedProperties,
+                propertiesOrder: mergedPropertiesOrder
+            } as MapProperty;
         }
-        return { ...mergedProperty, editable: targetEditable && sourceEditable };
+        return {
+            ...mergedProperty,
+            editable: targetEditable && sourceEditable
+        };
     }
 }