@firecms/core 3.0.0-canary.197 → 3.0.0-canary.198

package/dist/core/EntityEditView.d.ts

@@ -1,5 +1,6 @@
 import React from "react";
 import { Entity, EntityCollection, EntityStatus, User } from "../types";
+import { EntityFormProps } from "../form";
 export type OnUpdateParams = {
     entity: Entity<any>;
     status: EntityStatus;
@@ -27,13 +28,14 @@ export interface EntityEditViewProps<M extends Record<string, any>> {
     onTabChange?: (props: OnTabChangeParams<M>) => void;
     layout?: "side_panel" | "full_screen";
     barActions?: React.ReactNode;
+    formProps?: Partial<EntityFormProps<M>>;
 }
 /**
  * This is the default view that is used as the content of a side panel when
  * an entity is opened.
  */
 export declare function EntityEditView<M extends Record<string, any>, USER extends User>({ entityId, ...props }: EntityEditViewProps<M>): import("react/jsx-runtime").JSX.Element;
-export declare function EntityEditViewInner<M extends Record<string, any>>({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionIds, onValuesModified, onSaved, onTabChange, entity, cachedDirtyValues, dataLoading, layout, barActions, status, setStatus, }: EntityEditViewProps<M> & {
+export declare function EntityEditViewInner<M extends Record<string, any>>({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionIds, onValuesModified, onSaved, onTabChange, entity, cachedDirtyValues, dataLoading, layout, barActions, status, setStatus, formProps, }: EntityEditViewProps<M> & {
     entity?: Entity<M>;
     cachedDirtyValues?: Partial<M>;
     dataLoading: boolean;

package/dist/core/EntityEditViewFormActions.d.ts

@@ -1,2 +1,2 @@
 import { EntityFormActionsProps } from "../form/EntityFormActions";
-export declare function EntityEditViewFormActions({ collection, path, entity, layout, savingError, formex, disabled, status, pluginActions, openEntityMode }: EntityFormActionsProps): import("react/jsx-runtime").JSX.Element;
+export declare function EntityEditViewFormActions({ collection, path, entity, layout, savingError, formex, disabled, status, pluginActions, openEntityMode, showDefaultActions }: EntityFormActionsProps): import("react/jsx-runtime").JSX.Element;

package/dist/form/EntityForm.d.ts

@@ -11,7 +11,7 @@ export type OnUpdateParams = {
     selectedTab?: string;
     collection: EntityCollection<any>;
 };
-type EntityFormProps<M extends Record<string, any>> = {
+export type EntityFormProps<M extends Record<string, any>> = {
     path: string;
     collection: EntityCollection<M>;
     entityId?: string;
@@ -20,7 +20,7 @@ type EntityFormProps<M extends Record<string, any>> = {
     onIdChange?: (id: string) => void;
     onValuesModified?: (modified: boolean) => void;
     onSaved?: (params: OnUpdateParams) => void;
-    cachedDirtyValues?: Partial<M>;
+    initialDirtyValues?: Partial<M>;
     onFormContextReady?: (formContext: FormContext) => void;
     forceActionsAtTheBottom?: boolean;
     className?: string;
@@ -29,11 +29,19 @@ type EntityFormProps<M extends Record<string, any>> = {
     onEntityChange?: (entity: Entity<M>) => void;
     formex?: FormexController<M>;
     openEntityMode?: "side_panel" | "full_screen";
+    /**
+     * Include the copy and delete actions in the form
+     */
+    showDefaultActions?: boolean;
+    /**
+     * Display the entity path in the form
+     */
+    showEntityPath?: boolean;
     EntityFormActionsComponent?: React.FC<EntityFormActionsProps>;
 };
-export declare function EntityForm<M extends Record<string, any>>({ path, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, cachedDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode, formex: formexProp, EntityFormActionsComponent }: EntityFormProps<M>): import("react/jsx-runtime").JSX.Element;
+export declare function EntityForm<M extends Record<string, any>>({ path, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, initialDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode, formex: formexProp, EntityFormActionsComponent, showDefaultActions, showEntityPath }: EntityFormProps<M>): import("react/jsx-runtime").JSX.Element;
 export declare function yupToFormErrors(yupError: ValidationError): Record<string, any>;
-export declare function FormLayoutInner({ id, formContext, children, className, forceActionsAtTheBottom, pluginActions, EntityFormActionsComponent }: {
+export declare function FormLayoutInner({ id, formContext, children, className, forceActionsAtTheBottom, pluginActions, EntityFormActionsComponent, showDefaultActions }: {
     id?: string;
     formContext: FormContext;
     children: React.ReactNode;
@@ -41,5 +49,5 @@ export declare function FormLayoutInner({ id, formContext, children, className,
     forceActionsAtTheBottom?: boolean;
     pluginActions?: React.ReactNode[];
     EntityFormActionsComponent: React.FC<EntityFormActionsProps>;
+    showDefaultActions?: boolean;
 }): import("react/jsx-runtime").JSX.Element;
-export {};

package/dist/form/EntityFormActions.d.ts

@@ -12,5 +12,6 @@ export interface EntityFormActionsProps {
     status: "new" | "existing" | "copy";
     pluginActions: React.ReactNode[];
     openEntityMode: "side_panel" | "full_screen";
+    showDefaultActions?: boolean;
 }
 export declare function EntityFormActions({ collection, entity, layout, savingError, formex, disabled, status, pluginActions, openEntityMode }: EntityFormActionsProps): import("react/jsx-runtime").JSX.Element;

package/dist/index.es.js

@@ -16283,7 +16283,7 @@ function EntityForm({
   onIdChange,
   onSaved,
   entity,
-  cachedDirtyValues,
+  initialDirtyValues,
   onFormContextReady,
   forceActionsAtTheBottom,
   initialStatus,
@@ -16292,7 +16292,9 @@ function EntityForm({
   onEntityChange,
   openEntityMode = "full_screen",
   formex: formexProp,
-  EntityFormActionsComponent = EntityFormActions
+  EntityFormActionsComponent = EntityFormActions,
+  showDefaultActions = true,
+  showEntityPath = true
 }) {
   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`);
@@ -16366,8 +16368,8 @@ function EntityForm({
     });
   };
   const formex = formexProp ?? useCreateFormex({
-    initialValues: cachedDirtyValues ?? getInitialEntityValues(collection, path, status, entity),
-    initialDirty: Boolean(cachedDirtyValues),
+    initialValues: initialDirtyValues ?? getInitialEntityValues(collection, path, status, entity),
+    initialDirty: Boolean(initialDirtyValues),
     onSubmit,
     onReset: () => {
       clearDirtyCache();
@@ -16646,7 +16648,7 @@ function EntityForm({
   const formView = /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsxs("div", { className: "w-full py-2 flex flex-col items-start mt-4 lg:mt-8 mb-8", children: [
       /* @__PURE__ */ jsx(Typography, { className: "py-4 flex-grow line-clamp-1 " + (collection.hideIdFromForm ? "mb-2" : "mb-0"), variant: "h4", children: title ?? collection.singularName ?? collection.name }),
-      /* @__PURE__ */ jsx(Alert, { color: "base", className: "w-full", size: "small", children: /* @__PURE__ */ jsxs("code", { className: "text-xs select-all text-text-secondary dark:text-text-secondary-dark", children: [
+      showEntityPath && /* @__PURE__ */ jsx(Alert, { color: "base", className: "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,
         "/",
         entityId
@@ -16662,7 +16664,7 @@ function EntityForm({
   useEffect(() => {
     if (entityId && onIdChange) onIdChange(entityId);
   }, [entityId, onIdChange]);
-  return /* @__PURE__ */ jsx(FormLayoutInner, { className, id: `form_${path}`, pluginActions, forceActionsAtTheBottom, EntityFormActionsComponent, formContext, children: formView });
+  return /* @__PURE__ */ jsx(FormLayoutInner, { className, id: `form_${path}`, pluginActions, forceActionsAtTheBottom, EntityFormActionsComponent, formContext, showDefaultActions, children: formView });
 }
 function getInitialEntityValues(collection, path, status, entity) {
   const resolvedCollection = resolveCollection({
@@ -16698,7 +16700,7 @@ function yupToFormErrors(yupError) {
   return errors;
 }
 function FormLayoutInner(t0) {
-  const $ = c(41);
+  const $ = c(42);
   const {
     id,
     formContext,
@@ -16706,7 +16708,8 @@ function FormLayoutInner(t0) {
     className,
     forceActionsAtTheBottom,
     pluginActions,
-    EntityFormActionsComponent
+    EntityFormActionsComponent,
+    showDefaultActions
   } = t0;
   const formex = formContext.formex;
   const collection = formContext.collection;
@@ -16729,8 +16732,8 @@ function FormLayoutInner(t0) {
     t2 = $[1];
   }
   let t3;
-  if ($[2] !== EntityFormActionsComponent || $[3] !== collection || $[4] !== disabled || $[5] !== entity || $[6] !== formex || $[7] !== openEntityMode || $[8] !== path || $[9] !== savingError || $[10] !== status || $[11] !== t1 || $[12] !== t2) {
-    t3 = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection, path, entity, layout: t1, savingError, formex, disabled, status, pluginActions: t2, openEntityMode });
+  if ($[2] !== EntityFormActionsComponent || $[3] !== collection || $[4] !== disabled || $[5] !== entity || $[6] !== formex || $[7] !== openEntityMode || $[8] !== path || $[9] !== savingError || $[10] !== showDefaultActions || $[11] !== status || $[12] !== t1 || $[13] !== t2) {
+    t3 = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection, path, entity, layout: t1, savingError, formex, disabled, status, pluginActions: t2, openEntityMode, showDefaultActions });
     $[2] = EntityFormActionsComponent;
     $[3] = collection;
     $[4] = disabled;
@@ -16739,101 +16742,102 @@ function FormLayoutInner(t0) {
     $[7] = openEntityMode;
     $[8] = path;
     $[9] = savingError;
-    $[10] = status;
-    $[11] = t1;
-    $[12] = t2;
-    $[13] = t3;
+    $[10] = showDefaultActions;
+    $[11] = status;
+    $[12] = t1;
+    $[13] = t2;
+    $[14] = t3;
   } else {
-    t3 = $[13];
+    t3 = $[14];
   }
   const dialogActions = t3;
   const t4 = formContext.formex;
   const t5 = formContext.formex.handleSubmit;
   let t6;
-  if ($[14] !== collection || $[15] !== entity || $[16] !== formex || $[17] !== path || $[18] !== status) {
+  if ($[15] !== collection || $[16] !== entity || $[17] !== formex || $[18] !== path || $[19] !== status) {
     t6 = () => formex.resetForm({
       values: getInitialEntityValues(collection, path, status, entity)
     });
-    $[14] = collection;
-    $[15] = entity;
-    $[16] = formex;
-    $[17] = path;
-    $[18] = status;
-    $[19] = t6;
+    $[15] = collection;
+    $[16] = entity;
+    $[17] = formex;
+    $[18] = path;
+    $[19] = status;
+    $[20] = t6;
   } else {
-    t6 = $[19];
+    t6 = $[20];
   }
   let t7;
-  if ($[20] !== className) {
+  if ($[21] !== className) {
     t7 = cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", className);
-    $[20] = className;
-    $[21] = t7;
+    $[21] = className;
+    $[22] = t7;
   } else {
-    t7 = $[21];
+    t7 = $[22];
   }
   let t8;
   let t9;
-  if ($[22] === Symbol.for("react.memo_cache_sentinel")) {
+  if ($[23] === Symbol.for("react.memo_cache_sentinel")) {
     t8 = cls("relative flex flex-row max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-6xl w-full h-fit");
     t9 = cls("flex flex-col w-full pt-12 pb-16 px-4 sm:px-8 md:px-10");
-    $[22] = t8;
-    $[23] = t9;
+    $[23] = t8;
+    $[24] = t9;
   } else {
-    t8 = $[22];
-    t9 = $[23];
+    t8 = $[23];
+    t9 = $[24];
   }
   let t10;
-  if ($[24] !== formContext.formex.dirty) {
+  if ($[25] !== formContext.formex.dirty) {
     t10 = formContext.formex.dirty ? /* @__PURE__ */ jsx(Tooltip, { title: "Unsaved changes", className: "self-end sticky top-4 z-10", children: /* @__PURE__ */ jsx(Chip, { size: "small", colorScheme: "orangeDarker", children: /* @__PURE__ */ jsx(EditIcon, { size: "smallest" }) }) }) : /* @__PURE__ */ jsx(Tooltip, { title: "In sync with the database", className: "self-end sticky top-4 z-10", children: /* @__PURE__ */ jsx(Chip, { size: "small", children: /* @__PURE__ */ jsx(CheckIcon, { size: "smallest" }) }) });
-    $[24] = formContext.formex.dirty;
-    $[25] = t10;
+    $[25] = formContext.formex.dirty;
+    $[26] = t10;
   } else {
-    t10 = $[25];
+    t10 = $[26];
   }
   let t11;
-  if ($[26] !== children || $[27] !== t10) {
+  if ($[27] !== children || $[28] !== t10) {
     t11 = /* @__PURE__ */ jsxs("div", { className: t9, children: [
       t10,
       children
     ] });
-    $[26] = children;
-    $[27] = t10;
-    $[28] = t11;
+    $[27] = children;
+    $[28] = t10;
+    $[29] = t11;
   } else {
-    t11 = $[28];
+    t11 = $[29];
   }
   let t12;
-  if ($[29] !== id || $[30] !== t11) {
+  if ($[30] !== id || $[31] !== t11) {
     t12 = /* @__PURE__ */ jsx("div", { id, className: t8, children: t11 });
-    $[29] = id;
-    $[30] = t11;
-    $[31] = t12;
+    $[30] = id;
+    $[31] = t11;
+    $[32] = t12;
   } else {
-    t12 = $[31];
+    t12 = $[32];
   }
   let t13;
-  if ($[32] !== dialogActions || $[33] !== formContext.formex.handleSubmit || $[34] !== t12 || $[35] !== t6 || $[36] !== t7) {
+  if ($[33] !== dialogActions || $[34] !== formContext.formex.handleSubmit || $[35] !== t12 || $[36] !== t6 || $[37] !== t7) {
     t13 = /* @__PURE__ */ jsxs("form", { onSubmit: t5, onReset: t6, noValidate: true, className: t7, children: [
       t12,
       dialogActions
     ] });
-    $[32] = dialogActions;
-    $[33] = formContext.formex.handleSubmit;
-    $[34] = t12;
-    $[35] = t6;
-    $[36] = t7;
-    $[37] = t13;
+    $[33] = dialogActions;
+    $[34] = formContext.formex.handleSubmit;
+    $[35] = t12;
+    $[36] = t6;
+    $[37] = t7;
+    $[38] = t13;
   } else {
-    t13 = $[37];
+    t13 = $[38];
   }
   let t14;
-  if ($[38] !== formContext.formex || $[39] !== t13) {
+  if ($[39] !== formContext.formex || $[40] !== t13) {
     t14 = /* @__PURE__ */ jsx(Formex, { value: t4, children: t13 });
-    $[38] = formContext.formex;
-    $[39] = t13;
-    $[40] = t14;
+    $[39] = formContext.formex;
+    $[40] = t13;
+    $[41] = t14;
   } else {
-    t14 = $[40];
+    t14 = $[41];
   }
   return t14;
 }
@@ -21491,7 +21495,8 @@ function EntityEditViewFormActions({
   disabled,
   status,
   pluginActions,
-  openEntityMode
+  openEntityMode,
+  showDefaultActions = true
 }) {
   const authController = useAuthController();
   const context = useFireCMSContext();
@@ -21507,7 +21512,7 @@ function EntityEditViewFormActions({
     if (customEntityActions) return mergeEntityActions(actions, customEntityActions);
     return actions;
   }, [authController, collection, path]);
-  const formActions = entityActions.filter((a) => a.includeInForm === void 0 || a.includeInForm);
+  const formActions = showDefaultActions ? entityActions.filter((a) => a.includeInForm === void 0 || a.includeInForm) : [];
   return layout === "bottom" ? buildBottomActions({
     savingError,
     entity,
@@ -21791,7 +21796,8 @@ function EntityEditViewInner({
   layout = "side_panel",
   barActions,
   status,
-  setStatus
+  setStatus,
+  formProps
 }) {
   const context = useFireCMSContext();
   const [usedEntity, setUsedEntity] = useState(entity);
@@ -21860,10 +21866,23 @@ function EntityEditViewInner({
       });
     }
   };
-  const entityView = /* @__PURE__ */ jsx(EntityForm, { collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, onSaved: onSaved ? (params) => onSaved({
-    ...params,
-    selectedTab: MAIN_TAB_VALUE === selectedTab ? void 0 : selectedTab
-  }) : void 0, entity, cachedDirtyValues, openEntityMode: layout, onFormContextReady: setFormContext, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, onStatusChange: setStatus, className: !mainViewVisible ? "hidden" : "", EntityFormActionsComponent: EntityEditViewFormActions, onEntityChange: setUsedEntity });
+  const entityView = /* @__PURE__ */ jsx(EntityForm, { collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues: cachedDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls(!mainViewVisible ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, ...formProps, onEntityChange: (entity_0) => {
+    setUsedEntity(entity_0);
+    formProps?.onEntityChange?.(entity_0);
+  }, onStatusChange: (status_0) => {
+    setStatus(status_0);
+    formProps?.onStatusChange?.(status_0);
+  }, onFormContextReady: (formContext_0) => {
+    setFormContext(formContext_0);
+    formProps?.onFormContextReady?.(formContext_0);
+  }, onSaved: (params) => {
+    const res = {
+      ...params,
+      selectedTab: MAIN_TAB_VALUE === selectedTab ? void 0 : selectedTab
+    };
+    onSaved?.(res);
+    formProps?.onSaved?.(res);
+  } });
   const subcollectionTabs = subcollections && subcollections.map((subcollection_0) => /* @__PURE__ */ jsx(Tab, { className: "text-sm min-w-[120px]", value: subcollection_0.id, children: subcollection_0.name }, `entity_detail_collection_tab_${subcollection_0.name}`));
   const customViewTabs = resolvedEntityViews.map((view) => /* @__PURE__ */ jsx(Tab, { className: "text-sm min-w-[120px]", value: view.key, children: view.name }, `entity_detail_collection_tab_${view.name}`));
   const shouldShowTopBar = Boolean(barActions) || hasAdditionalViews;
@@ -21907,7 +21926,6 @@ function EntitySidePanel(props) {
   const sideEntityController = useSideEntityController();
   const navigationController = useNavigationController();
   const sideDialogsController = useSideDialogContext();
-  console.log("sideDialogsController", sideDialogsController);
   const onClose = () => {
     if (props.onClose) {
       props.onClose();
@@ -21989,7 +22007,7 @@ function EntitySidePanel(props) {
       updateUrl: true,
       collection: collection_0
     });
-  } }) }) });
+  }, formProps: props.formProps }) }) });
 }
 const NEW_URL_HASH = "new_side";
 const SIDE_URL_HASH = "side";
@@ -22287,7 +22305,8 @@ const propsToSidePanel = (props, buildUrlCollectionPath, resolveIdsFrom, smallLa
   const resolvedPath = resolveIdsFrom(props.path);
   const resolvedPanelProps = {
     ...props,
-    path: resolvedPath
+    path: resolvedPath,
+    formProps: props.formProps
   };
   const entityViewWidth = getEntityViewWidth(props, smallLayout);
   return {