From a1bfa1d0d68890ebd5811bd46455d10be4bbc17d Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Wed, 4 Oct 2023 13:16:50 -0300 Subject: support art tag info pages; ensure "art tag" terminology everywhere --- .../dependencies/generateArtTagGalleryPage.js | 78 +++++++++------------ src/content/dependencies/generateArtTagNavLinks.js | 80 ++++++++++++++++++++++ src/content/dependencies/generateCoverArtwork.js | 14 ++-- src/content/dependencies/image.js | 4 +- src/content/dependencies/linkArtTag.js | 2 +- src/content/dependencies/linkArtTagGallery.js | 8 +++ src/content/dependencies/listTagsByName.js | 15 ++-- src/content/dependencies/listTagsByUses.js | 49 ++++++------- src/content/dependencies/transformContent.js | 9 ++- 9 files changed, 170 insertions(+), 89 deletions(-) create mode 100644 src/content/dependencies/generateArtTagNavLinks.js create mode 100644 src/content/dependencies/linkArtTagGallery.js (limited to 'src/content/dependencies') diff --git a/src/content/dependencies/generateArtTagGalleryPage.js b/src/content/dependencies/generateArtTagGalleryPage.js index c37fe710..fcdf917b 100644 --- a/src/content/dependencies/generateArtTagGalleryPage.js +++ b/src/content/dependencies/generateArtTagGalleryPage.js @@ -3,12 +3,14 @@ import {sortAlbumsTracksChronologically} from '#wiki-data'; export default { contentDependencies: [ + 'generateArtTagNavLinks', 'generateCoverGrid', 'generatePageLayout', 'generateQuickDescription', 'image', 'linkAlbum', 'linkArtTag', + 'linkArtTagGallery', 'linkTrack', ], @@ -20,9 +22,9 @@ export default { }; }, - query(sprawl, tag) { - const directThings = tag.directlyTaggedInThings; - const indirectThings = tag.indirectlyTaggedInThings; + query(sprawl, artTag) { + const directThings = artTag.directlyTaggedInThings; + const indirectThings = artTag.indirectlyTaggedInThings; const allThings = unique([...directThings, ...indirectThings]); sortAlbumsTracksChronologically(allThings, { @@ -33,57 +35,57 @@ export default { return {directThings, indirectThings, allThings}; }, - relations(relation, query, sprawl, tag) { + relations(relation, query, sprawl, artTag) { const relations = {}; relations.layout = relation('generatePageLayout'); - relations.artTagMainLink = - relation('linkArtTag', tag); + relations.navLinks = + relation('generateArtTagNavLinks', artTag); - // TODO: linkArtTagInfo relations.infoPageLink = - relation('linkArtTag', tag); + relation('linkArtTag', artTag); relations.quickDescription = - relation('generateQuickDescription', tag); + relation('generateQuickDescription', artTag); - if (!empty(tag.directAncestorTags)) { + if (!empty(artTag.directAncestorArtTags)) { relations.ancestorLinks = - tag.directAncestorTags.map(tag => - relation('linkArtTag', tag)); + artTag.directAncestorArtTags + .map(artTag => relation('linkArtTagGallery', artTag)); } - if (!empty(tag.directDescendantTags)) { + if (!empty(artTag.directDescendantArtTags)) { relations.descendantLinks = - tag.directDescendantTags.map(tag => - relation('linkArtTag', tag)); + artTag.directDescendantArtTags + .map(artTag => relation('linkArtTagGallery', artTag)); } relations.coverGrid = relation('generateCoverGrid'); relations.links = - query.allThings.map(thing => - (thing.album - ? relation('linkTrack', thing) - : relation('linkAlbum', thing))); + query.allThings + .map(thing => + (thing.album + ? relation('linkTrack', thing) + : relation('linkAlbum', thing))); relations.images = - query.allThings.map(thing => - relation('image', thing.artTags)); + query.allThings + .map(thing => relation('image', thing.artTags)); return relations; }, - data(query, sprawl, tag) { + data(query, sprawl, artTag) { const data = {}; data.enableListings = sprawl.enableListings; - data.name = tag.name; - data.color = tag.color; + data.name = artTag.name; + data.color = artTag.color; data.numArtworks = query.allThings.length; @@ -107,7 +109,7 @@ export default { return relations.layout .slots({ title: - language.$('tagPage.title', { + language.$('artTagGalleryPage.title', { tag: data.name, }), @@ -121,7 +123,7 @@ export default { .slot('infoPageLink', relations.infoPageLink), html.tag('p', {class: 'quick-info'}, - language.$('tagPage.infoLine', { + language.$('artTagGalleryPage.infoLine', { coverArts: language.countArtworks(data.numArtworks, { unit: true, }), @@ -129,13 +131,13 @@ export default { relations.ancestorLinks && html.tag('p', {class: 'quick-info'}, - language.$('tagPage.descendsFrom', { + language.$('artTagGalleryPage.descendsFrom', { tags: language.formatConjunctionList(relations.ancestorLinks), })), relations.descendantLinks && html.tag('p', {clasS: 'quick-info'}, - language.$('tagPage.desendants', { + language.$('artTagGalleryPage.desendants', { tags: language.formatUnitList(relations.descendantLinks), })), @@ -159,22 +161,10 @@ export default { ], navLinkStyle: 'hierarchical', - navLinks: [ - {auto: 'home'}, - - data.enableListings && - { - path: ['localized.listingIndex'], - title: language.$('listingIndex.title'), - }, - - { - html: - language.$('tagPage.nav.tag', { - tag: relations.artTagMainLink, - }), - }, - ], + navLinks: + relations.navLinks + .slot('currentExtra', 'gallery') + .content, }); }, }; diff --git a/src/content/dependencies/generateArtTagNavLinks.js b/src/content/dependencies/generateArtTagNavLinks.js new file mode 100644 index 00000000..368b36fe --- /dev/null +++ b/src/content/dependencies/generateArtTagNavLinks.js @@ -0,0 +1,80 @@ +import {empty} from '#sugar'; + +export default { + contentDependencies: [ + 'linkArtTag', + 'linkArtTagGallery', + ], + + extraDependencies: ['html', 'language', 'wikiData'], + + sprawl: ({wikiInfo}) => + ({enableListings: wikiInfo.enableListings}), + + relations: (relation, sprawl, tag) => ({ + mainLink: + relation('linkArtTag', tag), + + infoLink: + relation('linkArtTag', tag), + + galleryLink: + relation('linkArtTagGallery', tag), + }), + + data: (sprawl) => + ({enableListings: sprawl.enableListings}), + + slots: { + currentExtra: { + validate: v => v.is('gallery'), + }, + }, + + generate(data, relations, slots, {language}) { + if (!data.enableListings) { + return [ + {auto: 'home'}, + {auto: 'current'}, + ]; + } + + const infoLink = + relations.infoLink.slots({ + attributes: {class: slots.currentExtra === null && 'current'}, + content: language.$('misc.nav.info'), + }); + + const extraLinks = [ + relations.galleryLink?.slots({ + attributes: {class: slots.currentExtra === 'gallery' && 'current'}, + content: language.$('misc.nav.gallery'), + }), + ]; + + const extrasPart = + (empty(extraLinks) + ? '' + : language.formatUnitList([infoLink, ...extraLinks])); + + const accent = `(${extrasPart})`; + + return [ + {auto: 'home'}, + + data.enableListings && + { + path: ['localized.listingIndex'], + title: language.$('listingIndex.title'), + }, + + { + accent, + html: + language.$('artTagPage.nav.tag', { + tag: relations.mainLink, + }), + }, + ].filter(Boolean); + }, +}; diff --git a/src/content/dependencies/generateCoverArtwork.js b/src/content/dependencies/generateCoverArtwork.js index 4060c6b0..392d8c25 100644 --- a/src/content/dependencies/generateCoverArtwork.js +++ b/src/content/dependencies/generateCoverArtwork.js @@ -1,7 +1,7 @@ import {empty} from '#sugar'; export default { - contentDependencies: ['image', 'linkArtTag'], + contentDependencies: ['image', 'linkArtTagGallery'], extraDependencies: ['html', 'language'], relations(relation, artTags) { @@ -11,12 +11,12 @@ export default { relation('image', artTags); if (artTags) { - relations.tagLinks = + relations.artTagLinks = artTags - .filter(tag => !tag.isContentWarning) - .map(tag => relation('linkArtTag', tag)); + .filter(artTag => !artTag.isContentWarning) + .map(artTag => relation('linkArtTagGallery', artTag)); } else { - relations.tagLinks = null; + relations.artTagLinks = null; } return relations; @@ -52,12 +52,12 @@ export default { square: true, }), - !empty(relations.tagLinks) && + !empty(relations.artTagLinks) && html.tag('p', language.$('releaseInfo.artTags.inline', { tags: language.formatUnitList( - relations.tagLinks + relations.artTagLinks .map(tagLink => tagLink.slot('preferShortName', true))), })), ]); diff --git a/src/content/dependencies/image.js b/src/content/dependencies/image.js index 6c0aeecd..006be156 100644 --- a/src/content/dependencies/image.js +++ b/src/content/dependencies/image.js @@ -20,8 +20,8 @@ export default { if (artTags) { data.contentWarnings = artTags - .filter(tag => tag.isContentWarning) - .map(tag => tag.name); + .filter(artTag => artTag.isContentWarning) + .map(artTag => artTag.name); } else { data.contentWarnings = null; } diff --git a/src/content/dependencies/linkArtTag.js b/src/content/dependencies/linkArtTag.js index 7ddb7786..409cb3c0 100644 --- a/src/content/dependencies/linkArtTag.js +++ b/src/content/dependencies/linkArtTag.js @@ -2,7 +2,7 @@ export default { contentDependencies: ['linkThing'], relations: (relation, artTag) => - ({link: relation('linkThing', 'localized.tag', artTag)}), + ({link: relation('linkThing', 'localized.artTagInfo', artTag)}), generate: (relations) => relations.link, }; diff --git a/src/content/dependencies/linkArtTagGallery.js b/src/content/dependencies/linkArtTagGallery.js new file mode 100644 index 00000000..a92b69c1 --- /dev/null +++ b/src/content/dependencies/linkArtTagGallery.js @@ -0,0 +1,8 @@ +export default { + contentDependencies: ['linkThing'], + + relations: (relation, artTag) => + ({link: relation('linkThing', 'localized.artTagGallery', artTag)}), + + generate: (relations) => relations.link, +}; diff --git a/src/content/dependencies/listTagsByName.js b/src/content/dependencies/listTagsByName.js index 8571ccd0..9bec9eaa 100644 --- a/src/content/dependencies/listTagsByName.js +++ b/src/content/dependencies/listTagsByName.js @@ -1,8 +1,8 @@ -import {stitchArrays} from '#sugar'; +import {stitchArrays, unique} from '#sugar'; import {sortAlphabetically} from '#wiki-data'; export default { - contentDependencies: ['generateListingPage', 'linkArtTag'], + contentDependencies: ['generateListingPage', 'linkArtTagGallery'], extraDependencies: ['language', 'wikiData'], sprawl({artTagData}) { @@ -16,7 +16,7 @@ export default { artTags: sortAlphabetically( artTagData - .filter(tag => !tag.isContentWarning)), + .filter(artTag => !artTag.isContentWarning)), }; }, @@ -26,15 +26,18 @@ export default { artTagLinks: query.artTags - .map(tag => relation('linkArtTag', tag)), + .map(artTag => relation('linkArtTagGallery', artTag)), }; }, data(query) { return { counts: - query.artTags - .map(tag => tag.taggedInThings.length), + query.artTags.map(artTag => + unique([ + ...artTag.indirectlyTaggedInThings, + ...artTag.directlyTaggedInThings, + ]).length), }; }, diff --git a/src/content/dependencies/listTagsByUses.js b/src/content/dependencies/listTagsByUses.js index 98a50b89..9eb6f185 100644 --- a/src/content/dependencies/listTagsByUses.js +++ b/src/content/dependencies/listTagsByUses.js @@ -1,23 +1,25 @@ -import {stitchArrays} from '#sugar'; +import {stitchArrays, unique} from '#sugar'; import {filterByCount, sortAlphabetically, sortByCount} from '#wiki-data'; export default { - contentDependencies: ['generateListingPage', 'linkArtTag'], + contentDependencies: ['generateListingPage', 'linkArtTagGallery'], extraDependencies: ['language', 'wikiData'], - sprawl({artTagData}) { - return {artTagData}; - }, + sprawl: ({artTagData}) => + ({artTagData}), query({artTagData}, spec) { const artTags = sortAlphabetically( artTagData - .filter(tag => !tag.isContentWarning)); + .filter(artTag => !artTag.isContentWarning)); const counts = - artTags - .map(tag => tag.taggedInThings.length); + artTags.map(artTag => + unique([ + ...artTag.directlyTaggedInThings, + ...artTag.indirectlyTaggedInThings, + ]).length); filterByCount(artTags, counts); sortByCount(artTags, counts, {greatestFirst: true}); @@ -25,26 +27,20 @@ export default { return {spec, artTags, counts}; }, - relations(relation, query) { - return { - page: relation('generateListingPage', query.spec), + relations: (relation, query) => ({ + page: + relation('generateListingPage', query.spec), - artTagLinks: - query.artTags - .map(tag => relation('linkArtTag', tag)), - }; - }, + artTagLinks: + query.artTags + .map(artTag => relation('linkArtTagGallery', artTag)), + }), - data(query) { - return { - counts: - query.artTags - .map(tag => tag.taggedInThings.length), - }; - }, + data: (query) => + ({counts: query.counts}), - generate(data, relations, {language}) { - return relations.page.slots({ + generate: (data, relations, {language}) => + relations.page.slots({ type: 'rows', rows: stitchArrays({ @@ -54,6 +50,5 @@ export default { tag: link, timesUsed: language.countTimesUsed(count, {unit: true}), })), - }); - }, + }), }; diff --git a/src/content/dependencies/transformContent.js b/src/content/dependencies/transformContent.js index 9a5ac456..087520ce 100644 --- a/src/content/dependencies/transformContent.js +++ b/src/content/dependencies/transformContent.js @@ -104,7 +104,11 @@ export const replacerSpec = { }, tag: { find: 'artTag', - link: 'tag', + link: 'artTag', + }, + 'tag-info': { + find: 'artTag', + link: 'artTagInfo', }, track: { find: 'track', @@ -118,13 +122,14 @@ const linkThingRelationMap = { albumGallery: 'linkAlbumGallery', artist: 'linkArtist', artistGallery: 'linkArtistGallery', + artTag: 'linkArtTagGallery', + artTagInfo: 'linkArtTag', flash: 'linkFlash', groupInfo: 'linkGroup', groupGallery: 'linkGroupGallery', listing: 'linkListing', newsEntry: 'linkNewsEntry', staticPage: 'linkStaticPage', - tag: 'linkArtTag', track: 'linkTrack', }; -- cgit 1.3.0-6-gf8a5