@firecms/core 3.0.0-canary.7 → 3.0.0-canary.70

package/src/preview/components/ReferencePreview.tsx

@@ -1,21 +1,11 @@
 import * as React from "react";
-import { useMemo } from "react";
 
-import { Entity, EntityCollection, EntityReference, ResolvedProperty } from "../../types";
-
-import { getReferencePreviewKeys, getValueInPath, resolveCollection } from "../../util";
-import {
-    useCustomizationController,
-    useEntityFetch,
-    useNavigationController,
-    useSideEntityController
-} from "../../hooks";
-import { PropertyPreview } from "../PropertyPreview";
+import { Entity, EntityCollection, EntityReference } from "../../types";
+import { useCustomizationController, useEntityFetch, useNavigationController } from "../../hooks";
 import { PreviewSize } from "../PropertyPreviewProps";
-import { SkeletonPropertyComponent } from "../property_previews/SkeletonPropertyComponent";
-import { cn, IconButton, KeyboardTabIcon, Skeleton, Tooltip, Typography } from "@firecms/ui";
+import { Skeleton } from "@firecms/ui";
 import { ErrorView } from "../../components";
-import { useAnalyticsController } from "../../hooks/useAnalyticsController";
+import { EntityPreview, EntityPreviewContainer } from "../../components/EntityPreview";
 
 export type ReferencePreviewProps = {
     disabled?: boolean;
@@ -23,8 +13,9 @@ export type ReferencePreviewProps = {
     size: PreviewSize;
     previewProperties?: string[];
     onClick?: (e: React.SyntheticEvent) => void;
-    onHover?: boolean;
-    allowEntityNavigation?: boolean;
+    hover?: boolean;
+    includeEntityLink?: boolean;
+    includeId?: boolean;
 };
 
 /**
@@ -34,12 +25,12 @@ export const ReferencePreview = React.memo<ReferencePreviewProps>(function Refer
     const reference = props.reference;
     if (!(typeof reference === "object" && "isEntityReference" in reference && reference.isEntityReference())) {
         console.warn("Reference preview received value of type", typeof reference);
-        return <ReferencePreviewContainer
+        return <EntityPreviewContainer
             onClick={props.onClick}
             size={props.size}>
             <ErrorView error={"Unexpected value. Click to edit"}
                        tooltip={JSON.stringify(reference)}/>
-        </ReferencePreviewContainer>;
+        </EntityPreviewContainer>;
     }
     return <ReferencePreviewInternal {...props} />;
 }, areEqual) as React.FunctionComponent<ReferencePreviewProps>;
@@ -47,28 +38,29 @@ export const ReferencePreview = React.memo<ReferencePreviewProps>(function Refer
 function areEqual(prevProps: ReferencePreviewProps, nextProps: ReferencePreviewProps) {
     return prevProps.disabled === nextProps.disabled &&
         prevProps.size === nextProps.size &&
-        prevProps.onHover === nextProps.onHover &&
+        prevProps.hover === nextProps.hover &&
         prevProps.reference?.id === nextProps.reference?.id &&
         prevProps.reference?.path === nextProps.reference?.path &&
-        prevProps.allowEntityNavigation === nextProps.allowEntityNavigation
+        prevProps.includeEntityLink === nextProps.includeEntityLink
         ;
 }
 
-function ReferencePreviewInternal<M extends Record<string, any>>({
-                                                                     disabled,
-                                                                     reference,
-                                                                     previewProperties,
-                                                                     size,
-                                                                     onHover,
-                                                                     onClick,
-                                                                     allowEntityNavigation = true
-                                                                 }: ReferencePreviewProps) {
+function ReferencePreviewInternal({
+                                      disabled,
+                                      reference,
+                                      previewProperties,
+                                      size,
+                                      hover,
+                                      onClick,
+                                      includeEntityLink = true,
+                                      includeId = true
+                                  }: ReferencePreviewProps) {
 
     const customizationController = useCustomizationController();
 
     const navigationController = useNavigationController();
 
-    const collection = navigationController.getCollection<EntityCollection<M>>(reference.path);
+    const collection = navigationController.getCollection(reference.path);
     if (!collection) {
         if (customizationController.components?.missingReference) {
             return <customizationController.components.missingReference path={reference.path}/>;
@@ -83,20 +75,26 @@ function ReferencePreviewInternal<M extends Record<string, any>>({
         previewProperties={previewProperties}
         size={size}
         disabled={disabled}
-        allowEntityNavigation={allowEntityNavigation}
+        includeEntityLink={includeEntityLink}
+        includeId={includeId}
         onClick={onClick}
-        onHover={onHover}/>
+        hover={hover}/>
 }
 
-function ReferencePreviewExisting<M extends Record<string, any> = any>({ reference, collection, previewProperties, size, disabled, allowEntityNavigation, onClick, onHover }: ReferencePreviewProps & {
+function ReferencePreviewExisting<M extends Record<string, any> = any>({
+                                                                           reference,
+                                                                           collection,
+                                                                           previewProperties,
+                                                                           size,
+                                                                           disabled,
+                                                                           includeEntityLink,
+                                                                           includeId,
+                                                                           onClick,
+                                                                           hover
+                                                                       }: ReferencePreviewProps & {
     collection: EntityCollection<M>
 }) {
 
-    const customizationController = useCustomizationController();
-
-    const analyticsController = useAnalyticsController();
-    const sideEntityController = useSideEntityController();
-
     const {
         entity,
         dataLoading,
@@ -114,145 +112,54 @@ function ReferencePreviewExisting<M extends Record<string, any> = any>({ referen
 
     const usedEntity = entity ?? referencesCache.get(reference.pathWithId);
 
-    const resolvedCollection = useMemo(() => resolveCollection({
-        collection,
-        path: reference.path,
-        values: usedEntity?.values,
-        fields: customizationController.propertyConfigs
-    }), [collection]);
-
-    const listProperties = useMemo(() => getReferencePreviewKeys(resolvedCollection, customizationController.propertyConfigs, previewProperties, size === "small" || size === "medium" ? 3 : 1),
-        [previewProperties, resolvedCollection, size]);
-
     let body: React.ReactNode;
 
-    if (!resolvedCollection) {
-        return <ErrorView
-            error={"Could not find collection with id " + resolvedCollection}/>
-    }
-
     if (!reference) {
         body = <ErrorView error={"Reference not set"}/>;
     } else if (usedEntity && !usedEntity.values) {
         body = <ErrorView error={"Reference does not exist"}
                           tooltip={reference.path}/>;
-    } else {
-        body = (
-            <>
-                <div
-                    className="flex flex-col flex-grow w-full max-w-[calc(100%-52px)] m-1">
-
-                    {size !== "tiny" && (
-                        reference
-                            ? <div className={`${
-                                size !== "medium"
-                                    ? "block whitespace-nowrap overflow-hidden truncate"
-                                    : ""
-                            }`}>
-                                <Typography variant={"caption"}
-                                            className={"font-mono"}>
-                                    {reference.id}
-                                </Typography>
-                            </div>
-                            : <Skeleton/>)}
-
-                    {listProperties && listProperties.map((key) => {
-                        const childProperty = resolvedCollection.properties[key as string];
-                        if (!childProperty) return null;
-
-                        return (
-                            <div key={"ref_prev_" + (key as string)}
-                                 className={listProperties.length > 1 ? "my-0.5" : "my-0"}>
-                                {
-                                    usedEntity
-                                        ? <PropertyPreview
-                                            propertyKey={key as string}
-                                            value={getValueInPath(usedEntity.values, key)}
-                                            property={childProperty as ResolvedProperty}
-                                            // entity={usedEntity}
-                                            size={"tiny"}/>
-                                        : <SkeletonPropertyComponent
-                                            property={childProperty as ResolvedProperty}
-                                            size={"tiny"}/>
-                                }
-                            </div>
-                        );
-                    })}
-
-                </div>
-                <div className={`my-${size === "tiny" ? 2 : 4}`}>
-                    {!disabled && usedEntity && allowEntityNavigation &&
-                        <Tooltip title={`See details for ${usedEntity.id}`}>
-                            <IconButton
-                                color={"inherit"}
-                                size={"small"}
-                                onClick={(e) => {
-                                    e.stopPropagation();
-                                    analyticsController.onAnalyticsEvent?.("entity_click_from_reference", {
-                                        path: usedEntity.path,
-                                        entityId: usedEntity.id
-                                    });
-                                    sideEntityController.open({
-                                        entityId: usedEntity.id,
-                                        path: usedEntity.path,
-                                        collection: resolvedCollection,
-                                        updateUrl: true
-                                    });
-                                }}>
-                                <KeyboardTabIcon size={"small"}/>
-                            </IconButton>
-                        </Tooltip>}
-                </div>
-            </>
+    }
+    if (body) {
+
+        return (
+            <EntityPreviewContainer onClick={disabled ? undefined : onClick}
+                                    hover={disabled ? undefined : hover}
+                                    size={size}>
+                {body}
+            </EntityPreviewContainer>
         );
     }
 
-    return (
-        <ReferencePreviewContainer onClick={disabled ? undefined : onClick}
-                                   onHover={disabled ? undefined : onHover}
-                                   size={size}>
-            {body}
-        </ReferencePreviewContainer>
-    );
-}
-
-export function ReferencePreviewContainer({
-                                              children,
-                                              onHover,
-                                              size,
-                                              onClick
-                                          }: {
-    children: React.ReactNode;
-    onHover?: boolean;
-    size: PreviewSize;
-    onClick?: (e: React.SyntheticEvent) => void;
-}) {
-    return <Typography variant={"label"}
-                       className={cn("bg-opacity-70 bg-gray-100 dark:bg-gray-800 dark:bg-opacity-60",
-                           "w-full",
-                           "flex",
-                           "rounded-md",
-                           "overflow-hidden",
-                           onHover ? "hover:bg-opacity-90 dark:hover:bg-opacity-90" : "",
-                           size === "medium" ? "p-2" : "p-1",
-                           size === "tiny" ? "items-center" : "",
-                           "transition-colors duration-300 ease-in-out ",
-                           // onHover ? "shadow-outline" : "",
-                           onClick ? "cursor-pointer" : "")}
-                       style={{
-                           // @ts-ignore
-                           tabindex: 0
-                       }}
-                       onClick={(event) => {
-                           if (onClick) {
-                               event.preventDefault();
-                               onClick(event);
-                           }
-                       }}>
+    if (dataLoading && !usedEntity) {
+        return (
+            <EntityPreviewContainer onClick={disabled ? undefined : onClick}
+                                    hover={disabled ? undefined : hover}
+                                    size={size}>
+                <Skeleton/>
+            </EntityPreviewContainer>
+        );
+    }
 
-        {children}
+    if (!usedEntity) {
+        return (
+            <EntityPreviewContainer onClick={disabled ? undefined : onClick}
+                                    hover={disabled ? undefined : hover}
+                                    size={size}>
+                <ErrorView error={"Entity not found"}/>
+            </EntityPreviewContainer>
+        );
+    }
+    return <EntityPreview size={size}
+                          previewProperties={previewProperties}
+                          disabled={disabled}
+                          entity={usedEntity}
+                          collection={collection}
+                          onClick={onClick}
+                          includeEntityLink={includeEntityLink}
+                          includeId={includeId}
+                          hover={hover}/>;
 
-    </Typography>
 }
 
 const referencesCache = new Map<string, Entity<any>>();

package/src/preview/property_previews/ArrayOfMapsPreview.tsx

@@ -20,7 +20,6 @@ export function ArrayOfMapsPreview({
     const property = resolveArrayProperty({
         propertyKey,
         property: inputProperty,
-        propertyValue: value,
         fields: customizationController.propertyConfigs
     });
 

package/src/preview/property_previews/ArrayOfReferencesPreview.tsx

@@ -18,7 +18,6 @@ export function ArrayOfReferencesPreview({
     const property = resolveArrayProperty({
         propertyKey,
         property: inputProperty,
-        propertyValue: value,
         fields: customizationController.propertyConfigs
     });
 
@@ -43,6 +42,8 @@ export function ArrayOfReferencesPreview({
                                 previewProperties={ofProperty.previewProperties}
                                 size={childSize}
                                 reference={reference}
+                                includeId={ofProperty.includeId}
+                                includeEntityLink={ofProperty.includeEntityLink}
                             />
                         </div>;
                     }

package/src/preview/property_previews/ArrayOfStorageComponentsPreview.tsx

@@ -23,7 +23,6 @@ export function ArrayOfStorageComponentsPreview({
     const property = resolveArrayProperty({
         propertyKey,
         property: inputProperty,
-        propertyValue: value,
         fields: customizationController.propertyConfigs
     });
 

package/src/preview/property_previews/ArrayOfStringsPreview.tsx

@@ -21,7 +21,6 @@ export function ArrayOfStringsPreview({
     const property = resolveArrayProperty({
         propertyKey,
         property: inputProperty,
-        propertyValue: value,
         fields: customizationController.propertyConfigs
     });
 

package/src/preview/property_previews/ArrayOneOfPreview.tsx

@@ -4,7 +4,7 @@ import { ResolvedProperty } from "../../types";
 import { useCustomizationController } from "../../hooks";
 import { PreviewSize, PropertyPreviewProps } from "../PropertyPreviewProps";
 import { PropertyPreview } from "../PropertyPreview";
-import { cn, defaultBorderMixin } from "@firecms/ui";
+import { cls, defaultBorderMixin } from "@firecms/ui";
 import { DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE } from "../../util/common";
 import { ErrorBoundary } from "../../components";
 
@@ -23,7 +23,6 @@ export function ArrayOneOfPreview({
     const property = resolveArrayProperty({
         propertyKey,
         property: inputProperty,
-        propertyValue: value,
         fields: customizationController.propertyConfigs
     });
 
@@ -50,7 +49,7 @@ export function ArrayOneOfPreview({
                 values.map((value, index) =>
                     <React.Fragment
                         key={"preview_array_" + value + "_" + index}>
-                        <div className={cn(defaultBorderMixin, "m-1 border-b last:border-b-0")}>
+                        <div className={cls(defaultBorderMixin, "m-1 border-b last:border-b-0")}>
                             <ErrorBoundary>
                                 {value && <PropertyPreview
                                     propertyKey={propertyKey}

package/src/preview/property_previews/ArrayPropertyPreview.tsx

@@ -5,7 +5,7 @@ import { ResolvedProperty } from "../../types";
 import { useCustomizationController } from "../../hooks";
 import { PreviewSize, PropertyPreviewProps } from "../PropertyPreviewProps";
 import { PropertyPreview } from "../PropertyPreview";
-import { cn, defaultBorderMixin } from "@firecms/ui";
+import { cls, defaultBorderMixin } from "@firecms/ui";
 import { ErrorBoundary } from "../../components";
 
 /**
@@ -23,7 +23,6 @@ export function ArrayPropertyPreview({
     const property = resolveArrayProperty({
         propertyKey,
         property: inputProperty,
-        propertyValue: value,
         fields: customizationController.propertyConfigs
     });
 
@@ -49,7 +48,7 @@ export function ArrayPropertyPreview({
                         return of
                             ? <React.Fragment
                                 key={"preview_array_" + index}>
-                                <div className={cn(defaultBorderMixin, "m-1 border-b last:border-b-0")}>
+                                <div className={cls(defaultBorderMixin, "m-1 border-b last:border-b-0")}>
                                     <ErrorBoundary>
                                         <PropertyPreview
                                             propertyKey={propertyKey}

package/src/preview/property_previews/MapPropertyPreview.tsx

@@ -3,7 +3,7 @@ import React from "react";
 import { ResolvedMapProperty } from "../../types";
 import { PropertyPreviewProps } from "../PropertyPreviewProps";
 import { PropertyPreview } from "../PropertyPreview";
-import { cn, defaultBorderMixin, Typography } from "@firecms/ui";
+import { cls, defaultBorderMixin, Typography } from "@firecms/ui";
 import { ErrorBoundary } from "../../components";
 import { EmptyValue } from "../components/EmptyValue";
 
@@ -61,7 +61,7 @@ export function MapPropertyPreview<T extends Record<string, any> = Record<string
                     return (
                         <div
                             key={`map_preview_table_${key}}`}
-                            className={cn(defaultBorderMixin, "last:border-b-0 border-b")}>
+                            className={cls(defaultBorderMixin, "last:border-b-0 border-b")}>
                             <div
                                 className={"flex flex-row pt-0.5 pb-0.5 gap-2"}>
                                 <div
@@ -87,7 +87,7 @@ export function MapPropertyPreview<T extends Record<string, any> = Record<string
                             </div>
 
                             {(childProperty.dataType === "map" || childProperty === "array") &&
-                                <div className={cn(defaultBorderMixin, "border-l pl-4 ml-2 my-2")}>
+                                <div className={cls(defaultBorderMixin, "border-l pl-4 ml-2 my-2")}>
                                     <PropertyPreview
                                         propertyKey={key}
                                         value={(value)[key]}
@@ -113,7 +113,7 @@ export function KeyValuePreview({ value }: { value: any }) {
             Object.entries(value).map(([key, childValue]) => (
                 <div
                     key={`map_preview_table_${key}}`}
-                    className={cn(defaultBorderMixin, "last:border-b-0 border-b")}>
+                    className={cls(defaultBorderMixin, "last:border-b-0 border-b")}>
                     <div
                         className={"flex flex-row pt-0.5 pb-0.5 gap-2"}>
                         <div
@@ -135,7 +135,7 @@ export function KeyValuePreview({ value }: { value: any }) {
                         </div>
                     </div>
                     {typeof childValue === "object" &&
-                        <div className={cn(defaultBorderMixin, "border-l pl-4")}>
+                        <div className={cls(defaultBorderMixin, "border-l pl-4")}>
                             <KeyValuePreview value={childValue}/>
                         </div>
                     }

package/src/preview/property_previews/StringPropertyPreview.tsx

@@ -6,7 +6,7 @@ import { PreviewType } from "../../types";
 import { UrlComponentPreview } from "../components/UrlComponentPreview";
 import { PropertyPreviewProps } from "../PropertyPreviewProps";
 import { ErrorBoundary } from "../../components";
-import { Chip, getColorSchemeForSeed } from "@firecms/ui";
+import { Chip, cls, getColorSchemeForSeed } from "@firecms/ui";
 
 /**
  * @group Preview components
@@ -24,14 +24,14 @@ export function StringPropertyPreview({
         return <EnumValuesChip
             enumKey={enumKey}
             enumValues={resolvedProperty.enumValues}
-            size={size !== "medium" ? "small" : "medium"}/>;
+            size={size}/>;
     } else if (property.previewAsTag) {
         const colorScheme = getColorSchemeForSeed(propertyKey ?? "");
         return (
             <ErrorBoundary>
                 <Chip
                     colorScheme={colorScheme}
-                    size={size !== "medium" ? "small" : "medium"}>
+                    size={size}>
                     {value}
                 </Chip>
             </ErrorBoundary>);
@@ -45,15 +45,16 @@ export function StringPropertyPreview({
         if (!value) return <></>;
         const lines = value.split("\n");
         return value && value.includes("\n")
-            ? <div className={"overflow-x-scroll"}>
+            ? <div className={cls("overflow-x-scroll", size === "tiny" ? "text-sm" : "")}>
                 {lines.map((str, index) =>
                     <React.Fragment key={`string_preview_${index}`}>
                         <span>{str}</span>
                         {index !== lines.length - 1 && <br/>}
                     </React.Fragment>)}
             </div>
-            : <>
-                {value}
-            </>;
+            : (size === "tiny"
+                    ? <span className={"text-sm"}>{value}</span>
+                    : <>{value}</>
+            );
     }
 }

package/src/types/analytics.ts

@@ -26,6 +26,7 @@ export type CMSAnalyticsEvent =
     | "home_navigate_to_collection"
     | "home_favorite_navigate_to_collection"
     | "home_navigate_to_view"
+    | "home_navigate_to_admin_view"
     | "home_favorite_navigate_to_view"
 
     | "collection_inline_editing"

package/src/types/auth.tsx

@@ -1,4 +1,7 @@
 import { User } from "./user";
+import { Role } from "./roles";
+import { DataSourceDelegate } from "./datasource";
+import { StorageSource } from "./storage";
 
 /**
  * Controller for retrieving the logged user or performing auth related operations.
@@ -6,7 +9,7 @@ import { User } from "./user";
  * to do it as the result of a hook.
  * @group Hooks and utilities
  */
-export type AuthController<UserType extends User = User> = {
+export type AuthController<UserType extends User = any, ExtraData extends any = any> = {
 
     /**
      * The user currently logged in
@@ -14,6 +17,11 @@ export type AuthController<UserType extends User = User> = {
      */
     user: UserType | null;
 
+    /**
+     * Roles related to the logged user
+     */
+    roles?: Role[];
+
     /**
      * Initial loading flag. It is used not to display the login screen
      * when the app first loads, and it has not been checked whether the user
@@ -21,6 +29,12 @@ export type AuthController<UserType extends User = User> = {
      */
     initialLoading?: boolean;
 
+    /**
+     * Loading flag. It is used to display a loading screen when the user is
+     * logging in or out.
+     */
+    authLoading: boolean;
+
     /**
      * Sign out
      */
@@ -46,4 +60,39 @@ export type AuthController<UserType extends User = User> = {
      */
     loginSkipped: boolean;
 
+    extra: ExtraData;
+
+    setExtra: (extra: ExtraData) => void;
+
+    // setUser?: (user: UserType | null) => void;
+
+    // setRoles?: (roles: Role[]) => void;
 };
+
+/**
+ * Implement this function to allow access to specific users.
+ * @group Hooks and utilities
+ */
+export type Authenticator<UserType extends User = User, Controller extends AuthController<UserType> = AuthController<UserType>> = (props: {
+
+    /**
+     * Logged-in user or null
+     */
+    user: UserType | null;
+
+    /**
+     * AuthController
+     */
+    authController: Controller;
+
+    /**
+     * Connector to your database, e.g. your Firestore database
+     */
+    dataSourceDelegate: DataSourceDelegate;
+
+    /**
+     * Used storage implementation
+     */
+    storageSource: StorageSource;
+
+}) => boolean | Promise<boolean>;