A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: folder details drawer does not have active tab on urls
aminnausine3228ffc2c5a
diff --git a/resources/js/components/drawers/FolderDetailsSidebarDrawer.vue b/resources/js/components/drawers/FolderDetailsSidebarDrawer.vuenew file mode 100644index 00000000..27f2672a--- /dev/null+++ b/resources/js/components/drawers/FolderDetailsSidebarDrawer.vue@@ -0,0 +1,34 @@+<script setup lang="ts">+import { defineAsyncComponent, watch } from 'vue';+import { useFolderTabs } from '@/components/folders/FolderTabs';+import { useAppStore } from '@/stores/AppStore.ts';+import { storeToRefs } from 'pinia';+import { BaseDrawer } from '@/components/cedar-ui/drawer';+import { useDrawer } from '@aminnausin/cedar-ui';+import { useRoute } from 'vue-router';++const { selectedSideBar } = storeToRefs(useAppStore());+const { activeFolderTab } = useFolderTabs();++const FolderSidebarAsync = defineAsyncComponent(async () => await import('@/components/panels/FolderSidebar.vue'));++const drawer = useDrawer();+const route = useRoute();++watch(+ () => route.fullPath,+ () => drawer.close('programmatic'),+);+</script>++<template>+ <BaseDrawer>+ <Suspense v-if="selectedSideBar === 'folders'">+ <FolderSidebarAsync :url-suffix="`${['details', activeFolderTab?.name].filter(Boolean).join('/')}`" />++ <template #fallback>+ <SidebarSkeleton />+ </template>+ </Suspense>+ </BaseDrawer>+</template>diff --git a/resources/js/components/folders/FolderTabs.ts b/resources/js/components/folders/FolderTabs.tsnew file mode 100644index 00000000..4fc30f6c--- /dev/null+++ b/resources/js/components/folders/FolderTabs.ts@@ -0,0 +1,19 @@+import type { SidebarTabItem } from '@/types/types';++import { useContentStore } from '@/stores/ContentStore';+import { createTabStore } from '@/stores/TabStore';+import { storeToRefs } from 'pinia';++export function useFolderTabs() {+ const { stateFolder } = storeToRefs(useContentStore());++ const tabsStore = createTabStore(+ `folder-info`,+ () => [{ name: 'overview' }, { name: 'files' }, { name: 'images' }, { name: 'metadata' }, { name: 'stats' }],+ (tab: SidebarTabItem) => `${stateFolder.value.title} ${tab.name}`,+ )();++ const { activeTab: activeFolderTab, tabs } = storeToRefs(tabsStore);++ return { tabs, activeFolderTab, setTab: tabsStore.setTab };+}diff --git a/resources/js/components/folders/charts/FolderSizeChart.vue b/resources/js/components/folders/charts/FolderSizeChart.vueindex 038ddb73..4b564314 100644--- a/resources/js/components/folders/charts/FolderSizeChart.vue+++ b/resources/js/components/folders/charts/FolderSizeChart.vue@@ -59,8 +59,8 @@ const chartOptions = computed<ChartOptions>(() => {const style = getComputedStyle(document.documentElement);const colourMuted = style.getPropertyValue('--color-foreground-2').trim() || '#9ca3af';const colourGrid = style.getPropertyValue('--color-foreground-3').trim();- const colourFileSize = style.getPropertyValue(lightMode.value ? '--color-primary' : '--color-primary-muted').trim();const colourFileCount = style.getPropertyValue('--color-warning-2').trim();+return {responsive: true,maintainAspectRatio: false,@@ -95,7 +95,7 @@ const chartOptions = computed<ChartOptions>(() => {color: colourFileCount,maxTicksLimit: 3,font: { size: 10 },- callback: (val) => `${val}`,+ callback: (val) => `${Math.round((parseFloat(`${val}`) + Number.EPSILON) * 100) / 100}`,},},},diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vueindex 28b52ce2..e17df47a 100755--- a/resources/js/components/panels/NavBar.vue+++ b/resources/js/components/panels/NavBar.vue@@ -11,6 +11,7 @@ import { storeToRefs } from 'pinia';import { ref, watch } from 'vue';import { drawer } from '@aminnausin/cedar-ui';+import FolderDetailsSidebarDrawer from '@/components/drawers/FolderDetailsSidebarDrawer.vue';import VideoSidebarDrawer from '@/components/drawers/VideoSidebarDrawer.vue';import ToggleLightMode from '@/components/inputs/ToggleLightMode.vue';import SidebarDrawer from '@/components/drawers/SidebarDrawer.vue';@@ -22,9 +23,9 @@ import CircumInboxIn from '~icons/circum/inbox-in';import CircumMonitor from '~icons/circum/monitor';import ProiconsMenu from '~icons/proicons/menu';+const { dropdownItems, dropdownItemsAuth } = useDropdownMenuItems();const { userData, isLoadingUserData } = storeToRefs(useAuthStore());const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());-const { dropdownItems, dropdownItemsAuth } = useDropdownMenuItems();const { cycleSideBar } = useAppStore();const breakpoints = useBreakpoints(breakpointsTailwind);@@ -42,7 +43,7 @@ const toggleVideoSidebar = (sidebar: 'folders' | 'history') => {if (selectedSideBar.value !== sidebar) return;if (getScreenSizeRank() < 3) {- drawer.open(VideoSidebarDrawer, {+ drawer.open(route.name === 'folder-details' ? FolderDetailsSidebarDrawer : VideoSidebarDrawer, {showHeader: false,showFooter: false,onClose: () => {@@ -158,7 +159,7 @@ watch(isDesktop, (now) => {<CircumInboxIn height="24" width="24" /></NavButton><NavButton- v-if="$route.name === 'home' || $route.name === 'folder'"+ v-if="$route.name === 'home' || $route.name === 'folder-details'"@click="toggleVideoSidebar('folders')":label="'folders'":active="selectedSideBar == 'folders'"diff --git a/resources/js/views/FolderView.vue b/resources/js/views/FolderView.vueindex daa18dc3..bc46145a 100644--- a/resources/js/views/FolderView.vue+++ b/resources/js/views/FolderView.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import type { PopoverItem, SidebarTabItem } from '@/types/types';+import type { PopoverItem } from '@/types/types';import { onMounted, nextTick, computed, watch, provide, defineAsyncComponent, useTemplateRef } from 'vue';import { ButtonBase, ButtonIcon, ButtonText } from '@/components/cedar-ui/button';@@ -8,7 +8,7 @@ import { startScanFilesTask } from '@/service/siteAPI';import { getScreenSizeRank } from '@/service/util';import { ContextMenuItem } from '@/components/cedar-ui/context-menu';import { useContentStore } from '@/stores/ContentStore';-import { createTabStore } from '@/stores/TabStore';+import { useFolderTabs } from '@/components/folders/FolderTabs';import { useModalStore } from '@/stores/ModalStore';import { BasePopover } from '@/components/cedar-ui/popover';import { useAppStore } from '@/stores/AppStore';@@ -33,6 +33,7 @@ import CircumEdit from '~icons/circum/edit';const VALID_TABS = new Set(['overview', 'files', 'images', 'metadata', 'stats']);const { stateDirectory, stateFolder, isLoadingContent } = storeToRefs(useContentStore());+const { activeFolderTab, tabs, setTab } = useFolderTabs();const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());const { getCategory, getFolder } = useContentStore();const { isAuthenticated } = useAuth();@@ -70,13 +71,6 @@ const popoverItems = computed<PopoverItem[]>(() => []);const modal = useModalStore();-const tabsStore = createTabStore(- `folder-info`,- () => [{ name: 'overview' }, { name: 'files' }, { name: 'images' }, { name: 'metadata' }, { name: 'stats' }],- (tab: SidebarTabItem) => `${stateFolder.value.title} ${tab.name}`,-)();--const { activeTab: activeFolderTab, tabs } = storeToRefs(tabsStore);const FolderOverview = defineAsyncComponent(() => import('@/components/folders/FolderOverview.vue'));const FolderMetadata = defineAsyncComponent(() => import('@/components/folders/FolderMetadata.vue'));@@ -167,8 +161,7 @@ watch(if (!VALID_TABS.has(parsedTab)) {parsedTab = 'overview';}-- tabsStore.setTab(parsedTab);+ setTab(parsedTab);},{ immediate: true },);