@mattisvensson/strapi-plugin-webatlas 0.8.1 → 0.8.2

package/dist/server/index.mjs

@@ -19,7 +19,7 @@ function transformToUrl(input) {
   input = input.replace(/-+/g, "-");
   return input;
 }
-const version = "0.8.1";
+const version = "0.8.2";
 const keywords = [];
 const type = "commonjs";
 const exports = {
@@ -5495,7 +5495,8 @@ async function createNavItem(data) {
       data: {
         navigation: data.navigation,
         route: data.route || null,
-        parent: data.parent || null
+        parent: data.parent || null,
+        order: data.order || 0
       }
     });
     return entity;
@@ -5506,8 +5507,6 @@ async function createNavItem(data) {
 async function updateNavItem(documentId, data) {
   try {
     const updateData = {};
-    if (data.navigation !== void 0 && data.navigation !== null && data.navigation !== "") updateData.navigation = data.navigation;
-    if (data.route !== void 0 && data.route !== null && data.route !== "") updateData.route = data.route;
     if (data.parent !== void 0) updateData.parent = data.parent;
     if (data.order !== void 0 && typeof data.order === "number") updateData.order = data.order;
     return await strapi.documents(waNavItem).update({
@@ -5528,6 +5527,24 @@ async function deleteNavItem(documentId) {
     console.log(e);
   }
 }
+function reduceDepthOfOrphanedItems(navigationItems, itemId) {
+  const navigationItemsCopy = JSON.parse(JSON.stringify(navigationItems));
+  const startItemIndex = navigationItemsCopy.findIndex((item) => item.documentId === itemId);
+  if (startItemIndex === -1) return;
+  const startItem = navigationItemsCopy[startItemIndex];
+  for (let i = startItemIndex + 1; i < navigationItemsCopy.length; i++) {
+    const currentItem = navigationItemsCopy[i];
+    if (!currentItem) continue;
+    if (currentItem.depth === 0) break;
+    if (currentItem.depth > startItem.depth) {
+      currentItem.depth = Math.max(0, currentItem.depth - 1);
+    } else {
+      break;
+    }
+  }
+  navigationItemsCopy.splice(startItemIndex, 1);
+  return navigationItemsCopy;
+}
 async function createExternalRoute(data) {
   try {
     return await strapi.documents(waRoute).create({
@@ -5560,19 +5577,6 @@ const admin = ({ strapi: strapi2 }) => ({
       console.log(err);
       return "Error. Couldn't update config";
     }
-    if (newConfigMerged.selectedContentTypes) {
-      try {
-        const routes2 = await strapi2.documents(waRoute).findMany();
-        const invalidRoutes = routes2.filter(
-          (route2) => !newConfigMerged.selectedContentTypes.find((type2) => type2.uid === route2.relatedContentType)
-        );
-        for (const route2 of invalidRoutes) {
-          await strapi2.documents(waRoute).delete({ documentId: route2.documentId });
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    }
     return newConfigMerged;
   },
   async getConfig() {
@@ -5716,31 +5720,28 @@ const admin = ({ strapi: strapi2 }) => ({
   async updateNavigationItemStructure(navigationId, navigationItems) {
     if (!navigationId || !navigationItems) return;
     let error = false;
-    let groupIndices = [];
-    let parentIds = [];
     const newNavItemsMap = /* @__PURE__ */ new Map();
     for (const [index2, item] of navigationItems.entries()) {
-      if (!item.route && item.documentId) {
-        try {
-          console.warn("Navigation item without route found. Deleting it. ", item);
-          await deleteNavItem(item.documentId);
-        } catch (error2) {
-          console.error("Error deleting navigation item without route ", error2);
-        }
-        continue;
-      }
       if (item.deleted) {
         try {
           item.documentId && await deleteNavItem(item.documentId);
+          const newItems = reduceDepthOfOrphanedItems(navigationItems, item.documentId);
+          if (!newItems) throw new Error("Failed to reduce depth of orphaned items");
+          navigationItems = newItems;
         } catch (error2) {
           error2 = true;
           console.error("Error deleting navigation item ", error2);
         }
         continue;
       }
-      if (item.parent?.documentId.startsWith("temp-")) {
-        const newItem = newNavItemsMap.get(item.parent.documentId);
-        item.isNew.parent = newItem?.documentId;
+      if (!item.route && item.documentId) {
+        try {
+          console.warn("Navigation item without route found. Deleting it. ", item);
+          await deleteNavItem(item.documentId);
+        } catch (error2) {
+          console.error("Error deleting navigation item without route ", error2);
+        }
+        continue;
       }
       if (item.update && !item.isNew) {
         try {
@@ -5755,9 +5756,12 @@ const admin = ({ strapi: strapi2 }) => ({
           console.error("Error updating route ", error2);
         }
       }
-      const previousItem = navigationItems[index2 - 1];
+    }
+    let parentIds = [];
+    let groupIndices = [];
+    for (const [index2, item] of navigationItems.entries()) {
       if (typeof item.depth !== "number") {
-        return;
+        continue;
       }
       if (item.depth === 0) {
         if (groupIndices[0] !== void 0) {
@@ -5766,25 +5770,34 @@ const admin = ({ strapi: strapi2 }) => ({
           groupIndices[0] = 0;
         }
         parentIds = [];
-      } else if (typeof previousItem.depth === "number" && item.depth === previousItem.depth + 1) {
-        parentIds.push(previousItem.documentId);
-        groupIndices[item.depth] = 0;
-      } else if (typeof previousItem.depth === "number" && item.depth <= previousItem.depth) {
-        const diff = previousItem.depth - item.depth;
-        for (let i = 0; i < diff; i++) {
-          parentIds.pop();
-          groupIndices.pop();
+      } else {
+        const previousItem = navigationItems[index2 - 1];
+        if (previousItem && typeof previousItem.depth === "number") {
+          if (item.depth === previousItem.depth + 1) {
+            parentIds.push(previousItem.documentId.startsWith("temp-") ? newNavItemsMap.get(previousItem.documentId)?.documentId || previousItem.documentId : previousItem.documentId);
+            groupIndices[item.depth] = 0;
+          } else if (item.depth <= previousItem.depth) {
+            const diff = previousItem.depth - item.depth;
+            for (let i = 0; i < diff; i++) {
+              parentIds.pop();
+              groupIndices.pop();
+            }
+            groupIndices[item.depth] = (groupIndices[item.depth] || 0) + 1;
+          } else {
+            groupIndices[item.depth] = (groupIndices[item.depth] || 0) + 1;
+          }
         }
-        groupIndices[item.depth] = (groupIndices[item.depth] || 0) + 1;
       }
+      const calculatedParent = parentIds.at(-1) || null;
+      const calculatedOrder = groupIndices[item.depth] || 0;
       try {
         if (item.isNew) {
           if (item.isNew.route) {
             await createNavItem({
               route: item.isNew.route,
-              parent: item.isNew.parent,
+              parent: calculatedParent,
               navigation: item.isNew.navigation,
-              order: groupIndices[item.depth]
+              order: calculatedOrder
             });
           } else {
             const newRoute = await createExternalRoute({
@@ -5793,23 +5806,19 @@ const admin = ({ strapi: strapi2 }) => ({
               fullPath: item.route.fullPath,
               wrapper: item.route.wrapper,
               internal: item.route.internal
-              // isOverride: item.route.isOverride,
-              // active: item.route.active,
             });
             const newNavItem = await createNavItem({
               route: newRoute.documentId,
               navigation: navigationId,
-              parent: item.isNew.parent,
-              order: groupIndices[item.depth]
+              parent: calculatedParent,
+              order: calculatedOrder
             });
             if (newNavItem) newNavItemsMap.set(item.documentId, newNavItem);
           }
         } else {
           await updateNavItem(item.documentId, {
-            navigation: void 0,
-            route: void 0,
-            order: groupIndices[item.depth] || 0,
-            parent: parentIds.at(-1) || null
+            order: calculatedOrder,
+            parent: calculatedParent
           });
         }
       } catch (errorMsg) {