Skip to content

A self-hosted media server and file management system

fix: config and settings tabs are broken

aminnausin34107c76beb1
diff --git a/resources/js/components/config/ConfigTabs.ts b/resources/js/components/config/ConfigTabs.ts
index 37695543..c61ca04d 100644
--- a/resources/js/components/config/ConfigTabs.ts
+++ b/resources/js/components/config/ConfigTabs.ts
@@ -1,61 +1,33 @@
-import type { SidebarTabItem } from '@/types/types';
-
-import { computed, ref, watch } from 'vue';
-import { useAppStore } from '@/stores/AppStore';
+// components/config/ConfigTabs.ts
+import { createTabStore } from '@/stores/TabStore';
import { storeToRefs } from 'pinia';
-import { useRoute } from 'vue-router';
import { useAuth } from '@/composables/auth/useAuth';
import ProiconsSettings from '~icons/proicons/settings';
import ProiconsLayers from '~icons/proicons/layers';
export function useConfigTabs() {
- const { pageTitle } = storeToRefs(useAppStore());
- const { isAdmin } = useAuth();
-
- const route = useRoute();
-
- const configTab = ref<{ name: string; title?: string; icon?: any }>();
- const configTabs = computed<SidebarTabItem[]>(() => {
+ const store = createTabStore('config', () => {
+ const { isAdmin } = useAuth();
return [
{
name: 'general',
title: 'general',
- description: 'Server Features', // Server features
+ description: 'Server Features',
disabled: !isAdmin.value,
icon: ProiconsSettings,
},
{
name: 'performance',
title: 'performance',
- description: 'Resource Allocation', // Server features
+ description: 'Resource Allocation',
disabled: !isAdmin.value,
icon: ProiconsLayers,
},
];
- });
-
- watch(
- () => route?.params?.tab,
- (URL_TAB) => {
- if (!URL_TAB) return;
- const defaultTab = configTabs.value.find((tab) => tab.title === URL_TAB || tab.name === URL_TAB) ?? configTabs.value[0];
+ })();
- pageTitle.value = defaultTab.title ?? defaultTab.name;
- configTab.value = defaultTab;
- },
- { immediate: true },
- );
+ const { tabs, activeTab } = storeToRefs(store);
- watch(
- () => configTab.value,
- () => {
- if (!configTab.value) return;
- pageTitle.value = configTab.value.title ?? configTab.value.name;
- },
- );
- return {
- configTabs,
- activeConfigTab: configTab,
- };
+ return { configTabs: tabs, activeConfigTab: activeTab, setTab: store.setTab };
}
diff --git a/resources/js/components/panels/LeftSidebar.vue b/resources/js/components/panels/LeftSidebar.vue
index cf48963d..98f65318 100644
--- a/resources/js/components/panels/LeftSidebar.vue
+++ b/resources/js/components/panels/LeftSidebar.vue
@@ -1,7 +1,6 @@
<script setup lang="ts">
import type { SidebarTabItem } from '@/types/types';
-import { useDashboardTabs } from '@/components/dashboard/DashboardTabs';
import { useSettingsTabs } from '@/components/settings/SettingsTabs';
import { useConfigTabs } from '@/components/config/ConfigTabs';
import { useRoute } from 'vue-router';
@@ -13,18 +12,16 @@ import SidebarHeader from '@/components/headers/SidebarHeader.vue';
const { configTabs, activeConfigTab } = useConfigTabs();
const { settingsTabs, activeSettingsTab } = useSettingsTabs();
-const { dashboardTabs, activeDashboardTab } = useDashboardTabs();
const route = useRoute();
const routeMap = computed<{ [key: string]: { tabs: SidebarTabItem[]; activeTab: any; base: string } }>(() => ({
- config: { tabs: configTabs.value, activeTab: activeConfigTab, base: 'config' },
- settings: { tabs: settingsTabs.value, activeTab: activeSettingsTab, base: 'settings' },
- preferences: { tabs: settingsTabs.value, activeTab: activeSettingsTab, base: 'settings' },
- dashboard: { tabs: dashboardTabs.value, activeTab: activeDashboardTab, base: 'dashboard' },
+ config: { tabs: configTabs.value, activeTab: activeConfigTab.value, base: 'config' },
+ settings: { tabs: settingsTabs.value, activeTab: activeSettingsTab.value, base: 'settings' },
+ preferences: { tabs: settingsTabs.value, activeTab: activeSettingsTab.value, base: 'settings' },
}));
-const currentMap = computed(() => routeMap.value[route.name as string] ?? routeMap.value.dashboard);
+const currentMap = computed(() => routeMap.value[route.name as string] ?? routeMap.value.settings);
</script>
<template>
diff --git a/resources/js/components/settings/SettingsTabs.ts b/resources/js/components/settings/SettingsTabs.ts
index 2f429e49..7899b9e3 100644
--- a/resources/js/components/settings/SettingsTabs.ts
+++ b/resources/js/components/settings/SettingsTabs.ts
@@ -1,9 +1,5 @@
-import type { SidebarTabItem } from '@/types/types';
-
-import { computed, ref, watch } from 'vue';
-import { useAppStore } from '@/stores/AppStore';
+import { createTabStore } from '@/stores/TabStore';
import { storeToRefs } from 'pinia';
-import { useRoute } from 'vue-router';
import { useAuth } from '@/composables/auth/useAuth';
import ProiconsSettings from '~icons/proicons/settings';
@@ -11,13 +7,8 @@ import LucideUser from '~icons/lucide/user';
export function useSettingsTabs() {
const { userData } = useAuth();
- const { pageTitle } = storeToRefs(useAppStore());
-
- const route = useRoute();
- const dev = true;
- const settingsTab = ref<{ name: string; title?: string; icon?: any }>();
- const settingsTabs = computed<SidebarTabItem[]>(() => {
+ const store = createTabStore('settings', () => {
return [
{
name: 'preferences',
@@ -36,32 +27,12 @@ export function useSettingsTabs() {
name: 'profile',
title: 'Profile',
description: 'Profile Settings', // Visibility, Avatar, Banner
- disabled: dev || !userData.value,
+ disabled: true,
},
];
- });
-
- watch(
- () => route?.params?.tab,
- (URL_TAB) => {
- if (!URL_TAB) return;
- const defaultTab = settingsTabs.value.find((tab) => tab.title === URL_TAB || tab.name === URL_TAB) ?? settingsTabs.value[0];
+ })();
- pageTitle.value = defaultTab.title ?? defaultTab.name;
- settingsTab.value = defaultTab;
- },
- { immediate: true },
- );
+ const { tabs, activeTab } = storeToRefs(store);
- watch(
- () => settingsTab.value,
- () => {
- if (!settingsTab.value) return;
- pageTitle.value = settingsTab.value.title ?? settingsTab.value.name;
- },
- );
- return {
- settingsTabs,
- activeSettingsTab: settingsTab,
- };
+ return { settingsTabs: tabs, activeSettingsTab: activeTab, setTab: store.setTab };
}
diff --git a/resources/js/stores/TabStore.ts b/resources/js/stores/TabStore.ts
new file mode 100644
index 00000000..3915df70
--- /dev/null
+++ b/resources/js/stores/TabStore.ts
@@ -0,0 +1,23 @@
+import type { SidebarTabItem } from '@/types/types';
+
+import { ref, computed } from 'vue';
+import { useAppStore } from '@/stores/AppStore';
+import { defineStore } from 'pinia';
+
+export function createTabStore(id: string, getTabs: () => SidebarTabItem[]) {
+ return defineStore(`tabs-${id}`, () => {
+ const tabs = computed(getTabs);
+ const activeTab = ref<SidebarTabItem | undefined>();
+
+ const setTab = (tabParam: string | string[]) => {
+ const tab = Array.isArray(tabParam) ? tabParam[0] : tabParam;
+ const match = tabs.value.find((t) => t.name === tab || t.title === tab);
+
+ activeTab.value = match ?? tabs.value[0];
+
+ if (activeTab.value) useAppStore().pageTitle = activeTab.value.title ?? activeTab.value.name;
+ };
+
+ return { tabs, activeTab, setTab };
+ });
+}
diff --git a/resources/js/views/ConfigView.vue b/resources/js/views/ConfigView.vue
index c9e367f7..0d2922b9 100644
--- a/resources/js/views/ConfigView.vue
+++ b/resources/js/views/ConfigView.vue
@@ -1,9 +1,9 @@
<script setup lang="ts">
+import { useRoute, useRouter } from 'vue-router';
+import { onMounted, watch } from 'vue';
import { useConfigTabs } from '@/components/config/ConfigTabs';
import { getScreenSize } from '@/service/util';
import { useAppStore } from '@/stores/AppStore';
-import { useRouter } from 'vue-router';
-import { onMounted } from 'vue';
import { useAuth } from '@/composables/auth/useAuth';
import ConfigPerformance from '@/components/config/ConfigPerformance.vue';
@@ -11,11 +11,12 @@ import ConfigGeneral from '@/components/config/ConfigGeneral.vue';
import LeftSidebar from '@/components/panels/LeftSidebar.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
-const { activeConfigTab } = useConfigTabs();
+const { activeConfigTab, setTab } = useConfigTabs();
const { cycleSideBar } = useAppStore();
-
const { isAdmin } = useAuth();
+
const router = useRouter();
+const route = useRoute();
if (!isAdmin.value) {
router.replace('/settings');
@@ -28,6 +29,8 @@ onMounted(async () => {
cycleSideBar('config', 'left-card', false);
});
+
+watch(() => route.params.tab, setTab, { immediate: true });
</script>
<template>
diff --git a/resources/js/views/SettingsView.vue b/resources/js/views/SettingsView.vue
index bceb953f..8c48e7cc 100755
--- a/resources/js/views/SettingsView.vue
+++ b/resources/js/views/SettingsView.vue
@@ -3,15 +3,19 @@ import { useSettingsTabs } from '@/components/settings/SettingsTabs';
import { getScreenSize } from '@/service/util';
import { useAppStore } from '@/stores/AppStore';
import { onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { watch } from 'vue';
import SettingsPreferences from '@/components/settings/SettingsPreferences.vue';
import SettingsAccount from '@/components/settings/SettingsAccount.vue';
import LeftSidebar from '@/components/panels/LeftSidebar.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
-const { activeSettingsTab } = useSettingsTabs();
+const { activeSettingsTab, setTab } = useSettingsTabs();
const { cycleSideBar } = useAppStore();
+const route = useRoute();
+
onMounted(async () => {
const screenSize = getScreenSize();
@@ -19,6 +23,8 @@ onMounted(async () => {
cycleSideBar('settings', 'left-card', false);
});
+
+watch(() => route.params.tab, setTab, { immediate: true });
</script>
<template>