Skip to content

🎧 Your Personal Streaming Service

Remove link from songs to artist (when artist has no albums)

Deluan023d7bfa8a16
diff --git a/ui/src/common/ArtistLinkField.js b/ui/src/common/ArtistLinkField.js
index f0a0a8e54..54babf220 100644
--- a/ui/src/common/ArtistLinkField.js
+++ b/ui/src/common/ArtistLinkField.js
@@ -14,24 +14,25 @@ export const useGetHandleArtistClick = (width) => {
}
}
-const songsFilteredByArtist = (artist) => {
- return `/song?filter={"artist":"${artist}"}`
-}
-
export const ArtistLinkField = withWidth()(
({ record, className, width, source }) => {
const artistLink = useGetHandleArtistClick(width)
const id = record[source + 'Id']
- const link = id ? artistLink(id) : songsFilteredByArtist(record[source])
return (
- <Link
- to={link}
- onClick={(e) => e.stopPropagation()}
- className={className}
- >
- {record[source]}
- </Link>
+ <>
+ {id ? (
+ <Link
+ to={artistLink(id)}
+ onClick={(e) => e.stopPropagation()}
+ className={className}
+ >
+ {record[source]}
+ </Link>
+ ) : (
+ record[source]
+ )}
+ </>
)
}
)
diff --git a/ui/src/layout/Menu.js b/ui/src/layout/Menu.js
index e57defe85..db5b82472 100644
--- a/ui/src/layout/Menu.js
+++ b/ui/src/layout/Menu.js
@@ -68,7 +68,7 @@ const Menu = ({ dense = false }) => {
const renderResourceMenuItemLink = (resource) => (
<MenuItemLink
key={resource.name}
- to={`/${resource.name}?page=1`}
+ to={`/${resource.name}`}
activeClassName={classes.active}
primaryText={translatedResourceName(resource, translate)}
leftIcon={resource.icon || <ViewListIcon />}