strapi-plugin-navigation 3.0.0-beta.2 → 3.0.0-beta.3

package/README.md

@@ -121,7 +121,7 @@ Complete installation requirements are exact same as for Strapi itself and can b
 
 **Supported Strapi versions**:
 
-- Strapi v5.0.6 (recently tested)
+- Strapi v5.1.0 (recently tested)
 - Strapi v5.x
 
 > This plugin is designed for **Strapi v5** and is not working with v4.x. To get version for **Strapi v4** install version [v4.x](https://github.com/VirtusLab-Open-Source/strapi-plugin-navigation/tree/strapi-v4).
@@ -373,7 +373,7 @@ NOTE: All params are optional
     "visible": true,
     "createdAt": "2023-09-29T12:45:54.399Z",
     "updatedAt": "2023-09-29T13:44:08.702Z",
-    "localeCode": "pl"
+    "locale": "pl"
   },
   {
     "id": 384,
@@ -382,7 +382,7 @@ NOTE: All params are optional
     "visible": true,
     "createdAt": "2023-09-29T12:45:54.399Z",
     "updatedAt": "2023-09-29T13:44:08.725Z",
-    "localeCode": "fr"
+    "locale": "fr"
   },
   {
     "id": 382,
@@ -391,7 +391,7 @@ NOTE: All params are optional
     "visible": true,
     "createdAt": "2023-09-29T12:45:54.173Z",
     "updatedAt": "2023-09-29T13:44:08.747Z",
-    "localeCode": "en"
+    "locale": "en"
   },
   {
     "id": 374,
@@ -400,7 +400,7 @@ NOTE: All params are optional
     "visible": true,
     "createdAt": "2023-09-29T12:22:30.373Z",
     "updatedAt": "2023-09-29T13:44:08.631Z",
-    "localeCode": "pl"
+    "locale": "pl"
   },
   {
     "id": 375,
@@ -409,7 +409,7 @@ NOTE: All params are optional
     "visible": true,
     "createdAt": "2023-09-29T12:22:30.373Z",
     "updatedAt": "2023-09-29T13:44:08.658Z",
-    "localeCode": "fr"
+    "locale": "fr"
   },
   {
     "id": 373,
@@ -418,7 +418,7 @@ NOTE: All params are optional
     "visible": true,
     "createdAt": "2023-09-29T12:22:30.356Z",
     "updatedAt": "2023-09-29T13:44:08.680Z",
-    "localeCode": "en"
+    "locale": "en"
   }
 ]
 ```

package/dist/_chunks/{ca-DIZHA0OL.mjs → ca-Catou0wg.mjs}

@@ -432,6 +432,10 @@ const ca = {
     }
   },
   components: {
+    toggle: {
+      enabled: "Activé",
+      disabled: "Désactivé"
+    },
     navigationItem: {
       action: {
         newItem: "Ajouter un élément imbriqué",

package/dist/_chunks/{ca-Bjfh0w36.js → ca-DtaqQvTI.js}

@@ -434,6 +434,10 @@ const ca = {
     }
   },
   components: {
+    toggle: {
+      enabled: "Activé",
+      disabled: "Désactivé"
+    },
     navigationItem: {
       action: {
         newItem: "Ajouter un élément imbriqué",

package/dist/admin/index.js

@@ -13815,7 +13815,7 @@ class TreeCursor {
     return this.move(1, enter);
   }
   /**
-  Move to the next node in a last-to-first pre-order traveral. A
+  Move to the next node in a last-to-first pre-order traversal. A
   node is followed by its last child or, if it has none, its
   previous sibling or the previous sibling of the first parent
   node that has one.
@@ -13890,10 +13890,10 @@ class TreeCursor {
         if (mustLeave && leave)
           leave(this);
         mustLeave = this.type.isAnonymous;
-        if (this.nextSibling())
-          break;
         if (!depth)
           return;
+        if (this.nextSibling())
+          break;
         this.parent();
         depth--;
         mustLeave = true;
@@ -50403,7 +50403,7 @@ const Field = ({ children, name: name2, hint, label, error, required }) => {
 const trads = {
   en: () => Promise.resolve().then(() => require("../_chunks/en-CT7eKHZS.js")),
   fr: () => Promise.resolve().then(() => require("../_chunks/fr-ybbSdjZO.js")),
-  ca: () => Promise.resolve().then(() => require("../_chunks/ca-Bjfh0w36.js"))
+  ca: () => Promise.resolve().then(() => require("../_chunks/ca-DtaqQvTI.js"))
 };
 const getTradId = (msg) => `${PLUGIN_ID}.${msg}`;
 const getTrad = (msg, defaultMessage) => ({
@@ -50525,7 +50525,7 @@ const navigationSchema = z__namespace.object({
   documentId: z__namespace.string(),
   name: z__namespace.string(),
   slug: z__namespace.string(),
-  localeCode: z__namespace.string(),
+  locale: z__namespace.string(),
   visible: z__namespace.boolean(),
   items: z__namespace.array(navigationItemSchema)
 });
@@ -50766,6 +50766,12 @@ const getApiClient = lodash$1.once((fetch) => ({
   readConfigIndex() {
     return [URL_PREFIX, "config"];
   },
+  healthCheck() {
+    return fetch.get(`/_health`);
+  },
+  healthCheckIndex() {
+    return ["health"];
+  },
   readNavigationItemFromLocale({
     source,
     structureId,
@@ -51509,7 +51515,7 @@ const AllNavigations = ({ navigations, selected, setState }) => {
   const purgeSelected = React.useCallback(purgeCache(selected), [purgeCache]);
   const getLocalizations = (focused) => [focused].concat(
     navigations.filter(
-      (navigation2) => navigation2.documentId === focused.documentId && navigation2.localeCode !== focused.localeCode
+      (navigation2) => navigation2.documentId === focused.documentId && navigation2.locale !== focused.locale
     )
   );
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -51537,7 +51543,7 @@ const AllNavigations = ({ navigations, selected, setState }) => {
           }
         ) }) }) : null })
       ] }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(Tbody, { children: navigations.filter(({ localeCode }) => localeCode === localeQuery.data?.defaultLocale).map((navigation2) => /* @__PURE__ */ jsxRuntime.jsxs(Tr, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(Tbody, { children: navigations.filter(({ locale }) => locale === localeQuery.data?.defaultLocale).map((navigation2) => /* @__PURE__ */ jsxRuntime.jsxs(Tr, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsx(
           CheckboxImpl,
           {
@@ -51550,7 +51556,7 @@ const AllNavigations = ({ navigations, selected, setState }) => {
         ) }),
         /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { textColor: "neutral800", children: navigation2.documentId }) }),
         /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { textColor: "neutral800", children: navigation2.name }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { textColor: "neutral800", children: getLocalizations(navigation2).map(fp.prop("localeCode")).join(", ") }) }),
+        /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { textColor: "neutral800", children: getLocalizations(navigation2).map(fp.prop("locale")).join(", ") }) }),
         /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { textColor: "neutral800", children: navigation2.visible ? formatMessage(getTrad("popup.navigation.manage.navigation.visible")) : formatMessage(getTrad("popup.navigation.manage.navigation.hidden")) }) }),
         /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsxs(Flex, { width: "100%", direction: "row", alignItems: "center", justifyContent: "flex-end", children: [
           /* @__PURE__ */ jsxRuntime.jsx(Box, { paddingLeft: 1, children: /* @__PURE__ */ jsxRuntime.jsx(
@@ -52070,7 +52076,7 @@ const NavigationHeader = ({
                   value: activeNavigation?.documentId,
                   size: "S",
                   style: null,
-                  children: availableNavigations.filter(({ localeCode }) => localeCode === currentLocale).map(({ documentId, name: name2 }) => /* @__PURE__ */ jsxRuntime.jsx(SingleSelectOption, { value: documentId, children: name2 }, documentId))
+                  children: availableNavigations.filter(({ locale: locale2 }) => locale2 === currentLocale).map(({ documentId, name: name2 }) => /* @__PURE__ */ jsxRuntime.jsx(SingleSelectOption, { value: documentId, children: name2 }, documentId))
                 }
               ) }) }),
               hasLocalizations ? /* @__PURE__ */ jsxRuntime.jsx(Grid.Item, { col: 2, children: /* @__PURE__ */ jsxRuntime.jsx(
@@ -53262,7 +53268,7 @@ const NavigationItemForm = ({
       event.preventDefault();
       event.stopPropagation();
       const source = navigationsQuery.data?.find(
-        ({ localeCode }) => localeCode === itemLocaleCopyValue
+        ({ locale: locale2 }) => locale2 === itemLocaleCopyValue
       );
       if (source) {
         setIsLoading(true);
@@ -53811,6 +53817,7 @@ const queryClient$1 = new reactQuery.QueryClient();
 const Inner$1 = () => {
   const { formatMessage } = reactIntl.useIntl();
   const localeQuery = useLocale();
+  const [recentNavigation, setRecentNavigation] = React.useState();
   const [currentNavigation, setCurrentNavigation] = React.useState();
   const [activeNavigationItem, setActiveNavigationItemState] = React.useState();
   const [isItemPopupVisible, setIsItemPopupVisible] = React.useState(false);
@@ -53898,14 +53905,14 @@ const Inner$1 = () => {
     React.useCallback(
       (sourceLocale) => {
         const source = navigationsQuery.data?.find(
-          ({ localeCode, documentId }) => localeCode === sourceLocale && documentId === currentNavigation?.documentId
+          ({ locale, documentId }) => locale === sourceLocale && documentId === currentNavigation?.documentId
         );
         if (source) {
           if (source.documentId && currentNavigation?.documentId) {
             copyNavigationI18nMutation.mutate(
               {
-                source: source.localeCode,
-                target: currentNavigation.localeCode,
+                source: source.locale,
+                target: currentNavigation.locale,
                 documentId: source.documentId
               },
               {
@@ -53925,6 +53932,10 @@ const Inner$1 = () => {
     i18nCopySourceLocale && setI18nCopyModalOpened(true);
   }, [setI18nCopyModalOpened, i18nCopySourceLocale]);
   const updateNavigationMutation = useUpdateNavigation(() => {
+    setRecentNavigation({
+      documentId: currentNavigation?.documentId,
+      id: currentNavigation?.id
+    });
     setCurrentNavigation(void 0);
   });
   const submit = () => {
@@ -54054,7 +54065,14 @@ const Inner$1 = () => {
   }
   React.useEffect(() => {
     if (!currentNavigation && navigationsQuery.data?.[0]) {
-      setCurrentNavigation(navigationsQuery.data[0]);
+      let navigation2;
+      if (recentNavigation?.documentId) {
+        navigation2 = navigationsQuery.data.find(
+          (nav2) => nav2.documentId === recentNavigation.documentId && nav2.id === recentNavigation.id
+        );
+      }
+      setRecentNavigation(void 0);
+      setCurrentNavigation(navigation2 ? navigation2 : lodash$1.first(navigationsQuery.data));
     }
   }, [navigationsQuery.data]);
   React.useEffect(() => {
@@ -54063,11 +54081,12 @@ const Inner$1 = () => {
     }
   }, [navigationsQuery.data]);
   React.useEffect(() => {
-    if (currentNavigation && currentLocale !== currentNavigation.localeCode) {
+    if (currentNavigation && currentLocale !== currentNavigation.locale) {
+      setRecentNavigation(void 0);
       const nextNavigation = navigationsQuery.data?.find(
-        (navigation2) => navigation2.documentId === currentNavigation.documentId && navigation2.localeCode === currentLocale
+        (navigation2) => navigation2.documentId === currentNavigation.documentId && navigation2.locale === currentLocale
       );
-      if (nextNavigation && nextNavigation.documentId === currentNavigation.documentId && nextNavigation.localeCode !== currentNavigation.localeCode) {
+      if (nextNavigation && nextNavigation.documentId === currentNavigation.documentId && nextNavigation.locale !== currentNavigation.locale) {
         setCurrentNavigation(nextNavigation);
       }
     }
@@ -54632,8 +54651,17 @@ const useConfig = () => {
 const useRestart = () => {
   const fetch = admin.getFetchClient();
   const apiClient = getApiClient(fetch);
+  const healthCheck = reactQuery.useQuery({
+    queryKey: apiClient.healthCheckIndex(),
+    queryFn: () => apiClient.healthCheck(),
+    retry: true,
+    retryDelay: 1e3 * 5,
+    enabled: false
+  });
   return reactQuery.useMutation({
-    mutationFn: () => apiClient.restart()
+    mutationFn: () => {
+      return apiClient.restart().then(() => healthCheck.refetch());
+    }
   });
 };
 const useRestoreConfig = () => {
@@ -54845,12 +54873,13 @@ const Inner = () => {
     restartMutation.mutate(void 0, {
       onSuccess() {
         setRestartStatus({ required: false });
+        window.location.reload();
       },
       onError() {
         setRestartStatus({ required: false });
+        window.location.reload();
       }
     });
-    window.location.reload();
   };
   const handleRestartDiscard = () => setRestartStatus({ required: false });
   React.useEffect(() => {
@@ -54951,8 +54980,8 @@ const Inner = () => {
                           name: "preferCustomContentTypes",
                           checked: values.preferCustomContentTypes,
                           onChange: (eventOrPath) => handleChange(eventOrPath, !values.preferCustomContentTypes, onChange),
-                          onLabel: formatMessage(getTrad("component.toggle.enabled")),
-                          offLabel: formatMessage(getTrad("component.toggle.disabled")),
+                          onLabel: formatMessage(getTrad("components.toggle.enabled")),
+                          offLabel: formatMessage(getTrad("components.toggle.disabled")),
                           disabled: restartStatus.required,
                           width: "100%"
                         }
@@ -55213,10 +55242,17 @@ const Inner = () => {
                         {
                           width: "100%",
                           name: "allowedLevels",
+                          type: "number",
                           placeholder: formatMessage(
                             getTrad("pages.settings.form.allowedLevels.placeholder")
                           ),
-                          onChange: (eventOrPath, value) => handleChange(eventOrPath, value, onChange),
+                          onChange: (eventOrPath, value) => {
+                            if (lodash$1.isObject(eventOrPath)) {
+                              const parsedVal = parseInt(eventOrPath.target.value);
+                              return handleChange(eventOrPath.target.name, lodash$1.isNaN(parsedVal) ? 0 : parsedVal, onChange);
+                            }
+                            return handleChange(eventOrPath, value, onChange);
+                          },
                           value: values.allowedLevels,
                           disabled: restartStatus.required
                         }
@@ -55238,8 +55274,8 @@ const Inner = () => {
                           name: "cascadeMenuAttached",
                           checked: values.cascadeMenuAttached,
                           onChange: (eventOrPath) => handleChange(eventOrPath, !values.cascadeMenuAttached, onChange),
-                          onLabel: formatMessage(getTrad("component.toggle.enabled")),
-                          offLabel: formatMessage(getTrad("component.toggle.disabled")),
+                          onLabel: formatMessage(getTrad("components.toggle.enabled")),
+                          offLabel: formatMessage(getTrad("components.toggle.disabled")),
                           disabled: restartStatus.required
                         }
                       )
@@ -55257,8 +55293,8 @@ const Inner = () => {
                           name: "audienceFieldChecked",
                           checked: values.audienceFieldChecked,
                           onChange: (eventOrPath) => handleChange(eventOrPath, !values.audienceFieldChecked, onChange),
-                          onLabel: formatMessage(getTrad("component.toggle.enabled")),
-                          offLabel: formatMessage(getTrad("component.toggle.disabled")),
+                          onLabel: formatMessage(getTrad("components.toggle.enabled")),
+                          offLabel: formatMessage(getTrad("components.toggle.disabled")),
                           disabled: restartStatus.required,
                           width: "100%"
                         }
@@ -55277,8 +55313,8 @@ const Inner = () => {
                           name: "isCacheEnabled",
                           checked: values.isCacheEnabled,
                           onChange: (eventOrPath) => handleChange(eventOrPath, !values.isCacheEnabled, onChange),
-                          onLabel: formatMessage(getTrad("component.toggle.enabled")),
-                          offLabel: formatMessage(getTrad("component.toggle.disabled")),
+                          onLabel: formatMessage(getTrad("components.toggle.enabled")),
+                          offLabel: formatMessage(getTrad("components.toggle.disabled")),
                           disabled: restartStatus.required,
                           width: "100%"
                         }

package/dist/admin/index.mjs

@@ -9,7 +9,7 @@ import { Routes, Route } from "react-router-dom";
 import * as ReactDOM from "react-dom";
 import ReactDOM__default, { flushSync, createPortal } from "react-dom";
 import { useQuery, useQueryClient, useMutation, QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { once, orderBy, capitalize, get, isEmpty, first, isObject, isNil, isString, set, sortBy, isNumber, isBoolean, isArray, pick } from "lodash";
+import { once, orderBy, capitalize, get, isEmpty, first, isObject, isNil, isString, set, sortBy, isNumber, isBoolean, isArray, pick, isNaN as isNaN$1 } from "lodash";
 import { useIntl } from "react-intl";
 import * as z from "zod";
 import { z as z$1 } from "zod";
@@ -13795,7 +13795,7 @@ class TreeCursor {
     return this.move(1, enter);
   }
   /**
-  Move to the next node in a last-to-first pre-order traveral. A
+  Move to the next node in a last-to-first pre-order traversal. A
   node is followed by its last child or, if it has none, its
   previous sibling or the previous sibling of the first parent
   node that has one.
@@ -13870,10 +13870,10 @@ class TreeCursor {
         if (mustLeave && leave)
           leave(this);
         mustLeave = this.type.isAnonymous;
-        if (this.nextSibling())
-          break;
         if (!depth)
           return;
+        if (this.nextSibling())
+          break;
         this.parent();
         depth--;
         mustLeave = true;
@@ -50383,7 +50383,7 @@ const Field = ({ children, name: name2, hint, label, error, required }) => {
 const trads = {
   en: () => import("../_chunks/en-BPYZYsnc.mjs"),
   fr: () => import("../_chunks/fr-BTVWPkax.mjs"),
-  ca: () => import("../_chunks/ca-DIZHA0OL.mjs")
+  ca: () => import("../_chunks/ca-Catou0wg.mjs")
 };
 const getTradId = (msg) => `${PLUGIN_ID}.${msg}`;
 const getTrad = (msg, defaultMessage) => ({
@@ -50505,7 +50505,7 @@ const navigationSchema = z.object({
   documentId: z.string(),
   name: z.string(),
   slug: z.string(),
-  localeCode: z.string(),
+  locale: z.string(),
   visible: z.boolean(),
   items: z.array(navigationItemSchema)
 });
@@ -50746,6 +50746,12 @@ const getApiClient = once((fetch) => ({
   readConfigIndex() {
     return [URL_PREFIX, "config"];
   },
+  healthCheck() {
+    return fetch.get(`/_health`);
+  },
+  healthCheckIndex() {
+    return ["health"];
+  },
   readNavigationItemFromLocale({
     source,
     structureId,
@@ -51489,7 +51495,7 @@ const AllNavigations = ({ navigations, selected, setState }) => {
   const purgeSelected = useCallback(purgeCache(selected), [purgeCache]);
   const getLocalizations = (focused) => [focused].concat(
     navigations.filter(
-      (navigation2) => navigation2.documentId === focused.documentId && navigation2.localeCode !== focused.localeCode
+      (navigation2) => navigation2.documentId === focused.documentId && navigation2.locale !== focused.locale
     )
   );
   return /* @__PURE__ */ jsxs(Fragment$1, { children: [
@@ -51517,7 +51523,7 @@ const AllNavigations = ({ navigations, selected, setState }) => {
           }
         ) }) }) : null })
       ] }) }),
-      /* @__PURE__ */ jsx(Tbody, { children: navigations.filter(({ localeCode }) => localeCode === localeQuery.data?.defaultLocale).map((navigation2) => /* @__PURE__ */ jsxs(Tr, { children: [
+      /* @__PURE__ */ jsx(Tbody, { children: navigations.filter(({ locale }) => locale === localeQuery.data?.defaultLocale).map((navigation2) => /* @__PURE__ */ jsxs(Tr, { children: [
         /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(
           CheckboxImpl,
           {
@@ -51530,7 +51536,7 @@ const AllNavigations = ({ navigations, selected, setState }) => {
         ) }),
         /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", children: navigation2.documentId }) }),
         /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", children: navigation2.name }) }),
-        /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", children: getLocalizations(navigation2).map(prop("localeCode")).join(", ") }) }),
+        /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", children: getLocalizations(navigation2).map(prop("locale")).join(", ") }) }),
         /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", children: navigation2.visible ? formatMessage(getTrad("popup.navigation.manage.navigation.visible")) : formatMessage(getTrad("popup.navigation.manage.navigation.hidden")) }) }),
         /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsxs(Flex, { width: "100%", direction: "row", alignItems: "center", justifyContent: "flex-end", children: [
           /* @__PURE__ */ jsx(Box, { paddingLeft: 1, children: /* @__PURE__ */ jsx(
@@ -52050,7 +52056,7 @@ const NavigationHeader = ({
                   value: activeNavigation?.documentId,
                   size: "S",
                   style: null,
-                  children: availableNavigations.filter(({ localeCode }) => localeCode === currentLocale).map(({ documentId, name: name2 }) => /* @__PURE__ */ jsx(SingleSelectOption, { value: documentId, children: name2 }, documentId))
+                  children: availableNavigations.filter(({ locale: locale2 }) => locale2 === currentLocale).map(({ documentId, name: name2 }) => /* @__PURE__ */ jsx(SingleSelectOption, { value: documentId, children: name2 }, documentId))
                 }
               ) }) }),
               hasLocalizations ? /* @__PURE__ */ jsx(Grid.Item, { col: 2, children: /* @__PURE__ */ jsx(
@@ -53242,7 +53248,7 @@ const NavigationItemForm = ({
       event.preventDefault();
       event.stopPropagation();
       const source = navigationsQuery.data?.find(
-        ({ localeCode }) => localeCode === itemLocaleCopyValue
+        ({ locale: locale2 }) => locale2 === itemLocaleCopyValue
       );
       if (source) {
         setIsLoading(true);
@@ -53791,6 +53797,7 @@ const queryClient$1 = new QueryClient();
 const Inner$1 = () => {
   const { formatMessage } = useIntl();
   const localeQuery = useLocale();
+  const [recentNavigation, setRecentNavigation] = useState();
   const [currentNavigation, setCurrentNavigation] = useState();
   const [activeNavigationItem, setActiveNavigationItemState] = useState();
   const [isItemPopupVisible, setIsItemPopupVisible] = useState(false);
@@ -53878,14 +53885,14 @@ const Inner$1 = () => {
     useCallback(
       (sourceLocale) => {
         const source = navigationsQuery.data?.find(
-          ({ localeCode, documentId }) => localeCode === sourceLocale && documentId === currentNavigation?.documentId
+          ({ locale, documentId }) => locale === sourceLocale && documentId === currentNavigation?.documentId
         );
         if (source) {
           if (source.documentId && currentNavigation?.documentId) {
             copyNavigationI18nMutation.mutate(
               {
-                source: source.localeCode,
-                target: currentNavigation.localeCode,
+                source: source.locale,
+                target: currentNavigation.locale,
                 documentId: source.documentId
               },
               {
@@ -53905,6 +53912,10 @@ const Inner$1 = () => {
     i18nCopySourceLocale && setI18nCopyModalOpened(true);
   }, [setI18nCopyModalOpened, i18nCopySourceLocale]);
   const updateNavigationMutation = useUpdateNavigation(() => {
+    setRecentNavigation({
+      documentId: currentNavigation?.documentId,
+      id: currentNavigation?.id
+    });
     setCurrentNavigation(void 0);
   });
   const submit = () => {
@@ -54034,7 +54045,14 @@ const Inner$1 = () => {
   }
   useEffect(() => {
     if (!currentNavigation && navigationsQuery.data?.[0]) {
-      setCurrentNavigation(navigationsQuery.data[0]);
+      let navigation2;
+      if (recentNavigation?.documentId) {
+        navigation2 = navigationsQuery.data.find(
+          (nav2) => nav2.documentId === recentNavigation.documentId && nav2.id === recentNavigation.id
+        );
+      }
+      setRecentNavigation(void 0);
+      setCurrentNavigation(navigation2 ? navigation2 : first(navigationsQuery.data));
     }
   }, [navigationsQuery.data]);
   useEffect(() => {
@@ -54043,11 +54061,12 @@ const Inner$1 = () => {
     }
   }, [navigationsQuery.data]);
   useEffect(() => {
-    if (currentNavigation && currentLocale !== currentNavigation.localeCode) {
+    if (currentNavigation && currentLocale !== currentNavigation.locale) {
+      setRecentNavigation(void 0);
       const nextNavigation = navigationsQuery.data?.find(
-        (navigation2) => navigation2.documentId === currentNavigation.documentId && navigation2.localeCode === currentLocale
+        (navigation2) => navigation2.documentId === currentNavigation.documentId && navigation2.locale === currentLocale
       );
-      if (nextNavigation && nextNavigation.documentId === currentNavigation.documentId && nextNavigation.localeCode !== currentNavigation.localeCode) {
+      if (nextNavigation && nextNavigation.documentId === currentNavigation.documentId && nextNavigation.locale !== currentNavigation.locale) {
         setCurrentNavigation(nextNavigation);
       }
     }
@@ -54612,8 +54631,17 @@ const useConfig = () => {
 const useRestart = () => {
   const fetch = getFetchClient();
   const apiClient = getApiClient(fetch);
+  const healthCheck = useQuery({
+    queryKey: apiClient.healthCheckIndex(),
+    queryFn: () => apiClient.healthCheck(),
+    retry: true,
+    retryDelay: 1e3 * 5,
+    enabled: false
+  });
   return useMutation({
-    mutationFn: () => apiClient.restart()
+    mutationFn: () => {
+      return apiClient.restart().then(() => healthCheck.refetch());
+    }
   });
 };
 const useRestoreConfig = () => {
@@ -54825,12 +54853,13 @@ const Inner = () => {
     restartMutation.mutate(void 0, {
       onSuccess() {
         setRestartStatus({ required: false });
+        window.location.reload();
       },
       onError() {
         setRestartStatus({ required: false });
+        window.location.reload();
       }
     });
-    window.location.reload();
   };
   const handleRestartDiscard = () => setRestartStatus({ required: false });
   useEffect(() => {
@@ -54931,8 +54960,8 @@ const Inner = () => {
                           name: "preferCustomContentTypes",
                           checked: values.preferCustomContentTypes,
                           onChange: (eventOrPath) => handleChange(eventOrPath, !values.preferCustomContentTypes, onChange),
-                          onLabel: formatMessage(getTrad("component.toggle.enabled")),
-                          offLabel: formatMessage(getTrad("component.toggle.disabled")),
+                          onLabel: formatMessage(getTrad("components.toggle.enabled")),
+                          offLabel: formatMessage(getTrad("components.toggle.disabled")),
                           disabled: restartStatus.required,
                           width: "100%"
                         }
@@ -55193,10 +55222,17 @@ const Inner = () => {
                         {
                           width: "100%",
                           name: "allowedLevels",
+                          type: "number",
                           placeholder: formatMessage(
                             getTrad("pages.settings.form.allowedLevels.placeholder")
                           ),
-                          onChange: (eventOrPath, value) => handleChange(eventOrPath, value, onChange),
+                          onChange: (eventOrPath, value) => {
+                            if (isObject(eventOrPath)) {
+                              const parsedVal = parseInt(eventOrPath.target.value);
+                              return handleChange(eventOrPath.target.name, isNaN$1(parsedVal) ? 0 : parsedVal, onChange);
+                            }
+                            return handleChange(eventOrPath, value, onChange);
+                          },
                           value: values.allowedLevels,
                           disabled: restartStatus.required
                         }
@@ -55218,8 +55254,8 @@ const Inner = () => {
                           name: "cascadeMenuAttached",
                           checked: values.cascadeMenuAttached,
                           onChange: (eventOrPath) => handleChange(eventOrPath, !values.cascadeMenuAttached, onChange),
-                          onLabel: formatMessage(getTrad("component.toggle.enabled")),
-                          offLabel: formatMessage(getTrad("component.toggle.disabled")),
+                          onLabel: formatMessage(getTrad("components.toggle.enabled")),
+                          offLabel: formatMessage(getTrad("components.toggle.disabled")),
                           disabled: restartStatus.required
                         }
                       )
@@ -55237,8 +55273,8 @@ const Inner = () => {
                           name: "audienceFieldChecked",
                           checked: values.audienceFieldChecked,
                           onChange: (eventOrPath) => handleChange(eventOrPath, !values.audienceFieldChecked, onChange),
-                          onLabel: formatMessage(getTrad("component.toggle.enabled")),
-                          offLabel: formatMessage(getTrad("component.toggle.disabled")),
+                          onLabel: formatMessage(getTrad("components.toggle.enabled")),
+                          offLabel: formatMessage(getTrad("components.toggle.disabled")),
                           disabled: restartStatus.required,
                           width: "100%"
                         }
@@ -55257,8 +55293,8 @@ const Inner = () => {
                           name: "isCacheEnabled",
                           checked: values.isCacheEnabled,
                           onChange: (eventOrPath) => handleChange(eventOrPath, !values.isCacheEnabled, onChange),
-                          onLabel: formatMessage(getTrad("component.toggle.enabled")),
-                          offLabel: formatMessage(getTrad("component.toggle.disabled")),
+                          onLabel: formatMessage(getTrad("components.toggle.enabled")),
+                          offLabel: formatMessage(getTrad("components.toggle.disabled")),
                           disabled: restartStatus.required,
                           width: "100%"
                         }

package/dist/admin/src/api/client.d.ts

@@ -9,7 +9,7 @@ export declare const getApiClient: (fetch: ReturnType<typeof getFetchClient>) =>
         documentId: string;
         items: import("./validators").NavigationItemSchema[];
         slug: string;
-        localeCode: string;
+        locale: string;
         visible: boolean;
     }[]>;
     readAllIndex(): string[];
@@ -82,6 +82,8 @@ export declare const getApiClient: (fetch: ReturnType<typeof getFetchClient>) =>
         isCachePluginEnabled?: boolean | undefined;
     }>;
     readConfigIndex(): string[];
+    healthCheck(): Promise<import("@strapi/strapi/admin").FetchResponse<any>>;
+    healthCheckIndex(): string[];
     readNavigationItemFromLocale({ source, structureId, target, documentId, }: {
         source: string;
         target: string;

package/dist/admin/src/api/validators.d.ts

@@ -118,7 +118,7 @@ export declare const navigationSchema: z.ZodObject<{
     documentId: z.ZodString;
     name: z.ZodString;
     slug: z.ZodString;
-    localeCode: z.ZodString;
+    locale: z.ZodString;
     visible: z.ZodBoolean;
     items: z.ZodArray<z.ZodType<NavigationItemSchema, z.ZodTypeDef, NavigationItemSchema>, "many">;
 }, "strip", z.ZodTypeAny, {
@@ -127,7 +127,7 @@ export declare const navigationSchema: z.ZodObject<{
     documentId: string;
     items: NavigationItemSchema[];
     slug: string;
-    localeCode: string;
+    locale: string;
     visible: boolean;
 }, {
     id: number;
@@ -135,7 +135,7 @@ export declare const navigationSchema: z.ZodObject<{
     documentId: string;
     items: NavigationItemSchema[];
     slug: string;
-    localeCode: string;
+    locale: string;
     visible: boolean;
 }>;
 export type NavigationItemCustomFieldSelect = z.infer<typeof navigationItemCustomFieldSelect>;