Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/components/layout/AppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ const customMenuItemsForUser = computed(() => {
})

const customMenuItemsForAdmin = computed(() => {
const items = appStore.cachedPublicSettings?.custom_menu_items ?? []
const items = adminSettingsStore.customMenuItems ?? []
return items
.filter((item) => item.visibility === 'admin')
.sort((a, b) => a.sort_order - b.sort_order)
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/stores/adminSettings.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { defineStore } from 'pinia'
import { ref } from 'vue'
import { adminAPI } from '@/api'
import type { CustomMenuItem } from '@/types'

export const useAdminSettingsStore = defineStore('adminSettings', () => {
const loaded = ref(false)
Expand Down Expand Up @@ -43,6 +44,9 @@ export const useAdminSettingsStore = defineStore('adminSettings', () => {
}
}

// Custom menu items (all items including admin-only, loaded from admin settings API)
const customMenuItems = ref<CustomMenuItem[]>([])

// Default open, but honor cached value to reduce UI flicker on first paint.
const opsMonitoringEnabled = ref(readCachedBool('ops_monitoring_enabled_cached', true))
const opsRealtimeMonitoringEnabled = ref(readCachedBool('ops_realtime_monitoring_enabled_cached', true))
Expand All @@ -64,6 +68,8 @@ export const useAdminSettingsStore = defineStore('adminSettings', () => {
opsQueryModeDefault.value = settings.ops_query_mode_default || 'auto'
writeCachedString('ops_query_mode_default_cached', opsQueryModeDefault.value)

customMenuItems.value = settings.custom_menu_items ?? []

loaded.value = true
} catch (err) {
// Keep cached/default value: do not "flip" the UI based on a transient fetch failure.
Expand Down Expand Up @@ -122,6 +128,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', () => {
opsMonitoringEnabled,
opsRealtimeMonitoringEnabled,
opsQueryModeDefault,
customMenuItems,
fetch,
setOpsMonitoringEnabledLocal,
setOpsRealtimeMonitoringEnabledLocal,
Expand Down
33 changes: 25 additions & 8 deletions frontend/src/views/user/CustomPageView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import { useRoute } from 'vue-router'
import { useI18n } from 'vue-i18n'
import { useAppStore } from '@/stores'
import { useAuthStore } from '@/stores/auth'
import { useAdminSettingsStore } from '@/stores/adminSettings'
import AppLayout from '@/components/layout/AppLayout.vue'
import Icon from '@/components/icons/Icon.vue'
import { buildEmbeddedUrl, detectTheme } from '@/utils/embedded-url'
Expand All @@ -78,6 +79,7 @@ const { t } = useI18n()
const route = useRoute()
const appStore = useAppStore()
const authStore = useAuthStore()
const adminSettingsStore = useAdminSettingsStore()

const loading = ref(false)
const pageTheme = ref<'light' | 'dark'>('light')
Expand All @@ -86,8 +88,15 @@ let themeObserver: MutationObserver | null = null
const menuItemId = computed(() => route.params.id as string)

const menuItem = computed(() => {
const items = appStore.cachedPublicSettings?.custom_menu_items ?? []
const found = items.find((item) => item.id === menuItemId.value) ?? null
const publicItems = appStore.cachedPublicSettings?.custom_menu_items ?? []
const adminItems = authStore.isAdmin ? (adminSettingsStore.customMenuItems ?? []) : []
const allItems = [...publicItems]
for (const item of adminItems) {
if (!allItems.some((existing) => existing.id === item.id)) {
allItems.push(item)
}
}
const found = allItems.find((item) => item.id === menuItemId.value) ?? null
if (found && found.visibility === 'admin' && !authStore.isAdmin) {
return null
}
Expand Down Expand Up @@ -122,12 +131,20 @@ onMounted(async () => {
})
}

if (appStore.publicSettingsLoaded) return
loading.value = true
try {
await appStore.fetchPublicSettings()
} finally {
loading.value = false
const promises: Promise<unknown>[] = []
if (!appStore.publicSettingsLoaded) {
promises.push(appStore.fetchPublicSettings())
}
if (authStore.isAdmin) {
promises.push(adminSettingsStore.fetch())
}
if (promises.length > 0) {
loading.value = true
try {
await Promise.all(promises)
} finally {
loading.value = false
}
}
})

Expand Down
Loading