MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-12 23:42:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

[web] Move grouping options to computed properties

Browse Source
This commit is contained in:
Alain Nussbaumer 2025-03-08 12:13:12 +01:00
parent 368bb18aa8
commit 966d563418
6 changed files with 92 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web-src/src/pages/PageAlbums.vue
View File

@ -95,8 +95,22 @@ export default {
},
data() {
return {
albums_list: new GroupedList(),
groupings: [
albums_list: new GroupedList()
}
},
computed: {
albums() {
const { options } = this.groupings.find(
(grouping) => grouping.id === this.uiStore.albums_sort
)
options.filters = [
(album) => !this.uiStore.hide_singles || album.track_count > 2,
(album) => !this.uiStore.hide_spotify || album.data_kind !== 'spotify'
]
return this.albums_list.group(options)
},
groupings() {
return [
{
id: 1,
name: this.$t('page.albums.sort.name'),
@ -141,18 +155,6 @@ export default {
}
}
]
}
},
computed: {
albums() {
const { options } = this.groupings.find(
(grouping) => grouping.id === this.uiStore.albums_sort
)
options.filters = [
(album) => !this.uiStore.hide_singles || album.track_count > 2,
(album) => !this.uiStore.hide_spotify || album.data_kind !== 'spotify'
]
return this.albums_list.group(options)
},
heading() {
return {

26
web-src/src/pages/PageArtist.vue
View File

@ -104,18 +104,6 @@ export default {
return {
albums_list: new GroupedList(),
artist: {},
groupings: [
{
id: 1,
name: this.$t('page.artist.sort.name'),
options: { criteria: [{ field: 'name_sort', type: String }] }
},
{
id: 2,
name: this.$t('page.artist.sort.release-date'),
options: { criteria: [{ field: 'date_released', type: Date }] }
}
],
show_details_modal: false
}
},
@ -129,6 +117,20 @@ export default {
]
return this.albums_list.group(options)
},
groupings() {
return [
{
id: 1,
name: this.$t('page.artist.sort.name'),
options: { criteria: [{ field: 'name_sort', type: String }] }
},
{
id: 2,
name: this.$t('page.artist.sort.release-date'),
options: { criteria: [{ field: 'date_released', type: Date }] }
}
]
},
heading() {
return {
title: this.artist.name,

28
web-src/src/pages/PageArtistTracks.vue
View File

@ -106,7 +106,20 @@ export default {
data() {
return {
artist: {},
groupings: [
show_details_modal: false,
tracks_list: new GroupedList()
}
},
computed: {
album_count() {
return new Set(
[...this.tracks]
.filter((track) => track.isItem)
.map((track) => track.item.album_id)
).size
},
groupings() {
return [
{
id: 1,
name: this.$t('page.artist.sort.name'),
@ -120,18 +133,7 @@ export default {
index: { field: 'rating', type: 'Digits' }
}
}
],
show_details_modal: false,
tracks_list: new GroupedList()
}
},
computed: {
album_count() {
return new Set(
[...this.tracks]
.filter((track) => track.isItem)
.map((track) => track.item.album_id)
).size
]
},
heading() {
return {

35
web-src/src/pages/PageArtists.vue
View File

@ -68,7 +68,6 @@ const dataObject = {
load(to) {
return webapi.library_artists('music')
},
set(vm, response) {
vm.artists_list = new GroupedList(response.data)
}
@ -95,22 +94,7 @@ export default {
},
data() {
return {
artists_list: new GroupedList(),
groupings: [
{
id: 1,
name: this.$t('page.artists.sort.name'),
options: { index: { field: 'name_sort', type: String } }
},
{
id: 2,
name: this.$t('page.artists.sort.recently-added'),
options: {
criteria: [{ field: 'time_added', order: -1, type: Date }],
index: { field: 'time_added', type: Date }
}
}
]
artists_list: new GroupedList()
}
},
computed: {
@ -126,6 +110,23 @@ export default {
]
return this.artists_list.group(options)
},
groupings() {
return [
{
id: 1,
name: this.$t('page.artists.sort.name'),
options: { index: { field: 'name_sort', type: String } }
},
{
id: 2,
name: this.$t('page.artists.sort.recently-added'),
options: {
criteria: [{ field: 'time_added', order: -1, type: Date }],
index: { field: 'time_added', type: Date }
}
}
]
},
heading() {
return {
title: this.$t('page.artists.title'),

33
web-src/src/pages/PageComposerTracks.vue
View File

@ -58,7 +58,6 @@ const dataObject = {
webapi.library_composer_tracks(to.params.name)
])
},
set(vm, response) {
vm.composer = response[0].data
vm.tracks_list = new GroupedList(response[1].data.tracks)
@ -87,21 +86,6 @@ export default {
data() {
return {
composer: {},
groupings: [
{
id: 1,
name: this.$t('page.composer.sort.name'),
options: { index: { field: 'title_sort', type: String } }
},
{
id: 2,
name: this.$t('page.composer.sort.rating'),
options: {
criteria: [{ field: 'rating', order: -1, type: Number }],
index: { field: 'rating', type: 'Digits' }
}
}
],
show_details_modal: false,
tracks_list: new GroupedList()
}
@ -134,6 +118,23 @@ export default {
}
},
methods: {
groupings() {
return [
{
id: 1,
name: this.$t('page.composer.sort.name'),
options: { index: { field: 'title_sort', type: String } }
},
{
id: 2,
name: this.$t('page.composer.sort.rating'),
options: {
criteria: [{ field: 'rating', order: -1, type: Number }],
index: { field: 'rating', type: 'Digits' }
}
}
]
},
open_albums() {
this.$router.push({
name: 'music-composer-albums',

22
web-src/src/pages/PageGenreTracks.vue
View File

@ -87,7 +87,17 @@ export default {
data() {
return {
genre: {},
groupings: [
media_kind: this.$route.query.media_kind,
show_details_modal: false,
tracks_list: new GroupedList()
}
},
computed: {
expression() {
return `genre is "${this.genre.name}" and media_kind is ${this.media_kind}`
},
groupings() {
return [
{
id: 1,
name: this.$t('page.genre.sort.name'),
@ -101,15 +111,7 @@ export default {
index: { field: 'rating', type: 'Digits' }
}
}
],
media_kind: this.$route.query.media_kind,
show_details_modal: false,
tracks_list: new GroupedList()
}
},
computed: {
expression() {
return `genre is "${this.genre.name}" and media_kind is ${this.media_kind}`
]
},
heading() {
if (this.genre.name) {