Artist discography sorted own-albums-first

persistence/album_repository.go

@@ -40,7 +40,6 @@ func NewAlbumRepository(ctx context.Context, o orm.QueryExecutor) model.AlbumRep
 		"starred":         booleanFilter,
 		"has_rating":      hasRatingFilter,
 	}
-
 	return r
 }
 
@@ -87,15 +86,20 @@ func (r *albumRepository) Exists(id string) (bool, error) {
 func (r *albumRepository) selectAlbum(options ...model.QueryOptions) SelectBuilder {
 	sql := r.newSelectWithAnnotation("album.id", options...).Columns("album.*")
 	if len(options) > 0 && options[0].Filters != nil {
-		s, _, _ := options[0].Filters.ToSql()
+		s, args, _ := options[0].Filters.ToSql()
 		// If there's any reference of genre in the filter, joins with genre
 		if strings.Contains(s, "genre") {
 			sql = r.withGenres(sql)
-			// If there's no filter on genre_id, group the results by media_file.id
+			// If there's no filter on genre_id, group the results by album.id
 			if !strings.Contains(s, "genre_id") {
 				sql = sql.GroupBy("album.id")
 			}
 		}
+		if strings.Contains(s, "all_artist_ids") {
+			artistID := strings.Trim(fmt.Sprintf("%s", args[0]), "%")
+			sql = sql.Column(Alias(Eq{"album_artist_id": artistID}, "match_album_artist"))
+			// OrderBy comes from the client: /artist/ArtistShow.js
+		}
 	}
 	return sql
 }

scanner/mapping_internal_test.go

@@ -39,7 +39,7 @@ var _ = Describe("mapping", func() {
 				gr = newCachedGenreRepository(ctx, gr)
 				mapper = newMediaFileMapper("/", gr)
 			})
-
+			
 			It("returns empty if no genres are available", func() {
 				g, gs := mapper.mapGenres(nil)
 				Expect(g).To(BeEmpty())
@@ -53,22 +53,7 @@ var _ = Describe("mapping", func() {
 				Expect(gs[0].Name).To(Equal("Rock"))
 				Expect(gs[1].Name).To(Equal("Electronic"))
 			})
-
-			It("parses multi-valued genres", func() {
-				g, gs := mapper.mapGenres([]string{"Rock;Dance", "Electronic", "Rock"})
-				Expect(g).To(Equal("Rock"))
-				Expect(gs).To(HaveLen(3))
-				Expect(gs[0].Name).To(Equal("Rock"))
-				Expect(gs[1].Name).To(Equal("Dance"))
-				Expect(gs[2].Name).To(Equal("Electronic"))
-			})
-			It("trims genres names", func() {
-				_, gs := mapper.mapGenres([]string{"Rock ;  Dance", " Electronic "})
-				Expect(gs).To(HaveLen(3))
-				Expect(gs[0].Name).To(Equal("Rock"))
-				Expect(gs[1].Name).To(Equal("Dance"))
-				Expect(gs[2].Name).To(Equal("Electronic"))
-			})
+
 			It("does not break on spaces", func() {
 				_, gs := mapper.mapGenres([]string{"New Wave"})
 				Expect(gs).To(HaveLen(1))

ui/src/artist/ArtistShow.js

@@ -60,7 +60,10 @@ const AlbumShowLayout = (props) => {
           addLabel={false}
           reference="album"
           target="artist_id"
-          sort={{ field: 'max_year asc,date asc', order: 'ASC' }}
+          sort={{
+            field: 'match_album_artist desc,max_year asc,date asc',
+            order: 'ASC',
+          }}
           filter={{ artist_id: record?.id }}
           perPage={0}
           pagination={null}