druxt-views 0.15.0 → 0.17.0

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # druxt-views
 
+## 0.17.0
+
+### Minor Changes
+
+- 7709ece: Fixed DruxtViewsFilter render method
+
+  ⚠ Potential breaking change
+
+  _**Note:** This may change the markup of a Druxt View filter component._
+
+### Patch Changes
+
+- Updated dependencies [2ae1d6d]
+  - druxt@0.15.0
+  - druxt-blocks@0.14.3
+  - druxt-entity@0.21.4
+  - druxt-router@0.24.2
+
+## 0.16.2
+
+### Patch Changes
+
+- Updated dependencies [45bc0b9]
+  - druxt@0.14.0
+  - druxt-blocks@0.14.2
+  - druxt-entity@0.21.3
+  - druxt-router@0.24.1
+
+## 0.16.1
+
+### Patch Changes
+
+- Updated dependencies [9161b38]
+  - druxt-router@0.24.0
+  - druxt-blocks@0.14.1
+  - druxt-entity@0.21.2
+
+## 0.16.0
+
+### Minor Changes
+
+- e7b1533: Refactored DruxtModule fetch hooks
+
+### Patch Changes
+
+- d80f5d4: Fixed issue with undefined wrapper in DruxtViewsFilter
+- Updated dependencies [025315a]
+  - druxt-entity@0.21.0
+  - druxt-blocks@0.14.0
+  - druxt@0.13.0
+  - druxt-router@0.23.0
+
 ## 0.15.0
 
 ### Minor Changes

package/dist/components/DruxtView.vue

@@ -113,55 +113,6 @@ export default {
     }
   },
 
-  /** */
-  async fetch() {
-    let component = { ...this.component }
-
-    // Fetch View.
-    if (!this.view && (this.uuid || this.viewId)) {
-      if (this.uuid) {
-        this.view = await this.getResource({
-          type: this.type,
-          id: this.uuid,
-        })
-      } else {
-        const collection = await this.getCollection({ type: this.type, query: new DrupalJsonApiParams().addFilter('drupal_internal__id', this.viewId) })
-        this.view = { data: collection.data[0] }
-      }
-
-      // Build wrapper component object.
-      const options = this.getModuleComponents()
-      component = {
-        is: (((options.filter(o => o.global) || [])[0] || {}).name || 'DruxtWrapper'),
-        options: options.map(o => o.name) || [],
-      }
-    }
-
-    // Get scoped slots.
-    component.slots = Object.keys(this.getScopedSlots())
-
-    // Get wrapper component data to merge with module settings.
-    const wrapperData = await this.getWrapperData(component.is)
-    component.settings = merge(this.$druxt.settings.views, wrapperData.druxt || {}, { arrayMerge: (dest, src) => src })
-
-    // Fetch JSON:API Views resource.
-    const viewId = this.viewId || (((this.view || {}).data || {}).attributes || {}).drupal_internal__id
-    if (viewId) {
-      const query = this.getQuery(component.settings)
-      this.resource = await this.getResults({
-        viewId,
-        displayId: this.displayId,
-        query: stringify(query)
-      })
-    }
-
-    // Build wrapper component propsData.
-    component = { ...component, ...this.getModulePropsData(wrapperData.props) }
-
-    // Set component data.
-    this.component = component
-  },
-
   fetchKey(getCounter) {
     const parts = ['DruxtView', this.viewId || this.uuid, this.displayId].filter((o) => o)
     return [...parts, getCounter(parts.join(':'))].join(':')
@@ -440,6 +391,38 @@ export default {
      */
     componentOptions: ({ displayId, uuid, viewId }) => ([[viewId || uuid, displayId]]),
 
+    /**
+     * Fetch View configuration resource.
+     */
+    async fetchConfig() {
+      if (!this.view && (this.uuid || this.viewId)) {
+        if (this.uuid) {
+          this.view = await this.getResource({
+            type: this.type,
+            id: this.uuid,
+          })
+        } else {
+          const collection = await this.getCollection({ type: this.type, query: new DrupalJsonApiParams().addFilter('drupal_internal__id', this.viewId) })
+          this.view = { data: collection.data[0] }
+        }
+      }
+    },
+
+    /**
+     * Fetch JSON:API Views results.
+     */
+    async fetchData(settings) {
+      const viewId = this.viewId || (((this.view || {}).data || {}).attributes || {}).drupal_internal__id
+      if (viewId) {
+        const query = this.getQuery(settings)
+        this.resource = await this.getResults({
+          viewId,
+          displayId: this.displayId,
+          query: stringify(query)
+        })
+      }
+    },
+
     /**
      * Provides propsData for the DruxtWrapper.
      *
@@ -455,6 +438,16 @@ export default {
       view: vm.view
     }),
 
+    /**
+     * Component settings.
+     */
+    settings: ({ $druxt }, wrapperSettings) => {
+      const settings = merge($druxt.settings.views || {}, wrapperSettings, { arrayMerge: (dest, src) => src })
+      return {
+        query: settings.query || {},
+      }
+    },
+
     /**
      * Provides the scoped slots object for the Module render function.
      *

package/dist/components/DruxtViewsFilter.vue

@@ -1,17 +1,3 @@
-<template>
-  <component
-    :is="wrapper.component"
-    v-if="!$fetchState.pending"
-    v-bind="wrapper.propsData"
-  >
-    <component
-      :is="component.is"
-      v-model="model"
-      v-bind="component.propsData"
-    />
-  </component>
-</template>
-
 <script>
 
 import DruxtModule from 'druxt/dist/components/DruxtModule.vue'
@@ -38,14 +24,6 @@ export default {
     },
   },
 
-  watch: {
-    model(to, from) {
-      if (to !== from) {
-        this.$emit('input', this.model)
-      }
-    }
-  },
-
   /** DruxtModule settings */
   druxt: {
     /**

package/dist/druxt-views.esm.js

@@ -7,7 +7,7 @@ import { DruxtEntityContextMixin } from 'druxt-entity';
 
 async function DruxtViewsStorybook({ stories }) {
   const { addTemplate, options } = this;
-  const druxt = new DruxtClient(options.druxt.baseUrl, options.druxt);
+  const druxt = new DruxtClient(options.druxt.baseUrl, { ...options.druxt, proxy: { api: false } });
   const resourceType = "view--view";
   const query = new DrupalJsonApiParams().addFilter("status", 1).addFields(resourceType, ["display", "description", "drupal_internal__id", "label"]);
   const collections = await druxt.getCollectionAll(resourceType, query);
@@ -71,7 +71,6 @@ const DruxtViewsNuxtModule = function(moduleOptions = {}) {
     await DruxtViewsStorybook.call(this, { stories });
   });
 };
-DruxtViewsNuxtModule.meta = require("../package.json");
 
 const DruxtViewsStore = ({ store }) => {
   if (typeof store === "undefined") {
@@ -278,5 +277,7 @@ const DruxtViewsViewMixin = {
   }
 };
 
+DruxtViewsNuxtModule.meta = require("../package.json");
+
 export default DruxtViewsNuxtModule;
 export { DruxtViewsFilterMixin, DruxtViewsFiltersMixin, DruxtViewsPagerMixin, DruxtViewsSortsMixin, DruxtViewsStore, DruxtViewsViewMixin };

package/dist/druxt-views.ssr.js

@@ -16,7 +16,7 @@ const md5__default = /*#__PURE__*/_interopDefaultLegacy(md5);
 
 async function DruxtViewsStorybook({ stories }) {
   const { addTemplate, options } = this;
-  const druxt$1 = new druxt.DruxtClient(options.druxt.baseUrl, options.druxt);
+  const druxt$1 = new druxt.DruxtClient(options.druxt.baseUrl, { ...options.druxt, proxy: { api: false } });
   const resourceType = "view--view";
   const query = new drupalJsonapiParams.DrupalJsonApiParams().addFilter("status", 1).addFields(resourceType, ["display", "description", "drupal_internal__id", "label"]);
   const collections = await druxt$1.getCollectionAll(resourceType, query);
@@ -80,7 +80,6 @@ const DruxtViewsNuxtModule = function(moduleOptions = {}) {
     await DruxtViewsStorybook.call(this, { stories });
   });
 };
-DruxtViewsNuxtModule.meta = require("../package.json");
 
 const DruxtViewsStore = ({ store }) => {
   if (typeof store === "undefined") {
@@ -287,6 +286,8 @@ const DruxtViewsViewMixin = {
   }
 };
 
+DruxtViewsNuxtModule.meta = require("../package.json");
+
 exports.DruxtViewsFilterMixin = DruxtViewsFilterMixin;
 exports.DruxtViewsFiltersMixin = DruxtViewsFiltersMixin;
 exports.DruxtViewsPagerMixin = DruxtViewsPagerMixin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-views",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "Drupal Views components for Druxt with support for filters, pagination and sorting.",
   "keywords": [
     "cms",
@@ -38,17 +38,16 @@
   "module": "dist/druxt-views.esm.js",
   "files": [
     "dist",
-    "nuxt",
     "templates"
   ],
   "dependencies": {
     "axios": "^0.21.1",
     "deepmerge": "^4.2.2",
     "drupal-jsonapi-params": "^1.1.12",
-    "druxt": "^0.12.0",
-    "druxt-blocks": "^0.13.1",
-    "druxt-entity": "^0.20.0",
-    "druxt-router": "^0.22.0",
+    "druxt": "^0.15.0",
+    "druxt-blocks": "^0.14.3",
+    "druxt-entity": "^0.21.4",
+    "druxt-router": "^0.24.2",
     "md5": "^2.3.0"
   },
   "optionalDependencies": {