@firecms/core 3.0.0-canary.174 → 3.0.0-canary.175

package/dist/index.umd.js

@@ -11523,6 +11523,61 @@
     }
     return t4;
   }
+  function FormLayout(t0) {
+    const $ = reactCompilerRuntime.c(12);
+    const {
+      id,
+      formex: formex2,
+      children,
+      className
+    } = t0;
+    let t1;
+    if ($[0] !== className) {
+      t1 = ui.cls("relative flex flex-row max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-5xl w-full h-fit", className);
+      $[0] = className;
+      $[1] = t1;
+    } else {
+      t1 = $[1];
+    }
+    let t2;
+    if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+      t2 = ui.cls("flex flex-col w-full pt-12 pb-16 px-4 sm:px-8 md:px-10");
+      $[2] = t2;
+    } else {
+      t2 = $[2];
+    }
+    let t3;
+    if ($[3] !== formex2.dirty) {
+      t3 = formex2.dirty ? /* @__PURE__ */ jsxRuntime.jsx(ui.Tooltip, { title: "Unsaved changes", className: "self-end sticky top-4 z-10", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Chip, { size: "small", colorScheme: "orangeDarker", children: /* @__PURE__ */ jsxRuntime.jsx(ui.EditIcon, { size: "smallest" }) }) }) : /* @__PURE__ */ jsxRuntime.jsx(ui.Tooltip, { title: "In sync with the database", className: "self-end sticky top-4 z-10", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Chip, { size: "small", children: /* @__PURE__ */ jsxRuntime.jsx(ui.CheckIcon, { size: "smallest" }) }) });
+      $[3] = formex2.dirty;
+      $[4] = t3;
+    } else {
+      t3 = $[4];
+    }
+    let t4;
+    if ($[5] !== children || $[6] !== t3) {
+      t4 = /* @__PURE__ */ jsxRuntime.jsxs("div", { className: t2, children: [
+        t3,
+        children
+      ] });
+      $[5] = children;
+      $[6] = t3;
+      $[7] = t4;
+    } else {
+      t4 = $[7];
+    }
+    let t5;
+    if ($[8] !== id || $[9] !== t1 || $[10] !== t4) {
+      t5 = /* @__PURE__ */ jsxRuntime.jsx("div", { role: "tabpanel", id, className: t1, children: t4 });
+      $[8] = id;
+      $[9] = t1;
+      $[10] = t4;
+      $[11] = t5;
+    } else {
+      t5 = $[11];
+    }
+    return t5;
+  }
   function EntityEditViewInner({
     path,
     entityId: entityIdProp,
@@ -11812,24 +11867,32 @@
     const resolvedEntityViews = customViews ? customViews.map((e_4) => resolveEntityView(e_4, customizationController.entityViews)).filter(Boolean) : [];
     const selectedEntityView = resolvedEntityViews.find((e_5) => e_5.key === selectedTab);
     const shouldShowEntityActions = !autoSave && (selectedTab === MAIN_TAB_VALUE || selectedEntityView?.includeActions);
-    const customViewsView = customViews && resolvedEntityViews.map((customView, colIndex) => {
+    const secondaryForms = customViews && resolvedEntityViews.filter((e_6) => e_6.includeActions).map((customView, colIndex) => {
       if (!customView) return null;
       const Builder = customView.Builder;
       if (!Builder) {
         console.error("customView.Builder is not defined");
         return null;
       }
+      return /* @__PURE__ */ jsxRuntime.jsx(FormLayout, { className: selectedTab !== customView.key ? "hidden" : "", formex: formex$1, children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: formContext && /* @__PURE__ */ jsxRuntime.jsx(Builder, { collection, entity: usedEntity, modifiedValues: formex$1.values ?? usedEntity?.values, formContext }) }) }, `custom_view_${customView.key}`);
+    }).filter(Boolean);
+    const customViewsView = customViews && resolvedEntityViews.filter((e_7) => !e_7.includeActions).map((customView_0, colIndex_0) => {
+      if (!customView_0) return null;
+      const Builder_0 = customView_0.Builder;
+      if (!Builder_0) {
+        console.error("customView.Builder is not defined");
+        return null;
+      }
       return /* @__PURE__ */ jsxRuntime.jsx("div", { className: ui.cls(ui.defaultBorderMixin, "relative flex-grow w-full h-full overflow-auto", {
-        "hidden": selectedTab !== customView.key
-      }), role: "tabpanel", children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: formContext && /* @__PURE__ */ jsxRuntime.jsx(Builder, { collection, entity: usedEntity, modifiedValues: formex$1.values ?? usedEntity?.values, formContext }) }) }, `custom_view_${customView.key}`);
+        "hidden": selectedTab !== customView_0.key
+      }), role: "tabpanel", children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: formContext && /* @__PURE__ */ jsxRuntime.jsx(Builder_0, { collection, entity: usedEntity, modifiedValues: formex$1.values ?? usedEntity?.values, formContext }) }) }, `custom_view_${customView_0.key}`);
     }).filter(Boolean);
     const globalLoading = dataLoading && !usedEntity || (!usedEntity || readOnly === void 0) && (status === "existing" || status === "copy");
-    const subCollectionsViews = subcollections && subcollections.map((subcollection, colIndex_0) => {
+    const subCollectionsViews = subcollections && subcollections.map((subcollection, colIndex_1) => {
       const subcollectionId = subcollection.id ?? subcollection.path;
       const fullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : void 0;
-      return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: ui.cls("relative flex-grow h-full overflow-auto w-full", {
-        "hidden": selectedTab !== subcollectionId
-      }), role: "tabpanel", children: [
+      if (selectedTab !== subcollectionId) return null;
+      return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative flex-grow h-full overflow-auto w-full", role: "tabpanel", children: [
         globalLoading || saving && /* @__PURE__ */ jsxRuntime.jsx(CircularProgressCenter, {}),
         !globalLoading && (usedEntity && fullPath ? /* @__PURE__ */ jsxRuntime.jsx(EntityCollectionView, { fullPath, parentCollectionIds: [...parentCollectionIds, collection.id], isSubCollection: true, updateUrl: false, ...subcollection, openEntityMode: layout }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center w-full h-full p-3", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "label", children: "You need to save your entity before adding additional collections" }) }))
       ] }, `subcol_${subcollectionId}`);
@@ -11890,9 +11953,9 @@
             context
           });
           setEntityId(updatedId);
-        } catch (e_6) {
-          onIdUpdateError?.(e_6);
-          console.error(e_6);
+        } catch (e_8) {
+          onIdUpdateError?.(e_8);
+          console.error(e_8);
         }
         setCustomIdLoading(false);
       }
@@ -11966,11 +12029,11 @@
       }
       const additionalField = resolvedCollection.additionalFields?.find((f) => f.key === key_1);
       if (additionalField && entity) {
-        const Builder_0 = additionalField.Builder;
-        if (!Builder_0 && !additionalField.value) {
+        const Builder_1 = additionalField.Builder;
+        if (!Builder_1 && !additionalField.value) {
           throw new Error("When using additional fields you need to provide a Builder or a value");
         }
-        const child = Builder_0 ? /* @__PURE__ */ jsxRuntime.jsx(Builder_0, { entity, context }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: additionalField.value?.({
+        const child = Builder_1 ? /* @__PURE__ */ jsxRuntime.jsx(Builder_1, { entity, context }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: additionalField.value?.({
           entity,
           context
         })?.toString() });
@@ -12017,8 +12080,7 @@
       pluginActions,
       layout
     });
-    const entityView = readOnly === void 0 ? /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {}) : !readOnly ? /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col w-full pt-12 pb-16 px-4 sm:px-8 md:px-10", children: [
-      formex$1.dirty ? /* @__PURE__ */ jsxRuntime.jsx(ui.Tooltip, { title: "Unsaved changes", className: "self-end sticky top-4 z-10", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Chip, { size: "small", colorScheme: "orangeDarker", children: /* @__PURE__ */ jsxRuntime.jsx(ui.EditIcon, { size: "smallest" }) }) }) : /* @__PURE__ */ jsxRuntime.jsx(ui.Tooltip, { title: "In sync with the database", className: "self-end sticky top-4 z-10", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Chip, { size: "small", children: /* @__PURE__ */ jsxRuntime.jsx(ui.CheckIcon, { size: "smallest" }) }) }),
+    const entityView = readOnly === void 0 ? /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {}) : !readOnly ? /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "w-full py-2 flex flex-col items-start mt-4 lg:mt-8 mb-8", children: [
         /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { className: "mt-4 flex-grow line-clamp-1 " + inputCollection.hideIdFromForm ? "mb-2" : "mb-0", variant: "h4", children: title ?? inputCollection.singularName ?? inputCollection.name }),
         /* @__PURE__ */ jsxRuntime.jsx(ui.Alert, { color: "base", className: "w-full", size: "small", children: /* @__PURE__ */ jsxRuntime.jsxs("code", { className: "text-xs select-all text-text-secondary dark:text-text-secondary-dark", children: [
@@ -12028,13 +12090,11 @@
         ] }) })
       ] }),
       !collection.hideIdFromForm && /* @__PURE__ */ jsxRuntime.jsx(CustomIdField, { customId: inputCollection.customId, entityId, status, onChange: setEntityId, error: entityIdError, loading: customIdLoading, entity }),
-      entityId && formContext && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-12 flex flex-col gap-8", ref: formRef, children: [
-          formFields,
-          /* @__PURE__ */ jsxRuntime.jsx(ErrorFocus, { containerRef: formRef })
-        ] }),
-        actionsAtTheBottom && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-16" })
-      ] })
+      entityId && formContext && /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-12 flex flex-col gap-8", ref: formRef, children: [
+        formFields,
+        /* @__PURE__ */ jsxRuntime.jsx(ErrorFocus, { containerRef: formRef })
+      ] }) }),
+      actionsAtTheBottom && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-16" })
     ] }) }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { className: "mt-16 mb-8 mx-8", variant: "h4", children: collection.singularName ?? collection.name }),
       /* @__PURE__ */ jsxRuntime.jsx(EntityView, { className: "px-12", entity: usedEntity, path, collection })
@@ -12065,13 +12125,12 @@
         });
         return onDiscard();
       }, noValidate: true, className: "flex-1 flex flex-row w-full overflow-y-auto justify-center", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("div", { role: "tabpanel", hidden: !mainViewVisible, id: `form_${path}`, className: ui.cls("relative flex flex-row max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-5xl w-full h-fit", {
-          "hidden": !mainViewVisible
-        }), children: globalLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full pt-12 pb-16 px-4 sm:px-8 md:px-10", children: /* @__PURE__ */ jsxRuntime.jsx(CircularProgressCenter, {}) }) : entityView }),
-        customViewsView,
-        subCollectionsViews,
+        /* @__PURE__ */ jsxRuntime.jsx(FormLayout, { className: !mainViewVisible ? "hidden" : "", id: `form_${path}`, formex: formex$1, children: globalLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full pt-12 pb-16 px-4 sm:px-8 md:px-10", children: /* @__PURE__ */ jsxRuntime.jsx(CircularProgressCenter, {}) }) : entityView }),
+        secondaryForms,
         shouldShowEntityActions && dialogActions
-      ] })
+      ] }),
+      customViewsView,
+      subCollectionsViews
     ] });
     if (plugins) {
       plugins.forEach((plugin_0) => {
@@ -23025,10 +23084,10 @@
     }
     const lastCollectionEntry = navigationEntries.findLast((entry_1) => entry_1.type === "collection");
     if (isNew && !lastCollectionEntry) {
-      throw new Error("No collection found in the navigation");
+      throw new Error("INTERNAL: No collection found in the navigation");
     }
     if (!isNew && !lastEntityEntry) {
-      throw new Error("No entity found in the navigation");
+      return /* @__PURE__ */ jsxRuntime.jsx(NotFoundPage, {});
     }
     const collection = isNew ? lastCollectionEntry.collection : lastEntityEntry.parentCollection;
     const collectionPath = navigation.resolveIdsFrom(isNew ? lastCollectionEntry.path : lastEntityEntry.path);