[web] Rename grouped list

owntone · Feb 22, 2024 · 4af4dd7 · 4af4dd7
1 parent 151af29
commit 4af4dd7
Show file tree

Hide file tree

Showing 27 changed files with 140 additions and 141 deletions.
diff --git a/web-src/src/lib/GroupByList.js → web-src/src/lib/GroupedList.js b/web-src/src/lib/GroupByList.js → web-src/src/lib/GroupedList.js
@@ -108,13 +108,12 @@ export function byDateSinceToday(field, defaultValue = '0000') {
   }
 }
 
-export class GroupByList {
+export class GroupedList {
   constructor({ items = [], total = 0, offset = 0, limit = -1 } = {}) {
     this.items = items
     this.total = total
     this.offset = offset
     this.limit = limit
-
     this.count = items.length
     this.indexList = []
     this.group(noop())

diff --git a/web-src/src/pages/PageAlbum.vue b/web-src/src/pages/PageAlbum.vue
@@ -47,7 +47,7 @@
 <script>
 import ContentWithHero from '@/templates/ContentWithHero.vue'
 import CoverArtwork from '@/components/CoverArtwork.vue'
-import { GroupByList, byMedium, noop } from '@/lib/GroupByList'
+import { GroupedList, byMedium, noop } from '@/lib/GroupedList'
 import ListTracks from '@/components/ListTracks.vue'
 import ModalDialogAlbum from '@/components/ModalDialogAlbum.vue'
 import webapi from '@/webapi'
@@ -62,7 +62,7 @@ const dataObject = {
 
   set(vm, response) {
     vm.album = response[0].data
-    vm.tracks = new GroupByList(response[1].data)
+    vm.tracks = new GroupedList(response[1].data)
     vm.tracks.group(byMedium('disc_number'))
     if (vm.tracks.indexList <= 1) {
       vm.tracks.group(noop())
@@ -91,7 +91,7 @@ export default {
     return {
       album: {},
       show_details_modal: false,
-      tracks: new GroupByList()
+      tracks: new GroupedList()
     }
   },
 

diff --git a/web-src/src/pages/PageAlbums.vue b/web-src/src/pages/PageAlbums.vue
@@ -41,8 +41,8 @@
           <div class="column">
             <p class="heading mb-5" v-text="$t('page.albums.sort.title')" />
             <control-dropdown
-              v-model:value="selected_groupby_option_id"
-              :options="groupby_options"
+              v-model:value="selected_grouping_option_id"
+              :options="grouping_options"
             />
           </div>
         </div>
@@ -64,7 +64,7 @@
 
 <script>
 import * as types from '@/store/mutation_types'
-import { GroupByList, byName, byYear } from '@/lib/GroupByList'
+import { GroupedList, byName, byYear } from '@/lib/GroupedList'
 import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import ControlDropdown from '@/components/ControlDropdown.vue'
 import IndexButtonList from '@/components/IndexButtonList.vue'
@@ -78,7 +78,7 @@ const dataObject = {
   },
 
   set(vm, response) {
-    vm.albums_list = new GroupByList(response.data)
+    vm.albums_list = new GroupedList(response.data)
   }
 }
 
@@ -112,8 +112,8 @@ export default {
 
   data() {
     return {
-      albums_list: new GroupByList(),
-      groupby_options: [
+      albums_list: new GroupedList(),
+      grouping_options: [
         {
           id: 1,
           name: this.$t('page.albums.sort.name'),
@@ -139,18 +139,18 @@ export default {
 
   computed: {
     albums() {
-      const groupBy = this.groupby_options.find(
-        (o) => o.id === this.selected_groupby_option_id
+      const grouping = this.grouping_options.find(
+        (o) => o.id === this.selected_grouping_option_id
       )
-      this.albums_list.group(groupBy.options, [
+      this.albums_list.group(grouping.options, [
         (album) => !this.hide_singles || album.track_count > 2,
         (album) => !this.hide_spotify || album.data_kind !== 'spotify'
       ])
 
       return this.albums_list
     },
 
-    selected_groupby_option_id: {
+    selected_grouping_option_id: {
       get() {
         return this.$store.state.albums_sort
       },

diff --git a/web-src/src/pages/PageArtist.vue b/web-src/src/pages/PageArtist.vue
@@ -24,8 +24,8 @@
           <div class="column">
             <p class="heading mb-5" v-text="$t('page.artist.sort.title')" />
             <control-dropdown
-              v-model:value="selected_groupby_option_id"
-              :options="groupby_options"
+              v-model:value="selected_grouping_option_id"
+              :options="grouping_options"
             />
           </div>
         </div>
@@ -74,7 +74,7 @@
 import * as types from '@/store/mutation_types'
 import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import ControlDropdown from '@/components/ControlDropdown.vue'
-import { GroupByList, byName, byYear } from '@/lib/GroupByList'
+import { GroupedList, byName, byYear } from '@/lib/GroupedList'
 import ListAlbums from '@/components/ListAlbums.vue'
 import ModalDialogArtist from '@/components/ModalDialogArtist.vue'
 import webapi from '@/webapi'
@@ -89,7 +89,7 @@ const dataObject = {
 
   set(vm, response) {
     vm.artist = response[0].data
-    vm.albums_list = new GroupByList(response[1].data)
+    vm.albums_list = new GroupedList(response[1].data)
   }
 }
 
@@ -118,8 +118,8 @@ export default {
   data() {
     return {
       artist: {},
-      albums_list: new GroupByList(),
-      groupby_options: [
+      albums_list: new GroupedList(),
+      grouping_options: [
         {
           id: 1,
           name: this.$t('page.artist.sort.name'),
@@ -139,10 +139,10 @@ export default {
 
   computed: {
     albums() {
-      const groupBy = this.groupby_options.find(
-        (o) => o.id === this.selected_groupby_option_id
+      const grouping = this.grouping_options.find(
+        (o) => o.id === this.selected_grouping_option_id
       )
-      this.albums_list.group(groupBy.options, [
+      this.albums_list.group(grouping.options, [
         (album) => !this.hide_spotify || album.data_kind !== 'spotify'
       ])
       return this.albums_list
@@ -155,7 +155,7 @@ export default {
         this.$store.commit(types.HIDE_SPOTIFY, value)
       }
     },
-    selected_groupby_option_id: {
+    selected_grouping_option_id: {
       get() {
         return this.$store.state.artist_albums_sort
       },

diff --git a/web-src/src/pages/PageArtistTracks.vue b/web-src/src/pages/PageArtistTracks.vue
@@ -25,8 +25,8 @@
           <div class="column">
             <p class="heading mb-5" v-text="$t('page.artist.sort.title')" />
             <control-dropdown
-              v-model:value="selected_groupby_option_id"
-              :options="groupby_options"
+              v-model:value="selected_grouping_option_id"
+              :options="grouping_options"
             />
           </div>
         </div>
@@ -73,7 +73,7 @@
 
 <script>
 import * as types from '@/store/mutation_types'
-import { GroupByList, byName, byRating } from '@/lib/GroupByList'
+import { GroupedList, byName, byRating } from '@/lib/GroupedList'
 import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import ControlDropdown from '@/components/ControlDropdown.vue'
 import IndexButtonList from '@/components/IndexButtonList.vue'
@@ -91,7 +91,7 @@ const dataObject = {
 
   set(vm, response) {
     vm.artist = response[0].data
-    vm.tracks_list = new GroupByList(response[1].data.tracks)
+    vm.tracks_list = new GroupedList(response[1].data.tracks)
   }
 }
 
@@ -121,7 +121,7 @@ export default {
   data() {
     return {
       artist: {},
-      groupby_options: [
+      grouping_options: [
         {
           id: 1,
           name: this.$t('page.artist.sort.name'),
@@ -136,7 +136,7 @@ export default {
         }
       ],
       show_details_modal: false,
-      tracks_list: new GroupByList()
+      tracks_list: new GroupedList()
     }
   },
 
@@ -156,7 +156,7 @@ export default {
         this.$store.commit(types.HIDE_SPOTIFY, value)
       }
     },
-    selected_groupby_option_id: {
+    selected_grouping_option_id: {
       get() {
         return this.$store.state.artist_tracks_sort
       },
@@ -168,10 +168,10 @@ export default {
       return this.$store.state.spotify.webapi_token_valid
     },
     tracks() {
-      const groupBy = this.groupby_options.find(
-        (o) => o.id === this.selected_groupby_option_id
+      const grouping = this.grouping_options.find(
+        (o) => o.id === this.selected_grouping_option_id
       )
-      this.tracks_list.group(groupBy.options, [
+      this.tracks_list.group(grouping.options, [
         (track) => !this.hide_spotify || track.data_kind !== 'spotify'
       ])
       return this.tracks_list

diff --git a/web-src/src/pages/PageArtists.vue b/web-src/src/pages/PageArtists.vue
@@ -41,8 +41,8 @@
           <div class="column">
             <p class="heading mb-5" v-text="$t('page.artists.sort.title')" />
             <control-dropdown
-              v-model:value="selected_groupby_option_id"
-              :options="groupby_options"
+              v-model:value="selected_grouping_option_id"
+              :options="grouping_options"
             />
           </div>
         </div>
@@ -64,7 +64,7 @@
 
 <script>
 import * as types from '@/store/mutation_types'
-import { GroupByList, byName, byYear } from '@/lib/GroupByList'
+import { GroupedList, byName, byYear } from '@/lib/GroupedList'
 import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import ControlDropdown from '@/components/ControlDropdown.vue'
 import IndexButtonList from '@/components/IndexButtonList.vue'
@@ -78,7 +78,7 @@ const dataObject = {
   },
 
   set(vm, response) {
-    vm.artists_list = new GroupByList(response.data)
+    vm.artists_list = new GroupedList(response.data)
   }
 }
 
@@ -112,8 +112,8 @@ export default {
 
   data() {
     return {
-      artists_list: new GroupByList(),
-      groupby_options: [
+      artists_list: new GroupedList(),
+      grouping_options: [
         {
           id: 1,
           name: this.$t('page.artists.sort.name'),
@@ -131,16 +131,16 @@ export default {
   },
 
   computed: {
-    // Wraps GroupByList and updates it if filter or sort changes
+    // Wraps GroupedList and updates it if filter or sort changes
     artists() {
       if (!this.artists_list) {
         return []
       }
 
-      const groupBy = this.groupby_options.find(
-        (o) => o.id === this.selected_groupby_option_id
+      const grouping = this.grouping_options.find(
+        (o) => o.id === this.selected_grouping_option_id
       )
-      this.artists_list.group(groupBy.options, [
+      this.artists_list.group(grouping.options, [
         (artist) =>
           !this.hide_singles || artist.track_count > artist.album_count * 2,
         (artist) => !this.hide_spotify || artist.data_kind !== 'spotify'
@@ -149,7 +149,7 @@ export default {
       return this.artists_list
     },
 
-    selected_groupby_option_id: {
+    selected_grouping_option_id: {
       get() {
         return this.$store.state.artists_sort
       },

diff --git a/web-src/src/pages/PageAudiobooksAlbum.vue b/web-src/src/pages/PageAudiobooksAlbum.vue
@@ -52,7 +52,7 @@
 <script>
 import ContentWithHero from '@/templates/ContentWithHero.vue'
 import CoverArtwork from '@/components/CoverArtwork.vue'
-import { GroupByList } from '@/lib/GroupByList'
+import { GroupedList } from '@/lib/GroupedList'
 import ListTracks from '@/components/ListTracks.vue'
 import ModalDialogAlbum from '@/components/ModalDialogAlbum.vue'
 import webapi from '@/webapi'
@@ -67,7 +67,7 @@ const dataObject = {
 
   set(vm, response) {
     vm.album = response[0].data
-    vm.tracks = new GroupByList(response[1].data)
+    vm.tracks = new GroupedList(response[1].data)
   }
 }
 
@@ -92,7 +92,7 @@ export default {
     return {
       album: {},
       show_details_modal: false,
-      tracks: new GroupByList()
+      tracks: new GroupedList()
     }
   },
 

diff --git a/web-src/src/pages/PageAudiobooksAlbums.vue b/web-src/src/pages/PageAudiobooksAlbums.vue
@@ -21,7 +21,7 @@
 
 <script>
 import ContentWithHeading from '@/templates/ContentWithHeading.vue'
-import { GroupByList, byName } from '@/lib/GroupByList'
+import { GroupedList, byName } from '@/lib/GroupedList'
 import IndexButtonList from '@/components/IndexButtonList.vue'
 import ListAlbums from '@/components/ListAlbums.vue'
 import TabsAudiobooks from '@/components/TabsAudiobooks.vue'
@@ -33,7 +33,7 @@ const dataObject = {
   },
 
   set(vm, response) {
-    vm.albums = new GroupByList(response.data)
+    vm.albums = new GroupedList(response.data)
     vm.albums.group(byName('name_sort', true))
   }
 }
@@ -67,7 +67,7 @@ export default {
 
   data() {
     return {
-      albums: new GroupByList()
+      albums: new GroupedList()
     }
   }
 }

diff --git a/web-src/src/pages/PageAudiobooksArtist.vue b/web-src/src/pages/PageAudiobooksArtist.vue
@@ -40,7 +40,7 @@
 
 <script>
 import ContentWithHeading from '@/templates/ContentWithHeading.vue'
-import { GroupByList } from '@/lib/GroupByList'
+import { GroupedList } from '@/lib/GroupedList'
 import ListAlbums from '@/components/ListAlbums.vue'
 import ModalDialogArtist from '@/components/ModalDialogArtist.vue'
 import webapi from '@/webapi'
@@ -55,7 +55,7 @@ const dataObject = {
 
   set(vm, response) {
     vm.artist = response[0].data
-    vm.albums = new GroupByList(response[1].data)
+    vm.albums = new GroupedList(response[1].data)
   }
 }
 
@@ -84,7 +84,7 @@ export default {
   data() {
     return {
       artist: {},
-      albums: new GroupByList(),
+      albums: new GroupedList(),
       show_details_modal: false
     }
   },