Skip to content

Commit

Permalink
feat(#639): add bypassCache setting to DruxtEntity
Browse files Browse the repository at this point in the history
  • Loading branch information
Decipher committed Jul 3, 2023
1 parent 219a001 commit 2981ace
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .changeset/khaki-glasses-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"druxt-entity": minor
---

feat(#639): add bypassCache druxt setting to DruxtEntity components.
30 changes: 28 additions & 2 deletions packages/entity/src/components/DruxtEntity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,14 @@ export default {
},
},
created() {
// If static, re-fetch data allowing for cache-bypass.
// @TODO - Don't re-fetch in serverless configuration.
if (this.$store.app.context.isStatic) {
this.$fetch()
}
},
methods: {
/**
* Builds the query for the JSON:API request.
Expand Down Expand Up @@ -318,12 +326,22 @@ export default {
}
if (this.uuid && !this.value) {
// Check if we need to bypass cache.
let bypassCache = false
if (typeof (settings.query || {}).bypassCache === 'boolean') {
bypassCache = settings.query.bypassCache
}
// Build query.
const query = this.getQuery(settings)
// Execute the resquest.
const resource = await this.getResource({
id: this.uuid,
prefix: this.lang,
type: this.type,
query
query,
bypassCache
})
const entity = { ...(resource.data || {}) }
entity.included = resource.included
Expand All @@ -342,12 +360,20 @@ export default {
/**
* Component settings.
*/
settings: ({ $druxt, settings }, wrapperSettings) => {
settings: (context, wrapperSettings) => {
const { $druxt, settings } = context
// Start with the `nuxt.config.js` `druxt.settings.entity` settings and
// merge the Wrapper component settings on top.
let mergedSettings = merge($druxt.settings.entity || {}, wrapperSettings, { arrayMerge: (dest, src) => src })
// Merge the DruxtEntity component `settings` property on top.
mergedSettings = merge(mergedSettings || {}, settings, { arrayMerge: (dest, src) => src })
// Evaluate the bypass cache function.
if (typeof (mergedSettings.query || {}).bypassCache === 'function') {
mergedSettings.query.bypassCache = !!mergedSettings.query.bypassCache(context)
}
// Currently only returning the query settings.
return {
query: mergedSettings.query || {},
Expand Down

0 comments on commit 2981ace

Please sign in to comment.