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

package/src/ui/collection_editor/import/CollectionEditorImportMapping.tsx

@@ -16,8 +16,7 @@ import {
     PropertyConfig,
     Select,
     Tooltip,
-    Typography,
-    useFireCMSContext
+    Typography
 } from "@firecms/core";
 import React, { useState } from "react";
 import { OnPropertyChangedParams, PropertyFormDialog, PropertyWithId } from "../PropertyEditView";
@@ -30,12 +29,12 @@ import { buildPropertyFromData } from "@firecms/schema_inference";
 
 export function CollectionEditorImportMapping({
                                                   importConfig,
-                                                  customFields,
+                                                  propertyConfigs,
                                                   collectionEditable
                                               }:
                                                   {
                                                       importConfig: ImportConfig,
-                                                      customFields: Record<string, PropertyConfig>,
+                                                      propertyConfigs: Record<string, PropertyConfig>,
                                                       collectionEditable: boolean
                                                   }) {
 
@@ -181,7 +180,7 @@ export function CollectionEditorImportMapping({
                                                                                         importKey
                                                                                     })}
                                                                                     propertyKey={propertyKey}
-                                                                                    customFields={customFields}/>}
+                                                                                    propertyConfigs={propertyConfigs}/>}
                                               />;
                                           }}/>
             </Container>
@@ -203,7 +202,7 @@ export function CollectionEditorImportMapping({
                 }}
                 autoOpenTypeSelect={false}
                 existingProperty={false}
-                customFields={customFields}/>
+                propertyConfigs={propertyConfigs}/>
 
             <div style={{ height: "52px" }}/>
         </div>
@@ -215,7 +214,7 @@ function PropertySelect({
                             property,
                             onPropertyChanged,
                             propertyKey,
-                            customFields,
+                            propertyConfigs,
                             disabled
                         }: {
     property: Property | null,
@@ -226,13 +225,12 @@ function PropertySelect({
                             previousId,
                             namespace
                         }: OnPropertyChangedParams) => void,
-    customFields: Record<string, PropertyConfig>,
+    propertyConfigs: Record<string, PropertyConfig>,
     disabled?: boolean
 }) {
 
-    const { fields } = useFireCMSContext();
     const fieldId = property ? getFieldId(property) : null;
-    const widget = property ? getFieldConfig(property, fields) : null;
+    const widget = property ? getFieldConfig(property, propertyConfigs) : null;
 
     const [selectOpen, setSelectOpen] = useState(false);
 
@@ -253,7 +251,7 @@ function PropertySelect({
                 return <FieldConfigBadge propertyConfig={widget}/>
             }}
             onValueChange={(newSelectedWidgetId) => {
-                const newProperty = updatePropertyFromWidget(property, newSelectedWidgetId, customFields)
+                const newProperty = updatePropertyFromWidget(property, newSelectedWidgetId, propertyConfigs)
                 if (!propertyKey) return;
                 onPropertyChanged({
                     id: propertyKey,

package/src/ui/collection_editor/properties/BlockPropertyField.tsx

@@ -5,11 +5,11 @@ import { PropertyFormDialog } from "../PropertyEditView";
 import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath } from "../util";
 import { PropertyTree } from "../PropertyTree";
 
-export function BlockPropertyField({ disabled, getData, allowDataInference, customFields, collectionEditable }: {
+export function BlockPropertyField({ disabled, getData, allowDataInference, propertyConfigs, collectionEditable }: {
     disabled: boolean;
     getData?: () => Promise<object[]>;
     allowDataInference: boolean;
-    customFields: Record<string, PropertyConfig>,
+    propertyConfigs: Record<string, PropertyConfig>,
     collectionEditable: boolean;
 }) {
 
@@ -128,7 +128,7 @@ export function BlockPropertyField({ disabled, getData, allowDataInference, cust
                 autoOpenTypeSelect={!selectedPropertyKey}
                 onPropertyChanged={onPropertyCreated}
                 existingPropertyKeys={selectedPropertyKey ? undefined : values.oneOf?.propertiesOrder}
-                customFields={customFields}/>}
+                propertyConfigs={propertyConfigs}/>}
 
         </>);
 }

package/src/ui/collection_editor/properties/MapPropertyField.tsx

@@ -15,11 +15,11 @@ import { PropertyTree } from "../PropertyTree";
 import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath, namespaceToPropertiesPath } from "../util";
 import { FieldHelperView } from "./FieldHelperView";
 
-export function MapPropertyField({ disabled, getData, allowDataInference, customFields, collectionEditable }: {
+export function MapPropertyField({ disabled, getData, allowDataInference, propertyConfigs, collectionEditable }: {
     disabled: boolean;
     getData?: () => Promise<object[]>;
     allowDataInference: boolean;
-    customFields: Record<string, PropertyConfig>,
+    propertyConfigs: Record<string, PropertyConfig>,
     collectionEditable: boolean;
 }) {
 
@@ -150,7 +150,7 @@ export function MapPropertyField({ disabled, getData, allowDataInference, custom
                 autoOpenTypeSelect={!selectedPropertyKey}
                 onPropertyChanged={onPropertyCreated}
                 existingPropertyKeys={selectedPropertyKey ? undefined : propertiesOrder}
-                customFields={customFields}
+                propertyConfigs={propertyConfigs}
             />
 
         </>);

package/src/ui/collection_editor/properties/RepeatPropertyField.tsx

@@ -21,7 +21,7 @@ export function RepeatPropertyField({
                                         disabled,
                                         getData,
                                         allowDataInference,
-                                        customFields,
+                                        propertyConfigs,
                                         collectionEditable
                                     }: {
     showErrors: boolean,
@@ -29,12 +29,10 @@ export function RepeatPropertyField({
     disabled: boolean,
     getData?: () => Promise<object[]>;
     allowDataInference: boolean;
-    customFields: Record<string, PropertyConfig>,
+    propertyConfigs: Record<string, PropertyConfig>,
     collectionEditable: boolean;
 }) {
 
-    const { fields } = useFireCMSContext();
-
     const {
         values,
         handleChange,
@@ -52,7 +50,7 @@ export function RepeatPropertyField({
         setFieldValue("of", property);
     }, []);
 
-    const widget = ofProperty && getFieldConfig(ofProperty, fields);
+    const widget = ofProperty && getFieldConfig(ofProperty, propertyConfigs);
     return (
         <>
             <div className={"col-span-12"}>
@@ -97,7 +95,7 @@ export function RepeatPropertyField({
                                 includeIdAndName={false}
                                 onPropertyChanged={onPropertyChanged}
                                 forceShowErrors={showErrors}
-                                customFields={customFields}
+                                propertyConfigs={propertyConfigs}
                                 collectionEditable={collectionEditable}
                             />
                         </Paper>

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, joinCollectionLists, 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";
@@ -74,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]);
@@ -105,7 +111,7 @@ export function useCollectionEditorPlugin<EC extends PersistedCollection = Persi
             }
         },
         homePage: {
-            additionalChildrenStart: <RootCollectionSuggestions/>,
+            additionalChildrenEnd: <RootCollectionSuggestions/>,
             CollectionActions: HomePageEditorCollectionAction,
             AdditionalCards: NewCollectionCard,
         },