@firecms/core 3.0.0-canary.183 → 3.0.0-canary.186

package/dist/index.umd.js

@@ -40,8 +40,6 @@
   const DEFAULT_MODE_STATE = {
     mode: "light",
     setMode: (mode) => {
-    },
-    toggleMode: () => {
     }
   };
   const ModeControllerContext = React.createContext(DEFAULT_MODE_STATE);
@@ -6129,7 +6127,13 @@
       if (validation.lowercase) collection = collection.lowercase();
       if (validation.uppercase) collection = collection.uppercase();
       if (property.email) collection = collection.email(`${property.name} must be an email`);
-      if (property.url) collection = collection.url(`${property.name} must be a url`);
+      if (property.url) {
+        if (!property.storage || property.storage?.storeUrl) {
+          collection = collection.url(`${property.name} must be a url`);
+        } else {
+          console.warn(`Property ${property.name} has a url validation but its storage configuration is not set to store urls`);
+        }
+      }
     } else {
       collection = collection.notRequired().nullable(true);
     }
@@ -7009,7 +7013,7 @@
     return entityCache.has(path);
   }
   function removeEntityFromCache(path) {
-    console.log("Removing entity from cache", path);
+    console.debug("Removing entity from cache", path);
     entityCache.delete(path);
     if (isLocalStorageAvailable) {
       try {
@@ -13582,7 +13586,7 @@
     const authController = useAuthController();
     const {
       mode,
-      toggleMode
+      setMode
     } = useModeController();
     const navigate = reactRouterDom.useNavigate();
     const largeLayout = useLargeLayout();
@@ -13682,11 +13686,25 @@
       t9 = $[22];
     }
     let t10;
-    if ($[23] !== includeModeToggle || $[24] !== mode || $[25] !== toggleMode) {
-      t10 = includeModeToggle && /* @__PURE__ */ jsxRuntime.jsx(ui.IconButton, { color: "inherit", "aria-label": "Open drawer", onClick: toggleMode, size: "large", children: mode === "dark" ? /* @__PURE__ */ jsxRuntime.jsx(ui.DarkModeIcon, {}) : /* @__PURE__ */ jsxRuntime.jsx(ui.LightModeIcon, {}) });
+    if ($[23] !== includeModeToggle || $[24] !== mode || $[25] !== setMode) {
+      t10 = includeModeToggle && /* @__PURE__ */ jsxRuntime.jsxs(ui.Menu, { trigger: /* @__PURE__ */ jsxRuntime.jsx(ui.IconButton, { color: "inherit", "aria-label": "Open drawer", size: "large", children: mode === "dark" ? /* @__PURE__ */ jsxRuntime.jsx(ui.DarkModeIcon, {}) : /* @__PURE__ */ jsxRuntime.jsx(ui.LightModeIcon, {}) }), children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(ui.MenuItem, { onClick: () => setMode("dark"), children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.DarkModeIcon, { size: "smallest" }),
+          " Dark"
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsxs(ui.MenuItem, { onClick: () => setMode("light"), children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.LightModeIcon, { size: "smallest" }),
+          " Light "
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsxs(ui.MenuItem, { onClick: () => setMode("system"), children: [
+          " ",
+          /* @__PURE__ */ jsxRuntime.jsx(ui.BrightnessMediumIcon, { size: "smallest" }),
+          "System"
+        ] })
+      ] });
       $[23] = includeModeToggle;
       $[24] = mode;
-      $[25] = toggleMode;
+      $[25] = setMode;
       $[26] = t10;
     } else {
       t10 = $[26];
@@ -14361,7 +14379,8 @@
       viewsOrder,
       userConfigPersistence,
       dataSourceDelegate,
-      injectCollections
+      injectCollections,
+      disabled
     } = props;
     const navigate = reactRouterDom.useNavigate();
     const collectionsRef = React.useRef();
@@ -14447,7 +14466,7 @@
       };
     }, [buildCMSUrlPath, buildUrlCollectionPath]);
     const refreshNavigation = React.useCallback(async () => {
-      if (authController.initialLoading) return;
+      if (disabled || authController.initialLoading) return;
       console.debug("Refreshing navigation");
       try {
         const [resolvedCollections = [], resolvedViews, resolvedAdminViews = []] = await Promise.all([resolveCollections(collectionsProp, collectionPermissions, authController, dataSourceDelegate, injectCollections), resolveCMSViews(viewsProp, authController, dataSourceDelegate), resolveCMSViews(adminViewsProp, authController, dataSourceDelegate)]);
@@ -14479,7 +14498,7 @@
       }
       if (navigationLoading) setNavigationLoading(false);
       if (!initialised) setInitialised(true);
-    }, [collectionsProp, collectionPermissions, authController.user, authController.initialLoading, viewsProp, adminViewsProp, computeTopNavigation, injectCollections]);
+    }, [collectionsProp, collectionPermissions, authController.user, authController.initialLoading, disabled, viewsProp, adminViewsProp, computeTopNavigation, injectCollections]);
     React.useEffect(() => {
       refreshNavigation();
     }, [refreshNavigation]);
@@ -14819,40 +14838,35 @@
       return mediaQueryList.matches;
     }, []);
     const prefersDarkModeStorage = localStorage.getItem("prefers-dark-mode") != null ? localStorage.getItem("prefers-dark-mode") === "true" : null;
-    const prefersDarkMode = prefersDarkModeStorage ?? prefersDarkModeQuery;
+    const prefersDarkMode = prefersDarkModeStorage ?? prefersDarkModeQuery();
     const [mode, setMode] = React.useState(prefersDarkMode ? "dark" : "light");
     React.useEffect(() => {
       setMode(prefersDarkMode ? "dark" : "light");
       setDocumentMode(prefersDarkMode ? "dark" : "light");
     }, [prefersDarkMode]);
-    const setDarkMode = React.useCallback(() => {
-      setMode("dark");
-      setDocumentMode("dark");
-    }, []);
-    const setLightMode = React.useCallback(() => {
-      setMode("light");
-      setDocumentMode("light");
-    }, []);
     const setDocumentMode = (mode_0) => {
       document.body.style.setProperty("color-scheme", mode_0);
       document.documentElement.dataset.theme = mode_0;
     };
-    const toggleMode = React.useCallback(() => {
-      const prefersDarkModeQueryResult = prefersDarkModeQuery();
-      if (mode === "light") {
-        if (!prefersDarkModeQueryResult) localStorage.setItem("prefers-dark-mode", "true");
-        else localStorage.removeItem("prefers-dark-mode");
-        setDarkMode();
+    const setModeInternal = React.useCallback((mode_1) => {
+      if (mode_1 === "light") {
+        setDocumentMode("light");
+        localStorage.setItem("prefers-dark-mode", "false");
+        setMode("light");
+      } else if (mode_1 === "dark") {
+        setDocumentMode("dark");
+        localStorage.setItem("prefers-dark-mode", "true");
+        setMode("dark");
       } else {
-        if (prefersDarkModeQueryResult) localStorage.setItem("prefers-dark-mode", "false");
-        else localStorage.removeItem("prefers-dark-mode");
-        setLightMode();
+        const preferredMode = prefersDarkModeQuery() ? "dark" : "light";
+        setDocumentMode(preferredMode);
+        localStorage.removeItem("prefers-dark-mode");
+        setMode(preferredMode);
       }
-    }, [mode, prefersDarkModeQuery]);
+    }, [prefersDarkModeQuery]);
     return {
       mode,
-      setMode,
-      toggleMode
+      setMode: setModeInternal
     };
   }
   function useValidateAuthenticator(t0) {
@@ -16506,12 +16520,13 @@
     if ($[10] !== mapProperty.properties || $[11] !== mapPropertyKeys || $[12] !== size || $[13] !== value) {
       t2 = /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-1 w-full", children: mapPropertyKeys && mapPropertyKeys.map((key_0, index_0) => {
         const childProperty = mapProperty.properties[key_0];
+        const isArrayOrMap = childProperty.dataType === "map" || childProperty === "array";
         return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: ui.cls(ui.defaultBorderMixin, "last:border-b-0 border-b"), children: [
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-row pt-0.5 pb-0.5 gap-2", children: [
             /* @__PURE__ */ jsxRuntime.jsx("div", { className: "min-w-[140px] w-[25%] py-1", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "caption", className: "font-mono break-words", color: "secondary", children: childProperty.name }) }),
-            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-grow max-w-[75%]", children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: !(childProperty.dataType === "map" || childProperty === "array") && /* @__PURE__ */ jsxRuntime.jsx(PropertyPreview, { propertyKey: key_0, value: value[key_0], property: childProperty, size }) }) })
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-grow max-w-[75%]", children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: !isArrayOrMap && /* @__PURE__ */ jsxRuntime.jsx(PropertyPreview, { propertyKey: key_0, value: value[key_0], property: childProperty, size }) }) })
           ] }),
-          (childProperty.dataType === "map" || childProperty === "array") && /* @__PURE__ */ jsxRuntime.jsx("div", { className: ui.cls(ui.defaultBorderMixin, "border-l pl-4 ml-2 my-2"), children: /* @__PURE__ */ jsxRuntime.jsx(PropertyPreview, { propertyKey: key_0, value: value[key_0], property: childProperty, size }) })
+          isArrayOrMap && /* @__PURE__ */ jsxRuntime.jsx("div", { className: ui.cls(ui.defaultBorderMixin, "border-l pl-4 ml-2 my-2"), children: /* @__PURE__ */ jsxRuntime.jsx(PropertyPreview, { propertyKey: key_0, value: value[key_0], property: childProperty, size }) })
         ] }, `map_preview_table_${key_0}}`);
       }) });
       $[10] = mapProperty.properties;
@@ -16746,50 +16761,50 @@
             if (property.dataType === "string") {
               const stringProperty = property;
               if (typeof value === "string") {
-                if (stringProperty.url) {
-                  if (typeof stringProperty.url === "boolean") {
-                    let t02;
-                    if ($[12] !== props.size || $[13] !== value) {
-                      t02 = /* @__PURE__ */ jsxRuntime.jsx(UrlComponentPreview, { size: props.size, url: value });
-                      $[12] = props.size;
-                      $[13] = value;
-                      $[14] = t02;
-                    } else {
-                      t02 = $[14];
-                    }
-                    content = t02;
+                if (stringProperty.storage) {
+                  const filePath = stringProperty.storage.previewUrl ? stringProperty.storage.previewUrl(value) : value;
+                  const t02 = property.storage?.storeUrl ?? false;
+                  let t1;
+                  if ($[12] !== filePath || $[13] !== interactive || $[14] !== props.size || $[15] !== t02) {
+                    t1 = /* @__PURE__ */ jsxRuntime.jsx(StorageThumbnail, { interactive, storeUrl: t02, size: props.size, storagePathOrDownloadUrl: filePath });
+                    $[12] = filePath;
+                    $[13] = interactive;
+                    $[14] = props.size;
+                    $[15] = t02;
+                    $[16] = t1;
                   } else {
-                    if (typeof stringProperty.url === "string") {
-                      content = /* @__PURE__ */ jsxRuntime.jsx(UrlComponentPreview, { size: props.size, url: value, interactive, previewType: stringProperty.url });
-                    }
+                    t1 = $[16];
                   }
+                  content = t1;
                 } else {
-                  if (stringProperty.markdown) {
-                    let t02;
-                    if ($[15] !== value) {
-                      t02 = /* @__PURE__ */ jsxRuntime.jsx(ui.Markdown, { source: value, size: "small" });
-                      $[15] = value;
-                      $[16] = t02;
+                  if (stringProperty.url) {
+                    if (typeof stringProperty.url === "boolean") {
+                      let t02;
+                      if ($[17] !== props.size || $[18] !== value) {
+                        t02 = /* @__PURE__ */ jsxRuntime.jsx(UrlComponentPreview, { size: props.size, url: value });
+                        $[17] = props.size;
+                        $[18] = value;
+                        $[19] = t02;
+                      } else {
+                        t02 = $[19];
+                      }
+                      content = t02;
                     } else {
-                      t02 = $[16];
+                      if (typeof stringProperty.url === "string") {
+                        content = /* @__PURE__ */ jsxRuntime.jsx(UrlComponentPreview, { size: props.size, url: value, interactive, previewType: stringProperty.url });
+                      }
                     }
-                    content = t02;
                   } else {
-                    if (stringProperty.storage) {
-                      const filePath = stringProperty.storage.previewUrl ? stringProperty.storage.previewUrl(value) : value;
-                      const t02 = property.storage?.storeUrl ?? false;
-                      let t1;
-                      if ($[17] !== filePath || $[18] !== interactive || $[19] !== props.size || $[20] !== t02) {
-                        t1 = /* @__PURE__ */ jsxRuntime.jsx(StorageThumbnail, { interactive, storeUrl: t02, size: props.size, storagePathOrDownloadUrl: filePath });
-                        $[17] = filePath;
-                        $[18] = interactive;
-                        $[19] = props.size;
-                        $[20] = t02;
-                        $[21] = t1;
+                    if (stringProperty.markdown) {
+                      let t02;
+                      if ($[20] !== value) {
+                        t02 = /* @__PURE__ */ jsxRuntime.jsx(ui.Markdown, { source: value, size: "small" });
+                        $[20] = value;
+                        $[21] = t02;
                       } else {
-                        t1 = $[21];
+                        t02 = $[21];
                       }
-                      content = t1;
+                      content = t02;
                     } else {
                       content = /* @__PURE__ */ jsxRuntime.jsx(StringPropertyPreview, { ...props, property: stringProperty, value });
                     }
@@ -22870,7 +22885,7 @@
     return t6;
   }
   function FireCMSRoute() {
-    const $ = reactCompilerRuntime.c(29);
+    const $ = reactCompilerRuntime.c(32);
     const location = reactRouter.useLocation();
     const navigation = useNavigationController();
     const breadcrumbs = useBreadcrumbsController();
@@ -22885,27 +22900,36 @@
       t0 = $[1];
     }
     const isNew = t0;
+    let t1;
+    if ($[2] !== hash2) {
+      t1 = hash2.includes("#copy");
+      $[2] = hash2;
+      $[3] = t1;
+    } else {
+      t1 = $[3];
+    }
+    const isCopy = t1;
     const pathname = location.pathname;
     let navigationEntries;
-    let t1;
     let t2;
     let t3;
-    if ($[2] !== breadcrumbs || $[3] !== navigation || $[4] !== pathname) {
+    let t4;
+    if ($[4] !== breadcrumbs || $[5] !== navigation || $[6] !== pathname) {
       const navigationPath = navigation.urlPathToDataPath(pathname);
-      let t42;
-      if ($[9] !== navigation.collections) {
-        t42 = navigation.collections ?? [];
-        $[9] = navigation.collections;
-        $[10] = t42;
+      let t52;
+      if ($[11] !== navigation.collections) {
+        t52 = navigation.collections ?? [];
+        $[11] = navigation.collections;
+        $[12] = t52;
       } else {
-        t42 = $[10];
+        t52 = $[12];
       }
       navigationEntries = getNavigationEntriesFromPath({
         path: navigationPath,
-        collections: t42
+        collections: t52
       });
-      t2 = React.useEffect;
-      t3 = () => {
+      t3 = React.useEffect;
+      t4 = () => {
         breadcrumbs.set({
           breadcrumbs: navigationEntries.map((entry) => {
             if (entry.type === "entity") {
@@ -22933,118 +22957,119 @@
           })
         });
       };
-      t1 = navigationEntries.map(_temp$1).join(",");
-      $[2] = breadcrumbs;
-      $[3] = navigation;
-      $[4] = pathname;
-      $[5] = navigationEntries;
-      $[6] = t1;
-      $[7] = t2;
-      $[8] = t3;
+      t2 = navigationEntries.map(_temp$1).join(",");
+      $[4] = breadcrumbs;
+      $[5] = navigation;
+      $[6] = pathname;
+      $[7] = navigationEntries;
+      $[8] = t2;
+      $[9] = t3;
+      $[10] = t4;
     } else {
-      navigationEntries = $[5];
-      t1 = $[6];
-      t2 = $[7];
-      t3 = $[8];
+      navigationEntries = $[7];
+      t2 = $[8];
+      t3 = $[9];
+      t4 = $[10];
     }
-    let t4;
-    if ($[11] !== t1) {
-      t4 = [t1];
-      $[11] = t1;
-      $[12] = t4;
+    let t5;
+    if ($[13] !== t2) {
+      t5 = [t2];
+      $[13] = t2;
+      $[14] = t5;
     } else {
-      t4 = $[12];
+      t5 = $[14];
     }
-    t2(t3, t4);
+    t3(t4, t5);
     if (isNew) {
-      let t52;
-      if ($[13] !== navigationEntries || $[14] !== pathname) {
-        t52 = /* @__PURE__ */ jsxRuntime.jsx(EntityFullScreenRoute, { pathname, navigationEntries, isNew: true });
-        $[13] = navigationEntries;
-        $[14] = pathname;
-        $[15] = t52;
+      let t62;
+      if ($[15] !== navigationEntries || $[16] !== pathname) {
+        t62 = /* @__PURE__ */ jsxRuntime.jsx(EntityFullScreenRoute, { pathname, navigationEntries, isNew: true, isCopy: false });
+        $[15] = navigationEntries;
+        $[16] = pathname;
+        $[17] = t62;
       } else {
-        t52 = $[15];
+        t62 = $[17];
       }
-      return t52;
+      return t62;
     }
     if (navigationEntries.length === 1 && navigationEntries[0].type === "collection") {
-      let t52;
-      let t6;
-      if ($[16] !== navigation || $[17] !== navigationEntries) {
-        t6 = Symbol.for("react.early_return_sentinel");
+      let t62;
+      let t7;
+      if ($[18] !== navigation || $[19] !== navigationEntries) {
+        t7 = Symbol.for("react.early_return_sentinel");
         bb0: {
           const collection = navigation.getCollection(navigationEntries[0].path);
           if (!collection) {
-            t6 = null;
+            t7 = null;
             break bb0;
           }
-          let t7;
-          if ($[20] === Symbol.for("react.memo_cache_sentinel")) {
-            t7 = [];
-            $[20] = t7;
+          let t8;
+          if ($[22] === Symbol.for("react.memo_cache_sentinel")) {
+            t8 = [];
+            $[22] = t8;
           } else {
-            t7 = $[20];
+            t8 = $[22];
           }
-          t52 = /* @__PURE__ */ jsxRuntime.jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t7, fullPath: collection.id, updateUrl: true, ...collection, Actions: toArray(collection.Actions) }, `collection_view_${collection.id ?? collection.path}`);
+          t62 = /* @__PURE__ */ jsxRuntime.jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t8, fullPath: collection.id, updateUrl: true, ...collection, Actions: toArray(collection.Actions) }, `collection_view_${collection.id ?? collection.path}`);
         }
-        $[16] = navigation;
-        $[17] = navigationEntries;
-        $[18] = t52;
-        $[19] = t6;
+        $[18] = navigation;
+        $[19] = navigationEntries;
+        $[20] = t62;
+        $[21] = t7;
       } else {
-        t52 = $[18];
-        t6 = $[19];
+        t62 = $[20];
+        t7 = $[21];
       }
-      if (t6 !== Symbol.for("react.early_return_sentinel")) {
-        return t6;
+      if (t7 !== Symbol.for("react.early_return_sentinel")) {
+        return t7;
       }
-      return t52;
+      return t62;
     }
     if (isSidePanel) {
-      let t52;
-      if ($[21] !== navigation || $[22] !== navigationEntries) {
-        t52 = Symbol.for("react.early_return_sentinel");
+      let t62;
+      if ($[23] !== navigation || $[24] !== navigationEntries) {
+        t62 = Symbol.for("react.early_return_sentinel");
         bb1: {
           const lastCollectionEntry = navigationEntries.findLast(_temp2$1);
           if (lastCollectionEntry) {
             const collection_0 = navigation.getCollection(lastCollectionEntry.path);
             if (!collection_0) {
-              t52 = null;
+              t62 = null;
               break bb1;
             }
-            let t6;
-            if ($[24] === Symbol.for("react.memo_cache_sentinel")) {
-              t6 = [];
-              $[24] = t6;
+            let t7;
+            if ($[26] === Symbol.for("react.memo_cache_sentinel")) {
+              t7 = [];
+              $[26] = t7;
             } else {
-              t6 = $[24];
+              t7 = $[26];
             }
-            t52 = /* @__PURE__ */ jsxRuntime.jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t6, fullPath: collection_0.id, updateUrl: true, ...collection_0, Actions: toArray(collection_0.Actions) }, `collection_view_${collection_0.id ?? collection_0.path}`);
+            t62 = /* @__PURE__ */ jsxRuntime.jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t7, fullPath: collection_0.id, updateUrl: true, ...collection_0, Actions: toArray(collection_0.Actions) }, `collection_view_${collection_0.id ?? collection_0.path}`);
             break bb1;
           }
         }
-        $[21] = navigation;
-        $[22] = navigationEntries;
-        $[23] = t52;
+        $[23] = navigation;
+        $[24] = navigationEntries;
+        $[25] = t62;
       } else {
-        t52 = $[23];
+        t62 = $[25];
       }
-      if (t52 !== Symbol.for("react.early_return_sentinel")) {
-        return t52;
+      if (t62 !== Symbol.for("react.early_return_sentinel")) {
+        return t62;
       }
     }
-    let t5;
-    if ($[25] !== isNew || $[26] !== navigationEntries || $[27] !== pathname) {
-      t5 = /* @__PURE__ */ jsxRuntime.jsx(EntityFullScreenRoute, { pathname, navigationEntries, isNew });
-      $[25] = isNew;
-      $[26] = navigationEntries;
-      $[27] = pathname;
-      $[28] = t5;
+    let t6;
+    if ($[27] !== isCopy || $[28] !== isNew || $[29] !== navigationEntries || $[30] !== pathname) {
+      t6 = /* @__PURE__ */ jsxRuntime.jsx(EntityFullScreenRoute, { pathname, navigationEntries, isNew, isCopy });
+      $[27] = isCopy;
+      $[28] = isNew;
+      $[29] = navigationEntries;
+      $[30] = pathname;
+      $[31] = t6;
     } else {
-      t5 = $[28];
+      t6 = $[31];
     }
-    return t5;
+    return t6;
   }
   function _temp2$1(entry_1) {
     return entry_1.type === "collection";
@@ -23055,7 +23080,8 @@
   function EntityFullScreenRoute({
     pathname,
     navigationEntries,
-    isNew
+    isNew,
+    isCopy
   }) {
     const navigation = useNavigationController();
     const navigate = reactRouterDom.useNavigate();
@@ -23086,34 +23112,6 @@
     } catch (e) {
       console.warn("Blocker not available, navigation will not be blocked");
     }
-    function updateUrl(entityId_0, newSelectedTab, replace, path, isNew_0) {
-      console.log("Updating url", {
-        entityId: entityId_0,
-        newSelectedTab,
-        replace,
-        basePath,
-        path,
-        isNew: isNew_0
-      });
-      if (!isNew_0 && (newSelectedTab ?? null) === (selectedTab ?? null)) {
-        return;
-      }
-      if (isNew_0) {
-        navigate(`${basePath}/${entityId_0}`, {
-          replace
-        });
-        return;
-      }
-      if (newSelectedTab) {
-        navigate(`${basePath}/${entityId_0}/${newSelectedTab}`, {
-          replace
-        });
-      } else {
-        navigate(`${basePath}/${entityId_0}`, {
-          replace
-        });
-      }
-    }
     const lastCollectionEntry = navigationEntries.findLast((entry_1) => entry_1.type === "collection");
     if (isNew && !lastCollectionEntry) {
       throw new Error("INTERNAL: No collection found in the navigation");
@@ -23124,12 +23122,27 @@
     const collection = isNew ? lastCollectionEntry.collection : lastEntityEntry.parentCollection;
     const collectionPath = navigation.resolveIdsFrom(isNew ? lastCollectionEntry.path : lastEntityEntry.path);
     return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-      /* @__PURE__ */ jsxRuntime.jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, collection, layout: "full_screen", path: collectionPath, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
-        updateUrl(params.entityId, params.selectedTab, true, params.path, isNew);
+      /* @__PURE__ */ jsxRuntime.jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, collection, layout: "full_screen", path: collectionPath, copy: isCopy, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
+        console.log("Entity saved", params);
+        navigate(`${basePath}/${params.entityId}`, {
+          replace: true
+        });
       }, onTabChange: (params_0) => {
-        updateUrl(params_0.entityId, params_0.selectedTab, !isNew, params_0.path, isNew);
         setSelectedTab(params_0.selectedTab);
-      }, parentCollectionIds }, collection.id + "_" + (isNew ? "new" : entityId)),
+        if (isNew) {
+          return;
+        }
+        const newSelectedTab = params_0.selectedTab;
+        if (newSelectedTab) {
+          navigate(`${basePath}/${entityId}/${newSelectedTab}`, {
+            replace: true
+          });
+        } else {
+          navigate(`${basePath}/${entityId}`, {
+            replace: true
+          });
+        }
+      }, parentCollectionIds }, collection.id + "_" + (isNew ? "new" : isCopy ? entityId + "_copy" : entityId)),
       /* @__PURE__ */ jsxRuntime.jsx(UnsavedChangesDialog, { open: blocker?.state === "blocked", handleOk: () => blocker?.proceed?.(), handleCancel: () => blocker?.reset?.(), body: "You have unsaved changes in this entity." })
     ] });
   }