From a4e4d1395b0fe5a562db04069614eba2b06ac940 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Thu, 17 Apr 2025 17:04:19 -0400
Subject: [PATCH] fix: Update album sort to use album_id instead of
 release_date

---
 persistence/mediafile_repository.go | 3 +--
 ui/src/album/AlbumShow.jsx          | 2 +-
 ui/src/common/ContextMenus.jsx      | 2 +-
 ui/src/common/PlayButton.jsx        | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.go
index 8d4241a55..046ab7176 100644
--- a/persistence/mediafile_repository.go
+++ b/persistence/mediafile_repository.go
@@ -77,11 +77,10 @@ func NewMediaFileRepository(ctx context.Context, db dbx.Builder) model.MediaFile
 		"title":        "order_title",
 		"artist":       "order_artist_name, order_album_name, release_date, disc_number, track_number",
 		"album_artist": "order_album_artist_name, order_album_name, release_date, disc_number, track_number",
-		"album":        "order_album_name, release_date, disc_number, track_number, order_artist_name, title",
+		"album":        "order_album_name, album_id, disc_number, track_number, order_artist_name, title",
 		"random":       "random",
 		"created_at":   "media_file.created_at",
 		"starred_at":   "starred, starred_at",
-		"album_tracks": "disc_number, track_number",
 	})
 	return r
 }
diff --git a/ui/src/album/AlbumShow.jsx b/ui/src/album/AlbumShow.jsx
index b111a8ca7..1b706295a 100644
--- a/ui/src/album/AlbumShow.jsx
+++ b/ui/src/album/AlbumShow.jsx
@@ -35,7 +35,7 @@ const AlbumShowLayout = (props) => {
           addLabel={false}
           reference="song"
           target="album_id"
-          sort={{ field: 'album_tracks', order: 'ASC' }}
+          sort={{ field: 'album', order: 'ASC' }}
           perPage={0}
           pagination={null}
         >
diff --git a/ui/src/common/ContextMenus.jsx b/ui/src/common/ContextMenus.jsx
index f27ee4602..855825496 100644
--- a/ui/src/common/ContextMenus.jsx
+++ b/ui/src/common/ContextMenus.jsx
@@ -228,7 +228,7 @@ export const AlbumContextMenu = (props) =>
       resource={'album'}
       songQueryParams={{
         pagination: { page: 1, perPage: -1 },
-        sort: { field: 'album_tracks', order: 'ASC' },
+        sort: { field: 'album', order: 'ASC' },
         filter: {
           album_id: props.record.id,
           release_date: props.releaseDate,
diff --git a/ui/src/common/PlayButton.jsx b/ui/src/common/PlayButton.jsx
index a11e08361..04b36ef5b 100644
--- a/ui/src/common/PlayButton.jsx
+++ b/ui/src/common/PlayButton.jsx
@@ -21,7 +21,7 @@ export const PlayButton = ({ record, size, className }) => {
     dataProvider
       .getList('song', {
         pagination: { page: 1, perPage: -1 },
-        sort: { field: 'album_tracks', order: 'ASC' },
+        sort: { field: 'album', order: 'ASC' },
         filter: {
           album_id: record.id,
           release_date: record.releaseDate,