[web] Confine the use of VueEternalLoading to one component

web-src/src/components/ListAlbumsSpotify.vue

@@ -13,6 +13,7 @@
     @open="open(item)"
     @open-details="openDetails(item)"
   />
+  <loader-list-item :load="load" :loaded="loaded" />
   <modal-dialog-album-spotify
     :item="selectedItem"
     :show="showDetailsModal"
@@ -22,13 +23,18 @@
 
 <script>
 import ListItem from '@/components/ListItem.vue'
+import LoaderListItem from '@/components/LoaderListItem.vue'
 import ModalDialogAlbumSpotify from '@/components/ModalDialogAlbumSpotify.vue'
 import { useSettingsStore } from '@/stores/settings'
 
 export default {
   name: 'ListAlbumsSpotify',
-  components: { ListItem, ModalDialogAlbumSpotify },
-  props: { items: { required: true, type: Object } },
+  components: { ListItem, LoaderListItem, ModalDialogAlbumSpotify },
+  props: {
+    items: { required: true, type: Object },
+    load: { default: null, type: Function },
+    loaded: { default: true, type: Boolean }
+  },
   setup() {
     return { settingsStore: useSettingsStore() }
   },

web-src/src/components/ListArtistsSpotify.vue

@@ -8,6 +8,7 @@
     @open="open(item)"
     @open-details="openDetails(item)"
   />
+  <loader-list-item :load="load" :loaded="loaded" />
   <modal-dialog-artist-spotify
     :item="selectedItem"
     :show="showDetailsModal"
@@ -17,13 +18,17 @@
 
 <script>
 import ListItem from '@/components/ListItem.vue'
+import LoaderListItem from '@/components/LoaderListItem.vue'
 import ModalDialogArtistSpotify from '@/components/ModalDialogArtistSpotify.vue'
 
 export default {
   name: 'ListArtistsSpotify',
-  components: { ListItem, ModalDialogArtistSpotify },
-  props: { items: { required: true, type: Object } },
-
+  components: { ListItem, LoaderListItem, ModalDialogArtistSpotify },
+  props: {
+    items: { required: true, type: Object },
+    load: { default: null, type: Function },
+    loaded: { default: true, type: Boolean }
+  },
   data() {
     return { selectedItem: {}, showDetailsModal: false }
   },

web-src/src/components/ListPlaylistsSpotify.vue

@@ -8,6 +8,7 @@
     @open="open(item)"
     @open-details="openDetails(item)"
   />
+  <loader-list-item :load="load" :loaded="loaded" />
   <modal-dialog-playlist-spotify
     :item="selectedItem"
     :show="showDetailsModal"
@@ -17,12 +18,17 @@
 
 <script>
 import ListItem from '@/components/ListItem.vue'
+import LoaderListItem from '@/components/LoaderListItem.vue'
 import ModalDialogPlaylistSpotify from '@/components/ModalDialogPlaylistSpotify.vue'
 
 export default {
   name: 'ListPlaylistsSpotify',
-  components: { ListItem, ModalDialogPlaylistSpotify },
-  props: { items: { required: true, type: Object } },
+  components: { ListItem, LoaderListItem, ModalDialogPlaylistSpotify },
+  props: {
+    items: { required: true, type: Object },
+    load: { default: null, type: Function },
+    loaded: { default: true, type: Boolean }
+  },
 
   data() {
     return { selectedItem: {}, showDetailsModal: false }

web-src/src/components/ListTracksSpotify.vue

@@ -19,6 +19,7 @@
       />)
     </template>
   </list-item>
+  <loader-list-item :load="load" :loaded="loaded" />
   <modal-dialog-track-spotify
     :item="selectedItem"
     :show="showDetailsModal"
@@ -28,15 +29,18 @@
 
 <script>
 import ListItem from '@/components/ListItem.vue'
+import LoaderListItem from '@/components/LoaderListItem.vue'
 import ModalDialogTrackSpotify from '@/components/ModalDialogTrackSpotify.vue'
 import webapi from '@/webapi'
 
 export default {
   name: 'ListTracksSpotify',
-  components: { ListItem, ModalDialogTrackSpotify },
+  components: { ListItem, LoaderListItem, ModalDialogTrackSpotify },
   props: {
     contextUri: { default: '', type: String },
-    items: { required: true, type: Object }
+    items: { required: true, type: Object },
+    load: { default: null, type: Function },
+    loaded: { default: true, type: Boolean }
   },
   data() {
     return { selectedItem: {}, showDetailsModal: false }

web-src/src/components/LoaderListItem.vue

@@ -0,0 +1,30 @@
+<template>
+  <vue-eternal-loading v-if="load && !loaded" :load="load">
+    <template #loading>
+      <div class="columns is-centered">
+        <div class="column has-text-centered">
+          <mdicon class="icon mdi-spin" name="loading" />
+        </div>
+      </div>
+    </template>
+    <template #no-more>
+      <br />
+    </template>
+    <template #no-results>
+      <br />
+    </template>
+  </vue-eternal-loading>
+</template>
+
+<script>
+import { VueEternalLoading } from '@ts-pro/vue-eternal-loading'
+
+export default {
+  name: 'LoaderListItem',
+  components: { VueEternalLoading },
+  props: {
+    load: { default: null, type: Function },
+    loaded: { default: true, type: Boolean }
+  }
+}
+</script>

web-src/src/pages/PageAlbumSpotify.vue

@@ -34,10 +34,12 @@ import webapi from '@/webapi'
 
 const dataObject = {
   load(to) {
-    const spotifyApi = new SpotifyWebApi()
-    spotifyApi.setAccessToken(useServicesStore().spotify.webapi_token)
-    return spotifyApi.getAlbum(to.params.id, {
-      market: useServicesStore().spotify.webapi_country
+    return webapi.spotify().then(({ data }) => {
+      const spotifyApi = new SpotifyWebApi()
+      spotifyApi.setAccessToken(data.webapi_token)
+      return spotifyApi.getAlbum(to.params.id, {
+        market: useServicesStore().spotify.webapi_country
+      })
     })
   },
   set(vm, response) {

web-src/src/pages/PageArtistSpotify.vue

@@ -12,22 +12,7 @@
       />
     </template>
     <template #content>
-      <list-albums-spotify :items="albums" />
-      <vue-eternal-loading v-if="offset < total" :load="load">
-        <template #loading>
-          <div class="columns is-centered">
-            <div class="column has-text-centered">
-              <mdicon class="icon mdi-spin" name="loading" />
-            </div>
-          </div>
-        </template>
-        <template #no-more>
-          <br />
-        </template>
-        <template #no-results>
-          <br />
-        </template>
-      </vue-eternal-loading>
+      <list-albums-spotify :items="albums" :load="load" :loaded="loaded" />
     </template>
   </content-with-heading>
   <modal-dialog-artist-spotify
@@ -44,7 +29,6 @@ import HeadingTitle from '@/components/HeadingTitle.vue'
 import ListAlbumsSpotify from '@/components/ListAlbumsSpotify.vue'
 import ModalDialogArtistSpotify from '@/components/ModalDialogArtistSpotify.vue'
 import SpotifyWebApi from 'spotify-web-api-js'
-import { VueEternalLoading } from '@ts-pro/vue-eternal-loading'
 import { useServicesStore } from '@/stores/services'
 import webapi from '@/webapi'
 
@@ -52,17 +36,19 @@ const PAGE_SIZE = 50
 
 const dataObject = {
   load(to) {
-    const spotifyApi = new SpotifyWebApi()
-    spotifyApi.setAccessToken(useServicesStore().spotify.webapi_token)
-    return Promise.all([
-      spotifyApi.getArtist(to.params.id),
-      spotifyApi.getArtistAlbums(to.params.id, {
-        include_groups: 'album,single',
-        limit: PAGE_SIZE,
-        market: useServicesStore().spotify.webapi_country,
-        offset: 0
-      })
-    ])
+    return webapi.spotify().then(({ data }) => {
+      const spotifyApi = new SpotifyWebApi()
+      spotifyApi.setAccessToken(data.webapi_token)
+      return Promise.all([
+        spotifyApi.getArtist(to.params.id),
+        spotifyApi.getArtistAlbums(to.params.id, {
+          include_groups: 'album,single',
+          limit: PAGE_SIZE,
+          market: useServicesStore().spotify.webapi_country,
+          offset: 0
+        })
+      ])
+    })
   },
   set(vm, response) {
     vm.artist = response.shift()
@@ -80,8 +66,7 @@ export default {
     ControlButton,
     HeadingTitle,
     ListAlbumsSpotify,
-    ModalDialogArtistSpotify,
-    VueEternalLoading
+    ModalDialogArtistSpotify
   },
   beforeRouteEnter(to, from, next) {
     dataObject.load(to).then((response) => {
@@ -106,6 +91,9 @@ export default {
         subtitle: [{ count: this.total, key: 'count.albums' }],
         title: this.artist.name
       }
+    },
+    loaded() {
+      return !(this.offset < this.total)
     }
   },
   methods: {
@@ -115,18 +103,20 @@ export default {
       this.offset += data.limit
     },
     load({ loaded }) {
-      const spotifyApi = new SpotifyWebApi()
-      spotifyApi.setAccessToken(this.servicesStore.spotify.webapi_token)
-      spotifyApi
-        .getArtistAlbums(this.artist.id, {
-          include_groups: 'album,single',
-          limit: PAGE_SIZE,
-          offset: this.offset
-        })
-        .then((data) => {
-          this.appendAlbums(data)
-          loaded(data.items.length, PAGE_SIZE)
-        })
+      webapi.spotify().then(({ data }) => {
+        const spotifyApi = new SpotifyWebApi()
+        spotifyApi.setAccessToken(data.webapi_token)
+        spotifyApi
+          .getArtistAlbums(this.artist.id, {
+            include_groups: 'album,single',
+            limit: PAGE_SIZE,
+            offset: this.offset
+          })
+          .then((albums) => {
+            this.appendAlbums(albums)
+            loaded(albums.items.length, PAGE_SIZE)
+          })
+      })
     },
     openDetails() {
       this.showDetailsModal = true

web-src/src/pages/PagePlaylistTracksSpotify.vue

@@ -17,19 +17,12 @@
       />
     </template>
     <template #content>
-      <list-tracks-spotify :items="tracks" :context-uri="playlist.uri" />
-      <vue-eternal-loading v-if="offset < total" :load="load">
-        <template #loading>
-          <div class="columns is-centered">
-            <div class="column has-text-centered">
-              <mdicon class="icon mdi-spin" name="loading" />
-            </div>
-          </div>
-        </template>
-        <template #no-more>
-          <br />
-        </template>
-      </vue-eternal-loading>
+      <list-tracks-spotify
+        :context-uri="playlist.uri"
+        :items="tracks"
+        :load="load"
+        :loaded="loaded"
+      />
     </template>
   </content-with-heading>
   <modal-dialog-playlist-spotify
@@ -46,7 +39,6 @@ import HeadingTitle from '@/components/HeadingTitle.vue'
 import ListTracksSpotify from '@/components/ListTracksSpotify.vue'
 import ModalDialogPlaylistSpotify from '@/components/ModalDialogPlaylistSpotify.vue'
 import SpotifyWebApi from 'spotify-web-api-js'
-import { VueEternalLoading } from '@ts-pro/vue-eternal-loading'
 import { useServicesStore } from '@/stores/services'
 import webapi from '@/webapi'
 
@@ -81,8 +73,7 @@ export default {
     ControlButton,
     HeadingTitle,
     ListTracksSpotify,
-    ModalDialogPlaylistSpotify,
-    VueEternalLoading
+    ModalDialogPlaylistSpotify
   },
   beforeRouteEnter(to, from, next) {
     dataObject.load(to).then((response) => {
@@ -112,6 +103,9 @@ export default {
         }
       }
       return {}
+    },
+    loaded() {
+      return !(this.offset < this.total)
     }
   },
   methods: {

web-src/src/pages/PageSearchSpotify.vue

@@ -35,19 +35,12 @@
       <heading-title :content="{ title: $t(`page.search.${type}s`) }" />
     </template>
     <template #content>
-      <component :is="components[type]" :items="items.items" />
-      <vue-eternal-loading v-if="expanded" :load="searchNext">
-        <template #loading>
-          <div class="columns is-centered">
-            <div class="column has-text-centered">
-              <mdicon class="icon mdi-spin" name="loading" />
-            </div>
-          </div>
-        </template>
-        <template #no-more>
-          <br />
-        </template>
-      </vue-eternal-loading>
+      <component
+        :is="components[type]"
+        :items="items.items"
+        :load="searchNext"
+        :loaded="!expanded"
+      />
     </template>
     <template v-if="!expanded" #footer>
       <control-button
@@ -78,7 +71,6 @@ import ListPlaylistsSpotify from '@/components/ListPlaylistsSpotify.vue'
 import ListTracksSpotify from '@/components/ListTracksSpotify.vue'
 import SpotifyWebApi from 'spotify-web-api-js'
 import TabsSearch from '@/components/TabsSearch.vue'
-import { VueEternalLoading } from '@ts-pro/vue-eternal-loading'
 import { useSearchStore } from '@/stores/search'
 import webapi from '@/webapi'
 
@@ -96,8 +88,7 @@ export default {
     ListArtistsSpotify,
     ListPlaylistsSpotify,
     ListTracksSpotify,
-    TabsSearch,
-    VueEternalLoading
+    TabsSearch
   },
   setup() {
     return { searchStore: useSearchStore() }