@firecms/collection_editor 3.0.0-beta.10 → 3.0.0-beta.12

package/src/utils/collections.ts

@@ -11,7 +11,7 @@ import { PersistedCollection } from "../types/persisted_collection";
  * Function in charge of merging collections defined in code with those stored in the backend.
  */
 export const mergeCollections = (baseCollections: EntityCollection[],
-                                 backendCollections: PersistedCollection[],
+                                 backendCollections: PersistedCollection[] = [],
                                  modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void
 ) => {
 
@@ -19,12 +19,18 @@ export const mergeCollections = (baseCollections: EntityCollection[],
         makePropertiesEditable(c.properties as Properties);
         c.subcollections?.forEach(markAsEditable);
     };
-    const storedCollections = backendCollections ?? [];
-    storedCollections.forEach(markAsEditable);
 
-    console.debug("Collections specified in code:", baseCollections);
-    console.debug("Collections stored in the backend", storedCollections);
-    const result = joinCollectionLists(baseCollections, storedCollections, [], modifyCollection);
-    console.debug("Collections after joining:", result);
+    backendCollections.forEach(markAsEditable);
+
+    const result = joinCollectionLists(baseCollections, backendCollections, [], modifyCollection);
+
+    // sort the collections so they are in the same order as the base collections
+    result.sort((a, b) => baseCollections.findIndex(c => c.id === a.id) - baseCollections.findIndex(c => c.id === b.id));
+    console.debug("Collections result", {
+        baseCollections,
+        backendCollections,
+        result
+    });
+
     return result;
 }