Skip to content

Commit bbfecd7

Browse files
committed
content: generateArtistInfoPage: show edits for wiki separately
1 parent 5379401 commit bbfecd7

File tree

3 files changed

+51
-11
lines changed

3 files changed

+51
-11
lines changed

src/content/dependencies/generateArtistInfoPage.js

+21-5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export default {
4040
artist.albumBannerArtistContributions,
4141
artist.trackCoverArtistContributions,
4242
]).flat()
43+
.filter(({annotation}) => !annotation?.startsWith('edits for wiki'))
4344
.map(({thing}) => thing),
4445

4546
// Banners and wallpapers don't show up in the artist gallery page, only
@@ -78,7 +79,10 @@ export default {
7879
relation('generateArtistGroupContributionsInfo', query.allTracks),
7980

8081
artworksChunkedList:
81-
relation('generateArtistInfoPageArtworksChunkedList', artist),
82+
relation('generateArtistInfoPageArtworksChunkedList', artist, false),
83+
84+
editsForWikiArtworksChunkedList:
85+
relation('generateArtistInfoPageArtworksChunkedList', artist, true),
8286

8387
artworksGroupInfo:
8488
relation('generateArtistGroupContributionsInfo', query.allArtworks),
@@ -181,10 +185,11 @@ export default {
181185
{href: '#tracks'},
182186
language.$(pageCapsule, 'trackList.title')),
183187

184-
!html.isBlank(relations.artworksChunkedList) &&
185-
html.tag('a',
186-
{href: '#art'},
187-
language.$(pageCapsule, 'artList.title')),
188+
(!html.isBlank(relations.artworksChunkedList) ||
189+
!html.isBlank(relations.editsForWikiArtworksChunkedList)) &&
190+
html.tag('a',
191+
{href: '#art'},
192+
language.$(pageCapsule, 'artList.title')),
188193

189194
!html.isBlank(relations.flashesChunkedList) &&
190195
html.tag('a',
@@ -276,6 +281,17 @@ export default {
276281
countUnit: 'artworks',
277282
})),
278283
}),
284+
285+
html.tags([
286+
html.tag('p',
287+
{[html.onlyIfSiblings]: true},
288+
289+
language.$(pageCapsule, 'wikiEditArtworks', {
290+
artist: data.name,
291+
})),
292+
293+
relations.editsForWikiArtworksChunkedList,
294+
]),
279295
]),
280296

281297
html.tags([

src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js

+27-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default {
88
'generateArtistInfoPageArtworksChunk',
99
],
1010

11-
query(artist) {
11+
query(artist, filterEditsForWiki) {
1212
const query = {};
1313

1414
const allContributions = [
@@ -18,12 +18,19 @@ export default {
1818
...artist.trackCoverArtistContributions,
1919
];
2020

21+
const filteredContributions =
22+
allContributions
23+
.filter(({annotation}) =>
24+
(filterEditsForWiki
25+
? annotation?.startsWith(`edits for wiki`)
26+
: !annotation?.startsWith(`edits for wiki`)));
27+
2128
sortContributionsChronologically(
22-
allContributions,
29+
filteredContributions,
2330
sortAlbumsTracksChronologically);
2431

2532
query.contribs =
26-
chunkByConditions(allContributions, [
33+
chunkByConditions(filteredContributions, [
2734
({date: date1}, {date: date2}) =>
2835
+date1 !== +date2,
2936
({thing: thing1}, {thing: thing2}) =>
@@ -39,7 +46,7 @@ export default {
3946
return query;
4047
},
4148

42-
relations: (relation, query, _artist) => ({
49+
relations: (relation, query, _artist, _filterEditsForWiki) => ({
4350
chunkedList:
4451
relation('generateArtistInfoPageChunkedList'),
4552

@@ -51,8 +58,22 @@ export default {
5158
relation('generateArtistInfoPageArtworksChunk', album, contribs)),
5259
}),
5360

54-
generate: (relations) =>
61+
data: (_query, _artist, filterEditsForWiki) => ({
62+
filterEditsForWiki,
63+
}),
64+
65+
generate: (data, relations) =>
5566
relations.chunkedList.slots({
56-
chunks: relations.chunks,
67+
chunks:
68+
relations.chunks.map(chunk => {
69+
if (data.filterEditsForWiki) {
70+
chunk.setSlots({
71+
trimAnnotations: true,
72+
dates: [],
73+
});
74+
}
75+
76+
return chunk;
77+
}),
5778
}),
5879
};

src/strings-default.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,9 @@ artistPage:
11531153
orBrowseList: "View {LINK}! Or browse the list:"
11541154
link: "art gallery"
11551155

1156+
wikiEditArtworks: >-
1157+
{ARTIST} has edited these artworks for this wiki:
1158+
11561159
#
11571160
# artistGalleryPage:
11581161
# The artist gallery page shows a neat grid of all of the album and

0 commit comments

Comments
 (0)