Repository navigation
feat(webapp): link each credited artist from song lists and the track menu #341
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import { describe, expect, it } from "vitest"; | ||
|
|
||
| import { creditedArtists } from "./artist-credits"; | ||
|
|
||
| describe("creditedArtists", () => { | ||
| it("uses the structured list, in tag order, when the server sends one", () => { | ||
| expect( | ||
| creditedArtists({ | ||
| artist: "Bleu Soleil, LUIZA", | ||
| artist_id: "artist-1", | ||
| artists: [ | ||
| { id: "artist-1", name: "Bleu Soleil" }, | ||
| { id: "artist-2", name: "LUIZA" }, | ||
| ], | ||
| }), | ||
| ).toEqual([ | ||
| { id: "artist-1", name: "Bleu Soleil" }, | ||
| { id: "artist-2", name: "LUIZA" }, | ||
| ]); | ||
| }); | ||
|
|
||
| it("falls back to the primary credit when the list is missing or empty", () => { | ||
| const primary = [{ id: "artist-1", name: "Björk" }]; | ||
| expect(creditedArtists({ artist: "Björk", artist_id: "artist-1" })).toEqual( | ||
| primary, | ||
| ); | ||
| expect( | ||
| creditedArtists({ artist: "Björk", artist_id: "artist-1", artists: [] }), | ||
| ).toEqual(primary); | ||
| }); | ||
|
|
||
| it("links nothing for an artist the catalogue does not know", () => { | ||
| expect( | ||
| creditedArtists({ | ||
| artist: "Nobody We Know", | ||
| artist_id: null, | ||
| artists: [], | ||
| }), | ||
| ).toEqual([]); | ||
| expect(creditedArtists({ artist: null, artist_id: null })).toEqual([]); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import type { Song } from "../api"; | ||
|
|
||
| /** One artist a track can link to. */ | ||
| export type CreditedArtist = { id: string; name: string }; | ||
|
|
||
| /** | ||
| * The artists a track can link to, in tag order. | ||
| * | ||
| * The structured list the server sends, where it has one. Otherwise the | ||
| * primary credit, if the catalogue knows it by an id, and nothing at all for | ||
| * an artist it does not know: a name with no page behind it is not a link. | ||
| */ | ||
| export function creditedArtists( | ||
| song: Pick<Song, "artist" | "artist_id" | "artists">, | ||
| ): CreditedArtist[] { | ||
| if (song.artists && song.artists.length > 0) return song.artists; | ||
| if (song.artist_id && song.artist) { | ||
| return [{ id: song.artist_id, name: song.artist }]; | ||
| } | ||
| return []; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.