diff options
Diffstat (limited to 'src/content/dependencies')
5 files changed, 17 insertions, 15 deletions
diff --git a/src/content/dependencies/generateAlbumTrackListItem.js b/src/content/dependencies/generateAlbumTrackListItem.js index b750ddb1..761a4b50 100644 --- a/src/content/dependencies/generateAlbumTrackListItem.js +++ b/src/content/dependencies/generateAlbumTrackListItem.js @@ -13,7 +13,7 @@ export default { relations.contributionLinks = track.artistContribs - .map(({who, what}) => relation('linkContribution', who, what)); + .map(contrib => relation('linkContribution', contrib)); relations.trackLink = relation('linkTrack', track); diff --git a/src/content/dependencies/generateReleaseInfoContributionsLine.js b/src/content/dependencies/generateReleaseInfoContributionsLine.js index 78d3e506..5a97e651 100644 --- a/src/content/dependencies/generateReleaseInfoContributionsLine.js +++ b/src/content/dependencies/generateReleaseInfoContributionsLine.js @@ -13,8 +13,7 @@ export default { contributionLinks: contributions .slice(0, 4) - .map(({who, what}) => - relation('linkContribution', who, what)), + .map(contrib => relation('linkContribution', contrib)), }; }, diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js index 9ea8efab..c4596f14 100644 --- a/src/content/dependencies/generateTrackInfoPage.js +++ b/src/content/dependencies/generateTrackInfoPage.js @@ -150,8 +150,8 @@ export default { relation('generateContentHeading'); contributors.contributionLinks = - track.contributorContribs.map(({who, what}) => - relation('linkContribution', who, what)); + track.contributorContribs + .map(contrib => relation('linkContribution', contrib)); } // Section: Referenced tracks diff --git a/src/content/dependencies/generateTrackList.js b/src/content/dependencies/generateTrackList.js index 6688a33d..d0f14618 100644 --- a/src/content/dependencies/generateTrackList.js +++ b/src/content/dependencies/generateTrackList.js @@ -16,8 +16,8 @@ export default { relation('linkTrack', track), contributionLinks: - track.artistContribs.map(contrib => - relation('linkContribution', contrib.who, contrib.what)), + track.artistContribs + .map(contrib => relation('linkContribution', contrib)), })), }; }, diff --git a/src/content/dependencies/linkContribution.js b/src/content/dependencies/linkContribution.js index c9b514fe..f4c05388 100644 --- a/src/content/dependencies/linkContribution.js +++ b/src/content/dependencies/linkContribution.js @@ -11,14 +11,15 @@ export default { 'language', ], - relations(relation, artist) { + relations(relation, contribution) { const relations = {}; - relations.artistLink = relation('linkArtist', artist); + relations.artistLink = + relation('linkArtist', contribution.who); - if (!empty(artist.urls)) { + if (!empty(contribution.who.urls)) { relations.artistIcons = - artist.urls + contribution.who.urls .slice(0, 4) .map(url => relation('linkExternalAsIcon', url)); } @@ -26,8 +27,10 @@ export default { return relations; }, - data(artist, contribution) { - return {contribution}; + data(contribution) { + return { + what: contribution.what, + }; }, slots: { @@ -36,7 +39,7 @@ export default { }, generate(data, relations, slots, {html, language}) { - const hasContributionPart = !!(slots.showContribution && data.contribution); + const hasContributionPart = !!(slots.showContribution && data.what); const hasExternalPart = !!(slots.showIcons && relations.artistIcons); const externalLinks = hasExternalPart && @@ -49,7 +52,7 @@ export default { if (hasContributionPart) { parts.push('withContribution'); - options.contrib = data.contribution; + options.contrib = data.what; } if (hasExternalPart) { |