Skip to content

Commit 737bcb8

Browse files
committed
New release
- Use related links in getRelated in preference to data
1 parent c630a8a commit 737bcb8

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"vuex": "^4.0.0"
5050
},
5151
"name": "jsonapi-vuex",
52-
"version": "5.5.0",
52+
"version": "5.6.0",
5353
"description": "Access restructured JSONAPI data from a Vuex Store.",
5454
"keywords": [
5555
"vue",

src/actions.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,21 +152,21 @@ const actions = (api, conf) => {
152152
throw `No such relationship: ${relName}`
153153
}
154154
}
155-
// Extract relationships from 'data' (type/id)
156-
// empty to-one rels (null) are special-cased
157-
if (utils.hasProperty(relItems, 'data') && relItems['data'] !== null) {
158-
relData = relItems['data']
159-
if (!Array.isArray(relData)) {
160-
// Treat as if always an array
161-
relData = [relData]
162-
}
163-
// Or from 'links/related'
164-
} else if (utils.hasProperty(relItems, 'links')) {
155+
// Use related link if provided
156+
if (utils.hasProperty(relItems, 'links')) {
165157
relData = relItems['links']['related']
166158
if (!(typeof relData === 'string')) {
167159
relData = relData['href']
168160
}
169161
relData = [relData]
162+
// Or extract relationships from 'data' (type/id)
163+
// empty to-one rels (null) are special-cased
164+
} else if (utils.hasProperty(relItems, 'data') && relItems['data'] !== null) {
165+
relData = relItems['data']
166+
if (!Array.isArray(relData)) {
167+
// Treat as if always an array
168+
relData = [relData]
169+
}
170170
}
171171
if (relData) {
172172
for (let entry of relData) {

0 commit comments

Comments
 (0)