From fc4eb21bc68dde6d7747cc785b9dfb7c0db2e204 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Mon, 14 Oct 2024 16:39:56 -0300 Subject: content: generateGroupInfoPageAlbumsListByDate --- .../generateGroupInfoPageAlbumsSection.js | 110 +-------------------- 1 file changed, 5 insertions(+), 105 deletions(-) (limited to 'src/content/dependencies/generateGroupInfoPageAlbumsSection.js') diff --git a/src/content/dependencies/generateGroupInfoPageAlbumsSection.js b/src/content/dependencies/generateGroupInfoPageAlbumsSection.js index a32167fc..6737bd98 100644 --- a/src/content/dependencies/generateGroupInfoPageAlbumsSection.js +++ b/src/content/dependencies/generateGroupInfoPageAlbumsSection.js @@ -1,75 +1,21 @@ -import {sortChronologically} from '#sort'; -import {empty, stitchArrays} from '#sugar'; - export default { contentDependencies: [ - 'generateAbsoluteDatetimestamp', - 'generateColorStyleAttribute', 'generateContentHeading', - 'linkAlbum', + 'generateGroupInfoPageAlbumsListByDate', 'linkGroupGallery', - 'linkGroup', ], extraDependencies: ['html', 'language'], - query(group) { - // Typically, a latestFirst: false (default) chronological sort would be - // appropriate here, but navigation between adjacent albums in a group is a - // rather "essential" movement or relationship in the wiki, and we consider - // the sorting order of a group's gallery page (latestFirst: true) to be - // "canonical" in this regard. We exactly match its sort here, but reverse - // it, to still present earlier albums preceding later ones. - const albums = - sortChronologically(group.albums.slice(), {latestFirst: true}) - .reverse(); - - const albumGroups = - albums - .map(album => album.groups); - - const albumOtherCategory = - albumGroups - .map(groups => groups - .map(group => group.category) - .find(category => category !== group.category)); - - const albumOtherGroups = - stitchArrays({ - groups: albumGroups, - category: albumOtherCategory, - }).map(({groups, category}) => - groups - .filter(group => group.category === category)); - - return {albums, albumOtherGroups}; - }, - - relations: (relation, query, group) => ({ + relations: (relation, group) => ({ contentHeading: relation('generateContentHeading'), galleryLink: relation('linkGroupGallery', group), - albumColorStyles: - query.albums - .map(album => relation('generateColorStyleAttribute', album.color)), - - albumLinks: - query.albums - .map(album => relation('linkAlbum', album)), - - otherGroupLinks: - query.albumOtherGroups - .map(groups => groups - .map(group => relation('linkGroup', group))), - - datetimestamps: - query.albums.map(album => - (album.date - ? relation('generateAbsoluteDatetimestamp', album.date) - : null)), + albumsListByDate: + relation('generateGroupInfoPageAlbumsListByDate', group), }), generate: (relations, {html, language}) => @@ -92,52 +38,6 @@ export default { .slot('content', language.$(capsule, 'link')), }))), - html.tag('ul', - {[html.onlyIfContent]: true}, - - stitchArrays({ - albumLink: relations.albumLinks, - otherGroupLinks: relations.otherGroupLinks, - datetimestamp: relations.datetimestamps, - albumColorStyle: relations.albumColorStyles, - }).map(({ - albumLink, - otherGroupLinks, - datetimestamp, - albumColorStyle, - }) => - html.tag('li', - albumColorStyle, - - language.encapsulate(listCapsule, 'item', itemCapsule => - language.encapsulate(itemCapsule, workingCapsule => { - const workingOptions = {}; - - workingOptions.album = - albumLink.slot('color', false); - - if (datetimestamp) { - workingCapsule += '.withYear'; - workingOptions.yearAccent = - language.$(itemCapsule, 'yearAccent', { - year: - datetimestamp.slots({style: 'year', tooltip: true}), - }); - } - - if (!empty(otherGroupLinks)) { - workingCapsule += '.withOtherGroup'; - workingOptions.otherGroupAccent = - html.tag('span', {class: 'other-group-accent'}, - language.$(itemCapsule, 'otherGroupAccent', { - groups: - language.formatConjunctionList( - otherGroupLinks.map(groupLink => - groupLink.slot('color', false))), - })); - } - - return language.$(workingCapsule, workingOptions); - }))))), + relations.albumsListByDate, ]))), }; -- cgit 1.3.0-6-gf8a5