@firecms/core 3.0.0-beta.14 → 3.0.0-beta.15

package/src/components/HomePage/NavigationCard.tsx

@@ -1,4 +1,5 @@
 import { ArrowForwardIcon, Card, cls, Markdown, Typography, } from "@firecms/ui";
+import React from "react"; // Import React
 
 export type NavigationCardProps = {
     name: string,
@@ -6,64 +7,72 @@ export type NavigationCardProps = {
     actions: React.ReactNode;
     icon: React.ReactNode;
     onClick?: () => void,
+    shrink?: boolean
 };
 
-export function NavigationCard({
+// Wrap the component with React.memo
+export const NavigationCard = React.memo(function NavigationCard({
                                    name,
                                    description,
                                    icon,
                                    actions,
                                    onClick,
+                                   shrink
                                }: NavigationCardProps) {
 
-    return (<Card
-        className={cls("h-full p-4 cursor-pointer min-h-[230px]")}
-        onClick={() => {
-            onClick?.();
-        }}>
+    return (
+        <Card
+            className={cls(
+                "h-full p-4 cursor-pointer min-h-[230px] transition-all duration-200 ease-in-out",
+                shrink && "w-full max-w-full min-h-0 scale-75"
+            )}
+            onClick={() => {
+                onClick?.();
+            }}
+        >
+
+            <div className="flex flex-col items-start h-full">
+                <div
+                    className="flex-grow w-full">
 
-        <div className="flex flex-col items-start h-full">
-            <div
-                className="flex-grow w-full">
+                    <div
+                        className="h-10 flex items-center w-full justify-between text-surface-300 dark:text-surface-600">
 
-                <div
-                    className="h-10 flex items-center w-full justify-between text-surface-300 dark:text-surface-600">
+                        {icon}
 
-                    {icon}
+                        <div
+                            className="flex items-center gap-1"
+                            onClick={(event: React.MouseEvent) => {
+                                event.preventDefault();
+                                event.stopPropagation();
+                            }}>
 
-                    <div
-                        className="flex items-center gap-1"
-                        onClick={(event: React.MouseEvent) => {
-                            event.preventDefault();
-                            event.stopPropagation();
-                        }}>
+                            {actions}
 
-                        {actions}
+                        </div>
 
                     </div>
 
-                </div>
-
-                <Typography gutterBottom variant="h5"
-                            component="h2">
-                    {name}
-                </Typography>
+                    <Typography gutterBottom variant="h5"
+                                component="h2">
+                        {name}
+                    </Typography>
 
-                {description && <Typography variant="body2"
-                                            color="secondary"
-                                            component="div">
-                    <Markdown source={description} size={"small"}/>
-                </Typography>}
-            </div>
+                    {description && <Typography variant="body2"
+                                                color="secondary"
+                                                component="div">
+                        <Markdown source={description} size={"small"}/>
+                    </Typography>}
+                </div>
 
-            <div style={{ alignSelf: "flex-end" }}>
+                <div style={{ alignSelf: "flex-end" }}>
 
-                <div className={"p-4"}>
-                    <ArrowForwardIcon className="text-primary"/>
+                    <div className={"p-4"}>
+                        <ArrowForwardIcon className="text-primary"/>
+                    </div>
                 </div>
-            </div>
 
-        </div>
+            </div>
 
-    </Card>)
-}
+        </Card>)
+});

package/src/components/HomePage/NavigationCardBinding.tsx

@@ -1,7 +1,7 @@
 import { useNavigate } from "react-router-dom";
 
 import { useCustomizationController, useFireCMSContext } from "../../hooks";
-import { PluginHomePageActionsProps, TopNavigationEntry } from "../../types";
+import { NavigationEntry, PluginHomePageActionsProps } from "../../types";
 import { IconForView } from "../../util";
 import { useUserConfigurationPersistence } from "../../hooks/useUserConfigurationPersistence";
 import { IconButton, StarIcon } from "@firecms/ui";
@@ -30,9 +30,11 @@ export function NavigationCardBinding({
                                           name,
                                           description,
                                           onClick,
-                                          type
-                                      }: TopNavigationEntry & {
-    onClick?: () => void
+                                          type,
+                                          shrink
+                                      }: NavigationEntry & {
+    onClick?: () => void,
+    shrink?: boolean // <-- add shrink prop type
 }) {
 
     const userConfigurationPersistence = useUserConfigurationPersistence();
@@ -93,7 +95,7 @@ export function NavigationCardBinding({
     if (type === "admin") {
         return <SmallNavigationCard icon={collectionIcon}
                                     name={name}
-                                    url={url}/>
+                                    url={url}/>;
     }
 
     return <NavigationCard
@@ -109,5 +111,7 @@ export function NavigationCardBinding({
                     [path, ...(userConfigurationPersistence.recentlyVisitedPaths ?? []).filter(p => p !== path)]
                 );
             }
-        }}/>;
+        }}
+        shrink={shrink}
+    />;
 }

package/src/components/HomePage/NavigationGroup.tsx

@@ -1,39 +1,73 @@
-import { PropsWithChildren } from "react";
-import { useUserConfigurationPersistence } from "../../hooks/useUserConfigurationPersistence";
-import { ExpandablePanel, Typography } from "@firecms/ui";
+import React, { PropsWithChildren, useState } from "react";
+import { cls, EditIcon, IconButton, Typography } from "@firecms/ui";
 
 export function NavigationGroup({
                                     children,
-                                    group
+                                    group,
+                                    minimised,
+                                    isPreview,
+                                    isPotentialCardDropTarget,
+                                    onEditGroup, // New prop to handle editing
+                                    dndDisabled // New prop to disable editing when D&D is off
                                 }: PropsWithChildren<{
-    group: string | undefined
+    group: string | undefined,
+    minimised?: boolean,
+    isPreview?: boolean,
+    isPotentialCardDropTarget?: boolean,
+    onEditGroup?: (groupName: string) => void; // Callback to open dialog
+    dndDisabled?: boolean; // Added dndDisabled prop
 }>) {
-    const userConfigurationPersistence = useUserConfigurationPersistence();
-    return (
-        <ExpandablePanel
-            invisible={true}
-            titleClassName={"font-medium text-sm text-surface-600 dark:text-surface-400"}
-            innerClassName={"py-4"}
-            initiallyExpanded={!(userConfigurationPersistence?.collapsedGroups ?? []).includes(group ?? "ungrouped")}
-            onExpandedChange={expanded => {
-                if (userConfigurationPersistence) {
 
-                    if (!expanded) {
-                        const paths = (userConfigurationPersistence.collapsedGroups ?? []).concat(group ?? "ungrouped");
-                        userConfigurationPersistence.setCollapsedGroups(paths);
-                    } else {
-                        userConfigurationPersistence.setCollapsedGroups((userConfigurationPersistence.collapsedGroups ?? []).filter(g => g !== (group ?? "ungrouped")));
-                    }
-                }
-            }}
-            title={<Typography color={"secondary"}
-                               className="font-medium ml-1">
-                {group?.toUpperCase() ?? "Views".toUpperCase()}
-            </Typography>}>
+    const [isHovered, setIsHovered] = useState(false);
+    const currentGroupName = group ?? "Views";
+
+    return (
+        <div className={cls(
+            !isPotentialCardDropTarget ? "my-10" : "my-6",
+            "transition-all duration-200 ease-in-out"
+        )}
+        >
+            <div className={`flex items-center ${isPreview ? "px-1 py-0.5 m-0" : "ml-3.5 mt-6"} `}
 
-            <div className="mb-8">
-                {children}
+                 onMouseEnter={() => setIsHovered(true)}
+                 onMouseLeave={() => setIsHovered(false)}>
+                <Typography
+                    variant={isPreview ? "body2" : "caption"}
+                    component={"h2"}
+                    color="secondary"
+                    // Minimal padding and no margin for preview title
+                    className={`${isPreview ? "px-1 py-0.5" : "ml-3.5"} font-medium uppercase text-sm text-surface-600 dark:text-surface-400`}
+                >
+                    {currentGroupName}
+                </Typography>
+                {!isPreview && onEditGroup && !dndDisabled && (
+                    <IconButton
+                        size="smallest"
+                        onClick={(e) => {
+                            e.stopPropagation(); // Prevent other click events
+                            onEditGroup(currentGroupName);
+                        }}
+                        className={cls("ml-2 ", isHovered ? "opacity-100" : "opacity-0", "transition-opacity duration-100")}
+                    >
+                        <EditIcon size="smallest"/>
+                    </IconButton>
+                )}
             </div>
-        </ExpandablePanel>
+
+            {isPreview ? (
+                children
+            ) : minimised ? (
+                // For minimised view in the main list
+                <div className={cls("mt-4 p-8 bg-surface-accent-200 dark:bg-surface-accent-800 rounded-lg")}
+                     style={{ minHeight: "50px" }}>
+                </div>
+            ) : (
+                // If highlighted, the parent div already has padding, so children (NavigationGroupDroppable) don't need extra margin top as much.
+                // The inner content of NavigationGroupDroppable will define its own padding if needed when active.
+                <div className={cls("mt-4", !minimised ? "pt-0" : "")}>
+                    {children}
+                </div>
+            )}
+        </div>
     );
 }

package/src/components/HomePage/RenameGroupDialog.tsx

@@ -0,0 +1,117 @@
+import React, { useState, useEffect, useRef } from "react";
+import { Button, Dialog, DialogActions, DialogContent, DialogTitle, TextField } from "@firecms/ui";
+
+interface RenameGroupDialogProps {
+    open: boolean;
+    initialName: string;
+    existingGroupNames: string[]; // Names of other existing groups to check for duplicates
+    onClose: () => void;
+    onRename: (newName: string) => void;
+}
+
+export function RenameGroupDialog({ open, initialName, existingGroupNames, onClose, onRename }: RenameGroupDialogProps) {
+    const [name, setName] = useState(initialName);
+    const [error, setError] = useState<string | null>(null);
+    const inputRef = useRef<HTMLInputElement | HTMLTextAreaElement | null>(null); // Create a ref for the input
+
+    useEffect(() => {
+        if (open) {
+            setName(initialName);
+            setError(null);
+            // Focus and select text when dialog opens
+            setTimeout(() => { // setTimeout to ensure the input is rendered and focusable
+                if (inputRef.current) {
+                    inputRef.current.focus();
+                    inputRef.current.select();
+                }
+            }, 100);
+        }
+    }, [initialName, open]);
+
+    const handleNameChange = (event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+        const newName = event.target.value;
+        setName(newName);
+        if (!newName.trim()) {
+            setError("Group name cannot be empty.");
+        } else if (existingGroupNames.includes(newName.trim())) {
+            setError("This group name already exists.");
+        } else {
+            setError(null);
+        }
+    };
+
+    const handleSave = () => {
+        const trimmedName = name.trim();
+        if (!trimmedName) {
+            setError("Group name cannot be empty.");
+            return;
+        }
+        if (existingGroupNames.includes(trimmedName)) {
+            setError("This group name already exists.");
+            return;
+        }
+        if (!error) {
+            onRename(trimmedName);
+            onClose();
+        }
+    };
+
+    const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+        if (event.key === "Enter") {
+            event.preventDefault(); // Prevent default form submission behavior
+            const trimmedName = name.trim();
+            // We need to check the error state directly as well,
+            // because the error state might not have updated if the user types and immediately hits enter.
+            let currentError = null;
+            if (!trimmedName) {
+                currentError = "Group name cannot be empty.";
+            } else if (existingGroupNames.includes(trimmedName)) {
+                currentError = "This group name already exists.";
+            }
+
+            if (!currentError && trimmedName) {
+                handleSave();
+            } else if (currentError) {
+                setError(currentError); // Ensure error is displayed if trying to submit with Enter
+            }
+        }
+    };
+
+    const handleClose = () => {
+        setName(initialName);
+        setError(null);
+        onClose();
+    };
+
+    if (!open) return null;
+
+    return (
+        <Dialog open={open} onOpenChange={onClose}>
+            <DialogTitle>Rename Group</DialogTitle>
+            <DialogContent>
+                <TextField
+                    inputRef={inputRef} // Pass the ref to the TextField
+                    label="Group Name"
+                    value={name}
+                    onChange={handleNameChange}
+                    onKeyDown={handleKeyDown} // Added onKeyDown handler
+                    error={!!error}
+                    aria-describedby={error ? "group-name-error" : undefined}
+                />
+                {error && <p id="group-name-error" style={{ display: "none" }}>{error}</p>}
+            </DialogContent>
+            <DialogActions>
+                <Button onClick={onClose}
+                        color={"primary"}
+                        variant="text">
+                    Cancel
+                </Button>
+                <Button onClick={handleSave}
+                        color={"primary"}
+                        disabled={!!error || !name.trim()}>
+                    Save
+                </Button>
+            </DialogActions>
+        </Dialog>
+    );
+}

package/src/components/UnsavedChangesDialog.tsx

@@ -34,8 +34,12 @@ export function UnsavedChangesDialog({
 
             </DialogContent>
             <DialogActions>
-                <Button variant="text" onClick={handleCancel} autoFocus> Cancel </Button>
-                <Button onClick={handleOk}> Ok </Button>
+                <Button variant="text"
+                        color={"primary"}
+                        onClick={handleCancel} autoFocus> Cancel </Button>
+                <Button
+                    color={"primary"}
+                    onClick={handleOk}> Ok </Button>
             </DialogActions>
         </Dialog>
     );

package/src/components/common/default_entity_actions.tsx

@@ -5,20 +5,26 @@ import { addRecentId } from "../EntityCollectionView/utils";
 import { navigateToEntity, resolveDefaultSelectedView } from "../../util";
 
 export const editEntityAction: EntityAction = {
-    icon: <EditIcon/>,
+    icon: <EditIcon size={"small"}/>,
     key: "edit",
     name: "Edit",
     collapsed: false,
+    isEnabled: ({ entity }) => Boolean(entity),
     onClick({
                 entity,
                 collection,
                 fullPath,
+                fullIdPath,
                 context,
                 highlightEntity,
                 unhighlightEntity,
                 openEntityMode
             }): Promise<void> {
 
+        if (!entity) {
+            throw new Error("INTERNAL: editEntityAction: Entity is undefined");
+        }
+
         highlightEntity?.(entity);
 
         context.analyticsController?.onAnalyticsEvent?.("entity_click", {
@@ -30,7 +36,8 @@ export const editEntityAction: EntityAction = {
             addRecentId(collection.id, entity.id);
         }
 
-        const path = collection?.collectionGroup ? collection.id : (fullPath ?? collection?.id ?? entity.path);
+        const path = collection?.collectionGroup ? entity.path : (fullPath ?? collection?.path ?? entity.path);
+        const newFullIdPath = collection?.collectionGroup ? collection.id : (fullIdPath ?? collection?.id ?? entity.path);
         const defaultSelectedView = resolveDefaultSelectedView(
             collection ? collection.defaultSelectedView : undefined,
             {
@@ -43,7 +50,7 @@ export const editEntityAction: EntityAction = {
             collection,
             entityId: entity.id,
             path,
-            fullIdPath: path,
+            fullIdPath: newFullIdPath,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),
             navigation: context.navigation,
@@ -55,9 +62,10 @@ export const editEntityAction: EntityAction = {
 }
 
 export const copyEntityAction: EntityAction = {
-    icon: <FileCopyIcon/>,
+    icon: <FileCopyIcon size={"small"}/>,
     name: "Copy",
     key: "copy",
+    isEnabled: ({ entity }) => Boolean(entity),
     onClick({
                 entity,
                 collection,
@@ -67,19 +75,23 @@ export const copyEntityAction: EntityAction = {
                 unhighlightEntity,
                 openEntityMode
             }): Promise<void> {
+        if (!entity) {
+            throw new Error("INTERNAL: copyEntityAction: Entity is undefined");
+        }
         highlightEntity?.(entity);
         context.analyticsController?.onAnalyticsEvent?.("copy_entity_click", {
             path: entity.path,
             entityId: entity.id
         });
 
-        const path = collection?.collectionGroup ? collection.id : (fullPath ?? collection?.id ?? entity.path);
+        const path = collection?.collectionGroup ? collection.path : (fullPath ?? collection?.path ?? entity.path);
+        const fullIdPath = collection?.collectionGroup ? collection.id : (fullPath ?? collection?.id ?? entity.path);
         navigateToEntity({
             openEntityMode,
             collection,
             entityId: entity.id,
             path,
-            fullIdPath: path,
+            fullIdPath,
             copy: true,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),
@@ -91,9 +103,10 @@ export const copyEntityAction: EntityAction = {
 }
 
 export const deleteEntityAction: EntityAction = {
-    icon: <DeleteIcon/>,
+    icon: <DeleteIcon size={"small"}/>,
     name: "Delete",
     key: "delete",
+    isEnabled: ({ entity }) => Boolean(entity),
     onClick({
                 entity,
                 fullPath,
@@ -101,8 +114,11 @@ export const deleteEntityAction: EntityAction = {
                 context,
                 selectionController,
                 onCollectionChange,
-                sideEntityController
+                navigateBack
             }): Promise<void> {
+        if (!entity) {
+            throw new Error("INTERNAL: deleteEntityAction: Entity is undefined");
+        }
         const { closeDialog } = context.dialogsController.open({
             key: "delete_entity_dialog_" + entity.id,
             Component: ({ open }) => {
@@ -120,7 +136,7 @@ export const deleteEntityAction: EntityAction = {
                         });
                         selectionController?.setSelectedEntities(selectionController.selectedEntities.filter(e => e.id !== entity.id));
                         onCollectionChange?.();
-                        sideEntityController?.close();
+                        navigateBack?.();
                     }}
                     onClose={closeDialog}/>;
             }

package/src/components/common/useDataSourceTableController.tsx

@@ -134,7 +134,7 @@ export function useDataSourceTableController<M extends Record<string, any> = any
     } = parseFilterAndSort(window.location.search);
 
     const [filterValues, setFilterValues] = React.useState<FilterValues<Extract<keyof M, string>> | undefined>(forceFilter ?? (updateUrl ? initialFilterUrl : undefined) ?? initialFilter ?? undefined);
-    const [sortBy, setSortBy] = React.useState<[Extract<keyof M, string>, "asc" | "desc"] | undefined>(initialSortUrl ?? initialSortInternal);
+    const [sortBy, setSortBy] = React.useState<[Extract<keyof M, string>, "asc" | "desc"] | undefined>((updateUrl ? initialSortUrl : undefined) ?? initialSortInternal);
 
     useUpdateUrl(filterValues, sortBy, searchString, updateUrl);
 
@@ -334,7 +334,7 @@ function encodeFilterAndSort(filterValues?: FilterValues<string>, sortBy?: [stri
                 }
                 if (encodedValue !== undefined) {
                     entries[encodeURIComponent(`${key}_op`)] = encodeURIComponent(op);
-                    entries[encodeURIComponent(`${key}_value`)] = encodeURIComponent(encodedValue.toString());
+                    entries[encodeURIComponent(`${key}_value`)] = encodedValue ? encodeURIComponent(encodedValue.toString()) : "null";
                 }
             }
         });

package/src/core/DefaultDrawer.tsx

@@ -3,7 +3,7 @@ import React, { useCallback } from "react";
 import { useLargeLayout, useNavigationController } from "../hooks";
 
 import { Link, useNavigate } from "react-router-dom";
-import { CMSAnalyticsEvent, TopNavigationEntry, TopNavigationResult } from "../types";
+import { CMSAnalyticsEvent, NavigationEntry, NavigationResult } from "../types";
 import { IconForView } from "../util";
 import { cls, IconButton, Menu, MenuItem, MoreVertIcon, Tooltip, Typography } from "@firecms/ui";
 import { useAnalyticsController } from "../hooks/useAnalyticsController";
@@ -45,7 +45,7 @@ export function DefaultDrawer({
     const {
         navigationEntries,
         groups
-    }: TopNavigationResult = navigation.topLevelNavigation;
+    }: NavigationResult = navigation.topLevelNavigation;
 
     const adminViews = navigationEntries.filter(e => e.type === "admin") ?? [];
     const groupsWithoutAdmin = groups.filter(g => g !== "Admin");
@@ -63,7 +63,7 @@ export function DefaultDrawer({
         </div>;
     }, [drawerOpen]);
 
-    const onClick = (view: TopNavigationEntry) => {
+    const onClick = (view: NavigationEntry) => {
         const eventName: CMSAnalyticsEvent = view.type === "collection"
             ? "drawer_navigate_to_collection"
             : (view.type === "view" ? "drawer_navigate_to_view" : "unmapped_event");
@@ -90,9 +90,9 @@ export function DefaultDrawer({
                             {buildGroupHeader(group)}
                             {Object.values(navigationEntries)
                                 .filter(e => e.group === group)
-                                .map((view, index) =>
+                                .map((view) =>
                                     <DrawerNavigationItem
-                                        key={`navigation_${index}`}
+                                        key={view.id}
                                         icon={<IconForView collectionOrView={view.collection ?? view.view}
                                                            size={"small"}/>}
                                         tooltipsOpen={tooltipsOpen}
@@ -128,13 +128,13 @@ export function DefaultDrawer({
                             </div>}
                         </IconButton>}
                 >
-                    {adminViews.map((entry, index) =>
+                    {adminViews.map((entry) =>
                         <MenuItem
                             onClick={(event) => {
                                 event.preventDefault();
-                                navigate(entry.path);
+                                navigate(entry.url); // Consistent use of entry.url for navigation
                             }}
-                            key={`navigation_${index}`}>
+                            key={entry.id}>
                             {<IconForView collectionOrView={entry.view}/>}
                             {entry.name}
                         </MenuItem>)}

package/src/core/DrawerNavigationItem.tsx

@@ -38,7 +38,7 @@ export function DrawerNavigationItem({
                 "flex flex-row items-center mr-8",
                 // "transition-all ease-in-out delay-100 duration-300",
                 // drawerOpen ? "w-full" : "w-18",
-                drawerOpen ? "pl-4 h-12" : "pl-4 h-11",
+                drawerOpen ? "pl-4 h-10" : "pl-4 h-9",
                 "font-semibold text-xs",
                 isActive ? "bg-surface-accent-200 bg-opacity-60 dark:bg-surface-800 dark:bg-opacity-50" : ""
             )}