@firecms/core 3.0.0-alpha.72 → 3.0.0-alpha.73

package/src/form/validation.ts

@@ -109,7 +109,11 @@ export function getYupMapObjectSchema<M extends Record<string, any>>({
             });
         });
 
-    return yup.object().shape(objectSchema);
+    const shape = yup.object().shape(objectSchema);
+    if (validation?.required) {
+        return shape.required(validation?.requiredMessage ? validation.requiredMessage : "Required").nullable(true);
+    }
+    return shape.nullable(true);
     // const object: ObjectSchema<any> = yup.object().shape(objectSchema);
     // return validation?.required
     //     ? object.required(validation?.requiredMessage ? validation.requiredMessage : "Required").nullable(true)

package/src/internal/EntityView.tsx

@@ -68,7 +68,6 @@ export function EntityView<M extends Record<string, any>, UserType extends User>
                                                                                      onClose
                                                                                  }: EntityViewProps<M>) {
 
-
     if (collection.customId && collection.formAutoSave) {
         console.warn(`The collection ${collection.path} has customId and formAutoSave enabled. This is not supported and formAutoSave will be ignored`);
     }
@@ -502,11 +501,12 @@ export function EntityView<M extends Record<string, any>, UserType extends User>
 
                         <div
                             className="pb-1 self-center">
-                            <IconButton onClick={() => {
-                                onClose?.();
-                                return sideDialogContext.close(false);
-                            }}
-                                        size="large">
+                            <IconButton
+                                onClick={() => {
+                                    onClose?.();
+                                    return sideDialogContext.close(false);
+                                }}
+                                size="large">
                                 <CloseIcon/>
                             </IconButton>
                         </div>

package/src/internal/useBuildDataSource.ts

@@ -225,8 +225,6 @@ export function useBuildDataSource({
                     })
                 : firestoreValues;
 
-            console.debug("Saving entity", path, entityId, updatedFirestoreValues);
-
             return delegate.saveEntity({
                 path,
                 entityId,

package/src/internal/useBuildSideEntityController.tsx

@@ -61,6 +61,7 @@ export const useBuildSideEntityController = (navigation: NavigationController,
         if (props.copy && !props.entityId) {
             throw Error("If you want to copy an entity you need to provide an entityId");
         }
+
         const defaultSelectedView = resolveDefaultSelectedView(
             props.collection ? props.collection.defaultSelectedView : undefined,
             {
@@ -69,7 +70,10 @@ export const useBuildSideEntityController = (navigation: NavigationController,
             }
         );
 
-        sideDialogsController.open(propsToSidePanel({ selectedSubPath: defaultSelectedView, ...props }, navigation, smallLayout));
+        sideDialogsController.open(propsToSidePanel({
+            selectedSubPath: defaultSelectedView,
+            ...props,
+        }, navigation, smallLayout));
 
     }, [sideDialogsController, navigation, smallLayout]);
 
@@ -144,17 +148,24 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
 
 const propsToSidePanel = (props: EntitySidePanelProps<any>, navigation: NavigationController, smallLayout: boolean): SideDialogPanelProps => {
 
-    const collectionPath = removeInitialAndTrailingSlashes(props.path);
-    const newPath = props.entityId
-        ? navigation.buildUrlCollectionPath(`${collectionPath}/${props.entityId}/${props.selectedSubPath || ""}`)
-        : navigation.buildUrlCollectionPath(`${collectionPath}#${NEW_URL_HASH}`);
-
-    return ({
-        key: `${props.path}/${props.entityId}`,
-        component: <EntitySidePanel {...props}/>,
-        urlPath: newPath,
-        parentUrlPath: navigation.buildUrlCollectionPath(collectionPath),
-        width: getEntityViewWidth(props, smallLayout),
-        onClose: props.onClose
-    });
-};
+        const collectionPath = removeInitialAndTrailingSlashes(props.path);
+        const newPath = props.entityId
+            ? navigation.buildUrlCollectionPath(`${collectionPath}/${props.entityId}/${props.selectedSubPath || ""}`)
+            : navigation.buildUrlCollectionPath(`${collectionPath}#${NEW_URL_HASH}`);
+        const resolvedPath = navigation.resolveAliasesFrom(props.path);
+
+        const resolvedPanelProps: EntitySidePanelProps<any> = {
+            ...props,
+            path: resolvedPath
+        };
+
+        return ({
+            key: `${props.path}/${props.entityId}`,
+            component: <EntitySidePanel {...resolvedPanelProps}/>,
+            urlPath: newPath,
+            parentUrlPath: navigation.buildUrlCollectionPath(collectionPath),
+            width: getEntityViewWidth(props, smallLayout),
+            onClose: props.onClose
+        });
+    }
+;

package/src/preview/property_previews/MapPropertyPreview.tsx

@@ -5,6 +5,7 @@ import { PropertyPreviewProps } from "../PropertyPreviewProps";
 import { PropertyPreview } from "../PropertyPreview";
 import { cn, defaultBorderMixin, Typography } from "@firecms/ui";
 import { ErrorBoundary } from "../../components";
+import { EmptyValue } from "../components/EmptyValue";
 
 /**
  * @group Preview components
@@ -43,7 +44,7 @@ export function MapPropertyPreview<T extends Record<string, any> = Record<string
                             <PropertyPreview propertyKey={key}
                                              value={(value)[key]}
                                              property={mapProperty.properties![key]}
-                                             // entity={entity}
+                                // entity={entity}
                                              size={size}/>
                         </ErrorBoundary>
                     </div>
@@ -105,6 +106,7 @@ export function MapPropertyPreview<T extends Record<string, any> = Record<string
 
 export function KeyValuePreview({ value }: { value: any }) {
     if (typeof value !== "object") return null;
+    if (!value) return <EmptyValue/>;
     return <div
         className="flex flex-col gap-1 w-full">
         {

package/src/preview/property_previews/StringPropertyPreview.tsx

@@ -2,12 +2,11 @@ import React from "react";
 
 import { resolvePropertyEnum } from "../../util";
 import { EnumValuesChip } from "../components/EnumValuesChip";
-import { getColorSchemeForSeed } from "../../util/chip_utils";
 import { PreviewType } from "../../types";
 import { UrlComponentPreview } from "../components/UrlComponentPreview";
 import { PropertyPreviewProps } from "../PropertyPreviewProps";
 import { ErrorBoundary } from "../../components";
-import { Chip } from "@firecms/ui";
+import { Chip, getColorSchemeForSeed } from "@firecms/ui";
 
 /**
  * @group Preview components

package/src/util/enums.ts

@@ -1,6 +1,5 @@
 import { EnumValueConfig, EnumValues } from "../types";
-import { CHIP_COLORS, ChipColorScheme } from "@firecms/ui";
-import { getColorSchemeForSeed } from "./chip_utils";
+import { CHIP_COLORS, ChipColorScheme, getColorSchemeForSeed } from "@firecms/ui";
 
 export function enumToObjectEntries(enumValues: EnumValues): EnumValueConfig[] {
     if (Array.isArray(enumValues)) {

package/dist/util/chip_utils.d.ts

@@ -1,3 +0,0 @@
-import { ChipColorKey, ChipColorScheme } from "@firecms/ui";
-export declare function getColorSchemeForSeed(seed: string): ChipColorScheme;
-export declare function getColorSchemeForKey(key: ChipColorKey): ChipColorScheme;

package/src/util/chip_utils.ts

@@ -1,13 +0,0 @@
-import { hashString } from "./hash";
-import { CHIP_COLORS, ChipColorKey, ChipColorScheme } from "@firecms/ui";
-
-export function getColorSchemeForSeed(seed: string): ChipColorScheme {
-    const hash: number = hashString(seed);
-    const colorKeys = Object.keys(CHIP_COLORS);
-    const index = hash % colorKeys.length;
-    return CHIP_COLORS[colorKeys[index]];
-}
-
-export function getColorSchemeForKey(key: ChipColorKey): ChipColorScheme {
-    return CHIP_COLORS[key];
-}