@mattisvensson/strapi-plugin-webatlas 0.9.5 → 0.10.0

package/dist/_chunks/{index-qrrfKpw1.mjs → index-CNKWb8pn.mjs}

@@ -1,11 +1,11 @@
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
-import { useNavigate, useParams, Routes, Route } from "react-router-dom";
-import { Trash, Pencil, Check, Drag, More, Link, OneToMany, ExternalLink, Plus } from "@strapi/icons";
-import { Box, Typography, Dialog, Button, Modal, Flex, SingleSelect, SingleSelectOption, Grid, Field, Toggle, Divider, Status, SimpleMenu, IconButton, MenuItem } from "@strapi/design-system";
-import { useState, useEffect, createContext, useRef, useContext, useReducer, useCallback, useMemo, forwardRef } from "react";
+import { useNavigate, Link, useParams, Routes, Route } from "react-router-dom";
+import { Trash, Pencil, Check, WarningCircle, More, Link as Link$1, OneToMany, ExternalLink, Drag, Plus } from "@strapi/icons";
+import { Box, Typography, Dialog, Button, Modal, Flex, SingleSelect, SingleSelectOption, Grid, Field, Toggle, Divider, Badge, SimpleMenu, IconButton, MenuItem } from "@strapi/design-system";
+import { useState, useEffect, createContext, useRef, useContext, useMemo, useReducer, useCallback, forwardRef } from "react";
 import { createPortal } from "react-dom";
 import { useIntl } from "react-intl";
-import { u as useApi, g as getTranslation, P as PLUGIN_ID, d as debounce, a as duplicateCheck, t as transformToUrl, b as PathInfo, c as usePluginConfig, p as pluginPermissions } from "./index-DDN4T6c7.mjs";
+import { u as useApi, g as getTranslation, P as PLUGIN_ID, d as debounce, a as duplicateCheck, T as Tooltip, b as PathInfo, c as usePluginConfig, p as pluginPermissions } from "./index-B07UVUOa.mjs";
 import { useNotification, useFetchClient, Page, Layouts } from "@strapi/strapi/admin";
 import { C as Center, F as FullLoader } from "./FullLoader-CrPED_dY.mjs";
 import { EmptyDocuments } from "@strapi/icons/symbols";
@@ -33,7 +33,7 @@ const useAllEntities = () => {
   return { entities, loading, error };
 };
 function createTempNavItemObject({
-  parentId,
+  actionItemParentId,
   entityRoute,
   selectedNavigation,
   navItemState,
@@ -42,6 +42,12 @@ function createTempNavItemObject({
   path,
   type = "internal"
 }) {
+  const clientModifications = {
+    type: "create",
+    route: entityRoute?.documentId ?? null,
+    parent: actionItemParentId ?? null,
+    navigation: selectedNavigation?.documentId ?? null
+  };
   const tempNavItem = {
     id: Math.floor(Math.random() * -1e6),
     // Temporary negative ID
@@ -51,25 +57,23 @@ function createTempNavItemObject({
     depth: 0,
     status: null,
     order: 0,
-    parent: parentId ? { documentId: parentId } : null,
+    parent: actionItemParentId ? { documentId: actionItemParentId } : null,
     items: [],
-    isNew: {
-      route: entityRoute?.documentId ?? null,
-      parent: parentId ?? null,
-      navigation: selectedNavigation?.documentId ?? null
-    },
+    clientModifications: { ...clientModifications },
+    initialClientModifications: { ...clientModifications },
     route: {
       active: navItemState.active || false,
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       documentId: "",
       path: path?.value || "",
+      canonicalPath: "",
       id: 0,
       type,
       isOverride: navItemState.isOverride || false,
-      relatedContentType: selectedContentType ? JSON.stringify(selectedContentType.contentType) : "",
+      relatedContentType: selectedContentType ? selectedContentType.contentType.uid : "",
       relatedDocumentId: selectedEntity ? selectedEntity.documentId : "",
       relatedId: selectedEntity ? selectedEntity.id : 0,
-      slug: path?.value || "",
+      slug: path?.slug || "",
       title: navItemState.title || "",
       uidPath: path?.uidPath || "",
       updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -78,6 +82,56 @@ function createTempNavItemObject({
   };
   return tempNavItem;
 }
+function findParentNavItem({
+  navigationItems,
+  targetItem,
+  onlyInternalItems = false
+}) {
+  if (!navigationItems || !Array.isArray(navigationItems)) return null;
+  if (!targetItem || typeof targetItem.depth !== "number" || targetItem.depth <= 0) return null;
+  const targetIndex = navigationItems.findIndex(
+    (navItem) => navItem.documentId === targetItem.documentId
+  );
+  if (targetIndex === -1) return null;
+  for (let i = targetIndex - 1; i >= 0; i--) {
+    const candidate = navigationItems[i];
+    if (candidate.depth === 0) {
+      if (onlyInternalItems && candidate.route.type !== "internal") {
+        return null;
+      }
+      return candidate;
+    }
+    if (candidate.clientModifications?.type === "delete" || typeof candidate.depth === "number" && candidate.depth >= targetItem.depth || onlyInternalItems && candidate.route.type !== "internal") {
+      continue;
+    }
+    return candidate;
+  }
+  return null;
+}
+function buildBreadcrumbString({
+  navigationItems,
+  targetItem,
+  includeTarget = true
+}) {
+  if (!navigationItems || !Array.isArray(navigationItems)) return null;
+  if (!targetItem || typeof targetItem.depth !== "number") return null;
+  if (targetItem.depth <= 0) return targetItem.route.title;
+  const targetIndex = navigationItems.findIndex(
+    (navItem) => navItem.documentId === targetItem.documentId
+  );
+  if (targetIndex === -1) return null;
+  const parts = [];
+  for (let i = targetIndex - 1; i >= 0; i--) {
+    const candidate = navigationItems[i];
+    if (candidate.clientModifications?.type === "delete") continue;
+    parts.unshift(candidate.route.title);
+    if (typeof candidate.depth === "number" && candidate.depth === 0) break;
+  }
+  if (includeTarget) {
+    parts.push(targetItem.route.title);
+  }
+  return parts.join(" > ");
+}
 function EmptyBox({ msg }) {
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(EmptyDocuments, { width: "10rem", height: "6rem" }),
@@ -100,11 +154,17 @@ function Delete({ variant, item, onDelete }) {
         await deleteNavigation(item.documentId);
         onDelete(item);
       } else if (variant === "ItemDelete") {
-        const editedItem = { ...item, deleted: true };
+        const editedItem = {
+          ...item,
+          clientModifications: {
+            ...item.clientModifications,
+            type: "delete"
+          }
+        };
         onDelete(editedItem);
       }
     } catch (err) {
-      console.log(err);
+      strapi.log.error(err);
     }
     setModalType(closeModalState.current);
   };
@@ -241,7 +301,7 @@ function NavCreate() {
       navigate(`/plugins/${PLUGIN_ID}/navigation/${data.documentId}`);
       setModalType("");
     } catch (err) {
-      console.log(err);
+      strapi.log.error(err);
       toggleNotification({
         type: "danger",
         message: formatMessage({
@@ -296,7 +356,7 @@ function NavEdit({ item, onEdit }) {
       setModalType("NavOverview");
       onEdit({ ...item, name, visible });
     } catch (err) {
-      console.log(err);
+      strapi.log.error(err);
       toggleNotification({
         type: "danger",
         message: formatMessage({
@@ -437,12 +497,10 @@ function NavOverview({ navigations, setActionItem }) {
     }
   );
 }
-function itemStateReducer(navItemState, action) {
+function navItemStateReducer(navItemState, action) {
   switch (action.type) {
     case "SET_TITLE":
       return { ...navItemState, title: action.payload };
-    case "SET_SLUG":
-      return { ...navItemState, slug: action.payload };
     case "SET_ACTIVE":
       return { ...navItemState, active: action.payload };
     case "SET_OVERRIDE":
@@ -456,14 +514,14 @@ function pathReducer(state, action) {
     case "DEFAULT":
       return {
         ...state,
-        value: transformToUrl(action.payload),
+        value: action.payload,
         prevValue: state.value,
         needsUrlCheck: true
       };
     case "NO_URL_CHECK":
       return {
         ...state,
-        value: transformToUrl(action.payload),
+        value: action.payload,
         prevValue: state.value,
         needsUrlCheck: false
       };
@@ -476,8 +534,14 @@ function pathReducer(state, action) {
       };
     case "RESET_URL_CHECK_FLAG":
       return { ...state, needsUrlCheck: false };
+    case "SET_REPLACEMENT":
+      return { ...state, replacement: action.payload };
     case "SET_UIDPATH":
       return { ...state, uidPath: action.payload };
+    case "SET_SLUG":
+      return { ...state, slug: action.payload };
+    case "SET_CANONICALPATH":
+      return { ...state, canonicalPath: action.payload };
     case "SET_INITIALPATH":
       return { ...state, initialPath: action.payload };
     default:
@@ -485,61 +549,64 @@ function pathReducer(state, action) {
   }
 }
 function useModalSharedLogic() {
-  const [availableEntities, setAvailableEntities] = useState([]);
-  const [selectedEntity, setSelectedEntity] = useState();
   const [selectedContentType, setSelectedContentType] = useState();
-  const [entityRoute, setEntityRoute] = useState();
-  const [replacement, setReplacement] = useState("");
   const [validationState, setValidationState] = useState("initial");
   const { entities } = useAllEntities();
-  const { updateRoute, getRelatedRoute } = useApi();
   const { get } = useFetchClient();
+  const availableEntities = useMemo(() => {
+    if (!entities) return [];
+    return entities;
+  }, [entities]);
   const initialState = useRef({
     title: "",
     slug: "",
     active: true,
-    internal: true,
+    type: "internal",
     isOverride: false
   });
-  const [navItemState, dispatchItemState] = useReducer(itemStateReducer, initialState.current);
-  const [path, dispatchPath] = useReducer(pathReducer, { needsUrlCheck: false });
+  const [navItemState, dispatchNavItemState] = useReducer(navItemStateReducer, initialState.current);
+  const [path, dispatchPath] = useReducer(pathReducer, {
+    needsUrlCheck: false,
+    value: "",
+    prevValue: "",
+    slug: "",
+    replacement: null,
+    uidPath: "",
+    canonicalPath: "",
+    initialPath: ""
+  });
   const debouncedCheckUrl = useCallback(debounce(checkUrl, 500), []);
   const { modalType, setModalType } = useContext(ModalContext);
   const { selectedNavigation } = useContext(SelectedNavigationContext);
-  async function checkUrl(url, routeDocumentId) {
+  async function checkUrl({
+    url,
+    routeDocumentId,
+    withoutTransform = false
+  }) {
     if (!url) return;
     setValidationState("checking");
-    setReplacement("");
+    dispatchPath({ type: "SET_REPLACEMENT", payload: "" });
     try {
-      const data = await duplicateCheck(get, url, routeDocumentId);
+      const data = await duplicateCheck({ fetchFunction: get, path: url, routeDocumentId, withoutTransform });
       if (!data || data === url) return;
       dispatchPath({ type: "NO_URL_CHECK", payload: data });
-      setReplacement(data);
+      dispatchPath({ type: "SET_REPLACEMENT", payload: data });
     } catch (err) {
-      console.log(err);
+      strapi.log.error(err);
     } finally {
       setValidationState("done");
     }
   }
-  const modalSharedLogic2 = {
+  const modalSharedLogic = {
     availableEntities,
-    setAvailableEntities,
-    selectedEntity,
-    setSelectedEntity,
     selectedContentType,
     setSelectedContentType,
-    entityRoute,
-    setEntityRoute,
     entities,
-    updateRoute,
-    getRelatedRoute,
-    replacement,
-    setReplacement,
     validationState,
     setValidationState,
     initialState,
     navItemState,
-    dispatchItemState,
+    dispatchNavItemState,
     path,
     dispatchPath,
     debouncedCheckUrl,
@@ -547,7 +614,7 @@ function useModalSharedLogic() {
     setModalType,
     selectedNavigation
   };
-  return modalSharedLogic2;
+  return modalSharedLogic;
 }
 function withModalSharedLogic(Component) {
   return function WrappedComponent(props) {
@@ -565,39 +632,39 @@ function ExternalItemComponent(props) {
   const {
     variant,
     navItemState,
-    dispatchItemState,
+    dispatchNavItemState,
     path,
     dispatchPath,
     setModalType,
     selectedNavigation
   } = props;
-  const parentId = isExternalCreateProps(props) ? props.parentId : void 0;
+  const actionItemParentId = isExternalCreateProps(props) ? props.actionItemParentId : void 0;
   const onCreate = isExternalCreateProps(props) ? props.onCreate : void 0;
   const onSave = isExternalEditProps(props) ? props.onSave : void 0;
   const item = isExternalEditProps(props) ? props.item : void 0;
   const { formatMessage } = useIntl();
   useEffect(() => {
     if (variant !== "ExternalEdit" || !item) return;
-    dispatchItemState({ type: "SET_TITLE", payload: item.route.title });
-    dispatchItemState({ type: "SET_ACTIVE", payload: item.route.active });
+    dispatchNavItemState({ type: "SET_TITLE", payload: item.route.title });
+    dispatchNavItemState({ type: "SET_ACTIVE", payload: item.route.active });
     dispatchPath({ type: "NO_TRANSFORM_AND_CHECK", payload: item.route.path });
-  }, [variant, item, dispatchItemState, dispatchPath]);
+  }, [variant, item, dispatchNavItemState, dispatchPath]);
   const handleConfirm = async () => {
     try {
       if (!path || path.value?.trim() === "" || !navItemState.title || navItemState.title?.trim() === "" || !selectedNavigation) return;
       if (variant === "ExternalEdit" && item && onSave) {
         onSave({
           ...item,
-          update: {
+          clientModifications: {
+            ...item.clientModifications,
+            type: "update",
             title: navItemState.title,
-            path: path.value
-            // internal: false,
-            // active: navItemState.active,
+            slug: path.value
           }
         });
       } else if (onCreate) {
         const newItem = createTempNavItemObject({
-          parentId,
+          actionItemParentId,
           entityRoute: null,
           selectedNavigation,
           navItemState,
@@ -610,7 +677,7 @@ function ExternalItemComponent(props) {
       }
       setModalType("");
     } catch (err) {
-      console.log(err);
+      strapi.log.error(err);
     }
   };
   return /* @__PURE__ */ jsx(
@@ -640,7 +707,7 @@ function ExternalItemComponent(props) {
               }),
               name: "title",
               value: navItemState.title || "",
-              onChange: (e) => dispatchItemState({ type: "SET_TITLE", payload: e.target.value }),
+              onChange: (e) => dispatchNavItemState({ type: "SET_TITLE", payload: e.target.value }),
               required: true
             }
           )
@@ -669,10 +736,79 @@ function ExternalItemComponent(props) {
   );
 }
 const ExternalItem = withModalSharedLogic(ExternalItemComponent);
-function ItemDetails({ navItemState, dispatchItemState, path, dispatchPath, validationState, replacement }) {
+function Warning({ main, info }) {
+  return /* @__PURE__ */ jsx(Grid.Item, { col: 12, s: 12, alignItems: "baseline", children: /* @__PURE__ */ jsx(Badge, { variant: "warning", minWidth: "100%", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "center", gap: 2, children: [
+    /* @__PURE__ */ jsxs(Flex, { alignItems: "center", gap: 2, children: [
+      /* @__PURE__ */ jsx(WarningCircle, {}),
+      /* @__PURE__ */ jsx(Typography, { children: main })
+    ] }),
+    info && /* @__PURE__ */ jsx(Typography, { variant: "sigma", children: info })
+  ] }) }) });
+}
+function ItemDetails({
+  navItemState,
+  dispatchNavItemState,
+  path,
+  dispatchPath,
+  validationState,
+  parentNavItem,
+  navigationItems,
+  navigations,
+  debouncedCheckUrl,
+  item,
+  route,
+  modalVariant
+}) {
   const { formatMessage } = useIntl();
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Grid.Root, { gap: 4, children: [
-    /* @__PURE__ */ jsx(Grid.Item, { col: 6, s: 12, alignItems: "baseline", children: /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(Field.Root, { children: [
+  const breadcrumbString = useMemo(() => {
+    if (!navigationItems) return null;
+    const targetItem = item || parentNavItem;
+    if (!targetItem || typeof targetItem.depth !== "number") return null;
+    return buildBreadcrumbString({ navigationItems, targetItem, includeTarget: modalVariant === "create" });
+  }, [parentNavItem, navigationItems, item, modalVariant]);
+  const navigationWhereRouteExists = useMemo(() => {
+    if (!navigations || !route) return false;
+    return navigations.find((nav) => nav.items.some((r) => r.route.documentId === route.documentId || r.route.relatedContentType === route.relatedContentType && r.route.relatedDocumentId === route.relatedDocumentId));
+  }, [navigations, route, navigationItems]);
+  useEffect(() => {
+    if (path.needsUrlCheck && path.value) {
+      if (path.uidPath === path.value || path.initialPath === path.value) return;
+      debouncedCheckUrl({ url: path.value, routeDocumentId: route.documentId, withoutTransform: true });
+      dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
+    }
+  }, [path.needsUrlCheck, route.documentId]);
+  useEffect(() => {
+    if (!path.slug) return;
+    const parentPath = parentNavItem?.clientModifications?.path || parentNavItem?.route.path || "";
+    const newPath = parentPath ? `${parentPath}/${path.slug}` : path.slug;
+    dispatchPath({ type: "DEFAULT", payload: newPath });
+  }, [path.slug, parentNavItem]);
+  return /* @__PURE__ */ jsxs(Grid.Root, { gap: 4, children: [
+    path.canonicalPath !== path.value && /* @__PURE__ */ jsx(
+      Warning,
+      {
+        main: formatMessage({
+          id: getTranslation("modal.item.canonicalPathMismatch"),
+          defaultMessage: "Warning: Canonical Path does not match navigation path"
+        })
+      }
+    ),
+    navigationWhereRouteExists && /* @__PURE__ */ jsx(
+      Warning,
+      {
+        main: formatMessage({
+          id: getTranslation("modal.item.routeAlreadyUsed"),
+          defaultMessage: 'Warning: This route is already used in the navigation "{navigationName}"'
+        }, {
+          navigationName: navigationWhereRouteExists.name
+        }),
+        info: formatMessage({
+          id: getTranslation("modal.item.routeAlreadyUsed.info"),
+          defaultMessage: "Changing the path for this item will also update the path in the existing item."
+        })
+      }
+    ),
+    /* @__PURE__ */ jsx(Grid.Item, { col: 12, s: 12, alignItems: "baseline", children: /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(Field.Root, { required: true, children: [
       /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
         id: getTranslation("modal.item.titleField.label"),
         defaultMessage: "Title"
@@ -680,17 +816,65 @@ function ItemDetails({ navItemState, dispatchItemState, path, dispatchPath, vali
       /* @__PURE__ */ jsx(
         Field.Input,
         {
-          placeholder: formatMessage({
-            id: getTranslation("modal.item.titleField.placeholder"),
-            defaultMessage: "e.g. About us"
-          }),
           name: "title",
           value: navItemState?.title || "",
-          onChange: (e) => dispatchItemState({ type: "SET_TITLE", payload: e.target.value }),
+          onChange: (e) => dispatchNavItemState({ type: "SET_TITLE", payload: e.target.value }),
           required: true
         }
       )
     ] }) }) }),
+    /* @__PURE__ */ jsx(Grid.Item, { col: 6, s: 12, alignItems: "baseline", children: /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(Field.Root, { children: [
+      /* @__PURE__ */ jsxs(Field.Label, { children: [
+        formatMessage({
+          id: getTranslation("modal.item.canonicalPathField.label"),
+          defaultMessage: "Canonical Path"
+        }),
+        /* @__PURE__ */ jsx(Tooltip, { description: formatMessage({
+          id: getTranslation("modal.item.canonicalPathField.tooltip"),
+          defaultMessage: "Based on content hierarchy"
+        }) })
+      ] }),
+      /* @__PURE__ */ jsx(
+        Field.Input,
+        {
+          name: "canonicalPath",
+          value: route.canonicalPath || "",
+          disabled: true
+        }
+      ),
+      /* @__PURE__ */ jsx(Field.Hint, {})
+    ] }) }) }),
+    /* @__PURE__ */ jsx(Grid.Item, { col: 6, s: 12, alignItems: "baseline", children: /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(Field.Root, { required: true, children: [
+      /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+        id: getTranslation("modal.item.slugField.label"),
+        defaultMessage: "Slug"
+      }) }),
+      /* @__PURE__ */ jsx(
+        Field.Input,
+        {
+          name: "slug",
+          value: path.slug,
+          onChange: (e) => dispatchPath({ type: "SET_SLUG", payload: e.target.value }),
+          onBlur: (e) => {
+            dispatchPath({ type: "SET_SLUG", payload: e.target.value });
+          }
+        }
+      )
+    ] }) }) }),
+    /* @__PURE__ */ jsx(Grid.Item, { col: 6, s: 12, alignItems: "baseline", children: /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(Field.Root, { children: [
+      /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+        id: getTranslation("modal.item.navigationPosition.label"),
+        defaultMessage: "Navigation Position"
+      }) }),
+      /* @__PURE__ */ jsx(
+        Field.Input,
+        {
+          name: "navigationPosition",
+          value: breadcrumbString || "Root",
+          disabled: true
+        }
+      )
+    ] }) }) }),
     /* @__PURE__ */ jsx(Grid.Item, { col: 6, s: 12, children: /* @__PURE__ */ jsxs(Box, { width: "100%", children: [
       /* @__PURE__ */ jsxs(Field.Root, { children: [
         /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
@@ -700,113 +884,80 @@ function ItemDetails({ navItemState, dispatchItemState, path, dispatchPath, vali
         /* @__PURE__ */ jsx(
           Field.Input,
           {
-            required: true,
-            placeholder: formatMessage({
-              id: getTranslation("modal.item.pathField.placeholder"),
-              defaultMessage: "e.g. about/"
-            }),
-            name: "slug",
-            value: path?.value || "",
-            onChange: (e) => dispatchPath({ type: "NO_TRANSFORM_AND_CHECK", payload: e.target.value }),
-            onBlur: (e) => {
-              if (e.target.value === path.prevValue) return;
-              dispatchPath({ type: "DEFAULT", payload: e.target.value });
-            }
+            name: "path",
+            value: path.value,
+            disabled: true
           }
         )
       ] }),
-      /* @__PURE__ */ jsx(PathInfo, { validationState, replacement })
+      /* @__PURE__ */ jsx(PathInfo, { validationState, replacement: path.replacement })
     ] }) })
-  ] }) });
+  ] });
 }
 function ItemCreateComponent({
   availableEntities,
-  setAvailableEntities,
-  selectedEntity,
-  setSelectedEntity,
   selectedContentType,
   setSelectedContentType,
-  entityRoute,
-  setEntityRoute,
-  entities,
-  getRelatedRoute,
-  replacement,
   validationState,
-  initialState,
   navItemState,
-  dispatchItemState,
+  dispatchNavItemState,
   path,
   dispatchPath,
   debouncedCheckUrl,
   setModalType,
   selectedNavigation,
-  parentId,
-  onCreate
+  actionItemParent,
+  onCreate,
+  navigationItems,
+  navigations
 }) {
-  const [loading, setLoading] = useState(false);
+  const [route, setRoute] = useState(null);
+  const [entity, setEntity] = useState(null);
   const [loadingRoute, setLoadingRoute] = useState(true);
   const { formatMessage } = useIntl();
-  useEffect(() => {
-    if (!entities) return;
-    setAvailableEntities(entities);
-  }, [entities]);
-  useEffect(() => {
-    if (path.needsUrlCheck && path.value) {
-      if (path.uidPath === path.value || path.initialPath === path.value) return;
-      debouncedCheckUrl(path.value, entityRoute?.documentId);
-      dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
-    }
-  }, [path.needsUrlCheck, entityRoute?.documentId]);
+  const { getRelatedRoute } = useApi();
   useEffect(() => {
     async function fetchRoute() {
-      if (!selectedContentType?.contentType || !selectedEntity?.documentId) return setLoadingRoute(false);
+      if (!selectedContentType?.contentType || !entity?.documentId) return setLoadingRoute(false);
       setLoadingRoute(true);
       try {
-        const route = await getRelatedRoute(selectedEntity.documentId);
-        if (!route) throw new Error("No route found for the selected entity");
-        dispatchPath({ type: "NO_URL_CHECK", payload: route.path });
-        dispatchPath({ type: "SET_UIDPATH", payload: route.uidPath });
-        dispatchPath({ type: "SET_INITIALPATH", payload: route.path });
-        dispatchItemState({ type: "SET_TITLE", payload: route.title });
-        dispatchItemState({ type: "SET_ACTIVE", payload: route.active });
-        dispatchItemState({ type: "SET_OVERRIDE", payload: route.isOverride });
-        initialState.current = {
-          title: route.title,
-          slug: route.path,
-          active: route.active,
-          isOverride: route.isOverride
-        };
-        setEntityRoute(route);
+        const relatedRoute = await getRelatedRoute(entity.documentId);
+        if (!relatedRoute) throw new Error("No route found for the selected entity");
+        dispatchPath({ type: "NO_URL_CHECK", payload: relatedRoute.path });
+        dispatchPath({ type: "SET_SLUG", payload: relatedRoute.slug });
+        dispatchPath({ type: "SET_INITIALPATH", payload: relatedRoute.path });
+        dispatchPath({ type: "SET_CANONICALPATH", payload: relatedRoute.canonicalPath });
+        dispatchNavItemState({ type: "SET_TITLE", payload: relatedRoute.title });
+        dispatchNavItemState({ type: "SET_ACTIVE", payload: relatedRoute.active });
+        dispatchNavItemState({ type: "SET_OVERRIDE", payload: relatedRoute.isOverride });
+        setRoute(relatedRoute);
       } catch (err) {
-        console.log(err);
+        strapi.log.error(err);
       } finally {
         setLoadingRoute(false);
       }
     }
     fetchRoute();
-  }, [selectedEntity]);
+  }, [entity]);
   const addItem = async () => {
     try {
-      setLoading(true);
-      if (!selectedContentType?.contentType || !selectedEntity?.documentId || !path || !path.value?.trim() || !navItemState.title || !navItemState.title?.trim() || !selectedNavigation || !entityRoute) return;
+      if (!selectedContentType?.contentType || !entity?.documentId || !path || !path.value?.trim() || !navItemState.title || !navItemState.title?.trim() || !selectedNavigation || !route) return;
       const newItem = createTempNavItemObject({
-        parentId,
-        entityRoute,
+        actionItemParentId: actionItemParent?.documentId,
+        entityRoute: route,
         selectedNavigation,
         navItemState,
-        selectedEntity,
+        selectedEntity: entity,
         selectedContentType,
         path
       });
       onCreate(newItem);
       setModalType("");
     } catch (err) {
-      console.log(err);
-    } finally {
-      setLoading(false);
+      strapi.log.error(err);
     }
   };
-  if (availableEntities && availableEntities.length === 0 || loadingRoute) {
+  if (availableEntities && availableEntities.length === 0) {
     return /* @__PURE__ */ jsx(
       NavModal,
       {
@@ -826,11 +977,10 @@ function ItemCreateComponent({
       titleText: formatMessage({ id: getTranslation("modal.internalItem.titleText.create"), defaultMessage: "Add new navigation item" }),
       loadingText: formatMessage({ id: getTranslation("modal.internalItem.loadingText.create"), defaultMessage: "Creating" }),
       onConfirm: addItem,
-      loading,
       modalToOpen: "",
       currentModalType: "ItemCreate",
       currentModalMode: "create",
-      disabled: !selectedContentType?.contentType || !selectedEntity?.documentId || !path || !path.value?.trim() || !navItemState.title || !navItemState.title?.trim(),
+      disabled: !selectedContentType?.contentType || !entity?.documentId || !path || !path.value?.trim() || !path.slug?.trim() || !navItemState.title || !navItemState.title?.trim(),
       children: [
         /* @__PURE__ */ jsxs(Grid.Root, { gap: 4, children: [
           /* @__PURE__ */ jsx(Grid.Item, { col: 6, s: 12, children: /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(Field.Root, { children: [
@@ -850,7 +1000,7 @@ function ItemCreateComponent({
                   const [contentType] = availableEntities.filter((group) => group.contentType.label === value);
                   if (contentType) {
                     setSelectedContentType(contentType);
-                    setSelectedEntity(null);
+                    setEntity(null);
                   }
                 },
                 disabled: availableEntities && availableEntities.length === 0,
@@ -866,39 +1016,40 @@ function ItemCreateComponent({
             /* @__PURE__ */ jsx(
               SingleSelect,
               {
-                value: selectedEntity ? selectedEntity.id : "",
+                value: entity ? entity.documentId : "",
                 placeholder: formatMessage({
                   id: getTranslation("modal.internalItem.entity.placeholder"),
                   defaultMessage: "Select an entity"
                 }),
                 onChange: (value) => {
                   const flatEntities = availableEntities.flatMap((group) => group.entities);
-                  const route = flatEntities.find((route2) => route2.id === Number(value));
-                  if (route) setSelectedEntity(route);
+                  const route2 = flatEntities.find((route3) => route3.documentId === value);
+                  if (route2) setEntity(route2);
                 },
                 disabled: !selectedContentType || selectedContentType?.entities && selectedContentType?.entities.length === 0,
                 children: selectedContentType && selectedContentType.entities?.map(
-                  (entity) => /* @__PURE__ */ jsxs(SingleSelectOption, { value: entity.id, children: [
-                    entity.id,
-                    " - ",
-                    entity[selectedContentType.contentType.default]
-                  ] }, entity.id)
+                  (entity2) => /* @__PURE__ */ jsx(SingleSelectOption, { value: entity2.documentId, children: entity2[selectedContentType.contentType.default] }, entity2.id)
                 )
               }
             )
           ] }) }) })
         ] }),
-        selectedEntity && selectedContentType && /* @__PURE__ */ jsxs(Fragment, { children: [
+        entity && selectedContentType && /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx(Box, { paddingBottom: 6, paddingTop: 6, children: /* @__PURE__ */ jsx(Divider, {}) }),
-          /* @__PURE__ */ jsx(
+          loadingRoute || !route ? /* @__PURE__ */ jsx(FullLoader, { height: 50 }) : /* @__PURE__ */ jsx(
             ItemDetails,
             {
               navItemState,
-              dispatchItemState,
+              dispatchNavItemState,
               path,
               dispatchPath,
               validationState,
-              replacement
+              parentNavItem: actionItemParent,
+              navigationItems,
+              navigations,
+              debouncedCheckUrl,
+              route,
+              modalVariant: "create"
             }
           )
         ] })
@@ -6398,23 +6549,35 @@ function ItemEditComponent({
   selectedContentType,
   setSelectedContentType,
   entities,
-  replacement,
   validationState,
   initialState,
   navItemState,
-  dispatchItemState,
+  dispatchNavItemState,
   path,
   dispatchPath,
   debouncedCheckUrl,
   setModalType,
+  navigationItems,
   onEdit
 }) {
   const { formatMessage } = useIntl();
+  const parentNavItem = useMemo(() => {
+    return findParentNavItem({
+      navigationItems,
+      targetItem: item,
+      onlyInternalItems: true
+    });
+  }, [navigationItems, item]);
   useEffect(() => {
-    dispatchPath({ type: "NO_TRANSFORM_AND_CHECK", payload: item.route.path });
-    dispatchItemState({ type: "SET_TITLE", payload: item.route.title });
-    dispatchItemState({ type: "SET_SLUG", payload: item.route.slug });
-    dispatchItemState({ type: "SET_ACTIVE", payload: item.route.active });
+    const parentPath = parentNavItem?.clientModifications?.path || parentNavItem?.route.path || "";
+    const initialPath = `${parentPath}/${item.route.slug}`;
+    dispatchPath({ type: "DEFAULT", payload: initialPath });
+    dispatchPath({ type: "SET_SLUG", payload: item.route.slug });
+    dispatchPath({ type: "SET_INITIALPATH", payload: initialPath });
+    dispatchPath({ type: "SET_CANONICALPATH", payload: item.route.canonicalPath });
+    dispatchNavItemState({ type: "SET_TITLE", payload: item.route.title });
+    dispatchNavItemState({ type: "SET_ACTIVE", payload: item.route.active });
+    dispatchNavItemState({ type: "SET_OVERRIDE", payload: item.route.isOverride });
     const initialValues = {
       title: item.route.title,
       active: item.route.active,
@@ -6422,8 +6585,7 @@ function ItemEditComponent({
       slug: item.route.slug
     };
     initialState.current = initialValues;
-    dispatchPath({ type: "SET_INITIALPATH", payload: item.route.path });
-  }, []);
+  }, [navigationItems, item, parentNavItem]);
   useEffect(() => {
     if (!entities) return;
     const contentType = entities.find((group) => group.contentType.uid === item.route.relatedContentType);
@@ -6432,38 +6594,27 @@ function ItemEditComponent({
   useEffect(() => {
     if (path.needsUrlCheck && path.value) {
       if (path.uidPath === path.value || path.initialPath === path.value) return;
-      debouncedCheckUrl(path.value, item.route.documentId);
+      debouncedCheckUrl({ url: path.value, routeDocumentId: item.route.documentId });
       dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
     }
   }, [path.needsUrlCheck, item.route.documentId]);
-  const debouncedValueEffect = useMemo(
-    () => debounce((path2) => {
-      dispatchPath({ type: "DEFAULT", payload: path2 });
-    }, 500),
-    []
-  );
-  const handlePathChange = (newPath) => {
-    if (newPath === path.prevValue) return;
-    dispatchPath({ type: "NO_TRANSFORM_AND_CHECK", payload: newPath });
-    if (newPath === "") return;
-    debouncedValueEffect(newPath);
-  };
   const updateItem = async () => {
     try {
       if (lodashExports.isEqual(navItemState, initialState.current) && path.value === path.initialPath) return;
       const isOverride = path.value !== item.route.path ? true : navItemState.isOverride;
       onEdit({
         ...item,
-        update: {
+        clientModifications: {
+          type: "update",
           title: navItemState.title,
-          slug: navItemState.slug,
+          slug: path.slug,
           path: path.value,
           isOverride
         }
       });
       setModalType("");
     } catch (err) {
-      console.log(err);
+      strapi.log.error(err);
     }
   };
   if (!selectedContentType) return null;
@@ -6508,53 +6659,25 @@ function ItemEditComponent({
             )
           ] }) }) })
         ] }),
-        /* @__PURE__ */ jsx(Box, { paddingBottom: 6, paddingTop: 6, children: /* @__PURE__ */ jsx(Divider, {}) }),
-        /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Grid.Root, { gap: 8, children: [
-          /* @__PURE__ */ jsx(Grid.Item, { col: 6, s: 12, alignItems: "baseline", children: /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(Field.Root, { children: [
-            /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
-              id: getTranslation("modal.item.titleField.label"),
-              defaultMessage: "Title"
-            }) }),
-            /* @__PURE__ */ jsx(
-              Field.Input,
-              {
-                placeholder: formatMessage({
-                  id: getTranslation("modal.item.titleField.placeholder"),
-                  defaultMessage: "e.g. About us"
-                }),
-                name: "title",
-                value: navItemState.title || "",
-                onChange: (e) => dispatchItemState({ type: "SET_TITLE", payload: e.target.value }),
-                required: true
-              }
-            )
-          ] }) }) }),
-          /* @__PURE__ */ jsx(Grid.Item, { col: 6, s: 12, children: /* @__PURE__ */ jsxs(Box, { width: "100%", children: [
-            /* @__PURE__ */ jsxs(Field.Root, { children: [
-              /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
-                id: getTranslation("modal.item.pathField.label"),
-                defaultMessage: "Path"
-              }) }),
-              /* @__PURE__ */ jsx(
-                Field.Input,
-                {
-                  placeholder: formatMessage({
-                    id: getTranslation("modal.item.pathField.placeholder"),
-                    defaultMessage: "e.g. about/"
-                  }),
-                  value: path.value || "",
-                  onChange: (e) => handlePathChange(e.target.value),
-                  onBlur: (e) => {
-                    if (e.target.value === path.prevValue) return;
-                    dispatchPath({ type: "DEFAULT", payload: e.target.value });
-                  },
-                  required: true
-                }
-              )
-            ] }),
-            /* @__PURE__ */ jsx(PathInfo, { validationState, replacement })
-          ] }) })
-        ] }) })
+        item && /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(Box, { paddingBottom: 6, paddingTop: 6, children: /* @__PURE__ */ jsx(Divider, {}) }),
+          /* @__PURE__ */ jsx(
+            ItemDetails,
+            {
+              navItemState,
+              dispatchNavItemState,
+              path,
+              dispatchPath,
+              validationState,
+              parentNavItem,
+              navigationItems,
+              debouncedCheckUrl,
+              item,
+              route: item.route,
+              modalVariant: "edit"
+            }
+          )
+        ] })
       ]
     }
   );
@@ -6570,40 +6693,37 @@ function WrapperItemComponent(props) {
   const {
     variant,
     navItemState,
-    dispatchItemState,
+    dispatchNavItemState,
     dispatchPath,
     setModalType,
     selectedNavigation
   } = props;
-  const parentId = isWrapperCreateProps(props) ? props.parentId : void 0;
+  const actionItemParentId = isWrapperCreateProps(props) ? props.actionItemParentId : void 0;
   const onCreate = isWrapperCreateProps(props) ? props.onCreate : void 0;
   const onSave = isWrapperEditProps(props) ? props.onSave : void 0;
   const item = isWrapperEditProps(props) ? props.item : void 0;
   const { formatMessage } = useIntl();
   useEffect(() => {
     if (variant !== "WrapperEdit" || !item) return;
-    dispatchItemState({ type: "SET_TITLE", payload: item.route.title });
-    dispatchItemState({ type: "SET_ACTIVE", payload: item.route.active });
+    dispatchNavItemState({ type: "SET_TITLE", payload: item.route.title });
+    dispatchNavItemState({ type: "SET_ACTIVE", payload: item.route.active });
     dispatchPath({ type: "NO_TRANSFORM_AND_CHECK", payload: item.route.path });
   }, []);
   const onConfirm = async () => {
     try {
       if (!navItemState.title || !selectedNavigation) return;
-      const data = {
-        title: navItemState.title,
-        active: navItemState.active,
-        type: "wrapper"
-      };
       if (variant === "WrapperEdit" && item && onSave) {
         onSave({
           ...item,
-          update: {
-            ...data
+          clientModifications: {
+            ...item.clientModifications,
+            type: "update",
+            title: navItemState.title
           }
         });
       } else if (onCreate) {
         const newItem = createTempNavItemObject({
-          parentId,
+          actionItemParentId,
           entityRoute: null,
           selectedNavigation,
           navItemState,
@@ -6615,7 +6735,7 @@ function WrapperItemComponent(props) {
       }
       setModalType("");
     } catch (err) {
-      console.log(err);
+      strapi.log.error(err);
     }
   };
   return /* @__PURE__ */ jsx(
@@ -6644,7 +6764,7 @@ function WrapperItemComponent(props) {
             }),
             name: "title",
             value: navItemState.title || "",
-            onChange: (e) => dispatchItemState({ type: "SET_TITLE", payload: e.target.value }),
+            onChange: (e) => dispatchNavItemState({ type: "SET_TITLE", payload: e.target.value }),
             required: true
           }
         )
@@ -6687,32 +6807,111 @@ function getMaxDepth({ previousItem, maxDepthValue }) {
 function getDragDepth(offset, indentationWidth2) {
   return Math.round(offset / indentationWidth2);
 }
-function RouteIcon({ type, color = "neutral800" }) {
+function RouteItemMenu({
+  item,
+  depth,
+  maxDepth,
+  handleEdit,
+  handleAddChildren,
+  handleDelete,
+  handleRestore
+}) {
+  const { formatMessage } = useIntl();
+  const viewEntityTo = item.route.relatedContentType && item.route.relatedDocumentId ? `/content-manager/collection-types/${item.route.relatedContentType}/${item.route.relatedDocumentId}` : null;
+  return /* @__PURE__ */ jsxs(SimpleMenu, { label: "Item actions", tag: IconButton, icon: /* @__PURE__ */ jsx(More, {}), children: [
+    (item.clientModifications?.type === "delete" || item.clientModifications?.type === "update") && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(MenuItem, { onClick: () => handleRestore(), children: formatMessage({
+      id: getTranslation("restore.metadata"),
+      defaultMessage: "Restore Metadata"
+    }) }) }),
+    item.clientModifications?.type !== "delete" && /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(MenuItem, { onClick: () => handleEdit(), children: formatMessage({
+        id: getTranslation("edit"),
+        defaultMessage: "Edit"
+      }) }),
+      item.route.type === "internal" && viewEntityTo && /* @__PURE__ */ jsx(
+        MenuItem,
+        {
+          isLink: true,
+          as: Link,
+          to: viewEntityTo,
+          children: /* @__PURE__ */ jsx(Typography, { children: formatMessage({
+            id: getTranslation("navigation.page.navItem.viewEntity"),
+            defaultMessage: "View Entity"
+          }) })
+        }
+      ),
+      depth !== void 0 && depth < maxDepth && /* @__PURE__ */ jsx(MenuItem, { onClick: () => handleAddChildren(), children: formatMessage({
+        id: getTranslation("navigation.page.navItem.addChildren"),
+        defaultMessage: "Add children"
+      }) }),
+      /* @__PURE__ */ jsx(MenuItem, { onClick: () => handleDelete(), children: /* @__PURE__ */ jsx(Typography, { textColor: "danger600", children: formatMessage({
+        id: getTranslation("delete"),
+        defaultMessage: "Delete"
+      }) }) })
+    ] })
+  ] });
+}
+function RouteItemStatus({
+  item,
+  isUpdated = false
+}) {
+  if (!item) return null;
+  const { formatMessage } = useIntl();
+  if (item.clientModifications?.type === "create")
+    return /* @__PURE__ */ jsx(
+      Badge,
+      {
+        backgroundColor: "success100",
+        textColor: "success600",
+        borderColor: "success200",
+        children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: formatMessage({
+          id: getTranslation("new"),
+          defaultMessage: "New"
+        }) })
+      }
+    );
+  if (item.clientModifications?.type === "update" || isUpdated)
+    return /* @__PURE__ */ jsx(
+      Badge,
+      {
+        backgroundColor: "warning100",
+        textColor: "warning600",
+        borderColor: "warning200",
+        children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: formatMessage({
+          id: getTranslation("updated"),
+          defaultMessage: "Updated"
+        }) })
+      }
+    );
+  if (item.clientModifications?.type === "delete")
+    return /* @__PURE__ */ jsx(
+      Badge,
+      {
+        backgroundColor: "danger100",
+        textColor: "danger600",
+        borderColor: "danger200",
+        children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: formatMessage({
+          id: getTranslation("deleted"),
+          defaultMessage: "Deleted"
+        }) })
+      }
+    );
+  return null;
+}
+function RouteItemIcon({ type, color = "neutral800" }) {
   switch (type) {
     case "external":
       return /* @__PURE__ */ jsx(ExternalLink, { color });
     case "wrapper":
       return /* @__PURE__ */ jsx(OneToMany, { color });
     case "internal":
-      return /* @__PURE__ */ jsx(Link, { color });
+      return /* @__PURE__ */ jsx(Link$1, { color });
     default:
       return /* @__PURE__ */ jsx(Box, { width: "16px", height: "16px" });
   }
 }
-const RouteItem = forwardRef(({
-  item,
-  setParentId,
-  setActionItem,
-  setNavigationItems,
-  ghost,
-  depth,
-  maxDepth,
-  style,
-  wrapperRef,
-  handleProps
-}, ref) => {
-  if (!item || !item.route) return null;
-  const { setModalType } = useContext(ModalContext);
+function RouteItemBadge({ item }) {
+  if (item.route.type !== "internal" || !item.status) return null;
   const { formatMessage } = useIntl();
   const itemStatusOptions = {
     published: {
@@ -6720,25 +6919,119 @@ const RouteItem = forwardRef(({
         id: getTranslation("published"),
         defaultMessage: "Published"
       }),
-      variant: "primary"
+      backgroundColor: "success100",
+      textColor: "success600",
+      borderColor: "success200"
     },
     draft: {
       status: formatMessage({
         id: getTranslation("draft"),
         defaultMessage: "Draft"
       }),
-      variant: "secondary"
+      backgroundColor: "secondary100",
+      textColor: "secondary600",
+      borderColor: "secondary200"
     },
     modified: {
       status: formatMessage({
         id: getTranslation("modified"),
         defaultMessage: "Modified"
       }),
-      variant: "alternative"
+      backgroundColor: "alternative100",
+      textColor: "alternative600",
+      borderColor: "alternative200"
+    }
+  };
+  return /* @__PURE__ */ jsx(
+    Badge,
+    {
+      backgroundColor: itemStatusOptions[item.status].backgroundColor,
+      textColor: itemStatusOptions[item.status].textColor,
+      borderColor: itemStatusOptions[item.status].borderColor,
+      children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: itemStatusOptions[item.status].status })
     }
+  );
+}
+const RouteItem = forwardRef(({
+  item,
+  initialItem,
+  setActionItemParent,
+  setActionItem,
+  setNavigationItems,
+  ghost,
+  depth,
+  maxDepth,
+  style,
+  wrapperRef,
+  handleProps,
+  navigationItems
+}, ref) => {
+  const { setModalType } = useContext(ModalContext);
+  const parentNavItem = useMemo(() => findParentNavItem({
+    navigationItems,
+    targetItem: item,
+    onlyInternalItems: true
+  }), [navigationItems, item]);
+  const hasStructureChanges = useMemo(() => {
+    if (!initialItem) return false;
+    return initialItem.order !== item.order || initialItem.depth !== item.depth;
+  }, [initialItem, item.order, item.depth]);
+  const isUpdated = item.clientModifications?.type === "update" || hasStructureChanges;
+  const itemPath = useMemo(() => {
+    if (!item.route) return "";
+    if (item.route.type !== "internal") return item.route.path;
+    const parentPath = parentNavItem ? `${parentNavItem.clientModifications?.path || parentNavItem.route.path}/` : "";
+    const itemSlug = item.clientModifications?.slug || item.route.slug;
+    return `${parentPath}${itemSlug}`;
+  }, [item, parentNavItem, isUpdated]);
+  const updateNavItem = (navItems) => {
+    if (!navItems) return navItems;
+    return navItems.map((navItem) => {
+      if (navItem.documentId === item.documentId) {
+        if (navItem.clientModifications?.path === itemPath) {
+          return navItem;
+        }
+        return {
+          ...navItem,
+          clientModifications: navItem.clientModifications ? {
+            ...navItem.clientModifications,
+            path: itemPath
+          } : {
+            type: "update",
+            path: itemPath,
+            autoGenerated: true
+          }
+        };
+      }
+      return navItem;
+    });
   };
+  const removeNavItemModifications = (navItems) => {
+    if (!navItems) return navItems;
+    return navItems.map((navItem) => {
+      if (navItem.documentId === item.documentId) {
+        const { clientModifications, ...rest } = navItem;
+        return rest;
+      }
+      return navItem;
+    });
+  };
+  useEffect(() => {
+    if (item.route?.type !== "internal") return;
+    const shouldSyncPath = item.clientModifications?.path !== itemPath && (item.clientModifications?.type === "update" || itemPath !== item.route.path);
+    if (shouldSyncPath) {
+      setNavigationItems(updateNavItem);
+    }
+  }, [itemPath, item.documentId, item.route?.type, item.route?.path, item.clientModifications?.type, item.clientModifications?.path, setNavigationItems]);
+  useEffect(() => {
+    if (item.route?.type !== "internal") return;
+    const canBeRemoved = item.clientModifications?.autoGenerated && item.route.path === itemPath && !hasStructureChanges;
+    if (canBeRemoved) {
+      setNavigationItems(removeNavItemModifications);
+    }
+  }, [itemPath, item.documentId, item.route?.type, item.route?.path, item.clientModifications?.autoGenerated, hasStructureChanges, setNavigationItems]);
   const handleAddChildren = () => {
-    setParentId(item.documentId);
+    setActionItemParent(item);
     setModalType("ItemCreate");
   };
   const handleEdit = () => {
@@ -6756,8 +7049,8 @@ const RouteItem = forwardRef(({
     setNavigationItems(
       (navItems) => navItems?.map((navItem) => {
         if (navItem.documentId === item.documentId) {
-          delete navItem.update;
-          delete navItem.deleted;
+          const { clientModifications: _, ...rest } = navItem;
+          return navItem.initialClientModifications ? { ...rest, clientModifications: navItem.initialClientModifications } : rest;
         }
         return navItem;
       })
@@ -6765,9 +7058,10 @@ const RouteItem = forwardRef(({
   };
   const elStyle = {
     marginLeft: depth !== void 0 ? depth * 48 : 0,
-    opacity: ghost || item.deleted ? 0.5 : 1,
+    opacity: ghost || item.clientModifications?.type === "delete" ? 0.5 : 1,
     ...style
   };
+  if (!item || !item.route) return null;
   return /* @__PURE__ */ jsx(
     Box,
     {
@@ -6776,8 +7070,8 @@ const RouteItem = forwardRef(({
       children: /* @__PURE__ */ jsx(
         Box,
         {
-          background: item.route?.active ? "neutral0" : "neutral100",
-          borderColor: "neutral150",
+          background: "neutral0",
+          borderColor: item.clientModifications?.type === "delete" ? "danger500" : "neutral150",
           hasRadius: true,
           paddingBottom: 4,
           paddingLeft: 4,
@@ -6796,49 +7090,30 @@ const RouteItem = forwardRef(({
                   background: "neutral150"
                 }
               ),
-              /* @__PURE__ */ jsx(RouteIcon, { type: item.route.type }),
+              /* @__PURE__ */ jsx(RouteItemIcon, { type: item.route.type }),
               /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-                /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: item.update?.title ? item.update.title : item.route.title }),
-                /* @__PURE__ */ jsxs(Typography, { textColor: "neutral400", children: [
-                  item.route.type === "internal" && "/",
-                  item.update?.path ? item.update.path : item.route.path
+                /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: item.clientModifications?.title ? item.clientModifications.title : item.route.title }),
+                itemPath && /* @__PURE__ */ jsxs(Typography, { textColor: "neutral400", children: [
+                  "/",
+                  itemPath
                 ] })
               ] }),
-              item.isNew && !item.deleted && /* @__PURE__ */ jsx(Status, { variant: "alternative", size: "S", children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: formatMessage({
-                id: getTranslation("new"),
-                defaultMessage: "New"
-              }) }) }),
-              item.update && !item.deleted && /* @__PURE__ */ jsx(Status, { variant: "alternative", size: "S", children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: formatMessage({
-                id: getTranslation("updated"),
-                defaultMessage: "Updated"
-              }) }) }),
-              item.deleted && /* @__PURE__ */ jsx(Status, { size: "S", children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: "danger500", children: formatMessage({
-                id: getTranslation("deleted"),
-                defaultMessage: "Deleted"
-              }) }) })
+              /* @__PURE__ */ jsx(RouteItemStatus, { item, isUpdated: hasStructureChanges })
             ] }),
             /* @__PURE__ */ jsxs(Flex, { direction: "row", gap: 4, children: [
-              item.route.type === "internal" && item.status && /* @__PURE__ */ jsx(Status, { variant: itemStatusOptions[item.status].variant, size: "S", children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: itemStatusOptions[item.status].status }) }),
-              /* @__PURE__ */ jsxs(SimpleMenu, { label: "Item actions", tag: IconButton, icon: /* @__PURE__ */ jsx(More, {}), children: [
-                !item.deleted && /* @__PURE__ */ jsxs(Fragment, { children: [
-                  /* @__PURE__ */ jsx(MenuItem, { onClick: () => handleEdit(), children: formatMessage({
-                    id: getTranslation("edit"),
-                    defaultMessage: "Edit"
-                  }) }),
-                  depth !== void 0 && depth < maxDepth && /* @__PURE__ */ jsx(MenuItem, { onClick: () => handleAddChildren(), children: formatMessage({
-                    id: getTranslation("navigation.page.navItem.addChildren"),
-                    defaultMessage: "Add children"
-                  }) }),
-                  /* @__PURE__ */ jsx(MenuItem, { onClick: () => handleDelete(), children: /* @__PURE__ */ jsx(Typography, { textColor: "danger600", children: formatMessage({
-                    id: getTranslation("delete"),
-                    defaultMessage: "Delete"
-                  }) }) })
-                ] }),
-                (item.deleted || item.update) && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(MenuItem, { onClick: () => handleRestore(), children: formatMessage({
-                  id: getTranslation("restore"),
-                  defaultMessage: "Restore"
-                }) }) })
-              ] })
+              /* @__PURE__ */ jsx(RouteItemBadge, { item }),
+              /* @__PURE__ */ jsx(
+                RouteItemMenu,
+                {
+                  item,
+                  depth,
+                  maxDepth,
+                  handleEdit,
+                  handleAddChildren,
+                  handleDelete,
+                  handleRestore
+                }
+              )
             ] })
           ] })
         }
@@ -7907,7 +8182,7 @@ const Navigation = () => {
   const [navigationItems, setNavigationItems] = useState();
   const initialNavigationItemsRef = useRef(null);
   const [actionItem, setActionItem] = useState();
-  const [parentId, setParentId] = useState();
+  const [actionItemParent, setActionItemParent] = useState(null);
   const { getNavigation, updateNavigationItemStructure } = useApi();
   const [isSavingNavigation, setIsSavingNavigation] = useState(false);
   const [loading, setLoading] = useState(true);
@@ -7937,7 +8212,7 @@ const Navigation = () => {
                 const { data: data2 } = await get(`/content-manager/collection-types/${ct}/${id}`);
                 return { ...item, status: data2.data.status };
               } catch (err) {
-                console.error(err);
+                strapi.log.error(err);
                 return item;
               }
             })
@@ -7961,7 +8236,7 @@ const Navigation = () => {
       cachedNavigations.current = updatedNavigations;
       switchNavigation(selectedNav, updatedNavigations);
     } catch (error) {
-      console.error("Error fetching navigations: ", error);
+      strapi.log.error("Error fetching navigations: ", error);
       toggleNotification({
         type: "danger",
         message: formatMessage({
@@ -8003,17 +8278,27 @@ const Navigation = () => {
   useEffect(() => {
     if (modalType === "NavOverview" || modalType === "") {
       setActionItem(void 0);
-      setParentId(void 0);
+      setActionItemParent(null);
     }
   }, [modalType]);
+  useEffect(() => {
+    if (!selectedNavigation || !navigationItems) return;
+    setNavigations(navigations.map((nav) => {
+      if (nav.documentId !== selectedNavigation.documentId) return nav;
+      return {
+        ...nav,
+        items: navigationItems
+      };
+    }));
+  }, [setNavigations, navigationItems, selectedNavigation]);
   useEffect(() => {
     if (!activeId || !navigationItems) return;
     const item = navigationItems.find(({ id }) => id === activeId);
     setActiveItem(item);
   }, [navigationItems, activeId]);
   function handleSoftAddedItem(newItem) {
-    if (newItem.isNew?.parent) {
-      const parentIndex = navigationItems?.findIndex((item) => item.documentId === newItem.isNew?.parent);
+    if (newItem.clientModifications?.parent) {
+      const parentIndex = navigationItems?.findIndex((item) => item.documentId === newItem.clientModifications?.parent);
       if (parentIndex !== void 0 && parentIndex >= 0) {
         const parentDepth = navigationItems ? navigationItems[parentIndex].depth || 0 : 0;
         newItem.depth = parentDepth + 1;
@@ -8041,7 +8326,7 @@ const Navigation = () => {
         })
       });
     } catch (e) {
-      console.error(e);
+      strapi.log.error(e);
       toggleNotification({
         type: "danger",
         message: formatMessage({
@@ -8143,28 +8428,34 @@ const Navigation = () => {
           onDragCancel: () => handleDragCancel(),
           measuring,
           children: /* @__PURE__ */ jsxs(SortableContext, { items: navigationItems, strategy: verticalListSortingStrategy, children: [
-            navigationItems.map((item, index) => config?.navigation.maxDepth && /* @__PURE__ */ jsx(
-              SortableRouteItem,
-              {
-                item,
-                setParentId,
-                setActionItem,
-                setNavigationItems,
-                indentationWidth,
-                depth: item.id === activeId && projected ? projected.depth : item.depth,
-                maxDepth: config.navigation.maxDepth
-              },
-              item.documentId || index
-            )),
+            navigationItems.map((item, index) => {
+              const initialItem = initialNavigationItemsRef.current?.find((i) => i.documentId === item.documentId);
+              return config?.navigation.maxDepth && /* @__PURE__ */ jsx(
+                SortableRouteItem,
+                {
+                  item,
+                  initialItem,
+                  setActionItemParent,
+                  setActionItem,
+                  setNavigationItems,
+                  indentationWidth,
+                  depth: item.id === activeId && projected ? projected.depth : item.depth,
+                  maxDepth: config.navigation.maxDepth,
+                  navigationItems
+                },
+                item.documentId || index
+              );
+            }),
             createPortal(
               /* @__PURE__ */ jsx(DragOverlay, { children: activeId && activeItem ? config?.navigation.maxDepth && /* @__PURE__ */ jsx(
                 SortableRouteItem,
                 {
                   item: activeItem,
-                  setParentId,
+                  setActionItemParent,
                   setActionItem,
                   setNavigationItems,
-                  maxDepth: config.navigation.maxDepth
+                  maxDepth: config.navigation.maxDepth,
+                  navigationItems
                 }
               ) : null }),
               document.body
@@ -8224,7 +8515,9 @@ const Navigation = () => {
     modalType === "ItemCreate" && /* @__PURE__ */ jsx(
       ItemCreate,
       {
-        parentId,
+        actionItemParent,
+        navigationItems: navigationItems || [],
+        navigations,
         onCreate: (newItem) => {
           handleSoftAddedItem(newItem);
         }
@@ -8246,6 +8539,7 @@ const Navigation = () => {
       ItemEdit,
       {
         item: actionItem,
+        navigationItems: navigationItems || [],
         onEdit: (editedItem) => {
           setNavigationItems(
             (items) => items?.map((item) => item.id === editedItem.id ? editedItem : item)
@@ -8257,7 +8551,7 @@ const Navigation = () => {
       ExternalItem,
       {
         variant: modalType,
-        parentId,
+        actionItemParentId: actionItemParent?.documentId,
         onCreate: (newItem) => {
           handleSoftAddedItem(newItem);
         }
@@ -8279,7 +8573,7 @@ const Navigation = () => {
       WrapperItem,
       {
         variant: modalType,
-        parentId,
+        actionItemParentId: actionItemParent?.documentId,
         onCreate: (newItem) => {
           handleSoftAddedItem(newItem);
         }