From 292cf99f49e376dedaa88436f5be8d7d3f0ae71a Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Mon, 28 Jun 2021 09:45:30 -0400
Subject: [PATCH] Add 'Year' column to Album and Playlists song list

---
 ui/src/album/AlbumSongs.js       | 10 +++++++++-
 ui/src/playlist/PlaylistSongs.js | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.js
index b98370853..781c43a5f 100644
--- a/ui/src/album/AlbumSongs.js
+++ b/ui/src/album/AlbumSongs.js
@@ -6,6 +6,7 @@ import {
   NumberField,
   useVersion,
   useListContext,
+  FunctionField,
 } from 'react-admin'
 import clsx from 'clsx'
 import { useDispatch } from 'react-redux'
@@ -110,6 +111,13 @@ const AlbumSongs = (props) => {
       ),
       artist: isDesktop && <TextField source="artist" sortable={false} />,
       duration: <DurationField source="duration" sortable={false} />,
+      year: isDesktop && (
+        <FunctionField
+          source="year"
+          render={(r) => r.year || ''}
+          sortByOrder={'DESC'}
+        />
+      ),
       quality: isDesktop && <QualityInfo source="quality" sortable={false} />,
       bpm: isDesktop && <NumberField source="bpm" sortable={false} />,
       rating: isDesktop && config.enableStarRating && (
@@ -127,7 +135,7 @@ const AlbumSongs = (props) => {
     resource: 'albumSong',
     columns: toggleableFields,
     omittedColumns: ['title'],
-    defaultOff: ['bpm'],
+    defaultOff: ['bpm', 'year'],
   })
 
   return (
diff --git a/ui/src/playlist/PlaylistSongs.js b/ui/src/playlist/PlaylistSongs.js
index b3c6fec00..85985acd3 100644
--- a/ui/src/playlist/PlaylistSongs.js
+++ b/ui/src/playlist/PlaylistSongs.js
@@ -10,6 +10,7 @@ import {
   useVersion,
   useListContext,
   ListBase,
+  FunctionField,
 } from 'react-admin'
 import clsx from 'clsx'
 import { useDispatch } from 'react-redux'
@@ -139,6 +140,13 @@ const PlaylistSongs = ({ playlistId, readOnly, actions, ...props }) => {
       duration: (
         <DurationField source="duration" className={classes.draggable} />
       ),
+      year: isDesktop && (
+        <FunctionField
+          source="year"
+          render={(r) => r.year || ''}
+          sortByOrder={'DESC'}
+        />
+      ),
       quality: isDesktop && <QualityInfo source="quality" sortable={false} />,
       bpm: isDesktop && <NumberField source="bpm" />,
     }
@@ -147,7 +155,7 @@ const PlaylistSongs = ({ playlistId, readOnly, actions, ...props }) => {
   const columns = useSelectedFields({
     resource: 'playlistTrack',
     columns: toggleableFields,
-    defaultOff: ['bpm'],
+    defaultOff: ['bpm', 'year'],
   })
 
   return (