Skip to content

A self-hosted media server and file management system

fix: folder details document title inaccurate

aminnausinf2513798d9c9
diff --git a/resources/js/components/folders/FolderTabs.ts b/resources/js/components/folders/FolderTabs.ts
index 4fc30f6c..88bed3c3 100644
--- a/resources/js/components/folders/FolderTabs.ts
+++ b/resources/js/components/folders/FolderTabs.ts
@@ -1,17 +1,8 @@
-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 tabsStore = createTabStore(`folder-info`, () => [{ name: 'overview' }, { name: 'files' }, { name: 'images' }, { name: 'metadata' }, { name: 'stats' }])();
const { activeTab: activeFolderTab, tabs } = storeToRefs(tabsStore);
diff --git a/resources/js/router/index.ts b/resources/js/router/index.ts
index dd194076..f77206cb 100644
--- a/resources/js/router/index.ts
+++ b/resources/js/router/index.ts
@@ -227,7 +227,7 @@ router.beforeEach(async (to, from, next) => {
nProgress.start();
// If going to a route that isnt included in the list, set the page title to the route title
- if (to?.name && !['logout', 'root', 'home'].includes(to.name.toString())) {
+ if (to?.name && !['logout', 'root', 'home', 'folder-details'].includes(to.name.toString())) {
document.title = meta.title ?? toTitleCase(`${to.name?.toString()}`); // Update Page Title
}
// Block logged in users if the route is guest-only
diff --git a/resources/js/views/FolderView.vue b/resources/js/views/FolderView.vue
index bc46145a..4680b312 100644
--- a/resources/js/views/FolderView.vue
+++ b/resources/js/views/FolderView.vue
@@ -3,9 +3,9 @@ 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';
+import { getScreenSizeRank, toTitleCase } from '@/service/util';
import { handleEditFolderImages } from '@/service/folder/folderActions';
import { startScanFilesTask } from '@/service/siteAPI';
-import { getScreenSizeRank } from '@/service/util';
import { ContextMenuItem } from '@/components/cedar-ui/context-menu';
import { useContentStore } from '@/stores/ContentStore';
import { useFolderTabs } from '@/components/folders/FolderTabs';
@@ -119,19 +119,23 @@ async function reload() {
await getCategory(URL_CATEGORY, URL_FOLDER, false);
}
} catch (error) {
- console.log(error);
+ console.error(error);
} finally {
isLoadingContent.value = false;
- setFolderAsPageTitle();
+ nextTick(setFolderAsPageTitle);
}
}
const setFolderAsPageTitle = () => {
if (isLoadingContent.value) return;
- const title = stateFolder.value.id ? `${stateFolder.value?.series?.title ?? stateFolder?.value?.name}` : 'Folder not found';
- pageTitle.value = title && activeFolderTab.value ? `Folder ${activeFolderTab.value.name}` : title;
- document.title = title;
+ if (!stateFolder.value.title) {
+ pageTitle.value = 'Folder not found';
+ document.title = 'Folder Details';
+ return;
+ }
+
+ document.title = activeFolderTab.value ? `${stateFolder.value.title} · ${toTitleCase(activeFolderTab.value.name)}` : stateFolder.value.title;
};
const handleStartScan = async () => {