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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@firecms/core",
-    "version": "3.0.0-alpha.48",
+    "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": "04d4690b0b71a4dd56a01a77e4c639d6af79be86",
+    "gitHead": "c9502da4e2caa2c3c896fbae55a7fe788cd0b840",
     "publishConfig": {
         "access": "public"
     }

package/src/util/join_collections.ts

@@ -10,6 +10,26 @@ 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;
+    }
+}
+
 /**
  *
  */
@@ -26,15 +46,7 @@ export function joinCollectionLists(targetCollections: EntityCollection[],
                 // return collection.path === codedCollection.path || collection.id && codedCollection.id;
             });
             if (!targetCol) {
-                if (modifyCollection) {
-                    const modified = modifyCollection({
-                        collection: sourceCol,
-                        parentPaths
-                    });
-                    return modified ?? sourceCol;
-                } else {
-                    return sourceCol;
-                }
+                return applyModifyFunction(modifyCollection, sourceCol, parentPaths);
             } else {
                 return mergeCollection(targetCol, sourceCol, parentPaths, modifyCollection);
             }
@@ -45,11 +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;
             }