@firecms/core 3.0.0-canary.241 → 3.0.0-canary.244

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -749,6 +749,7 @@ export const EntityCollectionView = React.memo(
             equal(a.defaultSize, b.defaultSize) &&
             equal(a.initialFilter, b.initialFilter) &&
             equal(a.initialSort, b.initialSort) &&
+            equal(a.includeJsonView, b.includeJsonView) &&
             equal(a.textSearchEnabled, b.textSearchEnabled) &&
             equal(a.additionalFields, b.additionalFields) &&
             equal(a.sideDialogWidth, b.sideDialogWidth) &&

package/src/components/HomePage/DefaultHomePage.tsx

@@ -114,6 +114,7 @@ export function DefaultHomePage({
                     );
                 })}
         </>;
+
         additionalPluginChildrenStart = <div className={"flex flex-col gap-2"}>
             {customizationController.plugins.filter(plugin => plugin.homePage?.additionalChildrenStart)
                 .map((plugin, i) => {

package/src/components/VirtualTable/VirtualTable.tsx

@@ -115,7 +115,6 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
                                                              endAdornment,
                                                              AddColumnComponent,
                                                              initialScroll = 0,
-                                                             debug
                                                          }: VirtualTableProps<T>) {
 
         const sortByProperty: string | undefined = sortBy ? sortBy[0] : undefined;
@@ -131,7 +130,8 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         // Set initial scroll position
         useEffect(() => {
             if (tableRef.current && initialScroll) {
-                tableRef.current.scrollTo(0, initialScroll);
+                const { scrollLeft } = tableRef.current;
+                tableRef.current.scrollTo(scrollLeft, initialScroll);
             }
         }, [tableRef, initialScroll]);
 
@@ -170,7 +170,6 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         });
 
         const onColumnResizeInternal = useCallback((params: OnVirtualTableColumnResizeParams) => {
-            if (debug) console.log("onColumnResizeInternal", params);
             setColumns(prevColumns =>
                 prevColumns.map((column) =>
                     column.key === params.column.key ? params.column : column
@@ -179,8 +178,6 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         }, []);
 
         const onColumnResizeEndInternal = useCallback((params: OnVirtualTableColumnResizeParams) => {
-            if (debug)
-                console.log("onColumnResizeEndInternal", params);
             setColumns(columns.map((column) => column.key === params.column.key ? params.column : column));
             if (onColumnResize) {
                 onColumnResize(params);
@@ -191,14 +188,10 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         const filterRef = useRef<VirtualTableFilterValues<any> | undefined>();
 
         useEffect(() => {
-            if (debug)
-                console.log("Filter updated", filterInput);
             filterRef.current = filterInput;
         }, [filterInput]);
 
         const scrollToTop = useCallback(() => {
-            if (debug)
-                console.log("scrollToTop");
             endReachCallbackThreshold.current = 0;
             if (tableRef.current) {
                 tableRef.current.scrollTo(tableRef.current?.scrollLeft, 0);
@@ -207,9 +200,6 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
 
         const onColumnSort = useCallback((key: string) => {
 
-            if (debug)
-                console.log("onColumnSort", key);
-
             const isDesc = sortByProperty === key && currentSort === "desc";
             const isAsc = sortByProperty === key && currentSort === "asc";
             const newSort = isAsc ? "desc" : (isDesc ? undefined : "asc");
@@ -237,12 +227,8 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         }, [checkFilterCombination, currentSort, onFilterUpdate, onResetPagination, onSortByUpdate, scrollToTop, sortByProperty]);
 
         const maxScroll = Math.max((data?.length ?? 0) * rowHeight - bounds.height, 0);
-        if (debug)
-            console.log("maxScroll", maxScroll);
 
         const onEndReachedInternal = useCallback((scrollOffset: number) => {
-            if (debug)
-                console.log("onEndReachedInternal", scrollOffset, endReachCallbackThreshold.current + endOffset);
             if (onEndReached && (data?.length ?? 0) > 0 && scrollOffset > endReachCallbackThreshold.current + endOffset) {
                 endReachCallbackThreshold.current = scrollOffset;
                 onEndReached();
@@ -258,12 +244,6 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
             scrollOffset: number,
             scrollUpdateWasRequested: boolean;
         }) => {
-            if (debug)
-                console.log("onScroll", {
-                    scrollDirection,
-                    scrollOffset,
-                    scrollUpdateWasRequested
-                });
             if (onScrollProp) {
                 debouncedScroll({
                     scrollDirection,
@@ -276,8 +256,6 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         }, [maxScroll, onEndReachedInternal]);
 
         const onFilterUpdateInternal = useCallback((column: VirtualTableColumn, filterForProperty?: [VirtualTableWhereFilterOp, any]) => {
-            if (debug)
-                console.log("onFilterUpdateInternal", column, filterForProperty);
 
             endReachCallbackThreshold.current = 0;
             const filter = filterRef.current;
@@ -340,9 +318,6 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
             AddColumnComponent
         };
 
-        if (debug)
-            console.log("VirtualTable render", virtualListController);
-
         return (
             <div
                 ref={measureRef}

package/src/components/VirtualTable/VirtualTableProps.tsx

@@ -162,11 +162,6 @@ export interface VirtualTableProps<T extends Record<string, any>> {
      */
     initialScroll?: number;
 
-    /**
-     * Debug mode
-     */
-    debug?: boolean;
-
 }
 
 export type CellRendererParams<T = any> = {

package/src/components/VirtualTable/fields/VirtualTableInput.tsx

@@ -66,7 +66,6 @@ export function VirtualTableInput(props: {
                 width: "100%",
                 color: "unset",
                 fontWeight: "unset",
-                lineHeight: 1.7142857,
                 fontSize: "unset",
                 fontFamily: "unset",
                 background: "unset",

package/src/core/EntityEditView.tsx

@@ -255,6 +255,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
                 <ErrorBoundary>
                     {usedFormContext && <Builder
                         collection={collection}
+                        parentCollectionIds={parentCollectionIds}
                         entity={usedEntity}
                         modifiedValues={usedFormContext?.formex?.values ?? usedEntity?.values}
                         formContext={usedFormContext}

package/src/core/EntitySidePanel.tsx

@@ -74,19 +74,7 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
         return navigationController.getParentCollectionIds(path);
     }, [navigationController, path]);
 
-    const collection = useMemo(() => {
-        if (props.collection) {
-            return props.collection;
-        }
-
-        const registryCollection = navigationController.getCollection(path);
-        if (registryCollection) {
-            return registryCollection;
-        }
-
-        console.error("ERROR: No collection found in path `", path, "`. Entity id: ", entityId);
-        throw Error("ERROR: No collection found in path `" + path + "`. Make sure you have defined a collection for this path in the root navigation.");
-    }, [navigationController, props.collection]);
+    const collection = props.collection ?? navigationController.getCollection(path);
 
     useEffect(() => {
         function beforeunload(e: any) {

package/src/form/components/CustomIdField.tsx

@@ -103,7 +103,9 @@ export function CustomIdField<M extends Record<string, any>>({
                     size={"large"}
                     error={error}
                     fullWidth={true}
-                    onValueChange={(v) => onChange(v as string)}
+                    onValueChange={(v) => {
+                        onChange(v as string);
+                    }}
                     {...fieldProps}
                     renderValue={(option) => {
                         const enumConfig = enumValues.find(e => e.id === option);

package/src/form/field_bindings/MultiSelectFieldBinding.tsx

@@ -84,7 +84,7 @@ export function MultiSelectFieldBinding({
             <MultiSelect
                 className={"w-full mt-2"}
                 size={size}
-                value={validValue ? value.map((v) => v.toString()) : []}
+                value={validValue ? value.map((v) => v?.toString()) : []}
                 disabled={disabled}
                 modalPopover={true}
                 label={<LabelWithIconAndTooltip

package/src/form/field_bindings/SelectFieldBinding.tsx

@@ -67,8 +67,9 @@ export function SelectFieldBinding<T extends EnumType>({
                     </PropertyIdCopyTooltip>}
                 endAdornment={
                     property.clearable && !disabled && <IconButton
+                        size="small"
                         onClick={handleClearClick}>
-                        <CloseIcon/>
+                        <CloseIcon size={"small"}/>
                     </IconButton>
                 }
                 onValueChange={(updatedValue: string) => {