[#21] Updated fetch methods.

druxt · Aug 29, 2020 · 24202f7 · 24202f7
1 parent 50f1ab6
commit 24202f7
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 26 deletions.
diff --git a/src/components/DruxtBlock.vue b/src/components/DruxtBlock.vue
@@ -165,6 +165,13 @@ export default {
      * @see {@link https://druxt.github.io/druxt-entity/api/mixins/componentSuggestion.html|DruxtEntityComponentSuggestionMixin}
      */
     tokenType: () => 'block'
+  },
+
+  created() {
+    // Workaround for Vuepress docs.
+    if (!this.$fetch && DruxtRouterEntityMixin.fetch) {
+      DruxtRouterEntityMixin.fetch.call(this)
+    }
   }
 }
 </script>
diff --git a/src/components/DruxtBlockRegion.vue b/src/components/DruxtBlockRegion.vue
@@ -67,30 +67,10 @@ export default {
   },
 
   /**
-   * Fetch requested blocks from Druxt.js Router.
+   * Nuxt.js fetch method.
    */
   async fetch() {
-    const query = new DrupalJsonApiParams()
-    query
-      .addFilter('region', this.name)
-      .addFilter('status', '1')
-      .addFilter('theme', this.theme)
-      .addGroup('visibility', 'OR')
-      .addFilter('visibility.request_path', null, 'IS NULL', 'visibility')
-
-    query.addGroup('pages', 'AND', 'visibility')
-      .addFilter('visibility.request_path.pages', this.route.resolvedPath, 'CONTAINS', 'pages')
-      .addFilter('visibility.request_path.negate', 0, '=', 'pages')
-
-    query.addGroup('front', 'AND', 'visibility')
-      .addFilter('visibility.request_path.pages', '<front>', 'CONTAINS', 'front')
-      .addFilter('visibility.request_path.negate', this.route.isHomePath ? 0 : 1, '=', 'front')
-
-    const options = {
-      headers: { 'Druxt-Request-Path': this.$store.state.druxtRouter.route.resolvedPath }
-    }
-
-    this.blocks = await this.getResources({ resource: 'block--block', query })
+    await this.fetch()
   },
 
   /**
@@ -176,13 +156,53 @@ export default {
     })
   },
 
+  /**
+   * Nuxt.js watch property.
+   */
   watch: {
+    /**
+     * Updates blocks on Route change.
+     */
     $route: function() {
-      this.$fetch()
+      this.fetch()
+    }
+  },
+
+  created() {
+    // Workaround for Vuepress docs.
+    if (!this.blocks.length) {
+      this.fetch()
     }
   },
 
   methods: {
+    /**
+     * Fetch requested blocks from Druxt.js Router.
+     */
+    async fetch() {
+      const query = new DrupalJsonApiParams()
+      query
+        .addFilter('region', this.name)
+        .addFilter('status', '1')
+        .addFilter('theme', this.theme)
+        .addGroup('visibility', 'OR')
+        .addFilter('visibility.request_path', null, 'IS NULL', 'visibility')
+
+      query.addGroup('pages', 'AND', 'visibility')
+        .addFilter('visibility.request_path.pages', this.route.resolvedPath, 'CONTAINS', 'pages')
+        .addFilter('visibility.request_path.negate', 0, '=', 'pages')
+
+      query.addGroup('front', 'AND', 'visibility')
+        .addFilter('visibility.request_path.pages', '<front>', 'CONTAINS', 'front')
+        .addFilter('visibility.request_path.negate', this.route.isHomePath ? 0 : 1, '=', 'front')
+
+      const options = {
+        headers: { 'Druxt-Request-Path': this.$store.state.druxtRouter.route.resolvedPath }
+      }
+
+      this.blocks = await this.getResources({ resource: 'block--block', query })
+    },
+
     /**
      * Maps `druxtRouter/getResources` Vuex action to `this.getResources`.
      */

diff --git a/src/components/__tests__/DruxtBlockRegion.test.js b/src/components/__tests__/DruxtBlockRegion.test.js
@@ -69,9 +69,9 @@ describe('Component - DruxtBlockRegion', () => {
 
     const watch = {
       ...DruxtBlockRegion.watch,
-      $fetch: jest.fn()
+      fetch: jest.fn()
     }
     watch.$route()
-    expect(watch.$fetch).toHaveBeenCalled()
+    expect(watch.fetch).toHaveBeenCalled()
   })
 })
diff --git a/src/mixins/block.js b/src/mixins/block.js
@@ -19,7 +19,7 @@ import { DruxtEntityContextMixin } from 'druxt-entity'
  * }
  * </script>
  *
- * @see {@link https://druxt.github.io/druxt-entity/api/mixins/componentSuggestion|DruxtEntityComponentSuggestionMixin}
+ * @see {@link https://entity.druxtjs.org/api/mixins/componentSuggestion.html|DruxtEntityComponentSuggestionMixin}
  */
 const DruxtBlocksBlockMixin = {
   /**