Merge branch 'release/0.16.1'

packages/blocks/CHANGELOG.md

@@ -1,5 +1,12 @@
 # druxt-blocks
 
+## 0.14.5
+
+### Patch Changes
+
+- Updated dependencies [60ee4e8]
+  - [email protected]
+
 ## 0.14.4
 
 ### Patch Changes

packages/blocks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-blocks",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "description": "Drupal Block and Block Region Druxt components.",
   "keywords": [
     "block",
@@ -45,7 +45,7 @@
     "axios": "^0.21.1",
     "drupal-jsonapi-params": "^1.1.12",
     "druxt": "^0.16.0",
-    "druxt-entity": "^0.22.0",
+    "druxt-entity": "^0.23.0",
     "druxt-router": "^0.25.0"
   },
   "optionalDependencies": {

packages/entity/CHANGELOG.md

@@ -1,5 +1,29 @@
 # druxt-entity
 
+## 0.23.0
+
+### Minor Changes
+
+- 87ec487: Updated DruxtRouterEntity to use Full view mode.
+
+  ⚠ Potential breaking change
+
+  _**Note:** This may effect the rendered template if the Full view mode is configured in Drupal._
+
+  ```diff
+  -components/DruxtEntityNodePageDefault.vue
+  +components/DruxtEntityNodePageFull.vue
+  -components/druxt/entity/node/page/Default.vue
+  +components/druxt/entity/node/page/Full.vue
+  ```
+
+- 60ee4e8: Added DruxtEntity[EntityType][viewmode][SchemaType] component options.
+
+### Patch Changes
+
+- Updated dependencies [87ec487]
+  - [email protected]
+
 ## 0.22.0
 
 ### Minor Changes

packages/entity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-entity",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "Drupal Display Mode powered Entity, Form and Field Druxt components.",
   "keywords": [
     "cms",
@@ -48,7 +48,7 @@
     "drupal-jsonapi-params": "^1.2.2",
     "druxt": "^0.16.0",
     "druxt-router": "^0.25.0",
-    "druxt-schema": "^0.9.3"
+    "druxt-schema": "^0.10.0"
   },
   "publishConfig": {
     "access": "public"

packages/entity/src/components/DruxtEntity.vue

@@ -119,7 +119,7 @@ export default {
       if (!schema) return false
 
       const fields = {}
-      for (const field of schema.fields) {
+      for (const field of schema.fields || []) {
         const relationship = !!((field.settings || {}).storage || {}).target_type || !!(model.relationships || {})[field.id]
         const value = relationship ? ((model || {}).relationships || {})[field.id] : ((model || {}).attributes || {})[field.id]
 
@@ -248,8 +248,24 @@ export default {
      * @returns {ComponentOptions}
      */
     componentOptions: ({ mode, schema, schemaType, type }) => ([
-      [(schema || {}).resourceType || type, ((schema || {}).config || {}).mode || mode, ((schema || {}).config || {}).schemaType || schemaType || 'view'],
-      [((schema || {}).config || {}).mode || mode],
+      // DruxtEntity[ResourceType][ViewMode][SchemaType]
+      [
+        (schema || {}).resourceType || type,
+        ((schema || {}).config || {}).mode || mode,
+        ((schema || {}).config || {}).schemaType || schemaType || 'view'
+      ],
+
+      // DruxtEntity[EntityType][ViewMode][SchemaType]
+      [
+        ((schema || {}).resourceType || type).split('--').shift(),
+        ((schema || {}).config || {}).mode || mode,
+        ((schema || {}).config || {}).schemaType || schemaType || 'view'
+      ],
+
+      // DruxtEntity[ViewMode]
+      [
+        ((schema || {}).config || {}).mode || mode,
+      ],
     ]),
 
     /**
@@ -368,17 +384,23 @@ export default {
  * @example @lang js
  * [
  *   'DruxtEntity[ResourceType][DisplayMode][SchemaType]',
+ *   'DruxtEntity[EntityType][DisplayMode][SchemaType]',
  *   'DruxtEntity[ResourceType][DisplayMode]',
+ *   'DruxtEntity[EntityType][DisplayMode]',
  *   'DruxtEntity[ResourceType]',
+ *   'DruxtEntity[EntityType]',
  *   'DruxtEntity[DisplayMode]',
  * ]
  *
  * @example <caption>Article Node (default)</caption> @lang js
  * [
  *   'DruxtEntityNodeArticleDefaultView',
+ *   'DruxtEntityNodeDefaultView',
  *   'DruxtEntityNodeArticleDefault',
- *   'DruxtEntityNodeArticle',
  *   'DruxtEntityNodeDefault',
+ *   'DruxtEntityNodeArticle',
+ *   'DruxtEntityNode',
+ *   'DruxtEntityDefault',
  * ]
  */
 

packages/entity/src/components/DruxtRouterEntity.vue

@@ -1,5 +1,8 @@
 <template>
-  <DruxtEntity v-bind="route.props" />
+  <DruxtEntity
+    v-bind="route.props"
+    mode="full"
+  />
 </template>
 
 <script>

packages/entity/test/components/DruxtEntity.test.js

@@ -77,12 +77,7 @@ describe('DruxtEntity', () => {
       'entity', 'fields', 'schema', 'value'
     ])
     expect(wrapper.vm.component.is).toBe('DruxtEntityNodePage')
-    expect(wrapper.vm.component.options).toStrictEqual([
-      'DruxtEntityNodePageDefaultView',
-      'DruxtEntityNodePageDefault',
-      'DruxtEntityNodePage',
-      'DruxtEntityDefault',
-    ])
+    expect(wrapper.vm.component.options).toMatchSnapshot()
     expect(wrapper.vm.component.props).toStrictEqual({})
     expect(Object.keys(wrapper.vm.component.propsData)).toStrictEqual([
       'entity', 'fields', 'schema', 'value',

packages/entity/test/components/__snapshots__/DruxtEntity.test.js.snap

@@ -1,6 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DruxtEntity component defaults 1`] = `
+Array [
+  "DruxtEntityNodePageDefaultView",
+  "DruxtEntityNodeDefaultView",
+  "DruxtEntityNodePageDefault",
+  "DruxtEntityNodeDefault",
+  "DruxtEntityNodePage",
+  "DruxtEntityNode",
+  "DruxtEntityDefault",
+]
+`;
+
+exports[`DruxtEntity component defaults 2`] = `
 "<div>
   <druxtentitynodepage-stub entity=\\"[object Object]\\" fields=\\"[object Object]\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"></druxtentitynodepage-stub>
 </div>"
@@ -11,8 +23,11 @@ exports[`DruxtEntity missing schema 1`] = `
   <div entity=\\"[object Object]\\" value=\\"[object Object]\\">
     <druxtdebug-stub summary=\\"Missing schema for 'file--file--default'\\"><label>Component options:<ul>
           <li>DruxtEntityFileFileDefaultView</li>
+          <li>DruxtEntityFileDefaultView</li>
           <li>DruxtEntityFileFileDefault</li>
+          <li>DruxtEntityFileDefault</li>
           <li>DruxtEntityFileFile</li>
+          <li>DruxtEntityFile</li>
           <li>DruxtEntityDefault</li>
         </ul></label><label>Entity:<pre>{
   \\"type\\": \\"file--file\\",

packages/schema/CHANGELOG.md

@@ -1,5 +1,11 @@
 # druxt-schema
 
+## 0.10.0
+
+### Minor Changes
+
+- 87ec487: Add fallback to 'default' if schema view mode is missing.
+
 ## 0.9.3
 
 ### Patch Changes

packages/schema/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-schema",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "Drupal Content Entity schema generator for Druxt with support for View and Form displays.",
   "keywords": [
     "cms",

packages/schema/templates/plugin.js

@@ -11,7 +11,20 @@ const DruxtSchemaPlugin = {
    * @example @lang js
    * const schema = await this.$druxtSchema.import('node--page--default--view')
    */
-  import: async id => import(`./schemas/${id}.json`).then(m => m.default || m)
+  import: async id => {
+    return import(`./schemas/${id}.json`)
+      .then(m => m.default || m)
+      .catch(async (err) => {
+        const parts = id.split('--')
+
+        // Error if there's no default view mode.
+        if (parts[parts.length - 2] === 'default') throw err
+
+        // Fallback to the default view mode.
+        parts[parts.length - 2] = 'default'
+        return import(`./schemas/${parts.join('--')}.json`).then(m => m.default || m)
+      })
+  }
 }
 
 export default (context, inject) => {

packages/site/CHANGELOG.md

@@ -1,5 +1,15 @@
 # druxt-site
 
+## 0.10.5
+
+### Patch Changes
+
+- Updated dependencies [60ee4e8]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.10.4
 
 ### Patch Changes

packages/site/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-site",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "Out of the box Decoupled Drupal sites with Druxt.",
   "keywords": [
     "cms",
@@ -44,13 +44,13 @@
   "dependencies": {
     "drupal-jsonapi-params": "^1.2.2",
     "druxt": "^0.16.0",
-    "druxt-blocks": "^0.14.4",
+    "druxt-blocks": "^0.14.5",
     "druxt-breadcrumb": "^0.13.4",
-    "druxt-entity": "^0.22.0",
+    "druxt-entity": "^0.23.0",
     "druxt-menu": "^0.15.3",
     "druxt-router": "^0.25.0",
-    "druxt-schema": "^0.9.3",
-    "druxt-views": "^0.17.1",
+    "druxt-schema": "^0.10.0",
+    "druxt-views": "^0.17.2",
     "md5": "^2.2.1"
   },
   "optionalDependencies": {

packages/views/CHANGELOG.md

@@ -1,5 +1,13 @@
 # druxt-views
 
+## 0.17.2
+
+### Patch Changes
+
+- Updated dependencies [60ee4e8]
+  - [email protected]
+  - [email protected]
+
 ## 0.17.1
 
 ### Patch Changes

packages/views/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-views",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "Drupal Views components for Druxt with support for filters, pagination and sorting.",
   "keywords": [
     "cms",
@@ -45,8 +45,8 @@
     "deepmerge": "^4.2.2",
     "drupal-jsonapi-params": "^1.1.12",
     "druxt": "^0.16.0",
-    "druxt-blocks": "^0.14.4",
-    "druxt-entity": "^0.22.0",
+    "druxt-blocks": "^0.14.5",
+    "druxt-entity": "^0.23.0",
     "druxt-router": "^0.25.0",
     "md5": "^2.3.0"
   },

yarn.lock

@@ -6305,14 +6305,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"druxt-blocks@^0.14.4, druxt-blocks@workspace:packages/blocks":
+"druxt-blocks@^0.14.4, druxt-blocks@^0.14.5, druxt-blocks@workspace:packages/blocks":
   version: 0.0.0-use.local
   resolution: "druxt-blocks@workspace:packages/blocks"
   dependencies:
     axios: ^0.21.1
     drupal-jsonapi-params: ^1.1.12
     druxt: ^0.16.0
-    druxt-entity: ^0.22.0
+    druxt-entity: ^0.23.0
     druxt-router: ^0.25.0
     vue: ^2.6.14
     vuex: ^3.6.2
@@ -6359,15 +6359,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"druxt-entity@^0.22.0, druxt-entity@workspace:packages/entity":
+"druxt-entity@^0.23.0, druxt-entity@workspace:packages/entity":
   version: 0.0.0-use.local
   resolution: "druxt-entity@workspace:packages/entity"
   dependencies:
     deepmerge: ^4.2.2
     drupal-jsonapi-params: ^1.2.2
     druxt: ^0.16.0
     druxt-router: ^0.25.0
-    druxt-schema: ^0.9.3
+    druxt-schema: ^0.10.0
   languageName: unknown
   linkType: soft
 
@@ -6405,7 +6405,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"druxt-schema@^0.9.3, druxt-schema@workspace:packages/schema":
+"druxt-schema@^0.10.0, druxt-schema@workspace:packages/schema":
   version: 0.0.0-use.local
   resolution: "druxt-schema@workspace:packages/schema"
   dependencies:
@@ -6428,13 +6428,13 @@ __metadata:
   dependencies:
     drupal-jsonapi-params: ^1.2.2
     druxt: ^0.16.0
-    druxt-blocks: ^0.14.4
+    druxt-blocks: ^0.14.5
     druxt-breadcrumb: ^0.13.4
-    druxt-entity: ^0.22.0
+    druxt-entity: ^0.23.0
     druxt-menu: ^0.15.3
     druxt-router: ^0.25.0
-    druxt-schema: ^0.9.3
-    druxt-views: ^0.17.1
+    druxt-schema: ^0.10.0
+    druxt-views: ^0.17.2
     md5: ^2.2.1
     vue: ^2.6.14
     vuex: ^3.6.2
@@ -6457,16 +6457,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"druxt-views@^0.17.1, druxt-views@workspace:packages/views":
+"druxt-views@^0.17.2, druxt-views@workspace:packages/views":
   version: 0.0.0-use.local
   resolution: "druxt-views@workspace:packages/views"
   dependencies:
     axios: ^0.21.1
     deepmerge: ^4.2.2
     drupal-jsonapi-params: ^1.1.12
     druxt: ^0.16.0
-    druxt-blocks: ^0.14.4
-    druxt-entity: ^0.22.0
+    druxt-blocks: ^0.14.5
+    druxt-entity: ^0.23.0
     druxt-router: ^0.25.0
     md5: ^2.3.0
     vue: ^2.6.14