Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update single playlst view for user playlist to have pagination #4593

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/renderer/components/playlist-info/playlist-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export default defineComponent({
},
methods: {
toggleCopyVideosPrompt: function (force = false) {
if (this.moreVideoDataAvailable && !force) {
if (this.moreVideoDataAvailable && !this.isUserPlaylist && !force) {
showToast(this.$t('User Playlists.SinglePlaylistView.Toast["Some videos in the playlist are not loaded yet. Click here to copy anyway."]'), 5000, () => {
this.toggleCopyVideosPrompt(true)
})
Expand Down
36 changes: 31 additions & 5 deletions src/renderer/views/Playlist/Playlist.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export default defineComponent({
isLoadingMore: false,
getPlaylistInfoDebounce: function() {},
playlistInEditMode: false,
userPlaylistVisibleVideoLimit: 100,

promptOpen: false,
}
Expand Down Expand Up @@ -102,8 +103,19 @@ export default defineComponent({
},

moreVideoDataAvailable() {
if (this.selectedUserPlaylist) {
return this.selectedUserPlaylist.videos.length > this.userPlaylistVisibleVideoLimit
}

return this.continuationData !== null
},
playlistInfoVideos() {
if (this.selectedUserPlaylist) {
return this.selectedUserPlaylist.videos
}

return this.playlistItems
},

isUserPlaylistRequested: function () {
return this.$route.query.playlistType === 'user'
Expand Down Expand Up @@ -146,6 +158,13 @@ export default defineComponent({
// Re-fetch from local store when current user playlist videos updated
this.getPlaylistInfoDebounce()
},
userPlaylistVisibleVideoLimit (val) {
if (this.selectedUserPlaylistVideos.length < this.userPlaylistVisibleVideoLimit) {
this.playlistItems = this.selectedUserPlaylistVideos
} else {
this.playlistItems = this.selectedUserPlaylistVideos.slice(0, this.userPlaylistVisibleVideoLimit)
}
},
},
mounted: function () {
this.getPlaylistInfoDebounce = debounce(this.getPlaylistInfo, 100)
Expand Down Expand Up @@ -285,7 +304,11 @@ export default defineComponent({
this.channelId = ''
this.infoSource = 'user'

this.playlistItems = playlist.videos
if (playlist.videos.length < this.userPlaylistVisibleVideoLimit) {
this.playlistItems = playlist.videos
} else {
this.playlistItems = playlist.videos.slice(0, this.userPlaylistVisibleVideoLimit)
}

this.isLoading = false
},
Expand All @@ -294,6 +317,11 @@ export default defineComponent({
},

getNextPage: function () {
if (this.selectedUserPlaylist) {
this.userPlaylistVisibleVideoLimit += 100
return
}

switch (this.infoSource) {
case 'local':
this.getNextPageLocal()
Expand Down Expand Up @@ -332,7 +360,7 @@ export default defineComponent({
},

moveVideoUp: function (videoId, playlistItemId) {
const playlistItems = [].concat(this.playlistItems)
const playlistItems = [].concat(this.selectedUserPlaylistVideos)
const videoIndex = playlistItems.findIndex((video) => {
return video.videoId === videoId && video.playlistItemId === playlistItemId
})
Expand All @@ -356,15 +384,14 @@ export default defineComponent({
}
try {
this.updatePlaylist(playlist)
this.playlistItems = playlistItems
} catch (e) {
showToast(this.$t('User Playlists.SinglePlaylistView.Toast["There was an issue with updating this playlist."]'))
console.error(e)
}
},

moveVideoDown: function (videoId, playlistItemId) {
const playlistItems = [].concat(this.playlistItems)
const playlistItems = [].concat(this.selectedUserPlaylistVideos)
const videoIndex = playlistItems.findIndex((video) => {
return video.videoId === videoId && video.playlistItemId === playlistItemId
})
Expand All @@ -388,7 +415,6 @@ export default defineComponent({
}
try {
this.updatePlaylist(playlist)
this.playlistItems = playlistItems
} catch (e) {
showToast(this.$t('User Playlists.SinglePlaylistView.Toast["There was an issue with updating this playlist."]'))
console.error(e)
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/views/Playlist/Playlist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
:last-updated="lastUpdated"
:description="playlistDescription"
:video-count="videoCount"
:videos="playlistItems"
:videos="playlistInfoVideos"
:view-count="viewCount"
:info-source="infoSource"
:more-video-data-available="moreVideoDataAvailable"
Expand Down
Loading