feat(Settings): Handle tab routes in settings (#1355)

package-lock.json

@@ -29,7 +29,7 @@
         "vue3-apexcharts": "^1.4.4",
         "vue3-toastify": "^0.1.14",
         "vuedraggable": "^4.1.0",
-        "vuetify": "^3.4.2"
+        "vuetify": "^3.4.3"
       },
       "devDependencies": {
         "@pinia/testing": "^0.1.3",
@@ -8090,9 +8090,9 @@
       }
     },
     "node_modules/vuetify": {
-      "version": "3.4.2",
+      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.4.3.tgz",
-      "integrity": "sha512-WvfVmES1SkhrCfYcfzPp8jpfIM+L+OcN9EYiBM+4bpmsIXLNJyMv42QhoDDWihSO6/zbE8RqCtyHawpu4ApyzA==",
+      "integrity": "sha512-b8yi87Zv4bn2JbaVkkV9uzSRw0fdY/v3ieWne0OTI29w/CNSyLyfHGBCrmx7eD74i562M1j+AwSSRJCX3wF0+Q==",
       "engines": {
         "node": "^12.20 || >=14.13"
       },

package.json

@@ -35,7 +35,7 @@
     "vue3-apexcharts": "^1.4.4",
     "vue3-toastify": "^0.1.14",
     "vuedraggable": "^4.1.0",
-    "vuetify": "^3.4.2"
+    "vuetify": "^3.4.3"
   },
   "devDependencies": {
     "@pinia/testing": "^0.1.3",

src/components/DnDZone.vue

@@ -11,7 +11,10 @@ const authStore = useAuthStore()
 const dndZoneRef = ref<HTMLDivElement>()
 
 function onDragEnter() {
-  if (['login', 'settings'].includes(route.name as string) || !authStore.isAuthenticated) return
+  if (
+    (route.name as string) === 'login'
+    || (route.name as string) === 'settings' && route.params.tab === 'vuetorrent' && route.params.subtab === 'torrentCard'
+    || !authStore.isAuthenticated) return
   isOverDropZone.value = true
 }
 

src/pages/Settings.vue

@@ -13,7 +13,7 @@ import VGeneral from '@/components/Settings/VueTorrent/General.vue'
 import VTorrentCard from '@/components/Settings/VueTorrent/TorrentCard.vue'
 import WebUI from '@/components/Settings/WebUI.vue'
 import { useDialogStore, usePreferenceStore } from '@/stores'
-import { onBeforeUnmount, onMounted, ref } from 'vue'
+import { onBeforeUnmount, onMounted, ref, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
 import { toast } from 'vue3-toastify'
@@ -23,6 +23,30 @@ const { t } = useI18n()
 const dialogStore = useDialogStore()
 const preferenceStore = usePreferenceStore()
 
+const tabs = [
+  { text: t('settings.tabs.vuetorrent.title'), value: 'vuetorrent' },
+  { text: t('settings.tabs.behavior'), value: 'behavior' },
+  { text: t('settings.tabs.downloads'), value: 'downloads' },
+  { text: t('settings.tabs.connection'), value: 'connection' },
+  { text: t('settings.tabs.speed'), value: 'speed' },
+  { text: t('settings.tabs.bittorrent'), value: 'bittorrent' },
+  { text: t('settings.tabs.rss.title'), value: 'rss' },
+  { text: t('settings.tabs.webui'), value: 'webui' },
+  { text: t('settings.tabs.tagsAndCategories'), value: 'tagsAndCategories' },
+  { text: t('settings.tabs.advanced'), value: 'advanced' }
+]
+
+const tabsV = [
+  { text: t('settings.tabs.vuetorrent.general'), value: 'general' },
+  { text: t('settings.tabs.vuetorrent.torrent_card'), value: 'torrentCard' }
+]
+
+const tabsR = [
+  { text: t('settings.tabs.rss.general'), value: 'general' },
+  { text: t('settings.tabs.rss.feeds'), value: 'feeds' },
+  { text: t('settings.tabs.rss.rules'), value: 'rules' }
+]
+
 const tab = ref('vuetorrent')
 const innerTabV = ref('general')
 const innerTabR = ref('general')
@@ -57,8 +81,27 @@ function handleKeyboardShortcut(e: KeyboardEvent) {
   }
 }
 
+function updateTabHandle() {
+  const tabRouteParam = router.currentRoute.value.params.tab as string
+  const subtabRouteParam = router.currentRoute.value.params.subtab as string
+  if (tabRouteParam) {
+    if (tabRouteParam === 'vuetorrent' && subtabRouteParam) {
+      innerTabV.value = subtabRouteParam
+    } else if (tabRouteParam === 'rss' && subtabRouteParam) {
+      innerTabR.value = subtabRouteParam
+    }
+    tab.value = tabRouteParam
+  }
+}
+
+watchEffect(() => {
+  updateTabHandle()
+})
+
 onMounted(() => {
   document.addEventListener('keydown', handleKeyboardShortcut)
+  updateTabHandle()
+
 })
 onBeforeUnmount(() => {
   document.removeEventListener('keydown', handleKeyboardShortcut)
@@ -83,29 +126,18 @@ onBeforeUnmount(() => {
 
     <v-row class="ma-0 pa-0">
       <v-tabs v-model="tab" bg-color="primary" grow show-arrows>
-        <v-tab value="vuetorrent">{{ t('settings.tabs.vuetorrent.title') }}</v-tab>
+        <v-tab v-for="{text, value} in tabs" :key="value" :value="value" :href="`#/settings/${value}`" :text="text" />
-        <v-tab value="behavior">{{ t('settings.tabs.behavior') }}</v-tab>
-        <v-tab value="downloads">{{ t('settings.tabs.downloads') }}</v-tab>
-        <v-tab value="connection">{{ t('settings.tabs.connection') }}</v-tab>
-        <v-tab value="speed">{{ t('settings.tabs.speed') }}</v-tab>
-        <v-tab value="bittorrent">{{ t('settings.tabs.bittorrent') }}</v-tab>
-        <v-tab value="rss">{{ t('settings.tabs.rss.title') }}</v-tab>
-        <v-tab value="webui">{{ t('settings.tabs.webui') }}</v-tab>
-        <v-tab value="tagsAndCategories">{{ t('settings.tabs.tagsAndCategories') }}</v-tab>
-        <v-tab value="advanced">{{ t('settings.tabs.advanced') }}</v-tab>
       </v-tabs>
     </v-row>
 
     <v-window v-model="tab" :touch="false">
       <v-window-item value="vuetorrent">
-        <v-tabs v-model="innerTabV" grow color="accent" bg-color="transparent" show-arrows>
+        <v-tabs v-model="innerTabV" grow color="accent" show-arrows>
-          <v-tab value="general">
+          <v-tab v-for="{text, value} in tabsV" :value="value" :text="text"
-            {{ t('settings.tabs.vuetorrent.general') }}
+                 :href="`#/settings/vuetorrent/${value}`" :class="{ 'text-accent': innerTabV === value }" />
-          </v-tab>
+          <!-- the class attribute is a workaround for https://github.com/vuetifyjs/vuetify/issues/18756 -->
-          <v-tab value="torrentCard">
-            {{ t('settings.tabs.vuetorrent.torrent_card') }}
-          </v-tab>
         </v-tabs>
+
         <v-window v-model="innerTabV" :touch="false">
           <v-window-item value="general">
             <VGeneral />
@@ -138,15 +170,9 @@ onBeforeUnmount(() => {
 
       <v-window-item value="rss">
         <v-tabs v-model="innerTabR" grow color="accent" bg-color="transparent">
-          <v-tab value="general">
+          <v-tab v-for="{text, value} in tabsR" :key="value" :value="value" :text="text"
-            {{ t('settings.tabs.rss.general') }}
+                 :href="`#/settings/rss/${value}`" :class="{ 'text-accent': innerTabR === value }" />
-          </v-tab>
+          <!-- the class attribute is a workaround for https://github.com/vuetifyjs/vuetify/issues/18756 -->
-          <v-tab value="feeds">
-            {{ t('settings.tabs.rss.feeds') }}
-          </v-tab>
-          <v-tab value="rules">
-            {{ t('settings.tabs.rss.rules') }}
-          </v-tab>
         </v-tabs>
         <v-window v-model="innerTabR" :touch="false">
           <v-window-item value="general">

src/pages/index.ts

@@ -8,7 +8,7 @@ export const routes: RouteRecordRaw[] = [
   },
   {
     name: 'settings',
-    path: '/settings',
+    path: '/settings/:tab?/:subtab?',
     component: () => import('./Settings.vue')
   },
   {