@firecms/core 3.0.0-canary.5 → 3.0.0-canary.50

package/src/components/EntityCollectionTable/PropertyTableCell.tsx

@@ -24,7 +24,7 @@ import { getPreviewSizeFrom } from "../../preview/util";
 import { isReadOnly } from "../../util";
 
 import { CustomFieldValidator, mapPropertyToYup } from "../../form/validation";
-import {  useFireCMSContext } from "../../hooks";
+import { useFireCMSContext } from "../../hooks";
 
 import { EntityTableCell } from "./internal/EntityTableCell";
 import { EntityTableCellActions } from "./internal/EntityTableCellActions";
@@ -33,7 +33,7 @@ import { getRowHeight } from "../VirtualTable/common";
 import { useSelectableTableController } from "../SelectableTable/SelectableTableContext";
 import { useClearRestoreValue } from "../../form/useClearRestoreValue";
 
-export interface PropertyTableCellProps<T extends CMSType, M extends Record<string, any>> {
+export interface PropertyTableCellProps<T extends CMSType> {
     propertyKey: string;
     columnIndex: number;
     align: "right" | "left" | "center";
@@ -46,6 +46,7 @@ export interface PropertyTableCellProps<T extends CMSType, M extends Record<stri
     entity: Entity<any>;
     path: string;
     disabled: boolean;
+    enablePopupIcon?: boolean;
 }
 
 function isStorageProperty(property: ResolvedProperty) {
@@ -62,7 +63,7 @@ function isStorageProperty(property: ResolvedProperty) {
     return false;
 }
 
-export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
+export const PropertyTableCell = React.memo<PropertyTableCellProps<any>>(
     function PropertyTableCell<T extends CMSType, M extends Record<string, any>>({
                                                                                      propertyKey,
                                                                                      customFieldValidator,
@@ -74,10 +75,9 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                                                                                      path,
                                                                                      entity,
                                                                                      readonly,
-                                                                                     disabled: disabledProp
-                                                                                 }: PropertyTableCellProps<T, M>) {
-
-        const context = useFireCMSContext();
+                                                                                     disabled: disabledProp,
+                                                                                     enablePopupIcon = true
+                                                                                 }: PropertyTableCellProps<T>) {
 
         const {
             onValueChange,
@@ -95,6 +95,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
         const internalValueRef = useRef(value);
 
         const [error, setError] = useState<Error | undefined>();
+        const [validationError, setValidationError] = useState<Error | undefined>();
         const [saved, setSaved] = useState<boolean>(false);
 
         const onValueUpdated = useCallback(() => {
@@ -120,7 +121,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
         useEffect(
             () => {
                 if (!equal(value, internalValueRef.current)) {
-                    setError(undefined);
+                    setValidationError(undefined);
                     setInternalValue(value);
                     internalValueRef.current = value;
                     onValueUpdated();
@@ -136,32 +137,34 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
             validation
                 .validate(value)
                 .then(() => {
-                    setError(undefined);
+                    setValidationError(undefined);
                     internalValueRef.current = value;
                     if (onValueChange) {
-                        onValueChange({
-                            value,
-                            propertyKey,
-                            setError,
-                            onValueUpdated,
-                            entity,
-                            fullPath: path,
-                            context
-                        });
+                        try {
+                            onValueChange({
+                                value,
+                                propertyKey,
+                                setError,
+                                onValueUpdated,
+                                data: entity,
+                            });
+                        } catch (e:any) {
+                            console.error("onValueChange error", e);
+                            setError(e);
+                        }
+
                     }
                 })
                 .catch((e) => {
-                    setError(e);
+                    setValidationError(e);
                 });
         };
 
         useEffect(() => {
             validation
                 .validate(internalValue)
-                .then(() => setError(undefined))
-                .catch((e) => {
-                    setError(e);
-                });
+                .then(() => setValidationError(undefined))
+                .catch(setValidationError);
         }, [internalValue, validation, propertyKey, property, entity]);
 
         const updateValue = (newValue: any | null) => {
@@ -237,7 +240,6 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                     height={getRowHeight(size)}
                     propertyKey={propertyKey}
                     property={property}
-                    // entity={entity}
                     value={internalValue}
                     size={getPreviewSizeFrom(size)}
                 />
@@ -247,7 +249,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
         if (!customField && (!customPreview || selected)) {
             const isAStorageProperty = isStorageProperty(property);
             if (isAStorageProperty) {
-                innerComponent = <TableStorageUpload error={error}
+                innerComponent = <TableStorageUpload error={validationError ?? error}
                                                      disabled={disabled}
                                                      focused={selected}
                                                      selected={selected}
@@ -274,7 +276,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                                                          valueType={"number"}
                                                          small={getPreviewSizeFrom(size) !== "medium"}
                                                          enumValues={numberProperty.enumValues}
-                                                         error={error}
+                                                         error={validationError ?? error}
                                                          internalValue={internalValue as string | number}
                                                          updateValue={updateValue}
                     />;
@@ -282,7 +284,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                 } else {
                     innerComponent = <VirtualTableNumberInput
                         align={align}
-                        error={error}
+                        error={validationError ?? error}
                         focused={selected}
                         disabled={disabled}
                         value={internalValue as number}
@@ -300,14 +302,14 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                                                          valueType={"string"}
                                                          small={getPreviewSizeFrom(size) !== "medium"}
                                                          enumValues={stringProperty.enumValues}
-                                                         error={error}
+                                                         error={validationError ?? error}
                                                          internalValue={internalValue as string | number}
                                                          updateValue={updateValue}
                     />;
                     fullHeight = true;
                 } else if (!stringProperty.storage) {
                     const multiline = Boolean(stringProperty.multiline) || Boolean(stringProperty.markdown);
-                    innerComponent = <VirtualTableInput error={error}
+                    innerComponent = <VirtualTableInput error={validationError ?? error}
                                                         disabled={disabled}
                                                         multiline={multiline}
                                                         focused={selected}
@@ -317,7 +319,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                     allowScroll = true;
                 }
             } else if (property.dataType === "boolean") {
-                innerComponent = <VirtualTableSwitch error={error}
+                innerComponent = <VirtualTableSwitch error={validationError ?? error}
                                                      disabled={disabled}
                                                      focused={selected}
                                                      internalValue={internalValue as boolean}
@@ -325,7 +327,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                 />;
             } else if (property.dataType === "date") {
                 innerComponent = <VirtualTableDateField name={propertyKey as string}
-                                                        error={error}
+                                                        error={validationError ?? error}
                                                         disabled={disabled}
                                                         mode={property.mode}
                                                         focused={selected}
@@ -368,7 +370,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                                                     small={getPreviewSizeFrom(size) !== "medium"}
                                                     valueType={arrayProperty.of.dataType}
                                                     enumValues={arrayProperty.of.enumValues}
-                                                    error={error}
+                                                    error={validationError ?? error}
                                                     internalValue={internalValue as string | number}
                                                     updateValue={updateValue}
                                 />;
@@ -401,16 +403,14 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
 
         if (!innerComponent) {
             allowScroll = false;
-            showExpandIcon = selected && !innerComponent && !disabled && !readOnlyProperty;
+            showExpandIcon = enablePopupIcon && selected && !innerComponent && !disabled && !readOnlyProperty;
             innerComponent = (
-                <PropertyPreview
-                    width={width}
-                    height={height}
-                    // entity={entity}
-                    propertyKey={propertyKey as string}
-                    value={internalValue}
-                    property={property}
-                    size={getPreviewSizeFrom(size)}
+                <PropertyPreview width={width}
+                                 height={height}
+                                 propertyKey={propertyKey as string}
+                                 value={internalValue}
+                                 property={property}
+                                 size={getPreviewSizeFrom(size)}
                 />
             );
         }
@@ -427,7 +427,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                 removePadding={removePadding}
                 fullHeight={fullHeight}
                 saved={saved}
-                error={error}
+                error={validationError ?? error}
                 align={align}
                 allowScroll={allowScroll}
                 showExpandIcon={showExpandIcon}
@@ -447,9 +447,9 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
         );
 
     },
-    areEqual) as React.FunctionComponent<PropertyTableCellProps<any, any>>;
+    areEqual) as React.FunctionComponent<PropertyTableCellProps<any>>;
 
-function areEqual(prevProps: PropertyTableCellProps<any, any>, nextProps: PropertyTableCellProps<any, any>) {
+function areEqual(prevProps: PropertyTableCellProps<any>, nextProps: PropertyTableCellProps<any>) {
     return prevProps.height === nextProps.height &&
         prevProps.propertyKey === nextProps.propertyKey &&
         prevProps.align === nextProps.align &&

package/src/components/EntityCollectionTable/column_utils.tsx

@@ -21,7 +21,6 @@ export interface PropertiesToColumnsParams<M extends Record<string, any>> {
     properties: ResolvedProperties<M>;
     sortable?: boolean;
     forceFilter?: FilterValues<keyof M extends string ? keyof M : never>;
-    disabledFilter?: boolean;
     AdditionalHeaderWidget?: React.ComponentType<{
         property: ResolvedProperty,
         propertyKey: string,
@@ -29,7 +28,8 @@ export interface PropertiesToColumnsParams<M extends Record<string, any>> {
     }>;
 }
 
-export function propertiesToColumns<M extends Record<string, any>>({ properties, sortable, forceFilter, disabledFilter, AdditionalHeaderWidget }: PropertiesToColumnsParams<M>): VirtualTableColumn[] {
+export function propertiesToColumns<M extends Record<string, any>>({ properties, sortable, forceFilter, AdditionalHeaderWidget }: PropertiesToColumnsParams<M>): VirtualTableColumn[] {
+    const disabledFilter = Boolean(forceFilter);
     return Object.entries<ResolvedProperty>(properties)
         .flatMap(([key, property]) => getColumnKeysForProperty(property, key))
         .map(({
@@ -45,7 +45,7 @@ export function propertiesToColumns<M extends Record<string, any>>({ properties,
                 align: getTableCellAlignment(property),
                 icon: getIconForProperty(property, "small"),
                 title: property.name ?? key as string,
-                sortable: sortable && (forceFilter ? Object.keys(forceFilter).includes(key) : true),
+                sortable: sortable,
                 filter: !disabledFilter && filterable,
                 width: getTablePropertyColumnWidth(property),
                 resizable: true,

package/src/components/EntityCollectionTable/fields/TableReferenceField.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from "react";
 import equal from "react-fast-compare"
 
-import { ReferencePreview, ReferencePreviewContainer } from "../../../preview";
+import { ReferencePreview } from "../../../preview";
 import { CollectionSize, Entity, EntityCollection, EntityReference, FilterValues } from "../../../types";
 
 import { getPreviewSizeFrom } from "../../../preview/util";
@@ -9,6 +9,7 @@ import { getReferenceFrom } from "../../../util";
 import { useCustomizationController, useNavigationController, useReferenceDialog } from "../../../hooks";
 import { ErrorView } from "../../ErrorView";
 import { Button } from "@firecms/ui";
+import { EntityPreviewContainer } from "../../EntityPreview";
 
 type TableReferenceFieldProps = {
     name: string;
@@ -28,7 +29,7 @@ export function TableReferenceField(props: TableReferenceFieldProps) {
 
     const navigationController = useNavigationController();
     const { path } = props;
-    const collection = navigationController.getCollection<EntityCollection>(path);
+    const collection = navigationController.getCollection(path);
     if (!collection) {
         if (customizationController.components?.missingReference) {
             return <customizationController.components.missingReference path={path}/>;
@@ -57,11 +58,6 @@ export const TableReferenceFieldSuccess = React.memo(
             collection
         } = props;
 
-        const [onHover, setOnHover] = useState(false);
-
-        const hoverTrue = useCallback(() => setOnHover(true), []);
-        const hoverFalse = useCallback(() => setOnHover(false), []);
-
         const onSingleEntitySelected = useCallback((entity: Entity<any>) => {
             updateValue(entity ? getReferenceFrom(entity) : null);
         }, [updateValue]);
@@ -101,29 +97,29 @@ export const TableReferenceFieldSuccess = React.memo(
                     onClick={disabled ? undefined : handleOpen}
                     size={getPreviewSizeFrom(size)}
                     reference={internalValue as EntityReference}
-                    onHover={onHover}
+                    hover={!disabled}
                     disabled={!path}
                     previewProperties={previewProperties}
                 />;
             else
-                return <ReferencePreviewContainer
+                return <EntityPreviewContainer
                     onClick={disabled ? undefined : handleOpen}
                     size={getPreviewSizeFrom(size)}>
                     <ErrorView title="Value is not a reference." error={"Click to edit"}/>
-                </ReferencePreviewContainer>;
+                </EntityPreviewContainer>;
         };
 
         const buildMultipleReferenceField = () => {
             if (Array.isArray(internalValue))
                 return <>
                     {internalValue.map((reference, index) =>
-                        <div className="m-1 w-full"
+                        <div className="w-full my-0.5"
                              key={`preview_array_ref_${name}_${index}`}>
                             <ReferencePreview
                                 onClick={disabled ? undefined : handleOpen}
                                 size={"tiny"}
                                 reference={reference}
-                                onHover={onHover}
+                                hover={!disabled}
                                 disabled={!path}
                                 previewProperties={previewProperties}
                             />
@@ -139,10 +135,7 @@ export const TableReferenceFieldSuccess = React.memo(
             return <ErrorView error={"The specified collection does not exist"}/>;
 
         return (
-            <div className="w-full"
-                 onMouseEnter={hoverTrue}
-                 onMouseMove={hoverTrue}
-                 onMouseLeave={hoverFalse}>
+            <div className="w-full group">
 
                 {internalValue && !multiselect && buildSingleReferenceField()}
 

package/src/components/EntityCollectionTable/fields/TableStorageUpload.tsx

@@ -51,7 +51,7 @@ export function TableStorageUpload(props: {
         entity,
         path,
         previewSize,
-        updateValue
+        updateValue,
     } = props;
 
     const storageSource = useStorageSource();
@@ -137,7 +137,7 @@ function StorageUpload({
                            storage,
                            onFilesAdded,
                            onFileUploadComplete,
-                           storagePathBuilder
+                           storagePathBuilder,
                        }: StorageUploadProps) {
 
     const [onHover, setOnHover] = useState(false);
@@ -293,7 +293,7 @@ export function TableStorageItemPreview({
 
     return (
         <div
-            className={"relative m-2"}
+            className={"relative p-2 max-w-full"}
         >
 
             {value &&

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

@@ -16,20 +16,27 @@ import { useLargeLayout } from "../../../hooks";
 
 interface CollectionTableToolbarProps {
     size: CollectionSize;
-    filterIsSet: boolean;
     loading: boolean;
-    forceFilter?: boolean;
     actionsStart?: React.ReactNode;
     actions?: React.ReactNode;
     title?: React.ReactNode,
     onTextSearchClick?: () => void;
     onTextSearch?: (searchString?: string) => void;
     onSizeChanged: (size: CollectionSize) => void;
-    clearFilter?: () => void;
     textSearchLoading?: boolean;
 }
 
-export function CollectionTableToolbar(props: CollectionTableToolbarProps) {
+export function CollectionTableToolbar({
+                                           actions,
+                                           actionsStart,
+                                           loading,
+                                           onSizeChanged,
+                                           onTextSearch,
+                                           onTextSearchClick,
+                                           size,
+                                           textSearchLoading,
+                                           title
+                                       }: CollectionTableToolbarProps) {
 
     const searchInputRef = React.useRef<HTMLInputElement>(null);
     const largeLayout = useLargeLayout();
@@ -37,30 +44,20 @@ export function CollectionTableToolbar(props: CollectionTableToolbarProps) {
     const searchLoading = React.useRef<boolean>(false);
 
     useEffect(() => {
-        if (searchInputRef.current && searchLoading.current && !props.textSearchLoading) {
+        if (searchInputRef.current && searchLoading.current && !textSearchLoading) {
             searchInputRef.current.focus();
         }
-        searchLoading.current = props.textSearchLoading ?? false;
-    }, [props.textSearchLoading]);
-
-    const clearFilterButton = !props.forceFilter && props.filterIsSet && props.clearFilter &&
-        <Button
-            variant={"outlined"}
-            className="h-fit-content"
-            aria-label="filter clear"
-            onClick={props.clearFilter}
-            size="small">
-            <FilterListOffIcon/>
-            Clear filter
-        </Button>;
+        searchLoading.current = textSearchLoading ?? false;
+    }, [textSearchLoading]);
+
 
     const sizeSelect = (
         <Tooltip title={"Table row size"} side={"right"} sideOffset={4}>
             <Select
-                value={props.size as string}
+                value={size as string}
                 className="w-16 h-10"
                 size={"small"}
-                onValueChange={(v) => props.onSizeChanged(v as CollectionSize)}
+                onValueChange={(v) => onSizeChanged(v as CollectionSize)}
                 renderValue={(v) => <div className={"font-medium"}>{v.toUpperCase()}</div>}
             >
                 {["xs", "s", "m", "l", "xl"].map((size) => (
@@ -78,36 +75,34 @@ export function CollectionTableToolbar(props: CollectionTableToolbarProps) {
 
             <div className="flex items-center gap-2 md:mr-4 mr-2">
 
-                {props.title && <div className={"hidden lg:block"}>
-                    {props.title}
+                {title && <div className={"hidden lg:block"}>
+                    {title}
                 </div>}
 
                 {sizeSelect}
 
-                {props.actionsStart}
-
-                {clearFilterButton}
+                {actionsStart}
 
             </div>
 
             <div className="flex items-center gap-2">
 
                 {largeLayout && <div className="w-[22px]">
-                    {props.loading &&
+                    {loading &&
                         <CircularProgress size={"small"}/>}
                 </div>}
 
-                {(props.onTextSearch || props.onTextSearchClick) &&
+                {(onTextSearch || onTextSearchClick) &&
                     <SearchBar
                         key={"search-bar"}
                         inputRef={searchInputRef}
-                        loading={props.textSearchLoading}
-                        disabled={Boolean(props.onTextSearchClick)}
-                        onClick={props.onTextSearchClick}
-                        onTextSearch={props.onTextSearchClick ? undefined : props.onTextSearch}
+                        loading={textSearchLoading}
+                        disabled={Boolean(onTextSearchClick)}
+                        onClick={onTextSearchClick}
+                        onTextSearch={onTextSearchClick ? undefined : onTextSearch}
                         expandable={true}/>}
 
-                {props.actions}
+                {actions}
 
             </div>
 

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

@@ -96,7 +96,7 @@ export const EntityTableCell = React.memo<EntityTableCellProps>(
         const [onHover, setOnHover] = useState(false);
         const [internalSaved, setInternalSaved] = useState(saved);
 
-        const showError = !disabled && error;
+        const showError = !disabled && Boolean(error);
 
         useEffect(() => {
             if (saved) {
@@ -176,21 +176,26 @@ export const EntityTableCell = React.memo<EntityTableCellProps>(
         const setOnHoverTrue = useCallback(() => setOnHover(true), []);
         const setOnHoverFalse = useCallback(() => setOnHover(false), []);
 
+        const borderClass = showError
+            ? "border-red-500"
+            : internalSaved
+                ? "border-green-500"
+                : isSelected
+                    ? "border-primary"
+                    : "border-transparent";
+
         return (
             <div
-                ref={ref}
                 className={cn(
                     "transition-colors duration-100 ease-in-out",
                     `flex relative h-full rounded-md p-${p} border border-4  border-opacity-75`,
                     onHover && !disabled ? "bg-gray-50 dark:bg-gray-900" : "",
                     saved ? "bg-gray-100 bg-opacity-75 dark:bg-gray-800 dark:bg-opacity-75" : "",
-                    !isSelected && !internalSaved && !showError ? "border-transparent" : "",
                     hideOverflow ? "overflow-hidden" : "",
                     isSelected ? "bg-gray-50 dark:bg-gray-900" : "",
-                    isSelected && !internalSaved ? "border-primary" : "",
-                    internalSaved ? "border-green-500 " : "",
-                    showError ? "border-red-500" : ""
+                    borderClass
                 )}
+                ref={ref}
                 style={{
                     justifyContent,
                     alignItems: disabled || !isOverflowing ? "center" : undefined,

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

@@ -9,21 +9,23 @@ export const editEntityAction: EntityAction = {
     onClick({
                 entity,
                 collection,
+                fullPath,
                 context,
                 highlightEntity,
-                unhighlightEntity
+                unhighlightEntity,
             }): Promise<void> {
         highlightEntity?.(entity);
         context.analyticsController?.onAnalyticsEvent?.("entity_click", {
             path: entity.path,
             entityId: entity.id
         });
+        const path = collection?.collectionGroup ? entity.path : (fullPath ?? entity.path);
         context.sideEntityController.open({
             entityId: entity.id,
-            path: entity.path,
+            path,
             collection,
             updateUrl: true,
-            onClose: () => unhighlightEntity?.(entity)
+            onClose: () => unhighlightEntity?.(entity),
         });
         return Promise.resolve(undefined);
     }
@@ -37,7 +39,7 @@ export const copyEntityAction: EntityAction = {
                 collection,
                 context,
                 highlightEntity,
-                unhighlightEntity
+                unhighlightEntity,
             }): Promise<void> {
         highlightEntity?.(entity);
         context.analyticsController?.onAnalyticsEvent?.("copy_entity_click", {
@@ -50,11 +52,12 @@ export const copyEntityAction: EntityAction = {
             copy: true,
             collection,
             updateUrl: true,
-            onClose: () => unhighlightEntity?.(entity)
+            onClose: () => unhighlightEntity?.(entity),
         });
         return Promise.resolve(undefined);
     }
 }
+
 export const archiveEntityAction: EntityAction = {
     icon: <ArchiveIcon/>,
     name: "Archive",
@@ -69,6 +72,7 @@ export const archiveEntityAction: EntityAction = {
         return Promise.resolve(undefined);
     }
 }
+
 export const openWebsiteAction: EntityAction = {
     icon: <OpenInNewIcon/>,
     name: "See in website",

package/src/components/EntityCollectionTable/internal/popup_field/PopupFormField.tsx

@@ -41,7 +41,7 @@ interface PopupFormFieldProps<M extends Record<string, any>> {
      * Callback when the value of a cell has been edited
      * @param params
      */
-    onCellValueChange?: (params: OnCellValueChangeParams<any, M>) => Promise<void> | void;
+    onCellValueChange?: (params: OnCellValueChangeParams<any, any>) => Promise<void> | void;
 }
 
 export function PopupFormField<M extends Record<string, any>>(props: PopupFormFieldProps<M>) {
@@ -205,12 +205,10 @@ export function PopupFormFieldInternal<M extends Record<string, any>>({
             return onCellValueChange({
                 value: values[propertyKey as string],
                 propertyKey: propertyKey as string,
-                entity,
+                data: entity,
                 setError: setSavingError,
                 onValueUpdated: () => {
                 },
-                fullPath: path,
-                context: fireCMSContext
             });
         }
         return Promise.resolve();