@firecms/core 3.0.0-alpha.54 → 3.0.0-alpha.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firecms/core",
-  "version": "3.0.0-alpha.54",
+  "version": "3.0.0-alpha.56",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -45,7 +45,7 @@
     "generateIcons": "ts-node --esm src/icons/generateIcons.ts"
   },
   "dependencies": {
-    "@firecms/ui": "^3.0.0-alpha.54",
+    "@firecms/ui": "^3.0.0-alpha.56",
     "@fontsource/ibm-plex-mono": "^5.0.8",
     "@fontsource/roboto": "^5.0.8",
     "@hello-pangea/dnd": "^16.5.0",
@@ -116,7 +116,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "9955c4f6403138fb68a54d6cbaf2c22d92fe85ce",
+  "gitHead": "a03621e95fe5b24491289fb9c3b5d71ec8e0c90d",
   "publishConfig": {
     "access": "public"
   }

package/src/components/ArrayContainer.tsx

@@ -184,7 +184,7 @@ export function ArrayContainer<T>({
 
                         {includeAddButton && <div className="py-4 justify-center text-left">
                             <Button
-                                variant={size === "small" ? "text" : "outlined"}
+                                variant={"text"}
                                 size={size === "small" ? "small" : "medium"}
                                 color="primary"
                                 disabled={disabled}

package/src/components/EntityCollectionTable/filters/ReferenceFilterField.tsx

@@ -147,10 +147,6 @@ export function ReferenceFilterField({
         );
     };
 
-    console.log("ReferenceFilterField", {
-        internalValue
-
-    })
     return (
 
         <div className="flex w-[440px] flex-row">

package/src/components/EntityCollectionTable/internal/DeleteEntityDialog.tsx

@@ -30,6 +30,7 @@ export function DeleteEntityDialog<M extends Record<string, any>>({
                                                                   }: DeleteEntityDialogProps<M>) {
 
     const dataSource = useDataSource();
+    console.log("dataSource", dataSource)
     const snackbarController = useSnackbarController();
     const [loading, setLoading] = useState(false);
 

package/src/components/ReferenceSelectionInner.tsx

@@ -98,8 +98,6 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
         maxSelection
     }: ReferenceSelectionInnerProps<M>) {
 
-    console.log("ReferenceSelectionInner");
-
     const sideDialogContext = useSideDialogContext();
     const sideEntityController = useSideEntityController();
     const navigation = useNavigationController();

package/src/core/FireCMS.tsx

@@ -113,65 +113,40 @@ export function FireCMS<UserType extends User, EC extends EntityCollection>(prop
         );
     }
 
-    const providers: {
-        context: React.Context<any>;
-        value?: any;
-    }[] = [
-        { context: ModeControllerContext, value: modeController },
-        { context: FireCMSContextInstance, value: context },
-        { context: UserConfigurationPersistenceContext, value: userConfigPersistence },
-        { context: StorageSourceContext, value: storageSource },
-        { context: DataSourceContext, value: dataSource },
-        { context: AuthControllerContext, value: authController },
-        { context: SideDialogsControllerContext, value: sideDialogsController },
-        { context: SideEntityControllerContext, value: sideEntityController },
-        { context: NavigationContext, value: navigationController }
-        // { context: DialogsProvider }
-    ];
-
-    return providers.reduce((children, provider) => {
-        const { context: Context, value } = provider;
-        return (
-            <Context.Provider value={value}>{children}</Context.Provider>
-        )
-    }, <FireCMSInternal
-        loading={loading}>
-        {children}
-    </FireCMSInternal>);
-
-    // return (
-    //     <ModeControllerContext.Provider value={modeController}>
-    //         <FireCMSContextInstance.Provider value={context}>
-    //             <UserConfigurationPersistenceContext.Provider
-    //                 value={userConfigPersistence}>
-    //                 <StorageSourceContext.Provider
-    //                     value={storageSource}>
-    //                     <DataSourceContext.Provider
-    //                         value={dataSource}>
-    //                         <AuthControllerContext.Provider
-    //                             value={authController}>
-    //                             <SideDialogsControllerContext.Provider
-    //                                 value={sideDialogsController}>
-    //                                 <SideEntityControllerContext.Provider
-    //                                     value={sideEntityController}>
-    //                                     <NavigationContext.Provider
-    //                                         value={navigationController}>
-    //                                         <DialogsProvider>
-    //                                             <FireCMSInternal
-    //                                                 loading={loading}>
-    //                                                 {children}
-    //                                             </FireCMSInternal>
-    //                                         </DialogsProvider>
-    //                                     </NavigationContext.Provider>
-    //                                 </SideEntityControllerContext.Provider>
-    //                             </SideDialogsControllerContext.Provider>
-    //                         </AuthControllerContext.Provider>
-    //                     </DataSourceContext.Provider>
-    //                 </StorageSourceContext.Provider>
-    //             </UserConfigurationPersistenceContext.Provider>
-    //         </FireCMSContextInstance.Provider>
-    //     </ModeControllerContext.Provider>
-    // );
+    return (
+        <ModeControllerContext.Provider value={modeController}>
+            <FireCMSContextInstance.Provider value={context}>
+                <UserConfigurationPersistenceContext.Provider
+                    value={userConfigPersistence}>
+                    <StorageSourceContext.Provider
+                        value={storageSource}>
+                        <DataSourceContext.Provider
+                            value={dataSource}>
+                            <AuthControllerContext.Provider
+                                value={authController}>
+                                <SideDialogsControllerContext.Provider
+                                    value={sideDialogsController}>
+                                    <SideEntityControllerContext.Provider
+                                        value={sideEntityController}>
+                                        <NavigationContext.Provider
+                                            value={navigationController}>
+                                                <DialogsProvider>
+                                                    <FireCMSInternal
+                                                        loading={loading}>
+                                                        {children}
+                                                    </FireCMSInternal>
+                                                </DialogsProvider>
+                                        </NavigationContext.Provider>
+                                    </SideEntityControllerContext.Provider>
+                                </SideDialogsControllerContext.Provider>
+                            </AuthControllerContext.Provider>
+                        </DataSourceContext.Provider>
+                    </StorageSourceContext.Provider>
+                </UserConfigurationPersistenceContext.Provider>
+            </FireCMSContextInstance.Provider>
+        </ModeControllerContext.Provider>
+    );
+
 }
 
 function FireCMSInternal({

package/src/form/EntityForm.tsx

@@ -147,6 +147,7 @@ function EntityFormInternal<M extends Record<string, any>>({
                                                                autoSave,
                                                                onIdUpdateError
                                                            }: EntityFormProps<M>) {
+
     const context = useFireCMSContext();
     const dataSource = useDataSource();
     const plugins = context.plugins;
@@ -212,7 +213,7 @@ function EntityFormInternal<M extends Record<string, any>>({
             onIdChange(entityId);
     }, [entityId, onIdChange]);
 
-    const collection = resolveCollection<M>({
+    const resolvedCollection = resolveCollection<M>({
         collection: inputCollection,
         path,
         entityId,
@@ -221,12 +222,12 @@ function EntityFormInternal<M extends Record<string, any>>({
         fields: context.propertyConfigs
     });
 
-    const onIdUpdate = collection.callbacks?.onIdUpdate;
+    const onIdUpdate = inputCollection.callbacks?.onIdUpdate;
     useEffect(() => {
         if (onIdUpdate && internalValues && (status === "new" || status === "copy")) {
             try {
                 const updatedId = onIdUpdate({
-                    collection,
+                    collection: resolvedCollection,
                     path,
                     entityId,
                     values: internalValues,
@@ -242,7 +243,7 @@ function EntityFormInternal<M extends Record<string, any>>({
 
     const underlyingChanges: Partial<EntityValues<M>> = useMemo(() => {
         if (initialValues && status === "existing") {
-            return Object.entries(collection.properties)
+            return Object.entries(resolvedCollection.properties)
                 .map(([key, property]) => {
                     if (isHidden(property)) {
                         return {};
@@ -258,11 +259,11 @@ function EntityFormInternal<M extends Record<string, any>>({
         } else {
             return {};
         }
-    }, [baseDataSourceValues, collection.properties, initialValues, status]);
+    }, [baseDataSourceValues, resolvedCollection.properties, initialValues, status]);
 
     const save = (values: EntityValues<M>) => {
         return onEntitySaveRequested({
-            collection,
+            collection: resolvedCollection,
             path,
             entityId,
             values,
@@ -300,8 +301,8 @@ function EntityFormInternal<M extends Record<string, any>>({
         if (status === "existing") {
             if (!entity?.id) throw Error("Form misconfiguration when saving, no id for existing entity");
         } else if (status === "new" || status === "copy") {
-            if (collection.customId) {
-                if (collection.customId !== "optional" && !entityId) {
+            if (inputCollection.customId) {
+                if (inputCollection.customId !== "optional" && !entityId) {
                     throw Error("Form misconfiguration when saving, entityId should be set");
                 }
             }
@@ -333,16 +334,16 @@ function EntityFormInternal<M extends Record<string, any>>({
     const validationSchema = useMemo(() => entityId
             ? getYupEntitySchema(
                 entityId,
-                collection.properties,
+                resolvedCollection.properties,
                 uniqueFieldValidator)
             : undefined,
-        [entityId, collection.properties, uniqueFieldValidator]);
+        [entityId, resolvedCollection.properties, uniqueFieldValidator]);
 
     const authController = useAuthController();
 
     const getActionsForEntity = useCallback(({ entity, customEntityActions }: { entity?: Entity<M>, customEntityActions?: EntityAction[] }): EntityAction[] => {
-        const createEnabled = canCreateEntity(collection, authController, fullPathToCollectionSegments(path), null);
-        const deleteEnabled = entity ? canDeleteEntity(collection, authController, fullPathToCollectionSegments(path), entity) : true;
+        const createEnabled = canCreateEntity(inputCollection, authController, fullPathToCollectionSegments(path), null);
+        const deleteEnabled = entity ? canDeleteEntity(inputCollection, authController, fullPathToCollectionSegments(path), entity) : true;
         const actions: EntityAction[] = [];
         if (createEnabled)
             actions.push(copyEntityAction);
@@ -351,7 +352,7 @@ function EntityFormInternal<M extends Record<string, any>>({
         if (customEntityActions)
             actions.push(...customEntityActions);
         return actions;
-    }, [authController, collection, path]);
+    }, [authController, inputCollection, path]);
 
     return (
         <Formik
@@ -368,11 +369,7 @@ function EntityFormInternal<M extends Record<string, any>>({
                 const formContext: FormContext<M> = {
                     setFieldValue: props.setFieldValue,
                     values: props.values,
-                    collection: resolveCollection({
-                        collection,
-                        path,
-                        fields: context.propertyConfigs
-                    }),
+                    collection: resolvedCollection,
                     entityId,
                     path,
                     save
@@ -385,7 +382,7 @@ function EntityFormInternal<M extends Record<string, any>>({
                     }
                 }, [onFormContextChange, formContext]);
 
-                if (plugins && collection) {
+                if (plugins && inputCollection) {
                     const actionProps: PluginFormActionProps = {
                         entityId,
                         path,
@@ -419,13 +416,13 @@ function EntityFormInternal<M extends Record<string, any>>({
                             className={`w-full py-2 flex items-center mt-${4 + (pluginActions ? 8 : 0)} lg:mt-${8 + (pluginActions ? 8 : 0)} mb-8`}>
 
                             <Typography
-                                className={"mt-4 flex-grow " + collection.hideIdFromForm ? "mb-2" : "mb-0"}
-                                variant={"h4"}>{collection.singularName ?? collection.name}
+                                className={"mt-4 flex-grow " + inputCollection.hideIdFromForm ? "mb-2" : "mb-0"}
+                                variant={"h4"}>{inputCollection.singularName ?? inputCollection.name}
                             </Typography>
                         </div>
 
                         {!hideId &&
-                            <CustomIdField customId={collection.customId}
+                            <CustomIdField customId={inputCollection.customId}
                                            entityId={entityId}
                                            status={status}
                                            onChange={setEntityId}
@@ -439,13 +436,13 @@ function EntityFormInternal<M extends Record<string, any>>({
                             onValuesChanged={doOnValuesChanges}
                             underlyingChanges={underlyingChanges}
                             entity={entity}
-                            resolvedCollection={collection}
+                            resolvedCollection={resolvedCollection}
                             formContext={formContext}
                             status={status}
                             savingError={savingError}
                             closeAfterSaveRef={closeAfterSaveRef}
                             autoSave={autoSave}
-                            entityActions={getActionsForEntity({ entity, customEntityActions: collection.entityActions })}/>}
+                            entityActions={getActionsForEntity({ entity, customEntityActions: inputCollection.entityActions })}/>}
 
                     </div>
                 </div>

package/src/form/PropertyFieldBinding.tsx

@@ -202,7 +202,7 @@ function FieldInternal<T extends CMSType, CustomProps, M extends Record<string,
         (!Array.isArray(error) || !!error.filter((e: any) => !!e).length);
 
     const WrappedComponent: ComponentType<FieldProps<T, any, M>> | null = useWrappedComponent(context.path, context.collection, propertyKey, property, Component, plugins);
-    const UsedComponent: ComponentType<FieldProps<T>> = WrappedComponent ?? Component;
+    const UsedComponent: ComponentType<FieldProps<T>> = Component;
 
     const isSubmitting = fieldProps.form.isSubmitting;
 

package/src/util/navigation_utils.ts

@@ -51,7 +51,7 @@ export function resolveCollectionPathAliases(path: string, allCollections: Entit
     const cleanPath = removeInitialAndTrailingSlashes(path);
     const subpaths = cleanPath.split("/");
     if (subpaths.length % 2 === 0) {
-        throw Error(`Collection paths must have an odd number of segments: ${path}`);
+        throw Error(`resolveCollectionPathAliases: Collection paths must have an odd number of segments: ${path}`);
     }
 
     const aliasedCollection = allCollections.find((col) => col.id === subpaths[0]);
@@ -82,7 +82,7 @@ export function getCollectionByPathOrAlias(pathOrAlias: string, collections: Ent
 
     const subpaths = removeInitialAndTrailingSlashes(pathOrAlias).split("/");
     if (subpaths.length % 2 === 0) {
-        throw Error(`Collection paths must have an odd number of segments: ${pathOrAlias}`);
+        throw Error(`getCollectionByPathOrAlias: Collection paths must have an odd number of segments: ${pathOrAlias}`);
     }
 
     const subpathCombinations = getCollectionPathsCombinations(subpaths);

package/src/util/resolutions.ts

@@ -28,6 +28,8 @@ import { getIn } from "formik";
 import { enumToObjectEntries } from "./enums";
 import { isDefaultFieldConfigId } from "../core";
 
+// import util from "util";
+
 export const resolveCollection = <M extends Record<string, any>, >
 ({
      collection,
@@ -57,17 +59,19 @@ export const resolveCollection = <M extends Record<string, any>, >
     const resolvedProperties = Object.entries(collection.properties)
         .map(([key, propertyOrBuilder]) => {
             const propertyValue = usedValues ? getIn(usedValues, key) : undefined;
+            const childResolvedProperty = resolveProperty({
+                propertyKey: key,
+                propertyOrBuilder: propertyOrBuilder as PropertyOrBuilder | ResolvedProperty,
+                values: usedValues,
+                previousValues: usedPreviousValues,
+                path,
+                propertyValue,
+                entityId,
+                fields
+            });
+            if (!childResolvedProperty) return {};
             return ({
-                [key]: resolveProperty({
-                    propertyKey: key,
-                    propertyOrBuilder: propertyOrBuilder as PropertyOrBuilder | ResolvedProperty,
-                    values: usedValues,
-                    previousValues: usedPreviousValues,
-                    path,
-                    propertyValue,
-                    entityId,
-                    fields
-                })
+                [key]: childResolvedProperty
             });
         })
         .filter((a) => a !== null)
@@ -133,7 +137,6 @@ export function resolveProperty<T extends CMSType = CMSType, M extends Record<st
         });
 
         if (!result) {
-            console.debug("Property builder not returning `Property` so it is not rendered", path, props.entityId, propertyOrBuilder);
             return null;
         }
 
@@ -338,13 +341,16 @@ export function resolveProperties<M extends Record<string, any>>({
 }): ResolvedProperties<M> {
     return Object.entries<PropertyOrBuilder>(properties as Record<string, PropertyOrBuilder>)
         .map(([key, property]) => {
+            const thisPropertyValue = propertyValue && typeof propertyValue === "object" ? getValueInPath(propertyValue, key) : undefined;
+            const childResolvedProperty = resolveProperty({
+                propertyKey: key,
+                propertyOrBuilder: property,
+                propertyValue: thisPropertyValue,
+                ...props
+            });
+            if (!childResolvedProperty) return {};
             return {
-                [key]: resolveProperty({
-                    propertyKey: key,
-                    propertyOrBuilder: property,
-                    propertyValue: propertyValue && typeof propertyValue === "object" ? getValueInPath(propertyValue, key) : undefined,
-                    ...props
-                })
+                [key]: childResolvedProperty
             };
         })
         .filter((a) => a !== null)