@firecms/core 3.0.0-beta.2 → 3.0.0-beta.4.pre.1

package/src/components/EntityCollectionTable/EntityCollectionTable.tsx

@@ -1,5 +1,4 @@
-import React, { useCallback, useContext, useMemo, useRef } from "react";
-import equal from "react-fast-compare";
+import React, { useCallback, useMemo, useRef } from "react";
 import { AdditionalFieldDelegate, CollectionSize, Entity, FireCMSContext, User } from "../../types";
 import { PropertyTableCell } from "./PropertyTableCell";
 import { ErrorBoundary } from "../ErrorBoundary";
@@ -8,7 +7,6 @@ import { CellRendererParams, VirtualTableColumn } from "../VirtualTable";
 import { getValueInPath } from "../../util";
 import { getRowHeight } from "../VirtualTable/common";
 import { EntityCollectionRowActions } from "./EntityCollectionRowActions";
-import { EntityCollectionTableController } from "../common/types";
 import { CollectionTableToolbar } from "./internal/CollectionTableToolbar";
 import { EntityCollectionTableProps } from "./EntityCollectionTableProps";
 import { EntityTableCell } from "./internal/EntityTableCell";
@@ -43,289 +41,285 @@ import { SelectableTable } from "../SelectableTable/SelectableTable";
  * @see VirtualTable
  * @group Components
  */
-export const EntityCollectionTable = React.memo<EntityCollectionTableProps<any>>(
-    function EntityCollectionTable<M extends Record<string, any>, UserType extends User>
-    ({
-         forceFilter,
-         actionsStart,
-         actions,
-         title,
-         tableRowActionsBuilder,
-         uniqueFieldValidator,
-         getPropertyFor,
-         onValueChange,
-         selectionController,
-         highlightedEntities,
-         onEntityClick,
-         onColumnResize,
-         onSizeChanged,
-         textSearchEnabled = false,
-         hoverRow = true,
-         inlineEditing = false,
-         additionalFields,
-         displayedColumnIds,
-         defaultSize,
-         properties,
-         tableController,
-         filterable = true,
-         sortable = true,
-         endAdornment,
-         AddColumnComponent,
-         AdditionalHeaderWidget,
-         additionalIDHeaderWidget,
-         emptyComponent,
-         getIdColumnWidth,
-         onTextSearchClick,
-         textSearchLoading
-     }: EntityCollectionTableProps<M>) {
-
-        const ref = useRef<HTMLDivElement>(null);
-
-        const largeLayout = useLargeLayout();
-        const disabledFilterChange = Boolean(forceFilter);
-        const selectedEntities = (selectionController?.selectedEntities?.length > 0 ? selectionController?.selectedEntities : highlightedEntities)?.filter(Boolean);
-
-        const context: FireCMSContext<UserType> = useFireCMSContext();
-
-        const [size, setSize] = React.useState<CollectionSize>(defaultSize ?? "m");
-
-        const selectedEntityIds = selectedEntities?.map(e => e.id);
-
-        const filterIsSet = !!tableController.filterValues && Object.keys(tableController.filterValues).length > 0;
-
-        const updateSize = useCallback((size: CollectionSize) => {
-            if (onSizeChanged)
-                onSizeChanged(size);
-            setSize(size);
-        }, []);
-
-        const onTextSearch = useCallback((newSearchString?: string) => tableController.setSearchString?.(newSearchString), []);
-
-        const additionalFieldsMap: Record<string, AdditionalFieldDelegate<M, UserType>> = useMemo(() => {
-            return (additionalFields
-                ? additionalFields
-                    .map((aC) => ({ [aC.key]: aC as AdditionalFieldDelegate<M, any> }))
-                    .reduce((a, b) => ({ ...a, ...b }), {})
-                : {}) as Record<string, AdditionalFieldDelegate<M, UserType>>;
-        }, [additionalFields]);
-
-        const customFieldValidator: CustomFieldValidator | undefined = uniqueFieldValidator;
-
-        const propertyCellRenderer = useCallback(({
-                                                      column,
-                                                      columnIndex,
-                                                      rowData,
-                                                      rowIndex
-                                                  }: CellRendererParams<any>) => {
-
-            const entity: Entity<M> = rowData;
-
-            const propertyKey = column.key;
-
-            let disabled = column.custom?.disabled;
-            const propertyValue = entity.values ? getValueInPath(entity.values, propertyKey) : undefined;
-            const property = getPropertyFor?.({
-                propertyKey,
-                propertyValue,
-                entity
-            }) ?? column.custom.resolvedProperty;
-            if (!property?.disabled) {
-                disabled = false;
-            }
+export const EntityCollectionTable = function EntityCollectionTable<M extends Record<string, any>, UserType extends User>
+({
+     forceFilter,
+     actionsStart,
+     actions,
+     title,
+     tableRowActionsBuilder,
+     uniqueFieldValidator,
+     getPropertyFor,
+     onValueChange,
+     selectionController,
+     highlightedEntities,
+     onEntityClick,
+     onColumnResize,
+     onSizeChanged,
+     textSearchEnabled = false,
+     hoverRow = true,
+     inlineEditing = false,
+     additionalFields,
+     displayedColumnIds,
+     defaultSize,
+     properties,
+     tableController,
+     filterable = true,
+     sortable = true,
+     endAdornment,
+     AddColumnComponent,
+     AdditionalHeaderWidget,
+     additionalIDHeaderWidget,
+     emptyComponent,
+     getIdColumnWidth,
+     onTextSearchClick,
+     textSearchLoading
+ }: EntityCollectionTableProps<M>) {
+
+    const ref = useRef<HTMLDivElement>(null);
+
+    const largeLayout = useLargeLayout();
+    const disabledFilterChange = Boolean(forceFilter);
+    const selectedEntities = (selectionController?.selectedEntities?.length > 0 ? selectionController?.selectedEntities : highlightedEntities)?.filter(Boolean);
+
+    const context: FireCMSContext<UserType> = useFireCMSContext();
+
+    const [size, setSize] = React.useState<CollectionSize>(defaultSize ?? "m");
+
+    const selectedEntityIds = selectedEntities?.map(e => e.id);
+
+    const filterIsSet = !!tableController.filterValues && Object.keys(tableController.filterValues).length > 0;
+
+    const updateSize = useCallback((size: CollectionSize) => {
+        if (onSizeChanged)
+            onSizeChanged(size);
+        setSize(size);
+    }, []);
+
+    const onTextSearch = useCallback((newSearchString?: string) => tableController.setSearchString?.(newSearchString), []);
+
+    const additionalFieldsMap: Record<string, AdditionalFieldDelegate<M, UserType>> = useMemo(() => {
+        return (additionalFields
+            ? additionalFields
+                .map((aC) => ({ [aC.key]: aC as AdditionalFieldDelegate<M, any> }))
+                .reduce((a, b) => ({ ...a, ...b }), {})
+            : {}) as Record<string, AdditionalFieldDelegate<M, UserType>>;
+    }, [additionalFields]);
+
+    const customFieldValidator: CustomFieldValidator | undefined = uniqueFieldValidator;
+
+    const propertyCellRenderer = ({
+                                      column,
+                                      columnIndex,
+                                      rowData,
+                                      rowIndex
+                                  }: CellRendererParams<any>) => {
+
+        const entity: Entity<M> = rowData;
+
+        const propertyKey = column.key;
+
+        let disabled = column.custom?.disabled;
+        const propertyValue = entity.values ? getValueInPath(entity.values, propertyKey) : undefined;
+        const property = getPropertyFor?.({
+            propertyKey,
+            propertyValue,
+            entity
+        }) ?? column.custom.resolvedProperty;
+        if (!property?.disabled) {
+            disabled = false;
+        }
+
+        if (!property) {
+            return null;
+        }
 
-            if (!property) {
-                return null;
-            }
+        return (
+            <ErrorBoundary>
+                {entity
+                    ? <PropertyTableCell
+                        key={`property_table_cell_${entity.id}_${propertyKey}`}
+                        readonly={!inlineEditing}
+                        align={column.align ?? "left"}
+                        propertyKey={propertyKey as string}
+                        property={property}
+                        value={entity?.values ? getValueInPath(entity.values, propertyKey) : undefined}
+                        customFieldValidator={customFieldValidator}
+                        columnIndex={columnIndex}
+                        width={column.width}
+                        height={getRowHeight(size)}
+                        entity={entity}
+                        disabled={disabled}
+                        path={entity.path}/>
+                    : renderSkeletonText()
+                }
+            </ErrorBoundary>);
 
-            return (
-                <ErrorBoundary>
-                    {entity
-                        ? <PropertyTableCell
-                            key={`property_table_cell_${entity.id}_${propertyKey}`}
-                            readonly={!inlineEditing}
-                            align={column.align ?? "left"}
-                            propertyKey={propertyKey as string}
-                            property={property}
-                            value={entity?.values ? getValueInPath(entity.values, propertyKey) : undefined}
-                            customFieldValidator={customFieldValidator}
-                            columnIndex={columnIndex}
-                            width={column.width}
-                            height={getRowHeight(size)}
-                            entity={entity}
-                            disabled={disabled}
-                            path={entity.path}/>
-                        : renderSkeletonText()
-                    }
-                </ErrorBoundary>);
-
-        }, [inlineEditing, size, selectedEntityIds]);
-
-        const additionalCellRenderer = useCallback(({
-                                                        column,
-                                                        rowData,
-                                                        width
-                                                    }: CellRendererParams<any>) => {
-
-            const entity: Entity<M> = rowData;
-
-            const additionalField = additionalFieldsMap[column.key as string];
-            const value = additionalField.dependencies
-                ? Object.entries(entity.values)
-                    .filter(([key, value]) => additionalField.dependencies!.includes(key as Extract<keyof M, string>))
-                    .reduce((a, b) => ({ ...a, ...b }), {})
-                : entity;
-
-            const Builder = additionalField.Builder;
-            if (!Builder && !additionalField.value) {
-                throw new Error("When using additional fields you need to provide a Builder or a value");
-            }
+    };
 
-            const child = Builder
-                ? <Builder entity={entity} context={context}/>
-                : <>{additionalField.value?.({ entity, context })}</>;
-
-            return (
-                <EntityTableCell
-                    key={`additional_table_cell_${entity.id}_${column.key}`}
-                    width={width}
-                    size={size}
-                    value={value}
-                    selected={false}
-                    disabled={true}
-                    align={"left"}
-                    allowScroll={false}
-                    showExpandIcon={false}
-                    disabledTooltip={"This column can't be edited directly"}
-                >
-                    <ErrorBoundary>
-                        {child}
-                    </ErrorBoundary>
-                </EntityTableCell>
-            );
-
-        }, [size, selectedEntityIds]);
-
-        const collectionColumns: VirtualTableColumn[] = useMemo(() => {
-                const columnsResult: VirtualTableColumn[] = propertiesToColumns({
-                    properties,
-                    sortable,
-                    forceFilter,
-                    disabledFilter: disabledFilterChange,
-                    AdditionalHeaderWidget
-                });
-
-                const additionalTableColumns: VirtualTableColumn[] = additionalFields
-                    ? additionalFields.map((additionalField) =>
-                        ({
-                            key: additionalField.key,
-                            align: "left",
-                            sortable: false,
-                            title: additionalField.name,
-                            width: additionalField.width ?? 200
-                        }))
-                    : [];
-                return [...columnsResult, ...additionalTableColumns];
-            },
-            [additionalFields, disabledFilterChange, forceFilter, properties, sortable]);
-
-        const idColumn: VirtualTableColumn = useMemo(() => ({
-            key: "id_ewcfedcswdf3",
-            width: getIdColumnWidth?.() ?? (largeLayout ? 160 : 130),
-            title: "ID",
-            resizable: false,
-            frozen: largeLayout,
-            headerAlign: "center",
-            align: "center",
-            AdditionalHeaderWidget: () => additionalIDHeaderWidget
-        }), [getIdColumnWidth, largeLayout])
-
-        const columns: VirtualTableColumn[] = useMemo(() => [
-            idColumn,
-            ...displayedColumnIds
-                .map((p) => {
-                    return collectionColumns.find(c => c.key === p.key);
-                }).filter(Boolean) as VirtualTableColumn[]
-        ], [collectionColumns, displayedColumnIds, idColumn]);
-
-        const cellRenderer = useCallback((props: CellRendererParams<any>) => {
-            const column = props.column;
-            const columns = props.columns;
-            const columnKey = column.key;
-
-            try {
-                if (props.columnIndex === 0) {
-                    if (tableRowActionsBuilder)
-                        return tableRowActionsBuilder({
-                            entity: props.rowData,
-                            size,
-                            width: column.width,
-                            frozen: column.frozen
-                        });
-                    else
-                        return <EntityCollectionRowActions entity={props.rowData}
-                                                           width={column.width}
-                                                           frozen={column.frozen}
-                                                           isSelected={false}
-                                                           size={size}/>;
-                } else if (additionalFieldsMap[columnKey]) {
-                    return additionalCellRenderer(props);
-                } else if (props.columnIndex < columns.length + 1) {
-                    return propertyCellRenderer(props);
-                } else {
-                    throw Error("Internal: columns not mapped properly");
-                }
-            } catch (e: any) {
-                console.error("Error rendering cell", e);
-                return <EntityTableCell
-                    size={size}
-                    width={column.width}
-                    saved={false}
-                    value={null}
-                    align={"left"}
-                    fullHeight={false}
-                    disabled={true}>
-                    <ErrorView error={e}/>
-                </EntityTableCell>;
-            }
-        }, [additionalFieldsMap, tableRowActionsBuilder, size, additionalCellRenderer, propertyCellRenderer])
+    const additionalCellRenderer = useCallback(({
+                                                    column,
+                                                    rowData,
+                                                    width
+                                                }: CellRendererParams<any>) => {
 
-        return (
+        const entity: Entity<M> = rowData;
+
+        const additionalField = additionalFieldsMap[column.key as string];
+        const value = additionalField.dependencies
+            ? Object.entries(entity.values)
+                .filter(([key, value]) => additionalField.dependencies!.includes(key as Extract<keyof M, string>))
+                .reduce((a, b) => ({ ...a, ...b }), {})
+            : entity;
+
+        const Builder = additionalField.Builder;
+        if (!Builder && !additionalField.value) {
+            throw new Error("When using additional fields you need to provide a Builder or a value");
+        }
+
+        const child = Builder
+            ? <Builder entity={entity} context={context}/>
+            : <>{additionalField.value?.({ entity, context })}</>;
 
-            <div ref={ref}
-                 className="h-full w-full flex flex-col bg-white dark:bg-gray-950">
-
-                <CollectionTableToolbar
-                    forceFilter={disabledFilterChange}
-                    filterIsSet={filterIsSet}
-                    onTextSearch={textSearchEnabled ? onTextSearch : undefined}
-                    textSearchLoading={textSearchLoading}
-                    onTextSearchClick={textSearchEnabled ? onTextSearchClick : undefined}
-                    clearFilter={tableController.clearFilter}
-                    size={size}
-                    onSizeChanged={updateSize}
-                    title={title}
-                    actionsStart={actionsStart}
-                    actions={actions}
-                    loading={tableController.dataLoading}/>
-
-                <SelectableTable columns={columns}
-                                 size={size}
-                                 inlineEditing={inlineEditing}
-                                 cellRenderer={cellRenderer}
-                                 onEntityClick={onEntityClick}
-                                 highlightedRow={useCallback((entity: Entity<M>) => selectedEntityIds?.includes(entity.id) ?? false, [selectedEntityIds])}
-                                 tableController={tableController}
-                                 onValueChange={onValueChange}
-                                 onColumnResize={onColumnResize}
-                                 hoverRow={hoverRow}
-                                 filterable={filterable}
-                                 emptyComponent={emptyComponent}
-                                 endAdornment={endAdornment}
-                                 AddColumnComponent={AddColumnComponent}/>
-
-            </div>
+        return (
+            <EntityTableCell
+                key={`additional_table_cell_${entity.id}_${column.key}`}
+                width={width}
+                size={size}
+                value={value}
+                selected={false}
+                disabled={true}
+                align={"left"}
+                allowScroll={false}
+                showExpandIcon={false}
+                disabledTooltip={"This column can't be edited directly"}
+            >
+                <ErrorBoundary>
+                    {child}
+                </ErrorBoundary>
+            </EntityTableCell>
         );
 
-    },
-    equal
-);
+    }, [size, selectedEntityIds]);
+
+    const collectionColumns: VirtualTableColumn[] = (() => {
+        const columnsResult: VirtualTableColumn[] = propertiesToColumns({
+            properties,
+            sortable,
+            forceFilter,
+            disabledFilter: disabledFilterChange,
+            AdditionalHeaderWidget
+        });
+
+        const additionalTableColumns: VirtualTableColumn[] = additionalFields
+            ? additionalFields.map((additionalField) =>
+                ({
+                    key: additionalField.key,
+                    align: "left",
+                    sortable: false,
+                    title: additionalField.name,
+                    width: additionalField.width ?? 200
+                }))
+            : [];
+        return [...columnsResult, ...additionalTableColumns];
+    })();
+
+    const idColumn: VirtualTableColumn = {
+        key: "id_ewcfedcswdf3",
+        width: getIdColumnWidth?.() ?? (largeLayout ? 160 : 130),
+        title: "ID",
+        resizable: false,
+        frozen: largeLayout,
+        headerAlign: "center",
+        align: "center",
+        AdditionalHeaderWidget: () => additionalIDHeaderWidget
+    }
+
+    const columns: VirtualTableColumn[] = [
+        idColumn,
+        ...displayedColumnIds
+            .map((p) => {
+                return collectionColumns.find(c => c.key === p.key);
+            }).filter(Boolean) as VirtualTableColumn[]
+    ];
+
+    const cellRenderer = (props: CellRendererParams<any>) => {
+        const column = props.column;
+        const columns = props.columns;
+        const columnKey = column.key;
+
+        try {
+            if (props.columnIndex === 0) {
+                if (tableRowActionsBuilder)
+                    return tableRowActionsBuilder({
+                        entity: props.rowData,
+                        size,
+                        width: column.width,
+                        frozen: column.frozen
+                    });
+                else
+                    return <EntityCollectionRowActions entity={props.rowData}
+                                                       width={column.width}
+                                                       frozen={column.frozen}
+                                                       isSelected={false}
+                                                       size={size}/>;
+            } else if (additionalFieldsMap[columnKey]) {
+                return additionalCellRenderer(props);
+            } else if (props.columnIndex < columns.length + 1) {
+                return propertyCellRenderer(props);
+            } else {
+                throw Error("Internal: columns not mapped properly");
+            }
+        } catch (e: any) {
+            console.error("Error rendering cell", e);
+            return <EntityTableCell
+                size={size}
+                width={column.width}
+                saved={false}
+                value={null}
+                align={"left"}
+                fullHeight={false}
+                disabled={true}>
+                <ErrorView error={e}/>
+            </EntityTableCell>;
+        }
+    }
+
+    return (
+
+        <div ref={ref}
+             className="h-full w-full flex flex-col bg-white dark:bg-gray-950">
+
+            <CollectionTableToolbar
+                forceFilter={disabledFilterChange}
+                filterIsSet={filterIsSet}
+                onTextSearch={textSearchEnabled ? onTextSearch : undefined}
+                textSearchLoading={textSearchLoading}
+                onTextSearchClick={textSearchEnabled ? onTextSearchClick : undefined}
+                clearFilter={tableController.clearFilter}
+                size={size}
+                onSizeChanged={updateSize}
+                title={title}
+                actionsStart={actionsStart}
+                actions={actions}
+                loading={tableController.dataLoading}/>
+
+            <SelectableTable columns={columns}
+                             size={size}
+                             inlineEditing={inlineEditing}
+                             cellRenderer={cellRenderer}
+                             onEntityClick={onEntityClick}
+                             highlightedRow={useCallback((entity: Entity<M>) => selectedEntityIds?.includes(entity.id) ?? false, [selectedEntityIds])}
+                             tableController={tableController}
+                             onValueChange={onValueChange}
+                             onColumnResize={onColumnResize}
+                             hoverRow={hoverRow}
+                             filterable={filterable}
+                             emptyComponent={emptyComponent}
+                             endAdornment={endAdornment}
+                             AddColumnComponent={AddColumnComponent}/>
+
+        </div>
+    );
+
+};

package/src/components/EntityCollectionTable/EntityCollectionTableProps.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import {
     AdditionalFieldDelegate,
     CollectionSize,
-    Entity,
+    Entity, EntityCollection,
     EntityTableController,
     FilterValues,
     ResolvedProperties,

package/src/components/EntityCollectionTable/PropertyTableCell.tsx

@@ -24,15 +24,16 @@ import { getPreviewSizeFrom } from "../../preview/util";
 import { isReadOnly } from "../../util";
 
 import { CustomFieldValidator, mapPropertyToYup } from "../../form/validation";
-import { useClearRestoreValue, useFireCMSContext } from "../../hooks";
+import { useFireCMSContext } from "../../hooks";
 
 import { EntityTableCell } from "./internal/EntityTableCell";
 import { EntityTableCellActions } from "./internal/EntityTableCellActions";
 
 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";
@@ -61,7 +62,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,7 +75,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                                                                                      entity,
                                                                                      readonly,
                                                                                      disabled: disabledProp
-                                                                                 }: PropertyTableCellProps<T, M>) {
+                                                                                 }: PropertyTableCellProps<T>) {
 
         const context = useFireCMSContext();
 
@@ -402,14 +403,13 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
             allowScroll = false;
             showExpandIcon = selected && !innerComponent && !disabled && !readOnlyProperty;
             innerComponent = (
-                <PropertyPreview
-                    width={width}
-                    height={height}
+                <PropertyPreview                                  width={width}
+                                 height={height}
                     // entity={entity}
-                    propertyKey={propertyKey as string}
-                    value={internalValue}
-                    property={property}
-                    size={getPreviewSizeFrom(size)}
+                                 propertyKey={propertyKey as string}
+                                 value={internalValue}
+                                 property={property}
+                                 size={getPreviewSizeFrom(size)}
                 />
             );
         }
@@ -446,9 +446,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 &&