@firecms/collection_editor 3.0.0-alpha.34 → 3.0.0-alpha.36

package/src/ui/collection_editor/templates/users_template.ts

@@ -1,13 +1,12 @@
-import { EntityCollection } from "@firecms/core";
+import { EntityCollection, makePropertiesEditable } from "@firecms/core";
 
 export const usersCollectionTemplate: EntityCollection = {
     path: "users",
     name: "Users",
     singularName: "User",
-    group: "Main",
     description: "Registered users in the app/web",
     icon: "person",
-    properties: {
+    properties: makePropertiesEditable({
         displayName: {
             name: "Display name",
             dataType: "string"
@@ -30,5 +29,5 @@ export const usersCollectionTemplate: EntityCollection = {
             dataType: "string",
             url: "image"
         }
-    },
+    }),
 };

package/src/ui/collection_editor/utils/update_property_for_widget.ts

@@ -12,7 +12,7 @@ import {
 
 export function updatePropertyFromWidget(propertyData: any,
                                          selectedWidgetId: string | undefined,
-                                         customFields: Record<string, PropertyConfig>): Property {
+                                         propertyConfigs: Record<string, PropertyConfig>): Property {
 
     let updatedProperty;
     if (selectedWidgetId === "text_field") {
@@ -260,8 +260,11 @@ export function updatePropertyFromWidget(propertyData: any,
                 }
             } satisfies ArrayProperty
         );
-    } else if (selectedWidgetId && customFields[selectedWidgetId]) {
-        updatedProperty = { ...customFields[selectedWidgetId].property, propertyConfig: selectedWidgetId };
+    } else if (selectedWidgetId && propertyConfigs[selectedWidgetId]) {
+        updatedProperty = {
+            ...propertyConfigs[selectedWidgetId].property,
+            propertyConfig: selectedWidgetId
+        };
     }
 
     return updatedProperty;

package/src/useCollectionEditorPlugin.tsx

@@ -1,5 +1,12 @@
 import React, { useCallback } from "react";
-import { EntityCollection, FireCMSPlugin, makePropertiesEditable, User } from "@firecms/core";
+import {
+    EntityCollection,
+    FireCMSPlugin,
+    joinCollectionLists,
+    makePropertiesEditable,
+    Properties,
+    User
+} from "@firecms/core";
 import { ConfigControllerProvider } from "./ConfigControllerProvider";
 import { CollectionEditorPermissionsBuilder } from "./types/config_permissions";
 import { EditorCollectionAction } from "./ui/EditorCollectionAction";
@@ -9,7 +16,6 @@ import { PersistedCollection } from "./types/persisted_collection";
 import { CollectionInference } from "./types/collection_inference";
 import { CollectionsConfigController } from "./types/config_controller";
 import { RootCollectionSuggestions } from "./ui/RootCollectionSuggestions";
-import { joinCollectionLists } from "./utils/join_collections";
 import { CollectionViewHeaderAction } from "./ui/CollectionViewHeaderAction";
 import { PropertyAddColumnComponent } from "./ui/PropertyAddColumnComponent";
 
@@ -75,12 +81,11 @@ export function useCollectionEditorPlugin<EC extends PersistedCollection = Persi
     const injectCollections = useCallback(
         (collections: EntityCollection[]) => {
             const markAsEditable = (c: PersistedCollection) => {
-                makePropertiesEditable(c.properties);
+                makePropertiesEditable(c.properties as Properties);
                 c.subcollections?.forEach(markAsEditable);
             };
             const editableCollections = collectionConfigController.collections ?? [];
             editableCollections.forEach(markAsEditable);
-            console.debug("Injecting collections", { editableCollections, collections });
             return joinCollectionLists(editableCollections, collections);
         },
         [collectionConfigController.collections]);
@@ -106,7 +111,7 @@ export function useCollectionEditorPlugin<EC extends PersistedCollection = Persi
             }
         },
         homePage: {
-            additionalChildrenStart: <RootCollectionSuggestions/>,
+            additionalChildrenEnd: <RootCollectionSuggestions/>,
             CollectionActions: HomePageEditorCollectionAction,
             AdditionalCards: NewCollectionCard,
         },

package/dist/utils/join_collections.d.ts

@@ -1,13 +0,0 @@
-import { EntityCollection } from "@firecms/core";
-/**
- *
- * @param storedCollections
- * @param codedCollections
- */
-export declare function joinCollectionLists(storedCollections: EntityCollection[], codedCollections: EntityCollection[] | undefined): EntityCollection[];
-/**
- *
- * @param target
- * @param source
- */
-export declare function mergeCollection(target: EntityCollection, source: EntityCollection): EntityCollection;

package/src/utils/join_collections.ts

@@ -1,113 +0,0 @@
-import {
-    EntityCollection,
-    isPropertyBuilder,
-    MapProperty,
-    mergeDeep,
-    PropertiesOrBuilders,
-    Property,
-    PropertyOrBuilder,
-    sortProperties
-} from "@firecms/core";
-
-/**
- *
- * @param storedCollections
- * @param codedCollections
- */
-export function joinCollectionLists(storedCollections: EntityCollection[], codedCollections: EntityCollection[] | undefined): EntityCollection[] {
-
-    // merge collections that are in both lists
-    const updatedCollections = (codedCollections ?? [])
-        .map((codedCollection) => {
-            const storedCollection = storedCollections?.find((collection) => {
-                return collection.path === codedCollection.path || (collection.alias && codedCollection.alias && collection.alias === codedCollection.alias);
-            });
-            if (!storedCollection) {
-                return codedCollection;
-            } else {
-                return mergeCollection(storedCollection, codedCollection);
-            }
-        });
-
-    // fetched collections that are not in the base collections
-    const resultStoredCollections = storedCollections
-        .filter((col) => !updatedCollections.map(c => c.path).includes(col.path) || !updatedCollections.map(c => c.alias).includes(col.alias));
-
-    return [...updatedCollections, ...resultStoredCollections];
-}
-
-/**
- *
- * @param target
- * @param source
- */
-export function mergeCollection(target: EntityCollection, source: EntityCollection): EntityCollection {
-
-    const subcollectionsMerged = joinCollectionLists(target?.subcollections ?? [], source?.subcollections ?? []);
-
-    const propertiesMerged: PropertiesOrBuilders = { ...target.properties } as PropertiesOrBuilders;
-    Object.keys(source.properties).forEach((key) => {
-        const property = target.properties[key] as Property;
-        if (property)
-            propertiesMerged[key] = mergePropertyOrBuilder(property, source.properties[key] as PropertyOrBuilder);
-        else
-            propertiesMerged[key] = source.properties[key] as PropertyOrBuilder;
-    });
-
-    const mergedCollection = mergeDeep(target, source);
-    const targetPropertiesOrder = getCollectionKeys(target);
-    const sourcePropertiesOrder = getCollectionKeys(source);
-    const mergedPropertiesOrder = [...new Set([...targetPropertiesOrder, ...sourcePropertiesOrder])];
-    const mergedEntityViews = [...new Set([...(target.entityViews ?? []), ...(source.entityViews ?? [])])];
-
-    return {
-        ...mergedCollection,
-        subcollections: subcollectionsMerged,
-        properties: sortProperties(propertiesMerged, mergedPropertiesOrder),
-        propertiesOrder: mergedPropertiesOrder,
-        entityViews: mergedEntityViews
-    }
-}
-
-function mergePropertyOrBuilder(target: Property, source: PropertyOrBuilder): PropertyOrBuilder {
-    if (isPropertyBuilder(source)) {
-        return source;
-    } else {
-        const mergedProperty = mergeDeep(target, source);
-        const targetEditable = Boolean(target.editable);
-        const sourceEditable = Boolean(source.editable);
-        if (source.dataType === "map" && source.properties) {
-            const targetProperties = ("properties" in target ? target.properties : {}) as PropertiesOrBuilders;
-            const sourceProperties = ("properties" in source ? source.properties : {}) as PropertiesOrBuilders;
-            const targetPropertiesOrder = "propertiesOrder" in target && target.propertiesOrder ? target.propertiesOrder : Object.keys(targetProperties);
-            const sourcePropertiesOrder = "propertiesOrder" in source && source.propertiesOrder ? source.propertiesOrder : ("properties" in source ? Object.keys(source.properties) : []);
-            const mergedPropertiesOrder = [...new Set([...targetPropertiesOrder, ...sourcePropertiesOrder])];
-            const mergedProperties: PropertiesOrBuilders = { ...targetProperties } as PropertiesOrBuilders;
-            Object.keys(source.properties).forEach((key) => {
-                const property = targetProperties[key] as Property;
-                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 };
-    }
-}
-
-function getCollectionKeys(collection: EntityCollection) {
-    if (collection.propertiesOrder && collection.propertiesOrder.length > 0) {
-        const propertiesOrder = collection.propertiesOrder;
-        if (collection.additionalFields) {
-            collection.additionalFields.forEach((field) => {
-                if (!propertiesOrder.includes(field.key)) {
-                    propertiesOrder.push(field.key);
-                }
-            });
-        }
-        return propertiesOrder;
-    }
-    return [
-        ...Object.keys(collection.properties),
-        ...(collection.additionalFields ?? [])?.map(f => f.key)
-    ];
-}