@firecms/core 3.0.0-canary.258 → 3.0.0-canary.259

package/dist/index.es.js

@@ -908,6 +908,13 @@ function resolveEntityView(entityView, contextEntityViews) {
     return entityView;
   }
 }
+function resolveEntityAction(entityAction, contextEntityActions) {
+  if (typeof entityAction === "string") {
+    return contextEntityActions?.find((entry) => entry.key === entityAction);
+  } else {
+    return entityAction;
+  }
+}
 function resolvedSelectedEntityView(customViews, customizationController, selectedTab, canEdit) {
   const resolvedEntityViews = customViews ? customViews.map((e) => resolveEntityView(e, customizationController.entityViews)).filter((e) => Boolean(e)) : [];
   const selectedEntityView = resolvedEntityViews.find((e) => e.key === selectedTab);
@@ -3573,12 +3580,14 @@ function mergeCollection(target, source, parentPaths = [], modifyCollection) {
   const sourcePropertiesOrder = getCollectionKeys(source);
   const mergedPropertiesOrder = [.../* @__PURE__ */ new Set([...sourcePropertiesOrder, ...targetPropertiesOrder])];
   const mergedEntityViews = [.../* @__PURE__ */ new Set([...target.entityViews ?? [], ...source.entityViews ?? []])];
+  const mergedEntityActions = [.../* @__PURE__ */ new Set([...target.entityActions ?? [], ...source.entityActions ?? []])];
   let resultCollection = {
     ...mergedCollection,
     subcollections: subcollectionsMerged,
     properties: sortProperties(propertiesMerged, mergedPropertiesOrder),
     propertiesOrder: mergedPropertiesOrder,
-    entityViews: mergedEntityViews
+    entityViews: mergedEntityViews,
+    entityActions: mergedEntityActions
   };
   if (modifyCollection) {
     const modifiedCollection = modifyCollection({
@@ -9572,6 +9581,7 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
       uncollapsedActions.map((action, index) => /* @__PURE__ */ jsx(Tooltip, { title: action.name, asChild: true, children: /* @__PURE__ */ jsx(IconButton, { onClick: (event_0) => {
         event_0.stopPropagation();
         action.onClick({
+          view: "collection",
           entity,
           fullPath,
           fullIdPath,
@@ -9587,6 +9597,7 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
       hasCollapsedActions && /* @__PURE__ */ jsx(Menu, { trigger: /* @__PURE__ */ jsx(IconButton, { size: largeLayout ? "medium" : "small", children: /* @__PURE__ */ jsx(MoreVertIcon, {}) }), children: collapsedActions.map((action_0, index_0) => /* @__PURE__ */ jsxs(MenuItem, { onClick: (e) => {
         e.stopPropagation();
         action_0.onClick({
+          view: "collection",
           entity,
           fullPath,
           fullIdPath,
@@ -9689,7 +9700,7 @@ function CollectionTableToolbar(t0) {
   }
   let t9;
   if ($[12] !== actionsStart || $[13] !== sizeSelect || $[14] !== t8) {
-    t9 = /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 md:mr-4 mr-2", children: [
+    t9 = /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1 md:mr-4 mr-2", children: [
       t8,
       sizeSelect,
       actionsStart
@@ -9722,7 +9733,7 @@ function CollectionTableToolbar(t0) {
   }
   let t12;
   if ($[23] !== actions || $[24] !== t10 || $[25] !== t11) {
-    t12 = /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
+    t12 = /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
       t10,
       t11,
       actions
@@ -12011,7 +12022,7 @@ function encodeFilterAndSort(filterValues, sortBy) {
         }
         if (encodedValue !== void 0) {
           entries[encodeURIComponent(`${key}_op`)] = encodeURIComponent(op);
-          entries[encodeURIComponent(`${key}_value`)] = encodeURIComponent(encodedValue.toString());
+          entries[encodeURIComponent(`${key}_value`)] = encodedValue ? encodeURIComponent(encodedValue.toString()) : "null";
         }
       }
     });
@@ -12391,10 +12402,13 @@ function getRecentIds(collectionId) {
   return JSON.parse(stored);
 }
 const editEntityAction = {
-  icon: /* @__PURE__ */ jsx(EditIcon, {}),
+  icon: /* @__PURE__ */ jsx(EditIcon, { size: "small" }),
   key: "edit",
   name: "Edit",
   collapsed: false,
+  isEnabled: ({
+    entity
+  }) => Boolean(entity),
   onClick({
     entity,
     collection,
@@ -12405,6 +12419,9 @@ const editEntityAction = {
     unhighlightEntity,
     openEntityMode
   }) {
+    if (!entity) {
+      throw new Error("INTERNAL: editEntityAction: Entity is undefined");
+    }
     highlightEntity?.(entity);
     context.analyticsController?.onAnalyticsEvent?.("entity_click", {
       path: entity.path,
@@ -12434,9 +12451,12 @@ const editEntityAction = {
   }
 };
 const copyEntityAction = {
-  icon: /* @__PURE__ */ jsx(FileCopyIcon, {}),
+  icon: /* @__PURE__ */ jsx(FileCopyIcon, { size: "small" }),
   name: "Copy",
   key: "copy",
+  isEnabled: ({
+    entity
+  }) => Boolean(entity),
   onClick({
     entity,
     collection,
@@ -12446,6 +12466,9 @@ const copyEntityAction = {
     unhighlightEntity,
     openEntityMode
   }) {
+    if (!entity) {
+      throw new Error("INTERNAL: copyEntityAction: Entity is undefined");
+    }
     highlightEntity?.(entity);
     context.analyticsController?.onAnalyticsEvent?.("copy_entity_click", {
       path: entity.path,
@@ -12468,9 +12491,12 @@ const copyEntityAction = {
   }
 };
 const deleteEntityAction = {
-  icon: /* @__PURE__ */ jsx(DeleteIcon, {}),
+  icon: /* @__PURE__ */ jsx(DeleteIcon, { size: "small" }),
   name: "Delete",
   key: "delete",
+  isEnabled: ({
+    entity
+  }) => Boolean(entity),
   onClick({
     entity,
     fullPath,
@@ -12478,8 +12504,11 @@ const deleteEntityAction = {
     context,
     selectionController,
     onCollectionChange,
-    sideEntityController
+    navigateBack
   }) {
+    if (!entity) {
+      throw new Error("INTERNAL: deleteEntityAction: Entity is undefined");
+    }
     const {
       closeDialog
     } = context.dialogsController.open({
@@ -12494,7 +12523,7 @@ const deleteEntityAction = {
           });
           selectionController?.setSelectedEntities(selectionController.selectedEntities.filter((e) => e.id !== entity.id));
           onCollectionChange?.();
-          sideEntityController?.close();
+          navigateBack?.();
         }, onClose: closeDialog });
       }
     });
@@ -13361,53 +13390,51 @@ function SortableNavigationCard(t0) {
     isDragging
   } = useSortable(t1);
   let t2;
-  let t3;
   if ($[2] !== transform) {
-    t3 = transform ? CSS.Transform.toString(transform) : void 0;
+    t2 = transform ? CSS.Transform.toString(transform) : void 0;
     $[2] = transform;
-    $[3] = t3;
+    $[3] = t2;
   } else {
-    t3 = $[3];
+    t2 = $[3];
   }
-  const t4 = isDragging ? 0 : 1;
-  let t5;
-  if ($[4] !== t3 || $[5] !== t4 || $[6] !== transition) {
-    t5 = {
-      transform: t3,
+  const t3 = isDragging ? 0 : 1;
+  let t4;
+  if ($[4] !== t2 || $[5] !== t3 || $[6] !== transition) {
+    t4 = {
+      transform: t2,
       transition,
-      opacity: t4
+      opacity: t3
     };
-    $[4] = t3;
-    $[5] = t4;
+    $[4] = t2;
+    $[5] = t3;
     $[6] = transition;
-    $[7] = t5;
+    $[7] = t4;
   } else {
-    t5 = $[7];
+    t4 = $[7];
   }
-  t2 = t5;
-  const style = t2;
-  let t6;
+  const style = t4;
+  let t5;
   if ($[8] !== entry || $[9] !== onClick) {
-    t6 = /* @__PURE__ */ jsx(NavigationCardBinding, { ...entry, onClick });
+    t5 = /* @__PURE__ */ jsx(NavigationCardBinding, { ...entry, onClick });
     $[8] = entry;
     $[9] = onClick;
-    $[10] = t6;
+    $[10] = t5;
   } else {
-    t6 = $[10];
+    t5 = $[10];
   }
-  let t7;
-  if ($[11] !== attributes || $[12] !== listeners2 || $[13] !== setNodeRef || $[14] !== style || $[15] !== t6) {
-    t7 = /* @__PURE__ */ jsx("div", { ref: setNodeRef, style, ...attributes, ...listeners2, children: t6 });
+  let t6;
+  if ($[11] !== attributes || $[12] !== listeners2 || $[13] !== setNodeRef || $[14] !== style || $[15] !== t5) {
+    t6 = /* @__PURE__ */ jsx("div", { ref: setNodeRef, style, ...attributes, ...listeners2, children: t5 });
     $[11] = attributes;
     $[12] = listeners2;
     $[13] = setNodeRef;
     $[14] = style;
-    $[15] = t6;
-    $[16] = t7;
+    $[15] = t5;
+    $[16] = t6;
   } else {
-    t7 = $[16];
+    t6 = $[16];
   }
-  return t7;
+  return t6;
 }
 function NavigationGroupDroppable(t0) {
   const $ = c(11);
@@ -13490,44 +13517,42 @@ function SortableNavigationGroup(t0) {
     isDragging
   } = useSortable(t1);
   let t2;
-  let t3;
   if ($[3] !== transform) {
-    t3 = transform ? CSS.Transform.toString(transform) : void 0;
+    t2 = transform ? CSS.Transform.toString(transform) : void 0;
     $[3] = transform;
-    $[4] = t3;
+    $[4] = t2;
   } else {
-    t3 = $[4];
+    t2 = $[4];
   }
-  const t4 = isDragging ? 0 : 1;
-  let t5;
-  if ($[5] !== t3 || $[6] !== t4 || $[7] !== transition) {
-    t5 = {
-      transform: t3,
+  const t3 = isDragging ? 0 : 1;
+  let t4;
+  if ($[5] !== t2 || $[6] !== t3 || $[7] !== transition) {
+    t4 = {
+      transform: t2,
       transition,
-      opacity: t4
+      opacity: t3
     };
-    $[5] = t3;
-    $[6] = t4;
+    $[5] = t2;
+    $[6] = t3;
     $[7] = transition;
-    $[8] = t5;
+    $[8] = t4;
   } else {
-    t5 = $[8];
+    t4 = $[8];
   }
-  t2 = t5;
-  const style = t2;
-  let t6;
+  const style = t4;
+  let t5;
   if ($[9] !== attributes || $[10] !== children || $[11] !== listeners2 || $[12] !== setNodeRef || $[13] !== style) {
-    t6 = /* @__PURE__ */ jsx("div", { ref: setNodeRef, style, ...attributes, ...listeners2, children });
+    t5 = /* @__PURE__ */ jsx("div", { ref: setNodeRef, style, ...attributes, ...listeners2, children });
     $[9] = attributes;
     $[10] = children;
     $[11] = listeners2;
     $[12] = setNodeRef;
     $[13] = style;
-    $[14] = t6;
+    $[14] = t5;
   } else {
-    t6 = $[14];
+    t5 = $[14];
   }
-  return t6;
+  return t5;
 }
 function useHomePageDnd({
   items: dndItems,
@@ -13561,8 +13586,8 @@ function useHomePageDnd({
     }
   });
   const keyboardSensor = useSensor(KeyboardSensor);
-  const sensors = useSensors(...disabled ? [] : [mouseSensor, touchSensor, keyboardSensor]);
-  const dndContainers = useMemo(() => dndItems.map((g) => g.name), [dndItems]);
+  const sensors = useSensors(mouseSensor, touchSensor, keyboardSensor);
+  const dndContainers = dndItems.map((g) => g.name);
   const findDndContainer = useCallback((id) => {
     if (!id) return void 0;
     const group = dndItems.find((g_0) => g_0.name === id);
@@ -13773,14 +13798,8 @@ function useHomePageDnd({
       return updated;
     });
   };
-  const activeItemForOverlay = useMemo(() => {
-    if (disabled || !activeId || activeIsGroup) return null;
-    return dndItems.flatMap((g_19) => g_19.entries).find((e_7) => e_7.url === activeId) || null;
-  }, [activeId, dndItems, disabled, activeIsGroup]);
-  const activeGroupData = useMemo(() => {
-    if (disabled || !activeId || !activeIsGroup) return null;
-    return dndItems.find((g_20) => g_20.name === activeId) || null;
-  }, [activeId, dndItems, disabled, activeIsGroup]);
+  const activeItemForOverlay = disabled || !activeId || activeIsGroup ? null : dndItems.flatMap((g_19) => g_19.entries).find((e_7) => e_7.url === activeId) || null;
+  const activeGroupData = disabled || !activeId || !activeIsGroup ? null : dndItems.find((g_20) => g_20.name === activeId) || null;
   return {
     sensors,
     collisionDetection,
@@ -14061,7 +14080,7 @@ function RenameGroupDialog(t0) {
   }
   let t12;
   if ($[28] !== onClose) {
-    t12 = /* @__PURE__ */ jsx(Button, { onClick: onClose, variant: "text", children: "Cancel" });
+    t12 = /* @__PURE__ */ jsx(Button, { onClick: onClose, color: "primary", variant: "text", children: "Cancel" });
     $[28] = onClose;
     $[29] = t12;
   } else {
@@ -14070,7 +14089,7 @@ function RenameGroupDialog(t0) {
   const t13 = !!error || !name.trim();
   let t14;
   if ($[30] !== handleSave || $[31] !== t13) {
-    t14 = /* @__PURE__ */ jsx(Button, { onClick: handleSave, disabled: t13, children: "Save" });
+    t14 = /* @__PURE__ */ jsx(Button, { onClick: handleSave, color: "primary", disabled: t13, children: "Save" });
     $[30] = handleSave;
     $[31] = t13;
     $[32] = t14;
@@ -14126,26 +14145,32 @@ function DefaultHomePage({
   const fuse = useRef(null);
   const [filteredUrls, setFilteredUrls] = useState(null);
   const performingSearch = Boolean(filteredUrls);
-  const filteredNavigationEntries = filteredUrls ? rawNavigationEntries.filter((e) => filteredUrls.includes(e.url)) : rawNavigationEntries;
+  const filteredNavigationEntries = useMemo(() => {
+    return filteredUrls ? rawNavigationEntries.filter((e) => filteredUrls.includes(e.url)) : rawNavigationEntries;
+  }, [filteredUrls, rawNavigationEntries]);
   useEffect(() => {
     fuse.current = new Fuse(rawNavigationEntries, {
       keys: ["name", "description", "group", "path"]
     });
   }, [rawNavigationEntries]);
   const updateSearch = useCallback((v) => {
-    if (!v?.trim()) return setFilteredUrls(null);
-    const r = fuse.current?.search(v.trim());
-    setFilteredUrls(r ? r.map((x) => x.item.url) : []);
+    if (!v?.trim()) {
+      setFilteredUrls(null);
+      return;
+    }
+    const results = fuse.current?.search(v.trim());
+    setFilteredUrls(results ? results.map((x) => x.item.url) : []);
   }, []);
   const [items, setItems] = useState([]);
   const [adminGroupData, setAdminGroupData] = useState(null);
-  useEffect(() => {
-    const src = performingSearch ? filteredNavigationEntries : rawNavigationEntries;
+  const processedGroups = useMemo(() => {
+    const src = filteredNavigationEntries;
     const entriesByGroup = {};
     src.forEach((e_0) => {
       const g = e_0.type === "admin" ? ADMIN_GROUP_NAME : e_0.group ?? DEFAULT_GROUP_NAME;
       (entriesByGroup[g] ??= []).push(e_0);
     });
+    const hasPluginAdditionalCards = customizationController.plugins?.some((p) => p.homePage?.AdditionalCards);
     let allProcessed;
     if (performingSearch) {
       const ordered = [...new Set(src.map((e_1) => e_1.group ?? DEFAULT_GROUP_NAME))];
@@ -14164,24 +14189,31 @@ function DefaultHomePage({
           entries: entriesByGroup[g_2]
         });
       });
-      allProcessed = allProcessed.filter((g_3) => g_3.entries.length || groupOrderFromNavController.includes(g_3.name));
-    }
-    const admin = allProcessed.find((g_4) => g_4.name === ADMIN_GROUP_NAME);
-    if (admin) {
-      setAdminGroupData(admin);
-      setItems(allProcessed.filter((g_5) => g_5.name !== ADMIN_GROUP_NAME));
-    } else {
-      setAdminGroupData(null);
-      setItems(allProcessed);
+      if (hasPluginAdditionalCards && !allProcessed.some((g_3) => g_3.name === DEFAULT_GROUP_NAME)) {
+        allProcessed.push({
+          name: DEFAULT_GROUP_NAME,
+          entries: []
+        });
+      }
+      allProcessed = allProcessed.filter((g_4) => g_4.entries.length || groupOrderFromNavController.includes(g_4.name) || g_4.name === DEFAULT_GROUP_NAME && hasPluginAdditionalCards);
     }
-  }, [performingSearch, filteredNavigationEntries, rawNavigationEntries, groupOrderFromNavController]);
+    const admin = allProcessed.find((g_5) => g_5.name === ADMIN_GROUP_NAME);
+    return {
+      adminGroupData: admin || null,
+      items: allProcessed.filter((g_6) => g_6.name !== ADMIN_GROUP_NAME)
+    };
+  }, [filteredNavigationEntries, performingSearch, groupOrderFromNavController, customizationController.plugins]);
+  useEffect(() => {
+    setAdminGroupData(processedGroups.adminGroupData);
+    setItems(processedGroups.items);
+  }, [processedGroups]);
   const updateItems = (updater) => {
     setItems(updater);
   };
   const persistNavigationGroups = (latest) => {
-    const draggable = latest.map((g_6) => ({
-      name: g_6.name,
-      entries: g_6.entries.map((e_2) => e_2.path)
+    const draggable = latest.map((g_7) => ({
+      name: g_7.name,
+      entries: g_7.entries.map((e_2) => e_2.path)
     }));
     const all = adminGroupData ? [...draggable, {
       name: adminGroupData.name,
@@ -14214,8 +14246,8 @@ function DefaultHomePage({
     disabled: !allowDragAndDrop || performingSearch,
     onPersist: persistNavigationGroups,
     // ——► persistence here
-    onGroupMoved: (g_7) => context.analyticsController?.onAnalyticsEvent?.("home_move_group", {
-      name: g_7
+    onGroupMoved: (g_8) => context.analyticsController?.onAnalyticsEvent?.("home_move_group", {
+      name: g_8
     }),
     onCardMovedBetweenGroups: (card) => context.analyticsController?.onAnalyticsEvent?.("home_move_card", {
       id: card.id
@@ -14227,10 +14259,7 @@ function DefaultHomePage({
     direction
   } = useRestoreScroll();
   const dndDisabled = !allowDragAndDrop || performingSearch;
-  const dndModifiers = useMemo(() => {
-    if (dndKitActiveNode?.data.current?.type === "group") return [restrictToVerticalAxis, restrictToWindowEdges];
-    return [restrictToWindowEdges];
-  }, [dndKitActiveNode]);
+  const dndModifiers = dndKitActiveNode?.data.current?.type === "group" ? [restrictToVerticalAxis, restrictToWindowEdges] : [restrictToWindowEdges];
   let additionalPluginChildrenStart;
   let additionalPluginChildrenEnd;
   let additionalPluginSections;
@@ -14238,12 +14267,12 @@ function DefaultHomePage({
     const sectionProps = {
       context
     };
-    additionalPluginSections = /* @__PURE__ */ jsx(Fragment, { children: customizationController.plugins.filter((p) => p.homePage?.includeSection).map((plugin) => {
+    additionalPluginSections = /* @__PURE__ */ jsx(Fragment, { children: customizationController.plugins.filter((p_0) => p_0.homePage?.includeSection).map((plugin) => {
       const section = plugin.homePage.includeSection(sectionProps);
       return /* @__PURE__ */ jsx(NavigationGroup, { group: section.title, children: section.children }, `plugin_section_${plugin.key}`);
     }) });
-    additionalPluginChildrenStart = /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2", children: customizationController.plugins.filter((p_0) => p_0.homePage?.additionalChildrenStart).map((plugin_0, i) => /* @__PURE__ */ jsx("div", { children: plugin_0.homePage.additionalChildrenStart }, `plugin_children_start_${i}`)) });
-    additionalPluginChildrenEnd = /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2", children: customizationController.plugins.filter((p_1) => p_1.homePage?.additionalChildrenEnd).map((plugin_1, i_0) => /* @__PURE__ */ jsx("div", { children: plugin_1.homePage.additionalChildrenEnd }, `plugin_children_end_${i_0}`)) });
+    additionalPluginChildrenStart = /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2", children: customizationController.plugins.filter((p_1) => p_1.homePage?.additionalChildrenStart).map((plugin_0, i) => /* @__PURE__ */ jsx("div", { children: plugin_0.homePage.additionalChildrenStart }, `plugin_children_start_${i}`)) });
+    additionalPluginChildrenEnd = /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2", children: customizationController.plugins.filter((p_2) => p_2.homePage?.additionalChildrenEnd).map((plugin_1, i_0) => /* @__PURE__ */ jsx("div", { children: plugin_1.homePage.additionalChildrenEnd }, `plugin_children_end_${i_0}`)) });
   }
   return /* @__PURE__ */ jsxs("div", { ref: containerRef, className: "py-2 overflow-auto h-full w-full", children: [
     /* @__PURE__ */ jsxs(Container, { maxWidth: "6xl", children: [
@@ -14266,8 +14295,8 @@ function DefaultHomePage({
           const groupKey = groupData.name;
           const entriesInGroup = groupData.entries;
           const AdditionalCards = [];
-          customizationController.plugins?.forEach((p_2) => {
-            if (p_2.homePage?.AdditionalCards) AdditionalCards.push(...toArray(p_2.homePage.AdditionalCards));
+          customizationController.plugins?.forEach((p_3) => {
+            if (p_3.homePage?.AdditionalCards) AdditionalCards.push(...toArray(p_3.homePage.AdditionalCards));
           });
           const actionProps = {
             group: groupKey === DEFAULT_GROUP_NAME ? void 0 : groupKey,
@@ -14309,7 +14338,7 @@ function DefaultHomePage({
       additionalPluginChildrenEnd,
       additionalChildrenEnd
     ] }),
-    dialogOpenForGroup && /* @__PURE__ */ jsx(RenameGroupDialog, { open: true, initialName: dialogOpenForGroup, existingGroupNames: items.map((g_8) => g_8.name).filter((n) => n !== dialogOpenForGroup), onClose: () => setDialogOpenForGroup(null), onRename: (newName) => {
+    dialogOpenForGroup && /* @__PURE__ */ jsx(RenameGroupDialog, { open: true, initialName: dialogOpenForGroup, existingGroupNames: items.map((g_9) => g_9.name).filter((n) => n !== dialogOpenForGroup), onClose: () => setDialogOpenForGroup(null), onRename: (newName) => {
       handleRenameGroup(dialogOpenForGroup, newName);
       setDialogOpenForGroup(null);
     } })
@@ -14374,11 +14403,11 @@ function EntityCollectionViewActions(t0) {
   if (selectionEnabled) {
     let t42;
     if ($[12] !== largeLayout || $[13] !== multipleDeleteEnabled || $[14] !== onMultipleDeleteClick || $[15] !== selectedEntities?.length) {
-      t42 = largeLayout ? /* @__PURE__ */ jsxs(Button, { variant: "text", disabled: !selectedEntities?.length || !multipleDeleteEnabled, startIcon: /* @__PURE__ */ jsx(DeleteIcon, {}), onClick: onMultipleDeleteClick, color: "primary", className: "lg:w-20", children: [
+      t42 = largeLayout ? /* @__PURE__ */ jsxs(Button, { variant: "text", disabled: !selectedEntities?.length || !multipleDeleteEnabled, startIcon: /* @__PURE__ */ jsx(DeleteIcon, { size: "small" }), onClick: onMultipleDeleteClick, color: "primary", className: "lg:w-20", children: [
         "(",
         selectedEntities?.length,
         ")"
-      ] }) : /* @__PURE__ */ jsx(IconButton, { color: "primary", disabled: !selectedEntities?.length || !multipleDeleteEnabled, onClick: onMultipleDeleteClick, children: /* @__PURE__ */ jsx(DeleteIcon, {}) });
+      ] }) : /* @__PURE__ */ jsx(IconButton, { size: "small", color: "primary", disabled: !selectedEntities?.length || !multipleDeleteEnabled, onClick: onMultipleDeleteClick, children: /* @__PURE__ */ jsx(DeleteIcon, { size: "small" }) });
       $[12] = largeLayout;
       $[13] = multipleDeleteEnabled;
       $[14] = onMultipleDeleteClick;
@@ -14690,7 +14719,7 @@ const getScrollableParent = (ele) => {
   return !ele || ele === document.body ? document.body : isScrollable(ele) ? ele : getScrollableParent(ele.parentNode);
 };
 function EntityFormActions(t0) {
-  const $ = c(14);
+  const $ = c(16);
   const {
     fullPath,
     fullIdPath,
@@ -14702,12 +14731,14 @@ function EntityFormActions(t0) {
     disabled,
     status,
     pluginActions,
-    openEntityMode
+    openEntityMode,
+    navigateBack,
+    formContext
   } = t0;
   const context = useFireCMSContext();
   const sideEntityController = useSideEntityController();
   let t1;
-  if ($[0] !== collection || $[1] !== context || $[2] !== disabled || $[3] !== entity || $[4] !== formex.isSubmitting || $[5] !== fullIdPath || $[6] !== fullPath || $[7] !== layout || $[8] !== openEntityMode || $[9] !== pluginActions || $[10] !== savingError || $[11] !== sideEntityController || $[12] !== status) {
+  if ($[0] !== collection || $[1] !== context || $[2] !== disabled || $[3] !== entity || $[4] !== formContext || $[5] !== formex.isSubmitting || $[6] !== fullIdPath || $[7] !== fullPath || $[8] !== layout || $[9] !== navigateBack || $[10] !== openEntityMode || $[11] !== pluginActions || $[12] !== savingError || $[13] !== sideEntityController || $[14] !== status) {
     t1 = layout === "bottom" ? buildBottomActions$1({
       fullPath,
       fullIdPath,
@@ -14720,7 +14751,9 @@ function EntityFormActions(t0) {
       disabled,
       status,
       pluginActions,
-      openEntityMode
+      openEntityMode,
+      navigateBack,
+      formContext
     }) : buildSideActions$1({
       fullPath,
       fullIdPath,
@@ -14733,24 +14766,28 @@ function EntityFormActions(t0) {
       disabled,
       status,
       pluginActions,
-      openEntityMode
+      openEntityMode,
+      navigateBack,
+      formContext
     });
     $[0] = collection;
     $[1] = context;
     $[2] = disabled;
     $[3] = entity;
-    $[4] = formex.isSubmitting;
-    $[5] = fullIdPath;
-    $[6] = fullPath;
-    $[7] = layout;
-    $[8] = openEntityMode;
-    $[9] = pluginActions;
-    $[10] = savingError;
-    $[11] = sideEntityController;
-    $[12] = status;
-    $[13] = t1;
+    $[4] = formContext;
+    $[5] = formex.isSubmitting;
+    $[6] = fullIdPath;
+    $[7] = fullPath;
+    $[8] = layout;
+    $[9] = navigateBack;
+    $[10] = openEntityMode;
+    $[11] = pluginActions;
+    $[12] = savingError;
+    $[13] = sideEntityController;
+    $[14] = status;
+    $[15] = t1;
   } else {
-    t1 = $[13];
+    t1 = $[15];
   }
   return t1;
 }
@@ -14767,24 +14804,29 @@ function buildBottomActions$1({
   disabled,
   status,
   pluginActions,
-  openEntityMode
+  openEntityMode,
+  navigateBack,
+  formContext
 }) {
   return /* @__PURE__ */ jsxs(DialogActions, { position: "absolute", children: [
     savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) }),
     entity && (formActions ?? []).length > 0 && /* @__PURE__ */ jsx("div", { className: "flex-grow flex overflow-auto no-scrollbar", children: (formActions ?? []).map((action) => /* @__PURE__ */ jsx(IconButton, { color: "primary", onClick: (event) => {
       event.stopPropagation();
       if (entity) action.onClick({
+        view: "form",
         entity,
         fullPath: fullPath ?? collection.path,
         fullIdPath: fullIdPath ?? collection.id,
         collection,
         context,
         sideEntityController,
-        openEntityMode
+        openEntityMode,
+        navigateBack,
+        formContext
       });
     }, children: action.icon }, action.name)) }),
     pluginActions,
-    /* @__PURE__ */ jsx(Button, { variant: "text", disabled: disabled || isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
+    /* @__PURE__ */ jsx(Button, { variant: "text", disabled: disabled || isSubmitting, color: "primary", type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
     /* @__PURE__ */ jsxs(Button, { variant: "filled", color: "primary", type: "submit", disabled: disabled || isSubmitting, children: [
       status === "existing" && "Save",
       status === "copy" && "Create copy",
@@ -14796,6 +14838,9 @@ function buildSideActions$1({
   savingError,
   entity,
   formActions,
+  fullPath,
+  fullIdPath,
+  openEntityMode,
   collection,
   context,
   sideEntityController,
@@ -14843,6 +14888,15 @@ function EntityForm({
   if (collection.customId && collection.formAutoSave) {
     console.warn(`The collection ${collection.path} has customId and formAutoSave enabled. This is not supported and formAutoSave will be ignored`);
   }
+  const sideEntityController = useSideEntityController();
+  const navigationController = useNavigationController();
+  const navigateBack = useCallback(() => {
+    if (openEntityMode === "side_panel") {
+      sideEntityController.close();
+    } else {
+      window.history.back();
+    }
+  }, []);
   const authController = useAuthController();
   const [status, setStatus] = useState(initialStatus);
   const updateStatus = (status_0) => {
@@ -15093,14 +15147,15 @@ function EntityForm({
   const pluginActions = [];
   const plugins = customizationController.plugins;
   const actionsDisabled = disabled || formex.isSubmitting || status === "existing" && !formex.dirty || Boolean(disabledProp);
+  const parentCollectionIds = navigationController.getParentCollectionIds(path);
   if (plugins && collection) {
     const actionProps = {
       entityId,
+      parentCollectionIds,
       path,
       status,
       collection,
       context,
-      currentEntityId: entityId,
       formContext,
       openEntityMode,
       disabled: actionsDisabled
@@ -15212,6 +15267,7 @@ function EntityForm({
   const formView = /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
     !Builder && /* @__PURE__ */ jsxs("div", { className: "w-full py-2 flex flex-col items-start my-4 lg:my-6", children: [
       /* @__PURE__ */ jsx(Typography, { className: "my-4 flex-grow line-clamp-1 " + (collection.hideIdFromForm ? "mb-6" : ""), variant: "h4", children: title ?? collection.singularName ?? collection.name }),
+      !entity?.values && initialStatus === "existing" && /* @__PURE__ */ jsx(Alert, { color: "warning", size: "small", outerClassName: "w-full mb-4 text-xs", children: "This entity does not exist in the database" }),
       showEntityPath && /* @__PURE__ */ jsx(Alert, { color: "base", outerClassName: "w-full", size: "small", children: /* @__PURE__ */ jsxs("code", { className: "text-xs select-all text-text-secondary dark:text-text-secondary-dark", children: [
         entity?.path ?? path,
         "/",
@@ -15219,6 +15275,7 @@ function EntityForm({
       ] }) })
     ] }),
     children,
+    initialEntityId && !entity && initialStatus !== "new" && /* @__PURE__ */ jsx(Alert, { color: "info", size: "small", children: "This entity does not exist in the database" }),
     !Builder && !collection.hideIdFromForm && /* @__PURE__ */ jsx(CustomIdField, { customId: collection.customId, entityId, status, onChange: setEntityId, error: entityIdError, loading: customIdLoading, entity }),
     entityId && formContext && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("div", { className: "mt-12 flex flex-col gap-8", ref: formRef, children: [
       formFields(),
@@ -15232,7 +15289,7 @@ function EntityForm({
   if (!resolvedCollection || !path) {
     throw Error("INTERNAL: Collection and path must be defined in form context");
   }
-  const dialogActions = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, fullPath: path, fullIdPath, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex, disabled: actionsDisabled, status, pluginActions, openEntityMode, showDefaultActions });
+  const dialogActions = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, fullPath: path, fullIdPath, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex, disabled: actionsDisabled, status, pluginActions, openEntityMode, showDefaultActions, navigateBack, formContext });
   return /* @__PURE__ */ jsx(Formex, { value: formex, children: /* @__PURE__ */ jsxs("form", { onSubmit: formex.handleSubmit, onReset: () => formex.resetForm({
     values: getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs)
   }), noValidate: true, className: cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", className), children: [
@@ -16087,7 +16144,7 @@ function StorageUploadFieldBinding(t0) {
   const resolvedProperty = t6;
   let t7;
   if ($[21] !== minimalistView || $[22] !== property || $[23] !== propertyKey) {
-    t7 = !minimalistView && /* @__PURE__ */ jsx(LabelWithIconAndTooltip, { propertyKey, icon: getIconForProperty(property, "small"), required: property.validation?.required, title: property.name, className: "h-8text-text-secondary dark:text-text-secondary-dark ml-3.5" });
+    t7 = !minimalistView && /* @__PURE__ */ jsx(LabelWithIconAndTooltip, { propertyKey, icon: getIconForProperty(property, "small"), required: property.validation?.required, title: property.name, className: "h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5" });
     $[21] = minimalistView;
     $[22] = property;
     $[23] = propertyKey;
@@ -18993,6 +19050,9 @@ function MarkdownEditorFieldBinding({
   const [fieldVersion, setFieldVersion] = useState(0);
   const internalValue = useRef(value);
   const onContentChange = useCallback((content) => {
+    if (content === value || value === null && content === "") {
+      return;
+    }
     internalValue.current = content;
     setValue(content);
   }, [setValue]);
@@ -19992,9 +20052,10 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     frozen
   }) => {
     const isSelected = Boolean(usedSelectionController.selectedEntities.find((e_1) => e_1.id == entity_6.id && e_1.path == entity_6.path));
+    const customEntityActions_0 = (collection.entityActions ?? []).map((action) => resolveEntityAction(action, customizationController.entityActions)).filter(Boolean);
     const actions_0 = getActionsForEntity({
       entity: entity_6,
-      customEntityActions: collection.entityActions
+      customEntityActions: customEntityActions_0
     });
     return /* @__PURE__ */ jsx(EntityCollectionRowActions, { entity: entity_6, width: width_0, frozen, isSelected, selectionEnabled, size: size_0, highlightEntity: setHighlightedEntity, unhighlightEntity: unselectNavigatedEntity, collection, fullPath, fullIdPath, actions: actions_0, hideId: collection?.hideIdFromCollection, onCollectionChange: updateLastDeleteTimestamp, selectionController: usedSelectionController, openEntityMode });
   }, [updateLastDeleteTimestamp, usedSelectionController]);
@@ -20354,7 +20415,7 @@ function ConfirmationDialog(t0) {
   }
   let t4;
   if ($[6] !== onCancel) {
-    t4 = /* @__PURE__ */ jsx(Button, { variant: "text", onClick: onCancel, autoFocus: true, children: "Cancel" });
+    t4 = /* @__PURE__ */ jsx(Button, { color: "primary", variant: "text", onClick: onCancel, autoFocus: true, children: "Cancel" });
     $[6] = onCancel;
     $[7] = t4;
   } else {
@@ -22257,7 +22318,7 @@ function UnsavedChangesDialog(t0) {
   }
   let t5;
   if ($[7] !== handleCancel) {
-    t5 = /* @__PURE__ */ jsx(Button, { variant: "text", onClick: handleCancel, autoFocus: true, children: " Cancel " });
+    t5 = /* @__PURE__ */ jsx(Button, { variant: "text", color: "primary", onClick: handleCancel, autoFocus: true, children: " Cancel " });
     $[7] = handleCancel;
     $[8] = t5;
   } else {
@@ -22265,7 +22326,7 @@ function UnsavedChangesDialog(t0) {
   }
   let t6;
   if ($[9] !== handleOk) {
-    t6 = /* @__PURE__ */ jsx(Button, { onClick: handleOk, children: " Ok " });
+    t6 = /* @__PURE__ */ jsx(Button, { color: "primary", onClick: handleOk, children: " Ok " });
     $[9] = handleOk;
     $[10] = t6;
   } else {
@@ -22409,14 +22470,17 @@ function EntityEditViewFormActions({
   status,
   pluginActions,
   openEntityMode,
-  showDefaultActions = true
+  showDefaultActions = true,
+  navigateBack,
+  formContext
 }) {
   const authController = useAuthController();
   const context = useFireCMSContext();
   const sideEntityController = useSideEntityController();
   const sideDialogContext = useSideDialogContext();
+  const customizationController = useCustomizationController();
   const entityActions = useMemo(() => {
-    const customEntityActions = collection.entityActions;
+    const customEntityActions = (collection.entityActions ?? []).map((action) => resolveEntityAction(action, customizationController.entityActions)).filter(Boolean);
     const createEnabled = canCreateEntity(collection, authController, path, null);
     const deleteEnabled = entity ? canDeleteEntity(collection, authController, path, entity) : false;
     const actions = [];
@@ -22424,7 +22488,7 @@ function EntityEditViewFormActions({
     if (deleteEnabled) actions.push(deleteEntityAction);
     if (customEntityActions) return mergeEntityActions(actions, customEntityActions);
     return actions;
-  }, [authController, collection, path]);
+  }, [authController, collection, path, customizationController.entityActions?.length]);
   const formActions = showDefaultActions ? entityActions.filter((a) => a.includeInForm === void 0 || a.includeInForm) : [];
   return layout === "bottom" ? buildBottomActions({
     savingError,
@@ -22438,7 +22502,9 @@ function EntityEditViewFormActions({
     status,
     sideDialogContext,
     pluginActions,
-    openEntityMode
+    openEntityMode,
+    navigateBack,
+    formContext
   }) : buildSideActions({
     savingError,
     entity,
@@ -22451,7 +22517,9 @@ function EntityEditViewFormActions({
     disabled,
     status,
     pluginActions,
-    openEntityMode
+    openEntityMode,
+    navigateBack,
+    formContext
   });
 }
 function buildBottomActions({
@@ -22466,22 +22534,28 @@ function buildBottomActions({
   status,
   sideDialogContext,
   pluginActions,
-  openEntityMode
+  openEntityMode,
+  navigateBack,
+  formContext
 }) {
   const canClose = openEntityMode === "side_panel";
   return /* @__PURE__ */ jsxs(DialogActions, { position: "absolute", children: [
     savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) }),
-    entity && formActions.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex-grow flex overflow-auto no-scrollbar", children: formActions.map((action) => /* @__PURE__ */ jsx(IconButton, { color: "primary", onClick: (event) => {
-      event.stopPropagation();
-      if (entity) action.onClick({
+    formActions.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex-grow flex overflow-auto no-scrollbar", children: formActions.map((action) => {
+      const props = {
+        view: "form",
         entity,
         fullPath: collection.path,
         collection,
         context,
         sideEntityController,
-        openEntityMode
-      });
-    }, children: action.icon }, action.name)) }),
+        openEntityMode,
+        navigateBack,
+        formContext
+      };
+      const isEnabled = !action.isEnabled || action.isEnabled(props);
+      return /* @__PURE__ */ jsx(EntityActionButton, { action, enabled: isEnabled, props }, action.key);
+    }) }),
     pluginActions,
     /* @__PURE__ */ jsx(Button, { variant: "text", disabled: disabled || isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
     /* @__PURE__ */ jsxs(Button, { variant: canClose ? "text" : "filled", color: "primary", type: "submit", disabled: disabled || isSubmitting, onClick: () => {
@@ -22511,7 +22585,10 @@ function buildSideActions({
   disabled,
   status,
   sideDialogContext,
-  pluginActions
+  pluginActions,
+  openEntityMode,
+  navigateBack,
+  formContext
 }) {
   return /* @__PURE__ */ jsxs("div", { className: cls("overflow-auto h-full flex flex-col gap-2 w-80 2xl:w-96 px-4 py-16 sticky top-0 border-l", defaultBorderMixin), children: [
     /* @__PURE__ */ jsxs(LoadingButton, { fullWidth: true, variant: "filled", color: "primary", type: "submit", size: "large", disabled: disabled || isSubmitting, onClick: () => {
@@ -22523,9 +22600,104 @@ function buildSideActions({
     ] }),
     /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "text", disabled: disabled || isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
     pluginActions,
+    formActions.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-row flex-wrap mt-2", children: formActions.map((action) => {
+      const props = {
+        view: "form",
+        entity,
+        fullPath: collection.path,
+        collection,
+        context,
+        sideEntityController,
+        openEntityMode,
+        navigateBack,
+        formContext
+      };
+      const isEnabled = !action.isEnabled || action.isEnabled(props);
+      return /* @__PURE__ */ jsx(EntityActionButton, { action, enabled: isEnabled, props }, action.key);
+    }) }),
     savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) })
   ] });
 }
+function EntityActionButton(t0) {
+  const $ = c(14);
+  const {
+    action,
+    enabled,
+    props
+  } = t0;
+  const snackbarController = useSnackbarController();
+  const [loading, setLoading] = React__default.useState(false);
+  const t1 = !enabled;
+  let t2;
+  if ($[0] !== action || $[1] !== props || $[2] !== snackbarController) {
+    t2 = (event) => {
+      console.debug("Executing action", action.key, props);
+      try {
+        event.stopPropagation();
+        if (props.entity) {
+          const onClick = action.onClick(props);
+          if (onClick instanceof Promise) {
+            setLoading(true);
+            onClick.catch((error) => {
+              console.error("Error executing action", action.key, error);
+              snackbarController.open({
+                message: `Error executing action: ${error.message}`,
+                type: "error"
+              });
+            }).finally(() => setLoading(false));
+          } else {
+            snackbarController.open({
+              message: `Action ${action.name} executed successfully`,
+              type: "success"
+            });
+          }
+        }
+      } catch (t32) {
+        const e = t32;
+        console.error("Error executing action", action.key, e);
+        snackbarController.open({
+          message: `Error executing action: ${e.message}`,
+          type: "error"
+        });
+      }
+    };
+    $[0] = action;
+    $[1] = props;
+    $[2] = snackbarController;
+    $[3] = t2;
+  } else {
+    t2 = $[3];
+  }
+  let t3;
+  if ($[4] !== action.icon || $[5] !== loading) {
+    t3 = loading ? /* @__PURE__ */ jsx(CircularProgress, { size: "smallest" }) : action.icon;
+    $[4] = action.icon;
+    $[5] = loading;
+    $[6] = t3;
+  } else {
+    t3 = $[6];
+  }
+  let t4;
+  if ($[7] !== t1 || $[8] !== t2 || $[9] !== t3) {
+    t4 = /* @__PURE__ */ jsx(IconButton, { color: "primary", disabled: t1, onClick: t2, children: t3 });
+    $[7] = t1;
+    $[8] = t2;
+    $[9] = t3;
+    $[10] = t4;
+  } else {
+    t4 = $[10];
+  }
+  let t5;
+  if ($[11] !== action.name || $[12] !== t4) {
+    t5 = /* @__PURE__ */ jsx(Tooltip, { title: action.name, children: t4 });
+    $[11] = action.name;
+    $[12] = t4;
+    $[13] = t5;
+  } else {
+    t5 = $[13];
+  }
+  return t5;
+}
 function EntityJsonPreview(t0) {
   const $ = c(6);
   const {
@@ -22701,6 +22873,22 @@ function EntityEditViewInner({
   const [formContext, setFormContext] = useState(void 0);
   const largeLayout = useLargeLayout();
   const customizationController = useCustomizationController();
+  const plugins = customizationController.plugins;
+  const pluginActionsTop = [];
+  if (plugins && collection) {
+    const actionProps = {
+      entityId,
+      parentCollectionIds,
+      path,
+      status,
+      collection,
+      context,
+      formContext,
+      openEntityMode: layout,
+      disabled: false
+    };
+    pluginActionsTop.push(...plugins.map((plugin) => plugin.form?.ActionsTop ? /* @__PURE__ */ jsx(plugin.form.ActionsTop, { ...actionProps }, `actions_${plugin.key}`) : null).filter(Boolean));
+  }
   const defaultSelectedView = useMemo(() => resolveDefaultSelectedView(collection ? collection.defaultSelectedView : void 0, {
     status,
     entityId
@@ -22717,7 +22905,6 @@ function EntityEditViewInner({
   const customViewsCount = customViews?.length ?? 0;
   const includeJsonView = collection.includeJsonView === void 0 ? true : collection.includeJsonView;
   const hasAdditionalViews = customViewsCount > 0 || subcollectionsCount > 0 || includeJsonView;
-  const plugins = customizationController.plugins;
   const {
     resolvedEntityViews,
     selectedEntityView,
@@ -22775,13 +22962,6 @@ function EntityEditViewInner({
     const subcollectionId = subcollection.id ?? subcollection.path;
     const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.path)}` : void 0;
     const newFullIdPath = fullIdPath ? `${fullIdPath}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : void 0;
-    console.debug("Rendering subcollection", {
-      subcollectionId,
-      fullIdPath,
-      newFullPath,
-      newFullIdPath,
-      selectedTab
-    });
     if (selectedTab !== subcollectionId) return null;
     return /* @__PURE__ */ jsxs("div", { className: "relative flex-1 h-full overflow-auto w-full", role: "tabpanel", children: [
       globalLoading && /* @__PURE__ */ jsx(CircularProgressCenter, {}),
@@ -22826,11 +23006,12 @@ function EntityEditViewInner({
   const customViewTabsEnd = resolvedEntityViews.filter((view_1) => !view_1.position || view_1.position === "end").map((view_2) => /* @__PURE__ */ jsx(Tab, { className: !view_2.tabComponent ? "text-sm min-w-[120px]" : void 0, value: view_2.key, children: view_2.tabComponent ?? view_2.name }, `entity_detail_collection_tab_${view_2.name}`));
   const shouldShowTopBar = Boolean(barActions) || hasAdditionalViews;
   let result = /* @__PURE__ */ jsxs("div", { className: "relative flex flex-col h-full w-full bg-white dark:bg-surface-900", children: [
-    shouldShowTopBar && /* @__PURE__ */ jsxs("div", { className: cls("h-14 flex overflow-visible overflow-x-scroll w-full no-scrollbar h-14 border-b pl-2 pr-2 pt-1 flex items-end bg-surface-50 dark:bg-surface-900", defaultBorderMixin), children: [
+    shouldShowTopBar && /* @__PURE__ */ jsxs("div", { className: cls("h-14 items-center flex overflow-visible overflow-x-scroll w-full no-scrollbar h-14 border-b pl-2 pr-2 pt-1 flex bg-surface-50 dark:bg-surface-900", defaultBorderMixin), children: [
       barActions,
       /* @__PURE__ */ jsx("div", { className: "flex-grow" }),
+      pluginActionsTop,
       globalLoading && /* @__PURE__ */ jsx("div", { className: "self-center", children: /* @__PURE__ */ jsx(CircularProgress, { size: "small" }) }),
-      hasAdditionalViews && /* @__PURE__ */ jsxs(Tabs, { value: selectedTab, onValueChange: (value_1) => {
+      hasAdditionalViews && /* @__PURE__ */ jsxs(Tabs, { className: "self-end", value: selectedTab, onValueChange: (value_1) => {
         onSideTabClick(value_1);
       }, children: [
         includeJsonView && /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: JSON_TAB_VALUE, className: "text-sm", children: /* @__PURE__ */ jsx(CodeIcon, { size: "small" }) }),
@@ -22849,9 +23030,9 @@ function EntityEditViewInner({
     subCollectionsViews
   ] });
   if (plugins) {
-    plugins.forEach((plugin) => {
-      if (plugin.form?.provider) {
-        result = /* @__PURE__ */ jsx(plugin.form.provider.Component, { status, path, collection, entity: usedEntity, context, formContext, ...plugin.form.provider.props, children: result });
+    plugins.forEach((plugin_0) => {
+      if (plugin_0.form?.provider) {
+        result = /* @__PURE__ */ jsx(plugin_0.form.provider.Component, { status, path, collection, entity: usedEntity, context, formContext, ...plugin_0.form.provider.props, children: result });
       }
     });
   }
@@ -22905,7 +23086,7 @@ function EntitySidePanel(props) {
   const parentCollectionIds = useMemo(() => {
     return navigationController.getParentCollectionIds(path);
   }, [navigationController, path]);
-  const collection = props.collection ?? navigationController.getCollection(path);
+  const collection = navigationController.getCollection(fullIdPath ?? path) ?? props.collection;
   useEffect(() => {
     function beforeunload(e) {
       if (blocked && collection) {
@@ -23687,6 +23868,7 @@ function FireCMS(props) {
     onAnalyticsEvent,
     propertyConfigs,
     entityViews,
+    entityActions,
     components,
     navigationController,
     apiKey
@@ -23705,6 +23887,7 @@ function FireCMS(props) {
     entityLinkBuilder,
     plugins,
     entityViews: entityViews ?? [],
+    entityActions: entityActions ?? [],
     propertyConfigs: propertyConfigs ?? {},
     components
   };
@@ -25580,6 +25763,7 @@ export {
   resolveCollection,
   resolveCollectionPathIds,
   resolveDefaultSelectedView,
+  resolveEntityAction,
   resolveEntityView,
   resolveEnumValues,
   resolveNavigationFrom,