* Allow unsetting quick bookmark target and prompt to set it later wh…

…en user attempt to quick bookmark
PikachuEXE · Sep 21, 2024 · 8124dd5 · 8124dd5
1 parent 7547b9f
commit 8124dd5
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 14 deletions.
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.js b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
@@ -124,10 +124,6 @@ export default defineComponent({
       })
     },
 
-    handleQuickBookmarkEnabledDisabledClick: function () {
-      showToast(this.$t('User Playlists.SinglePlaylistView.Toast["This playlist is already being used for quick bookmark."]'))
-    },
-
     parseInvidiousData: function () {
       this.title = this.data.title
       if (this.thumbnailCanBeShown) {
@@ -194,6 +190,10 @@ export default defineComponent({
         showToast(this.$t('User Playlists.SinglePlaylistView.Toast.This playlist is now used for quick bookmark'))
       }
     },
+    disableQuickBookmark() {
+      this.updateQuickBookmarkTargetPlaylistId(null)
+      showToast(this.$t('User Playlists.SinglePlaylistView.Toast.Quick bookmark disabled'))
+    },
 
     ...mapActions([
       'openInExternalPlayer',

diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.vue b/src/renderer/components/ft-list-playlist/ft-list-playlist.vue
@@ -74,11 +74,9 @@
         <ft-icon-button
           :title="markedAsQuickBookmarkTarget ? $t('User Playlists.Quick Bookmark Enabled') : $t('User Playlists.Enable Quick Bookmark With This Playlist')"
           :icon="markedAsQuickBookmarkTarget ? ['fas', 'bookmark'] : ['far', 'bookmark']"
-          :disabled="markedAsQuickBookmarkTarget"
           :theme="markedAsQuickBookmarkTarget ? 'secondary' : 'base-no-default'"
           :size="16"
-          @disabled-click="handleQuickBookmarkEnabledDisabledClick"
-          @click="enableQuickBookmarkForThisPlaylist"
+          @click="() => markedAsQuickBookmarkTarget ? disableQuickBookmark() : enableQuickBookmarkForThisPlaylist()"
         />
       </span>
     </div>

diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -7,6 +7,7 @@ import {
   formatNumber,
   getRelativeTimeFromDate,
   openExternalLink,
+  openInternalPath,
   showToast,
   toDistractionFreeTitle,
   deepCopy
@@ -460,7 +461,7 @@ export default defineComponent({
       })
     },
     quickBookmarkIconText: function () {
-      if (!this.isQuickBookmarkEnabled) { return false }
+      if (!this.isQuickBookmarkEnabled) { return this.$t('User Playlists.Add to Playlist') }
 
       const translationProperties = {
         playlistName: this.quickBookmarkPlaylist.playlistName,
@@ -766,7 +767,13 @@ export default defineComponent({
 
     toggleQuickBookmarked() {
       if (!this.isQuickBookmarkEnabled) {
-        // This should be prevented by UI
+        showToast(
+          this.$t('Video["Quick Bookmark Disabled. Click Here To Open User Playlists Page To Enable Quick Bookmark"]'),
+          5000,
+          () => {
+            this.createNewWindowInUserPlaylistsView()
+          },
+        )
         return
       }
 
@@ -776,6 +783,13 @@ export default defineComponent({
         this.addToQuickBookmarkPlaylist()
       }
     },
+    createNewWindowInUserPlaylistsView: function () {
+      openInternalPath({
+        path: '/userPlaylists',
+        query: {},
+        doCreateNewWindow: true,
+      })
+    },
     addToQuickBookmarkPlaylist() {
       const videoData = {
         videoId: this.id,

diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue
@@ -56,7 +56,7 @@
           @click="togglePlaylistPrompt"
         />
         <ft-icon-button
-          v-if="isQuickBookmarkEnabled && quickBookmarkButtonEnabled"
+          v-if="quickBookmarkButtonEnabled"
           :title="quickBookmarkIconText"
           :icon="isInQuickBookmarkPlaylist ? ['fas', 'check'] : ['fas', 'bookmark']"
           class="quickBookmarkVideoIcon"

diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -4,7 +4,12 @@ import FtCard from '../ft-card/ft-card.vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import FtShareButton from '../ft-share-button/ft-share-button.vue'
 import FtSubscribeButton from '../ft-subscribe-button/ft-subscribe-button.vue'
-import { formatNumber, openExternalLink, showToast } from '../../helpers/utils'
+import {
+  formatNumber,
+  openExternalLink,
+  openInternalPath,
+  showToast,
+} from '../../helpers/utils'
 
 export default defineComponent({
   name: 'WatchVideoInfo',
@@ -241,7 +246,7 @@ export default defineComponent({
       })
     },
     quickBookmarkIconText: function () {
-      if (!this.isQuickBookmarkEnabled) { return false }
+      if (!this.isQuickBookmarkEnabled) { return this.$t('User Playlists.Add to Playlist') }
 
       const translationProperties = {
         playlistName: this.quickBookmarkPlaylist.playlistName,
@@ -351,7 +356,13 @@ export default defineComponent({
 
     toggleQuickBookmarked() {
       if (!this.isQuickBookmarkEnabled) {
-        // This should be prevented by UI
+        showToast(
+          this.$t('Video["Quick Bookmark Disabled. Click Here To Open User Playlists Page To Enable Quick Bookmark"]'),
+          5000,
+          () => {
+            this.createNewWindowInUserPlaylistsView()
+          },
+        )
         return
       }
 
@@ -361,6 +372,13 @@ export default defineComponent({
         this.addToQuickBookmarkPlaylist()
       }
     },
+    createNewWindowInUserPlaylistsView: function () {
+      openInternalPath({
+        path: '/userPlaylists',
+        query: {},
+        doCreateNewWindow: true,
+      })
+    },
     addToQuickBookmarkPlaylist() {
       const videoData = {
         videoId: this.id,

diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -88,7 +88,6 @@
           @click="togglePlaylistPrompt"
         />
         <ft-icon-button
-          v-if="isQuickBookmarkEnabled"
           :title="quickBookmarkIconText"
           :icon="isInQuickBookmarkPlaylist ? ['fas', 'check'] : ['fas', 'bookmark']"
           class="quickBookmarkVideoIcon"

diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
@@ -774,6 +774,7 @@ Video:
   Save Video: Save Video
   Video has been saved: Video has been saved
   Video has been removed from your saved list: Video has been removed from your saved list
+  "Quick Bookmark Disabled. Click Here To Open User Playlists Page To Enable Quick Bookmark": "Quick Bookmark Disabled. Click Here To Open User Playlists Page To Enable Quick Bookmark"
   Open in YouTube: Open in YouTube
   Copy YouTube Link: Copy YouTube Link
   Open YouTube Embedded Player: Open YouTube Embedded Player