[#28] Improved subtree support.

druxt · Sep 16, 2020 · a625d46 · a625d46
1 parent 817fe06
commit a625d46
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...ata/f4fabf86024f8ede67c3834e4f59dae6.json → ...ata/4f558cdfa7030f95ba06f2fc426784a6.json b/...ata/f4fabf86024f8ede67c3834e4f59dae6.json → ...ata/4f558cdfa7030f95ba06f2fc426784a6.json
@@ -19,6 +19,7 @@
         }
       },
       "attributes":{
+        "bundle": "menu_link_content",
         "title":"Home",
         "description":"Home",
         "menu_name":"main",
@@ -42,6 +43,7 @@
         }
       },
       "attributes":{
+        "bundle": "menu_link_content",
         "title":"Articles",
         "description":"Articles",
         "menu_name":"main",
@@ -65,6 +67,7 @@
         }
       },
       "attributes":{
+        "bundle": "menu_link_content",
         "title":"Recipes",
         "description":"Recipes",
         "menu_name":"main",
@@ -88,6 +91,7 @@
         }
       },
       "attributes":{
+        "bundle": "menu_link_content",
         "title":"Child",
         "description":"Child",
         "menu_name":"main",

diff --git a/src/components/DruxtMenu.vue b/src/components/DruxtMenu.vue
@@ -216,7 +216,12 @@ export default {
       if (!this.depth || position <= this.depth) {
         let parent = null
         if (entity) {
-          parent = 'menu_link_content:' + entity.id
+          parent = entity.id
+
+          // Ensure that the parent is prefixed correctly if we're not using the JSON:API Menu Items module.
+          if (typeof entity.attributes.bundle !== 'undefined') {
+            parent = [entity.attributes.bundle, entity.id].join(':')
+          }
         }
 
         const entities = this.getEntitiesByFilter(key => {

diff --git a/src/menu.js b/src/menu.js
@@ -67,7 +67,7 @@ class DruxtMenu {
    */
   async getMenuLinkContent(menuName) {
     const resource = 'menu_link_content--menu_link_content'
-    const fields = ['description', 'link', 'menu_name', 'parent', 'title', 'weight']
+    const fields = ['bundle', 'description', 'link', 'menu_name', 'parent', 'title', 'weight']
 
     const query = new DrupalJsonApiParams()
       .addFilter('enabled', '1')