@mattisvensson/strapi-plugin-webatlas 0.11.4 → 0.11.5

package/dist/admin/{SettingTitle-BdiDHFXF.js → SettingTitle-DGSkTF7e.js}

@@ -2,7 +2,7 @@
 const jsxRuntime = require("react/jsx-runtime");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-BkPtrXJO.js");
+const index = require("./index-Bm8lkiNL.js");
 const reactIntl = require("react-intl");
 const icons = require("@strapi/icons");
 function PageWrapper({

package/dist/admin/{SettingTitle-CcNfx_4T.mjs → SettingTitle-UPbQCuTC.mjs}

@@ -1,7 +1,7 @@
 import { jsxs, jsx } from "react/jsx-runtime";
 import { Button, Flex, Typography, Box } from "@strapi/design-system";
 import { Page, Layouts } from "@strapi/strapi/admin";
-import { f as PLUGIN_NAME, g as getTranslation } from "./index-BX3hiURm.mjs";
+import { f as PLUGIN_NAME, g as getTranslation } from "./index-Dx-EVn-t.mjs";
 import { useIntl } from "react-intl";
 import { Check } from "@strapi/icons";
 function PageWrapper({

package/dist/admin/{index-uW7YJoRU.js → index-BiXgA5Ru.js}

@@ -7,7 +7,7 @@ const designSystem = require("@strapi/design-system");
 const React = require("react");
 const ReactDOM = require("react-dom");
 const reactIntl = require("react-intl");
-const index = require("./index-BkPtrXJO.js");
+const index = require("./index-Bm8lkiNL.js");
 const admin = require("@strapi/strapi/admin");
 const FullLoader = require("./FullLoader-Da2n70bJ.js");
 const symbols = require("@strapi/icons/symbols");
@@ -582,8 +582,8 @@ function pathReducer(state, action) {
         prevValue: state.value,
         needsUrlCheck: false
       };
-    case "RESET_URL_CHECK_FLAG":
-      return { ...state, needsUrlCheck: false };
+    case "SET_URL_CHECK_FLAG":
+      return { ...state, needsUrlCheck: action.payload || false };
     case "SET_REPLACEMENT":
       return { ...state, replacement: action.payload };
     case "SET_UIDPATH":
@@ -866,7 +866,7 @@ function ItemDetails({
         routeDocumentId: route.documentId,
         withoutTransform: true
       });
-      dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
+      dispatchPath({ type: "SET_URL_CHECK_FLAG" });
     }
   }, [path.needsUrlCheck, route.documentId]);
   React.useEffect(() => {
@@ -6747,7 +6747,7 @@ function ItemEditComponent({
         url: path.value,
         routeDocumentId: item.route.documentId
       });
-      dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
+      dispatchPath({ type: "SET_URL_CHECK_FLAG" });
     }
   }, [path.needsUrlCheck, item.route.documentId]);
   const updateItem = async () => {

package/dist/admin/{index-BkPtrXJO.js → index-Bm8lkiNL.js}

@@ -70,7 +70,7 @@ function transformToUrl(input, replaceSlash = true) {
   input = input.replace(/-+/g, "-");
   return input;
 }
-const version = "0.11.3";
+const version = "0.11.4";
 const strapi$1 = { "name": "webatlas", "displayName": "Webatlas" };
 const pluginPkg = {
   version,
@@ -3681,7 +3681,7 @@ function Tooltip({ description }) {
     ) }) })
   ] }) });
 }
-function PathInput({ path, dispatchPath, isOverride, config }) {
+function PathInput({ path, dispatchPath, isOverride, config, hasUserInteracted }) {
   const { formatMessage } = reactIntl.useIntl();
   const displayedPath = isOverride && path.overridePath !== void 0 ? path.overridePath : path.value ?? "";
   const inputBorder = path.replacement === null ? "" : path.replacement ? "1px solid #ee5e52" : "1px solid #5cb176";
@@ -3719,12 +3719,21 @@ function PathInput({ path, dispatchPath, isOverride, config }) {
           {
             id: "path-input",
             value: displayedPath,
-            onChange: (e) => dispatchPath({ type: "SET_OVERRIDEPATH", payload: e.target.value }),
+            onChange: (e) => {
+              hasUserInteracted.current = true;
+              dispatchPath({ type: "SET_OVERRIDEPATH", payload: e.target.value });
+            },
             disabled: !isOverride,
-            onBlur: (e) => dispatchPath({
-              type: "SET_OVERRIDEPATH",
-              payload: transformToUrl(e.target.value, false)
-            }),
+            onBlur: (e) => {
+              dispatchPath({
+                type: "SET_OVERRIDEPATH",
+                payload: transformToUrl(e.target.value, false)
+              });
+              dispatchPath({
+                type: "SET_URL_CHECK_FLAG",
+                payload: true
+              });
+            },
             style: { outline: inputBorder }
           }
         ),
@@ -3813,8 +3822,8 @@ function reducer(state, action) {
         prevValue: state.value,
         needsUrlCheck: false
       };
-    case "RESET_URL_CHECK_FLAG":
-      return { ...state, needsUrlCheck: false };
+    case "SET_URL_CHECK_FLAG":
+      return { ...state, needsUrlCheck: action.payload || false };
     case "SET_REPLACEMENT":
       return { ...state, replacement: action.payload };
     case "SET_UIDPATH":
@@ -3946,7 +3955,7 @@ const Panel = ({ config }) => {
     if (path.needsUrlCheck && path.value) {
       if (path.uidPath === path.value || initialPath.current === path.value) return;
       debouncedCheckPath(path.value, route?.documentId || null);
-      dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
+      dispatchPath({ type: "SET_URL_CHECK_FLAG" });
     } else {
       setValidationState("idle");
       dispatchPath({ type: "SET_REPLACEMENT", payload: null });
@@ -4073,7 +4082,8 @@ const Panel = ({ config }) => {
           path,
           dispatchPath,
           isOverride,
-          config
+          config,
+          hasUserInteracted
         }
       ),
       validationState !== "initial" && /* @__PURE__ */ jsxRuntime.jsx(PathInfo, { validationState, replacement: path.replacement })
@@ -4159,7 +4169,7 @@ const index = {
         id: `${PLUGIN_ID}.link.paths`,
         defaultMessage: "Paths"
       },
-      Component: () => Promise.resolve().then(() => require("./index-DBG6vBGU.js")),
+      Component: () => Promise.resolve().then(() => require("./index-BztvKcfc.js")),
       permissions: [pluginPermissions["page.routes"][0]]
     });
     app.addMenuLink({
@@ -4169,7 +4179,7 @@ const index = {
         id: `${PLUGIN_ID}.link.navigation`,
         defaultMessage: "Navigation"
       },
-      Component: () => Promise.resolve().then(() => require("./index-uW7YJoRU.js")),
+      Component: () => Promise.resolve().then(() => require("./index-BiXgA5Ru.js")),
       permissions: [pluginPermissions["page.navigation"][0]]
     });
     app.addSettingsLink(
@@ -4187,7 +4197,7 @@ const index = {
         },
         id: `${PLUGIN_ID}-general`,
         to: `${PLUGIN_ID}/general`,
-        Component: () => Promise.resolve().then(() => require("./index-CEBh9c4X.js")),
+        Component: () => Promise.resolve().then(() => require("./index-DcUmtUyp.js")),
         permissions: [pluginPermissions["settings.general"][0]]
       }
     );
@@ -4198,7 +4208,7 @@ const index = {
       },
       id: `${PLUGIN_ID}-navigation`,
       to: `${PLUGIN_ID}/navigation`,
-      Component: () => Promise.resolve().then(() => require("./index-Sj2FxwAu.js")),
+      Component: () => Promise.resolve().then(() => require("./index-CyzPvvul.js")),
       permissions: [pluginPermissions["settings.navigation"][0]]
     });
     app.registerPlugin({

package/dist/admin/{index-DBG6vBGU.js → index-BztvKcfc.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
-const index = require("./index-BkPtrXJO.js");
+const index = require("./index-Bm8lkiNL.js");
 const admin = require("@strapi/strapi/admin");
 const designSystem = require("@strapi/design-system");
 require("@strapi/icons/symbols");

package/dist/admin/{index-BMTlUOrK.mjs → index-CrgTYzgl.mjs}

@@ -2,11 +2,11 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useReducer, useState, useRef, useEffect } from "react";
 import { Box, Accordion, Field, SingleSelect, SingleSelectOption, Typography, Link } from "@strapi/design-system";
 import { useNotification, Page } from "@strapi/strapi/admin";
-import { g as getTranslation, c as usePluginConfig, e as useAllContentTypes, p as pluginPermissions, f as PLUGIN_NAME, h as PLUGIN_VERSION } from "./index-BX3hiURm.mjs";
+import { g as getTranslation, c as usePluginConfig, e as useAllContentTypes, p as pluginPermissions, f as PLUGIN_NAME, h as PLUGIN_VERSION } from "./index-Dx-EVn-t.mjs";
 import { useIntl } from "react-intl";
 import "@strapi/icons/symbols";
 import { F as FullLoader } from "./FullLoader-Btjb2W2p.mjs";
-import { P as PageWrapper, C as ContentBox, S as SettingTitle } from "./SettingTitle-CcNfx_4T.mjs";
+import { P as PageWrapper, C as ContentBox, S as SettingTitle } from "./SettingTitle-UPbQCuTC.mjs";
 import { ExternalLink } from "@strapi/icons";
 function ContentTypeAccordion({
   contentType,

package/dist/admin/{index-Sj2FxwAu.js → index-CyzPvvul.js}

@@ -4,11 +4,11 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-BkPtrXJO.js");
+const index = require("./index-Bm8lkiNL.js");
 const reactIntl = require("react-intl");
 require("@strapi/icons/symbols");
 const FullLoader = require("./FullLoader-Da2n70bJ.js");
-const SettingTitle = require("./SettingTitle-BdiDHFXF.js");
+const SettingTitle = require("./SettingTitle-DGSkTF7e.js");
 function reducer(newConfig, action) {
   switch (action.type) {
     case "SET_MAX_DEPTH":

package/dist/admin/{index-DkEReTkt.mjs → index-D4B4s4XO.mjs}

@@ -2,11 +2,11 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useReducer, useState, useRef, useEffect } from "react";
 import { Field } from "@strapi/design-system";
 import { useNotification, Page } from "@strapi/strapi/admin";
-import { c as usePluginConfig, g as getTranslation, p as pluginPermissions } from "./index-BX3hiURm.mjs";
+import { c as usePluginConfig, g as getTranslation, p as pluginPermissions } from "./index-Dx-EVn-t.mjs";
 import { useIntl } from "react-intl";
 import "@strapi/icons/symbols";
 import { F as FullLoader } from "./FullLoader-Btjb2W2p.mjs";
-import { P as PageWrapper, C as ContentBox, S as SettingTitle } from "./SettingTitle-CcNfx_4T.mjs";
+import { P as PageWrapper, C as ContentBox, S as SettingTitle } from "./SettingTitle-UPbQCuTC.mjs";
 function reducer(newConfig, action) {
   switch (action.type) {
     case "SET_MAX_DEPTH":

package/dist/admin/{index-DkfE_arE.mjs → index-DLoZpHxU.mjs}

@@ -5,7 +5,7 @@ import { Box, Typography, Dialog, Button, Modal, Flex, SingleSelect, SingleSelec
 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 Tooltip, b as PathInfo, c as usePluginConfig, p as pluginPermissions } from "./index-BX3hiURm.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-Dx-EVn-t.mjs";
 import { useNotification, useFetchClient, Page, Layouts } from "@strapi/strapi/admin";
 import { C as Center, F as FullLoader } from "./FullLoader-Btjb2W2p.mjs";
 import { EmptyDocuments } from "@strapi/icons/symbols";
@@ -580,8 +580,8 @@ function pathReducer(state, action) {
         prevValue: state.value,
         needsUrlCheck: false
       };
-    case "RESET_URL_CHECK_FLAG":
-      return { ...state, needsUrlCheck: false };
+    case "SET_URL_CHECK_FLAG":
+      return { ...state, needsUrlCheck: action.payload || false };
     case "SET_REPLACEMENT":
       return { ...state, replacement: action.payload };
     case "SET_UIDPATH":
@@ -864,7 +864,7 @@ function ItemDetails({
         routeDocumentId: route.documentId,
         withoutTransform: true
       });
-      dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
+      dispatchPath({ type: "SET_URL_CHECK_FLAG" });
     }
   }, [path.needsUrlCheck, route.documentId]);
   useEffect(() => {
@@ -6745,7 +6745,7 @@ function ItemEditComponent({
         url: path.value,
         routeDocumentId: item.route.documentId
       });
-      dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
+      dispatchPath({ type: "SET_URL_CHECK_FLAG" });
     }
   }, [path.needsUrlCheck, item.route.documentId]);
   const updateItem = async () => {

package/dist/admin/{index-CEBh9c4X.js → index-DcUmtUyp.js}

@@ -4,11 +4,11 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-BkPtrXJO.js");
+const index = require("./index-Bm8lkiNL.js");
 const reactIntl = require("react-intl");
 require("@strapi/icons/symbols");
 const FullLoader = require("./FullLoader-Da2n70bJ.js");
-const SettingTitle = require("./SettingTitle-BdiDHFXF.js");
+const SettingTitle = require("./SettingTitle-DGSkTF7e.js");
 const icons = require("@strapi/icons");
 function ContentTypeAccordion({
   contentType,

package/dist/admin/{index-BX3hiURm.mjs → index-Dx-EVn-t.mjs}

@@ -52,7 +52,7 @@ function transformToUrl(input, replaceSlash = true) {
   input = input.replace(/-+/g, "-");
   return input;
 }
-const version = "0.11.3";
+const version = "0.11.4";
 const strapi$1 = { "name": "webatlas", "displayName": "Webatlas" };
 const pluginPkg = {
   version,
@@ -3663,7 +3663,7 @@ function Tooltip({ description }) {
     ) }) })
   ] }) });
 }
-function PathInput({ path, dispatchPath, isOverride, config }) {
+function PathInput({ path, dispatchPath, isOverride, config, hasUserInteracted }) {
   const { formatMessage } = useIntl();
   const displayedPath = isOverride && path.overridePath !== void 0 ? path.overridePath : path.value ?? "";
   const inputBorder = path.replacement === null ? "" : path.replacement ? "1px solid #ee5e52" : "1px solid #5cb176";
@@ -3701,12 +3701,21 @@ function PathInput({ path, dispatchPath, isOverride, config }) {
           {
             id: "path-input",
             value: displayedPath,
-            onChange: (e) => dispatchPath({ type: "SET_OVERRIDEPATH", payload: e.target.value }),
+            onChange: (e) => {
+              hasUserInteracted.current = true;
+              dispatchPath({ type: "SET_OVERRIDEPATH", payload: e.target.value });
+            },
             disabled: !isOverride,
-            onBlur: (e) => dispatchPath({
-              type: "SET_OVERRIDEPATH",
-              payload: transformToUrl(e.target.value, false)
-            }),
+            onBlur: (e) => {
+              dispatchPath({
+                type: "SET_OVERRIDEPATH",
+                payload: transformToUrl(e.target.value, false)
+              });
+              dispatchPath({
+                type: "SET_URL_CHECK_FLAG",
+                payload: true
+              });
+            },
             style: { outline: inputBorder }
           }
         ),
@@ -3795,8 +3804,8 @@ function reducer(state, action) {
         prevValue: state.value,
         needsUrlCheck: false
       };
-    case "RESET_URL_CHECK_FLAG":
-      return { ...state, needsUrlCheck: false };
+    case "SET_URL_CHECK_FLAG":
+      return { ...state, needsUrlCheck: action.payload || false };
     case "SET_REPLACEMENT":
       return { ...state, replacement: action.payload };
     case "SET_UIDPATH":
@@ -3928,7 +3937,7 @@ const Panel = ({ config }) => {
     if (path.needsUrlCheck && path.value) {
       if (path.uidPath === path.value || initialPath.current === path.value) return;
       debouncedCheckPath(path.value, route?.documentId || null);
-      dispatchPath({ type: "RESET_URL_CHECK_FLAG" });
+      dispatchPath({ type: "SET_URL_CHECK_FLAG" });
     } else {
       setValidationState("idle");
       dispatchPath({ type: "SET_REPLACEMENT", payload: null });
@@ -4055,7 +4064,8 @@ const Panel = ({ config }) => {
           path,
           dispatchPath,
           isOverride,
-          config
+          config,
+          hasUserInteracted
         }
       ),
       validationState !== "initial" && /* @__PURE__ */ jsx(PathInfo, { validationState, replacement: path.replacement })
@@ -4141,7 +4151,7 @@ const index = {
         id: `${PLUGIN_ID}.link.paths`,
         defaultMessage: "Paths"
       },
-      Component: () => import("./index-BdyLsiR4.mjs"),
+      Component: () => import("./index-b3yS9Dm7.mjs"),
       permissions: [pluginPermissions["page.routes"][0]]
     });
     app.addMenuLink({
@@ -4151,7 +4161,7 @@ const index = {
         id: `${PLUGIN_ID}.link.navigation`,
         defaultMessage: "Navigation"
       },
-      Component: () => import("./index-DkfE_arE.mjs"),
+      Component: () => import("./index-DLoZpHxU.mjs"),
       permissions: [pluginPermissions["page.navigation"][0]]
     });
     app.addSettingsLink(
@@ -4169,7 +4179,7 @@ const index = {
         },
         id: `${PLUGIN_ID}-general`,
         to: `${PLUGIN_ID}/general`,
-        Component: () => import("./index-BMTlUOrK.mjs"),
+        Component: () => import("./index-CrgTYzgl.mjs"),
         permissions: [pluginPermissions["settings.general"][0]]
       }
     );
@@ -4180,7 +4190,7 @@ const index = {
       },
       id: `${PLUGIN_ID}-navigation`,
       to: `${PLUGIN_ID}/navigation`,
-      Component: () => import("./index-DkEReTkt.mjs"),
+      Component: () => import("./index-D4B4s4XO.mjs"),
       permissions: [pluginPermissions["settings.navigation"][0]]
     });
     app.registerPlugin({

package/dist/admin/{index-BdyLsiR4.mjs → index-b3yS9Dm7.mjs}

@@ -1,6 +1,6 @@
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
 import { useState, useEffect, useMemo } from "react";
-import { g as getTranslation, u as useApi, d as debounce, p as pluginPermissions } from "./index-BX3hiURm.mjs";
+import { g as getTranslation, u as useApi, d as debounce, p as pluginPermissions } from "./index-Dx-EVn-t.mjs";
 import { Page, Layouts, useNotification } from "@strapi/strapi/admin";
 import { Grid, Box, Field, Thead, Tr, Th, Typography, VisuallyHidden, Td, Flex, LinkButton, Table, Tbody, EmptyStateLayout } from "@strapi/design-system";
 import "@strapi/icons/symbols";

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const index = require("./index-BkPtrXJO.js");
+const index = require("./index-Bm8lkiNL.js");
 exports.default = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "./index-BX3hiURm.mjs";
+import { i } from "./index-Dx-EVn-t.mjs";
 export {
   i as default
 };

package/dist/server/index.js

@@ -4664,6 +4664,106 @@ function calculateParentAndOrder({
     calculatedOrder
   };
 }
+async function enrichWebatlasData(data, contentTypeUid) {
+  console.log("Enriching data with webatlas fields...", { contentTypeUid });
+  console.log("Original data:", JSON.stringify(data, null, 2));
+  if (!data || typeof data !== "object") return data;
+  const collectDocumentIds = (obj, uid) => {
+    if (!obj || typeof obj !== "object") return [];
+    const ids = [];
+    if (obj.documentId) ids.push(obj.documentId);
+    if (!uid) return ids;
+    const ct = strapi.contentTypes[uid];
+    if (!ct?.attributes) return ids;
+    for (const [key, attr] of Object.entries(ct.attributes)) {
+      const attribute = attr;
+      if (attribute.type === "relation" && obj[key]) {
+        const targetUid = attribute.target;
+        if (Array.isArray(obj[key])) {
+          ids.push(...obj[key].flatMap((item) => collectDocumentIds(item, targetUid)));
+        } else {
+          ids.push(...collectDocumentIds(obj[key], targetUid));
+        }
+      }
+      if (attribute.type === "component" && obj[key]) {
+        const componentUid = attribute.component;
+        if (Array.isArray(obj[key])) {
+          ids.push(...obj[key].flatMap((item) => collectDocumentIds(item, componentUid)));
+        } else {
+          ids.push(...collectDocumentIds(obj[key], componentUid));
+        }
+      }
+      if (attribute.type === "dynamiczone" && Array.isArray(obj[key])) {
+        ids.push(
+          ...obj[key].flatMap((item) => {
+            if (!item || !item.__component) return [];
+            return collectDocumentIds(item, item.__component);
+          })
+        );
+      }
+    }
+    return ids;
+  };
+  const documentIds = collectDocumentIds(data, contentTypeUid);
+  if (documentIds.length === 0) return data;
+  const uniqueDocumentIds = [...new Set(documentIds)];
+  const routes2 = await strapi.db?.query(waRoute).findMany({
+    where: {
+      relatedDocumentId: { $in: uniqueDocumentIds }
+    },
+    select: ["relatedDocumentId", "relatedContentType", "path", "canonicalPath", "slug", "uidPath"]
+  });
+  const routeMap = new Map(routes2?.map((route2) => [route2.relatedDocumentId, route2]) || []);
+  const enrichEntity = (entity, uid) => {
+    if (!entity || typeof entity !== "object") return entity;
+    const ct = uid ? strapi.contentTypes[uid] : null;
+    const isWebatlasEnabled = ct?.pluginOptions?.webatlas?.enabled === true;
+    if (isWebatlasEnabled && entity.documentId && routeMap.has(entity.documentId)) {
+      const route2 = routeMap.get(entity.documentId);
+      entity.webatlas = {
+        path: route2.path || "",
+        canonicalPath: route2.canonicalPath || "",
+        slug: route2.slug || "",
+        uidPath: route2.uidPath || ""
+      };
+    }
+    if (ct?.attributes) {
+      for (const [key, attr] of Object.entries(ct.attributes)) {
+        const attribute = attr;
+        if (attribute.type === "relation" && entity[key]) {
+          const targetUid = attribute.target;
+          strapi.log.debug("relation found");
+          if (Array.isArray(entity[key])) {
+            entity[key] = entity[key].map(
+              (item) => item ? enrichEntity(item, targetUid) : item
+            );
+          } else {
+            entity[key] = enrichEntity(entity[key], targetUid);
+          }
+        }
+        if (attribute.type === "component" && entity[key]) {
+          const componentUid = attribute.component;
+          if (Array.isArray(entity[key])) {
+            entity[key] = entity[key].map(
+              (item) => item ? enrichEntity(item, componentUid) : item
+            );
+          } else {
+            entity[key] = enrichEntity(entity[key], componentUid);
+          }
+        }
+        if (attribute.type === "dynamiczone" && Array.isArray(entity[key])) {
+          entity[key] = entity[key].map((item) => {
+            if (!item || !item.__component) return item;
+            return enrichEntity(item, item.__component);
+          });
+        }
+      }
+    }
+    strapi.log.debug("finished - returning");
+    return entity;
+  };
+  return enrichEntity(data, contentTypeUid);
+}
 const migration_001_canonical_path = {
   version: "001",
   description: "Migrate title field to canonicalPath using transformToUrl",
@@ -4902,7 +5002,7 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
       const data = context.params.data;
       const { webatlas } = data;
       const { slug, parentDocumentId, isOverride } = webatlas || {};
-      const transformedSlug = slug ? transformToUrl(slug) : null;
+      const transformedSlug = slug ? transformToUrl(slug, !isOverride) : null;
       const result2 = await next();
       if (!transformedSlug) return result2;
       const existing = await strapi2.db?.query(waRoute).findOne({
@@ -4975,7 +5075,7 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
           });
         }
       }
-      const transformedSlug = transformToUrl(slug);
+      const transformedSlug = transformToUrl(slug, !isOverride);
       let rawPath = transformedSlug;
       if (!isOverride) rawPath = parent ? `${parent.path}/${transformedSlug}` : transformedSlug;
       const validatedPath = await duplicateCheck(rawPath, relatedRoute?.documentId ?? null);
@@ -5087,124 +5187,18 @@ const addWebatlasField = ({ strapi: strapi2 }) => {
     );
     if (!contentTypeEntry) return;
     const [contentTypeUid, contentType] = contentTypeEntry;
-    const collectDocumentIds = (data, uid = contentTypeUid) => {
-      if (!data || typeof data !== "object") return [];
-      const ids = [];
-      if (data.documentId) {
-        ids.push(data.documentId);
-      }
-      const ct = strapi2.contentTypes[uid];
-      if (ct?.attributes) {
-        for (const [key, attr] of Object.entries(ct.attributes)) {
-          const attribute = attr;
-          if (attribute.type === "relation" && data[key]) {
-            const targetUid = attribute.target;
-            if (Array.isArray(data[key])) {
-              ids.push(...data[key].flatMap((item) => collectDocumentIds(item, targetUid)));
-            } else {
-              ids.push(...collectDocumentIds(data[key], targetUid));
-            }
-          }
-          if (attribute.type === "component" && data[key]) {
-            const componentUid = attribute.component;
-            if (Array.isArray(data[key])) {
-              ids.push(...data[key].flatMap((item) => collectDocumentIds(item, componentUid)));
-            } else {
-              ids.push(...collectDocumentIds(data[key], componentUid));
-            }
-          }
-          if (attribute.type === "dynamiczone" && Array.isArray(data[key])) {
-            ids.push(
-              ...data[key].flatMap((item) => {
-                const componentUid = item.__component;
-                return collectDocumentIds(item, componentUid);
-              })
-            );
-          }
-        }
-      }
-      return ids;
-    };
-    let documentIds = [];
-    if (ctx.body.data) {
-      if (Array.isArray(ctx.body.data)) {
-        documentIds = ctx.body.data.flatMap((item) => collectDocumentIds(item, contentTypeUid));
-      } else {
-        documentIds = collectDocumentIds(ctx.body.data, contentTypeUid);
-      }
-    } else if (Array.isArray(ctx.body)) {
-      documentIds = ctx.body.flatMap((item) => collectDocumentIds(item, contentTypeUid));
-    } else if (typeof ctx.body === "object") {
-      documentIds = collectDocumentIds(ctx.body, contentTypeUid);
-    }
-    if (documentIds.length === 0) return;
-    const uniqueDocumentIds = [...new Set(documentIds)];
-    const routes2 = await strapi2.db?.query(waRoute).findMany({
-      where: {
-        relatedDocumentId: { $in: uniqueDocumentIds }
-      },
-      select: [
-        "relatedDocumentId",
-        "relatedContentType",
-        "path",
-        "canonicalPath",
-        "slug",
-        "uidPath"
-      ]
-    });
-    const routeMap = new Map(routes2?.map((route2) => [route2.relatedDocumentId, route2]) || []);
-    const enrichWebatlasField = (data, uid = contentTypeUid) => {
-      if (!data || typeof data !== "object") return data;
-      const ct = strapi2.contentTypes[uid];
-      const isWebatlasEnabled = ct?.pluginOptions?.webatlas?.enabled === true;
-      if (isWebatlasEnabled && data.documentId && routeMap.has(data.documentId)) {
-        const route2 = routeMap.get(data.documentId);
-        data.webatlas = {
-          path: route2.path || "",
-          canonicalPath: route2.canonicalPath || "",
-          slug: route2.slug || "",
-          uidPath: route2.uidPath || ""
-        };
-      }
-      if (ct?.attributes) {
-        for (const [key, attr] of Object.entries(ct.attributes)) {
-          const attribute = attr;
-          if (attribute.type === "relation" && data[key]) {
-            const targetUid = attribute.target;
-            if (Array.isArray(data[key])) {
-              data[key] = data[key].map((item) => enrichWebatlasField(item, targetUid));
-            } else {
-              data[key] = enrichWebatlasField(data[key], targetUid);
-            }
-          }
-          if (attribute.type === "component" && data[key]) {
-            const componentUid = attribute.component;
-            if (Array.isArray(data[key])) {
-              data[key] = data[key].map((item) => enrichWebatlasField(item, componentUid));
-            } else {
-              data[key] = enrichWebatlasField(data[key], componentUid);
-            }
-          }
-          if (attribute.type === "dynamiczone" && Array.isArray(data[key])) {
-            data[key] = data[key].map((item) => {
-              const componentUid = item.__component;
-              return enrichWebatlasField(item, componentUid);
-            });
-          }
-        }
-      }
-      return data;
-    };
     if (ctx.body.data) {
       if (Array.isArray(ctx.body.data)) {
-        ctx.body.data = ctx.body.data.map((item) => enrichWebatlasField(item, contentTypeUid));
+        ctx.body.data = await Promise.all(
+          ctx.body.data.map((item) => enrichWebatlasData(item, contentTypeUid))
+        );
       } else {
-        ctx.body.data = enrichWebatlasField(ctx.body.data, contentTypeUid);
+        ctx.body.data = await enrichWebatlasData(ctx.body.data, contentTypeUid);
       }
     } else if (Array.isArray(ctx.body)) {
-      ctx.body = ctx.body.map((item) => enrichWebatlasField(item, contentTypeUid));
+      ctx.body = await Promise.all(ctx.body.map((item) => enrichWebatlasData(item, contentTypeUid)));
     } else if (typeof ctx.body === "object") {
-      ctx.body = enrichWebatlasField(ctx.body, contentTypeUid);
+      ctx.body = await enrichWebatlasData(ctx.body, contentTypeUid);
     }
   };
 };
@@ -6092,17 +6086,9 @@ const client = ({ strapi: strapi2 }) => ({
       if (!entity) return null;
       let cleanEntity = cleanRootKeys(entity);
       cleanEntity = removeWaFields(cleanEntity);
-      const webatlasFields = {
-        path: route2.path,
-        canonicalPath: route2.canonicalPath,
-        slug: route2.slug,
-        uidPath: route2.uidPath
-      };
+      cleanEntity = await enrichWebatlasData(cleanEntity, route2.relatedContentType);
       return {
         contentType: contentType.info.singularName,
-        webatlas: {
-          ...webatlasFields
-        },
         ...cleanEntity
       };
     } catch (e) {

package/dist/server/index.mjs

@@ -4662,6 +4662,106 @@ function calculateParentAndOrder({
     calculatedOrder
   };
 }
+async function enrichWebatlasData(data, contentTypeUid) {
+  console.log("Enriching data with webatlas fields...", { contentTypeUid });
+  console.log("Original data:", JSON.stringify(data, null, 2));
+  if (!data || typeof data !== "object") return data;
+  const collectDocumentIds = (obj, uid) => {
+    if (!obj || typeof obj !== "object") return [];
+    const ids = [];
+    if (obj.documentId) ids.push(obj.documentId);
+    if (!uid) return ids;
+    const ct = strapi.contentTypes[uid];
+    if (!ct?.attributes) return ids;
+    for (const [key, attr] of Object.entries(ct.attributes)) {
+      const attribute = attr;
+      if (attribute.type === "relation" && obj[key]) {
+        const targetUid = attribute.target;
+        if (Array.isArray(obj[key])) {
+          ids.push(...obj[key].flatMap((item) => collectDocumentIds(item, targetUid)));
+        } else {
+          ids.push(...collectDocumentIds(obj[key], targetUid));
+        }
+      }
+      if (attribute.type === "component" && obj[key]) {
+        const componentUid = attribute.component;
+        if (Array.isArray(obj[key])) {
+          ids.push(...obj[key].flatMap((item) => collectDocumentIds(item, componentUid)));
+        } else {
+          ids.push(...collectDocumentIds(obj[key], componentUid));
+        }
+      }
+      if (attribute.type === "dynamiczone" && Array.isArray(obj[key])) {
+        ids.push(
+          ...obj[key].flatMap((item) => {
+            if (!item || !item.__component) return [];
+            return collectDocumentIds(item, item.__component);
+          })
+        );
+      }
+    }
+    return ids;
+  };
+  const documentIds = collectDocumentIds(data, contentTypeUid);
+  if (documentIds.length === 0) return data;
+  const uniqueDocumentIds = [...new Set(documentIds)];
+  const routes2 = await strapi.db?.query(waRoute).findMany({
+    where: {
+      relatedDocumentId: { $in: uniqueDocumentIds }
+    },
+    select: ["relatedDocumentId", "relatedContentType", "path", "canonicalPath", "slug", "uidPath"]
+  });
+  const routeMap = new Map(routes2?.map((route2) => [route2.relatedDocumentId, route2]) || []);
+  const enrichEntity = (entity, uid) => {
+    if (!entity || typeof entity !== "object") return entity;
+    const ct = uid ? strapi.contentTypes[uid] : null;
+    const isWebatlasEnabled = ct?.pluginOptions?.webatlas?.enabled === true;
+    if (isWebatlasEnabled && entity.documentId && routeMap.has(entity.documentId)) {
+      const route2 = routeMap.get(entity.documentId);
+      entity.webatlas = {
+        path: route2.path || "",
+        canonicalPath: route2.canonicalPath || "",
+        slug: route2.slug || "",
+        uidPath: route2.uidPath || ""
+      };
+    }
+    if (ct?.attributes) {
+      for (const [key, attr] of Object.entries(ct.attributes)) {
+        const attribute = attr;
+        if (attribute.type === "relation" && entity[key]) {
+          const targetUid = attribute.target;
+          strapi.log.debug("relation found");
+          if (Array.isArray(entity[key])) {
+            entity[key] = entity[key].map(
+              (item) => item ? enrichEntity(item, targetUid) : item
+            );
+          } else {
+            entity[key] = enrichEntity(entity[key], targetUid);
+          }
+        }
+        if (attribute.type === "component" && entity[key]) {
+          const componentUid = attribute.component;
+          if (Array.isArray(entity[key])) {
+            entity[key] = entity[key].map(
+              (item) => item ? enrichEntity(item, componentUid) : item
+            );
+          } else {
+            entity[key] = enrichEntity(entity[key], componentUid);
+          }
+        }
+        if (attribute.type === "dynamiczone" && Array.isArray(entity[key])) {
+          entity[key] = entity[key].map((item) => {
+            if (!item || !item.__component) return item;
+            return enrichEntity(item, item.__component);
+          });
+        }
+      }
+    }
+    strapi.log.debug("finished - returning");
+    return entity;
+  };
+  return enrichEntity(data, contentTypeUid);
+}
 const migration_001_canonical_path = {
   version: "001",
   description: "Migrate title field to canonicalPath using transformToUrl",
@@ -4900,7 +5000,7 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
       const data = context.params.data;
       const { webatlas } = data;
       const { slug, parentDocumentId, isOverride } = webatlas || {};
-      const transformedSlug = slug ? transformToUrl(slug) : null;
+      const transformedSlug = slug ? transformToUrl(slug, !isOverride) : null;
       const result2 = await next();
       if (!transformedSlug) return result2;
       const existing = await strapi2.db?.query(waRoute).findOne({
@@ -4973,7 +5073,7 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
           });
         }
       }
-      const transformedSlug = transformToUrl(slug);
+      const transformedSlug = transformToUrl(slug, !isOverride);
       let rawPath = transformedSlug;
       if (!isOverride) rawPath = parent ? `${parent.path}/${transformedSlug}` : transformedSlug;
       const validatedPath = await duplicateCheck(rawPath, relatedRoute?.documentId ?? null);
@@ -5085,124 +5185,18 @@ const addWebatlasField = ({ strapi: strapi2 }) => {
     );
     if (!contentTypeEntry) return;
     const [contentTypeUid, contentType] = contentTypeEntry;
-    const collectDocumentIds = (data, uid = contentTypeUid) => {
-      if (!data || typeof data !== "object") return [];
-      const ids = [];
-      if (data.documentId) {
-        ids.push(data.documentId);
-      }
-      const ct = strapi2.contentTypes[uid];
-      if (ct?.attributes) {
-        for (const [key, attr] of Object.entries(ct.attributes)) {
-          const attribute = attr;
-          if (attribute.type === "relation" && data[key]) {
-            const targetUid = attribute.target;
-            if (Array.isArray(data[key])) {
-              ids.push(...data[key].flatMap((item) => collectDocumentIds(item, targetUid)));
-            } else {
-              ids.push(...collectDocumentIds(data[key], targetUid));
-            }
-          }
-          if (attribute.type === "component" && data[key]) {
-            const componentUid = attribute.component;
-            if (Array.isArray(data[key])) {
-              ids.push(...data[key].flatMap((item) => collectDocumentIds(item, componentUid)));
-            } else {
-              ids.push(...collectDocumentIds(data[key], componentUid));
-            }
-          }
-          if (attribute.type === "dynamiczone" && Array.isArray(data[key])) {
-            ids.push(
-              ...data[key].flatMap((item) => {
-                const componentUid = item.__component;
-                return collectDocumentIds(item, componentUid);
-              })
-            );
-          }
-        }
-      }
-      return ids;
-    };
-    let documentIds = [];
-    if (ctx.body.data) {
-      if (Array.isArray(ctx.body.data)) {
-        documentIds = ctx.body.data.flatMap((item) => collectDocumentIds(item, contentTypeUid));
-      } else {
-        documentIds = collectDocumentIds(ctx.body.data, contentTypeUid);
-      }
-    } else if (Array.isArray(ctx.body)) {
-      documentIds = ctx.body.flatMap((item) => collectDocumentIds(item, contentTypeUid));
-    } else if (typeof ctx.body === "object") {
-      documentIds = collectDocumentIds(ctx.body, contentTypeUid);
-    }
-    if (documentIds.length === 0) return;
-    const uniqueDocumentIds = [...new Set(documentIds)];
-    const routes2 = await strapi2.db?.query(waRoute).findMany({
-      where: {
-        relatedDocumentId: { $in: uniqueDocumentIds }
-      },
-      select: [
-        "relatedDocumentId",
-        "relatedContentType",
-        "path",
-        "canonicalPath",
-        "slug",
-        "uidPath"
-      ]
-    });
-    const routeMap = new Map(routes2?.map((route2) => [route2.relatedDocumentId, route2]) || []);
-    const enrichWebatlasField = (data, uid = contentTypeUid) => {
-      if (!data || typeof data !== "object") return data;
-      const ct = strapi2.contentTypes[uid];
-      const isWebatlasEnabled = ct?.pluginOptions?.webatlas?.enabled === true;
-      if (isWebatlasEnabled && data.documentId && routeMap.has(data.documentId)) {
-        const route2 = routeMap.get(data.documentId);
-        data.webatlas = {
-          path: route2.path || "",
-          canonicalPath: route2.canonicalPath || "",
-          slug: route2.slug || "",
-          uidPath: route2.uidPath || ""
-        };
-      }
-      if (ct?.attributes) {
-        for (const [key, attr] of Object.entries(ct.attributes)) {
-          const attribute = attr;
-          if (attribute.type === "relation" && data[key]) {
-            const targetUid = attribute.target;
-            if (Array.isArray(data[key])) {
-              data[key] = data[key].map((item) => enrichWebatlasField(item, targetUid));
-            } else {
-              data[key] = enrichWebatlasField(data[key], targetUid);
-            }
-          }
-          if (attribute.type === "component" && data[key]) {
-            const componentUid = attribute.component;
-            if (Array.isArray(data[key])) {
-              data[key] = data[key].map((item) => enrichWebatlasField(item, componentUid));
-            } else {
-              data[key] = enrichWebatlasField(data[key], componentUid);
-            }
-          }
-          if (attribute.type === "dynamiczone" && Array.isArray(data[key])) {
-            data[key] = data[key].map((item) => {
-              const componentUid = item.__component;
-              return enrichWebatlasField(item, componentUid);
-            });
-          }
-        }
-      }
-      return data;
-    };
     if (ctx.body.data) {
       if (Array.isArray(ctx.body.data)) {
-        ctx.body.data = ctx.body.data.map((item) => enrichWebatlasField(item, contentTypeUid));
+        ctx.body.data = await Promise.all(
+          ctx.body.data.map((item) => enrichWebatlasData(item, contentTypeUid))
+        );
       } else {
-        ctx.body.data = enrichWebatlasField(ctx.body.data, contentTypeUid);
+        ctx.body.data = await enrichWebatlasData(ctx.body.data, contentTypeUid);
       }
     } else if (Array.isArray(ctx.body)) {
-      ctx.body = ctx.body.map((item) => enrichWebatlasField(item, contentTypeUid));
+      ctx.body = await Promise.all(ctx.body.map((item) => enrichWebatlasData(item, contentTypeUid)));
     } else if (typeof ctx.body === "object") {
-      ctx.body = enrichWebatlasField(ctx.body, contentTypeUid);
+      ctx.body = await enrichWebatlasData(ctx.body, contentTypeUid);
     }
   };
 };
@@ -6090,17 +6084,9 @@ const client = ({ strapi: strapi2 }) => ({
       if (!entity) return null;
       let cleanEntity = cleanRootKeys(entity);
       cleanEntity = removeWaFields(cleanEntity);
-      const webatlasFields = {
-        path: route2.path,
-        canonicalPath: route2.canonicalPath,
-        slug: route2.slug,
-        uidPath: route2.uidPath
-      };
+      cleanEntity = await enrichWebatlasData(cleanEntity, route2.relatedContentType);
       return {
         contentType: contentType.info.singularName,
-        webatlas: {
-          ...webatlasFields
-        },
         ...cleanEntity
       };
     } catch (e) {

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@mattisvensson/strapi-plugin-webatlas",
 	"description": "A strapi plugin to manage URL routes and navigations.",
 	"license": "MIT",
-	"version": "0.11.4",
+	"version": "0.11.5",
 	"keywords": [
 		"strapi",
 		"plugin",