diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Browser.vue b/platypush/backend/http/webapp/src/components/panels/Media/Browser.vue index 0fb9b73caf..8e5a1e2ac0 100644 --- a/platypush/backend/http/webapp/src/components/panels/Media/Browser.vue +++ b/platypush/backend/http/webapp/src/components/panels/Media/Browser.vue @@ -24,6 +24,7 @@ :is="mediaProvider" :filter="filter" :selected-playlist="selectedPlaylist" + :selected-channel="selectedChannel" @add-to-playlist="$emit('add-to-playlist', $event)" @back="back" @path-change="$emit('path-change', $event)" @@ -68,6 +69,10 @@ export default { selectedPlaylist: { type: Object, }, + + selectedChannel: { + type: Object, + }, }, data() { @@ -116,7 +121,7 @@ export default { this.registerMediaProvider('YouTube') }, - async onPlaylistChange() { + onPlaylistChange() { if (!this.selectedPlaylist) return @@ -127,17 +132,34 @@ export default { this.mediaProvider = this.mediaProviders[playlistMediaProvider] } }, + + onChannelChange() { + if (!this.selectedChannel) + return + + const channelType = this.selectedChannel.type?.toLowerCase() + const channelMediaProvider = this.mediaProvidersLookup[channelType] + + if (channelMediaProvider) { + this.mediaProvider = this.mediaProviders[channelMediaProvider] + } + }, }, watch: { selectedPlaylist() { this.onPlaylistChange() }, + + selectedChannel() { + this.onChannelChange() + }, }, async mounted() { await this.refreshMediaProviders() - await this.onPlaylistChange() + this.onPlaylistChange() + this.onChannelChange() }, } diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Index.vue b/platypush/backend/http/webapp/src/components/panels/Media/Index.vue index b879242bc1..4088a1850d 100644 --- a/platypush/backend/http/webapp/src/components/panels/Media/Index.vue +++ b/platypush/backend/http/webapp/src/components/panels/Media/Index.vue @@ -53,6 +53,7 @@
- +
@@ -16,7 +16,7 @@
- +
@@ -58,6 +58,33 @@ export default { typeIcons: Icons, } }, + + computed: { + iconClass() { + switch (this.item?.item_type) { + case 'channel': + return 'fas fa-user' + case 'playlist': + return 'fas fa-list' + case 'folder': + return 'fas fa-folder' + default: + return 'fas fa-play' + } + }, + + overlayIconClass() { + if ( + this.item?.item_type === 'channel' || + this.item?.item_type === 'playlist' || + this.item?.item_type === 'folder' + ) { + return 'fas fa-folder-open' + } + + return 'fas fa-play' + }, + }, } diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Providers/Mixin.vue b/platypush/backend/http/webapp/src/components/panels/Media/Providers/Mixin.vue index 994b706307..e787a68da1 100644 --- a/platypush/backend/http/webapp/src/components/panels/Media/Providers/Mixin.vue +++ b/platypush/backend/http/webapp/src/components/panels/Media/Providers/Mixin.vue @@ -23,6 +23,10 @@ export default { selectedPlaylist: { default: null, }, + + selectedChannel: { + default: null, + }, }, data() { diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Providers/YouTube.vue b/platypush/backend/http/webapp/src/components/panels/Media/Providers/YouTube.vue index 2de3298bca..e8bdb82674 100644 --- a/platypush/backend/http/webapp/src/components/panels/Media/Providers/YouTube.vue +++ b/platypush/backend/http/webapp/src/components/panels/Media/Providers/YouTube.vue @@ -23,7 +23,7 @@ /> diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Providers/YouTube/Subscriptions.vue b/platypush/backend/http/webapp/src/components/panels/Media/Providers/YouTube/Subscriptions.vue index e97cdf7939..bfcc6317d4 100644 --- a/platypush/backend/http/webapp/src/components/panels/Media/Providers/YouTube/Subscriptions.vue +++ b/platypush/backend/http/webapp/src/components/panels/Media/Providers/YouTube/Subscriptions.vue @@ -1,6 +1,6 @@ @@ -42,7 +42,7 @@ export default { props: { selectedChannel: { - type: String, + type: Object, default: null, }, diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Results.vue b/platypush/backend/http/webapp/src/components/panels/Media/Results.vue index 6c7e3eab32..2f006ae34d 100644 --- a/platypush/backend/http/webapp/src/components/panels/Media/Results.vue +++ b/platypush/backend/http/webapp/src/components/panels/Media/Results.vue @@ -118,7 +118,7 @@ export default { mounted() { this.$watch('selectedResult', (value) => { - if (value?.item_type === 'playlist') { + if (value?.item_type === 'playlist' || value?.item_type === 'channel') { this.$emit('select', null) return }