diff options
Diffstat (limited to 'src/content')
4 files changed, 89 insertions, 16 deletions
diff --git a/src/content/dependencies/generateCommentaryContentHeading.js b/src/content/dependencies/generateCommentaryContentHeading.js new file mode 100644 index 00000000..92405010 --- /dev/null +++ b/src/content/dependencies/generateCommentaryContentHeading.js @@ -0,0 +1,33 @@ +export default { + contentDependencies: ['generateContentContentHeading'], + extraDependencies: ['language'], + + relations: (relation, thing) => ({ + contentContentHeading: + relation('generateContentContentHeading', thing), + }), + + data: (thing) => ({ + hasWikiEditorCommentary: + thing.commentary + .some(entry => entry.isWikiEditorCommentary), + + onlyWikiEditorCommentary: + thing.commentary + .every(entry => entry.isWikiEditorCommentary), + }), + + generate: (data, relations, {language}) => + relations.contentContentHeading.slots({ + // It's #artist-commentary for legacy reasons... Sorry... + attributes: {id: 'artist-commentary'}, + + string: + language.encapsulate('misc.artistCommentary', capsule => + (data.onlyWikiEditorCommentary + ? language.encapsulate(capsule, 'onlyWikiCommentary') + : data.hasWikiEditorCommentary + ? language.encapsulate(capsule, 'withWikiCommentary') + : capsule)), + }), +}; diff --git a/src/content/dependencies/generateReadCommentaryLine.js b/src/content/dependencies/generateReadCommentaryLine.js new file mode 100644 index 00000000..a7a7a4da --- /dev/null +++ b/src/content/dependencies/generateReadCommentaryLine.js @@ -0,0 +1,47 @@ +import {empty} from '#sugar'; + +export default { + extraDependencies: ['html', 'language'], + + query: (thing) => ({ + entries: + (thing.isTrack + ? [...thing.commentary, ...thing.commentaryFromMainRelease] + : thing.commentary), + }), + + data: (query, _thing) => ({ + hasWikiEditorCommentary: + query.entries + .some(entry => entry.isWikiEditorCommentary), + + onlyWikiEditorCommentary: + !empty(query.entries) && + query.entries + .every(entry => entry.isWikiEditorCommentary), + + hasAnyCommentary: + !empty(query.entries), + }), + + generate: (data, {html, language}) => + language.encapsulate('releaseInfo.readCommentary', capsule => + language.$(capsule, { + [language.onlyIfOptions]: ['link'], + + link: + html.tag('a', + {[html.onlyIfContent]: true}, + + {href: '#artist-commentary'}, + + language.encapsulate(capsule, 'link', capsule => + (data.onlyWikiEditorCommentary + ? language.$(capsule, 'onlyWikiCommentary') + : data.hasWikiEditorCommentary + ? language.$(capsule, 'withWikiCommentary') + : data.hasAnyCommentary + ? language.$(capsule) + : html.blank()))), + })), +}; diff --git a/src/content/dependencies/generateTrackArtistCommentarySection.js b/src/content/dependencies/generateTrackArtistCommentarySection.js index 50565bce..5ed24d6c 100644 --- a/src/content/dependencies/generateTrackArtistCommentarySection.js +++ b/src/content/dependencies/generateTrackArtistCommentarySection.js @@ -2,7 +2,7 @@ import {empty, stitchArrays} from '#sugar'; export default { contentDependencies: [ - 'generateContentContentHeading', + 'generateCommentaryContentHeading', 'generateCommentaryEntry', 'linkAlbum', 'linkTrack', @@ -18,8 +18,8 @@ export default { }), relations: (relation, query, track) => ({ - contentContentHeading: - relation('generateContentContentHeading', track), + commentaryContentHeading: + relation('generateCommentaryContentHeading', track), mainReleaseTrackLink: (track.isSecondaryRelease @@ -78,11 +78,7 @@ export default { generate: (data, relations, {html, language}) => language.encapsulate('misc.artistCommentary', capsule => html.tags([ - relations.contentContentHeading.slots({ - attributes: {id: 'artist-commentary'}, - string: 'misc.artistCommentary', - }), - + relations.commentaryContentHeading, relations.artistCommentaryEntries, data.isSecondaryRelease && diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js index b37da199..1f6205d8 100644 --- a/src/content/dependencies/generateTrackInfoPage.js +++ b/src/content/dependencies/generateTrackInfoPage.js @@ -13,6 +13,7 @@ export default { 'generateContributionList', 'generateLyricsSection', 'generatePageLayout', + 'generateReadCommentaryLine', 'generateTrackArtistCommentarySection', 'generateTrackArtworkColumn', 'generateTrackInfoPageFeaturedByFlashesList', @@ -86,6 +87,9 @@ export default { releaseInfo: relation('generateTrackReleaseInfo', track), + readCommentaryLine: + relation('generateReadCommentaryLine', track), + otherReleasesList: relation('generateTrackInfoPageOtherReleasesList', track), @@ -205,14 +209,7 @@ export default { language.$(capsule, 'link')), })), - !html.isBlank(relations.artistCommentarySection) && - language.encapsulate(capsule, 'readCommentary', capsule => - language.$(capsule, { - link: - html.tag('a', - {href: '#artist-commentary'}, - language.$(capsule, 'link')), - })), + relations.readCommentaryLine, !html.isBlank(relations.creditingSourceEntries) && language.encapsulate(capsule, 'readCreditingSources', capsule => |