From 1075771abb1ce4b649704614959d7c75540ee5e4 Mon Sep 17 00:00:00 2001
From: Michel NAUD <michel.naud26400@gmail.com>
Date: Thu, 12 Mar 2026 18:33:03 +0100
Subject: [PATCH 1/2] avoid frontend hardcoded menu entries types, fix missing
 discord type

---
 backend/app/api/admin_menu.py                 |  5 ++++
 frontend/src/api/menu.ts                      |  5 ++++
 .../src/components/admin/MenuListView.vue     | 25 ++++++-------------
 .../src/components/admin/MenuTreeNode.vue     | 16 ++----------
 .../src/components/admin/MenuTreeView.vue     | 15 ++++++++---
 5 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/backend/app/api/admin_menu.py b/backend/app/api/admin_menu.py
index 93e1800..859d224 100644
--- a/backend/app/api/admin_menu.py
+++ b/backend/app/api/admin_menu.py
@@ -19,6 +19,11 @@
 router = APIRouter(prefix="/admin/menu", tags=["admin-menu"])
 
 
+@router.get("/types")
+async def get_menu_types(user: User = Depends(require_admin)):
+    return [{"value": k, "label": v} for k, v in MenuItem.TYPES.items()]
+
+
 def _build_admin_item_out(item: MenuItem) -> AdminMenuItemOut:
     return AdminMenuItemOut(
         id=item.id,
diff --git a/frontend/src/api/menu.ts b/frontend/src/api/menu.ts
index f8a4852..d2da3d6 100644
--- a/frontend/src/api/menu.ts
+++ b/frontend/src/api/menu.ts
@@ -21,6 +21,11 @@ export async function getAdminMenuItems(params?: {
   return data
 }
 
+export async function getAdminMenuTypes(): Promise<{ value: number; label: string }[]> {
+  const { data } = await apiClient.get<{ value: number; label: string }[]>('/admin/menu/types')
+  return data
+}
+
 export async function getAdminMenuTree(): Promise<AdminMenuItemTree[]> {
   const { data } = await apiClient.get<AdminMenuItemTree[]>('/admin/menu/tree')
   return data
diff --git a/frontend/src/components/admin/MenuListView.vue b/frontend/src/components/admin/MenuListView.vue
index a2330af..ce4263d 100644
--- a/frontend/src/components/admin/MenuListView.vue
+++ b/frontend/src/components/admin/MenuListView.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { ref, watch, onMounted } from 'vue'
+import { ref, computed, watch, onMounted } from 'vue'
 import {
   getAdminMenuItems,
+  getAdminMenuTypes,
   createAdminMenuItem,
   updateAdminMenuItem,
   deleteAdminMenuItem,
@@ -15,22 +16,10 @@ import { useToast } from '@/composables/useToast'
 const { confirm } = useConfirm()
 const toast = useToast()
 
-// Type constants
-const typeOptions = [
-  { value: 1, label: 'Menu' },
-  { value: 2, label: 'Url personnalisée' },
-  { value: 3, label: 'Url (redirection)' },
-  { value: 4, label: 'Page' },
-  { value: 5, label: 'Séparateur' },
-  { value: 6, label: 'Bureau' },
-  { value: 7, label: 'Serveurs' },
-  { value: 8, label: 'Roster' },
-  { value: 9, label: 'Calendrier' },
-  { value: 10, label: 'Mission Maker' },
-  { value: 11, label: 'Team Speak' },
-]
+// Type constants (loaded from backend)
+const typeOptions = ref<{ value: number; label: string }[]>([])
 
-const typeLabels: Record<number, string> = Object.fromEntries(typeOptions.map((t) => [t.value, t.label]))
+const typeLabels = computed(() => Object.fromEntries(typeOptions.value.map((t) => [t.value, t.label])))
 
 const restrictionOptions = [
   { value: 0, label: 'Tout le monde' },
@@ -115,14 +104,16 @@ async function loadItems() {
 
 async function loadReferenceData() {
   try {
-    const [menuResult, urlResult, pageResult] = await Promise.all([
+    const [menuResult, urlResult, pageResult, types] = await Promise.all([
       getAdminMenuItems({ type: 1, limit: 100 }),
       getAdminUrls({ limit: 100 }),
       getAdminPages({ limit: 100 }),
+      getAdminMenuTypes(),
     ])
     parentMenuItems.value = menuResult.items
     availableUrls.value = urlResult.items
     availablePages.value = pageResult.items
+    typeOptions.value = types
   } catch (e) {
     toast.error(e)
   }
diff --git a/frontend/src/components/admin/MenuTreeNode.vue b/frontend/src/components/admin/MenuTreeNode.vue
index 57907b8..023ddbc 100644
--- a/frontend/src/components/admin/MenuTreeNode.vue
+++ b/frontend/src/components/admin/MenuTreeNode.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted, nextTick } from 'vue'
+import { ref, inject, onMounted, onUnmounted, nextTick } from 'vue'
 import { dragAndDrop } from '@formkit/drag-and-drop/vue'
 import { tearDown } from '@formkit/drag-and-drop'
 import type { AdminMenuItemTree } from '@/types/api'
@@ -15,19 +15,7 @@ const emit = defineEmits<{
 
 const TYPE_MENU = 1
 
-const typeLabels: Record<number, string> = {
-  1: 'Menu',
-  2: 'Lien',
-  3: 'Url',
-  4: 'Page',
-  5: 'Séparateur',
-  6: 'Bureau',
-  7: 'Serveurs',
-  8: 'Roster',
-  9: 'Calendrier',
-  10: 'Mission Maker',
-  11: 'Team Speak',
-}
+const typeLabels = inject<import('vue').Ref<Record<number, string>>>('menuTypeLabels', ref({}))
 
 const restrictionLabels: Record<number, string> = {
   1: 'Invité+',
diff --git a/frontend/src/components/admin/MenuTreeView.vue b/frontend/src/components/admin/MenuTreeView.vue
index 23440de..69e9eb1 100644
--- a/frontend/src/components/admin/MenuTreeView.vue
+++ b/frontend/src/components/admin/MenuTreeView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { ref, nextTick, onMounted } from 'vue'
+import { ref, provide, nextTick, onMounted } from 'vue'
 import { useDragAndDrop } from '@formkit/drag-and-drop/vue'
-import { getAdminMenuTree, reorderAdminMenuItems } from '@/api/menu'
+import { getAdminMenuTree, getAdminMenuTypes, reorderAdminMenuItems } from '@/api/menu'
 import type { AdminMenuItemTree, MenuItemReorderEntry } from '@/types/api'
 import { useToast } from '@/composables/useToast'
 import { useMenuStore } from '@/stores/menu'
@@ -14,6 +14,9 @@ const loading = ref(false)
 const saving = ref(false)
 const hasChanges = ref(false)
 
+const typeLabels = ref<Record<number, string>>({})
+provide('menuTypeLabels', typeLabels)
+
 function onChanged() {
   hasChanges.value = true
 }
@@ -82,7 +85,13 @@ async function saveOrder() {
   }
 }
 
-onMounted(loadTree)
+onMounted(async () => {
+  const [, types] = await Promise.all([
+    loadTree(),
+    getAdminMenuTypes(),
+  ])
+  typeLabels.value = Object.fromEntries(types.map((t) => [t.value, t.label]))
+})
 </script>
 
 <template>

From 9642e26f13859a1a1fca9f4f0b340cb7f94ef33e Mon Sep 17 00:00:00 2001
From: Michel NAUD <michel.naud26400@gmail.com>
Date: Thu, 12 Mar 2026 18:40:24 +0100
Subject: [PATCH 2/2] improve api response, add tests

---
 backend/app/api/admin_menu.py                 |  5 +-
 backend/app/schemas/content.py                |  5 ++
 .../tests/integration/api/test_admin_menu.py  | 57 +++++++++++++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/backend/app/api/admin_menu.py b/backend/app/api/admin_menu.py
index 859d224..bc3e5e2 100644
--- a/backend/app/api/admin_menu.py
+++ b/backend/app/api/admin_menu.py
@@ -14,14 +14,15 @@
     MenuItemCreate,
     MenuItemReorderRequest,
     MenuItemUpdate,
+    MenuTypeOut,
 )
 
 router = APIRouter(prefix="/admin/menu", tags=["admin-menu"])
 
 
-@router.get("/types")
+@router.get("/types", response_model=list[MenuTypeOut])
 async def get_menu_types(user: User = Depends(require_admin)):
-    return [{"value": k, "label": v} for k, v in MenuItem.TYPES.items()]
+    return [MenuTypeOut(value=k, label=v) for k, v in MenuItem.TYPES.items()]
 
 
 def _build_admin_item_out(item: MenuItem) -> AdminMenuItemOut:
diff --git a/backend/app/schemas/content.py b/backend/app/schemas/content.py
index 4999adc..e37b9f9 100644
--- a/backend/app/schemas/content.py
+++ b/backend/app/schemas/content.py
@@ -77,6 +77,11 @@ class PageBlockUpdate(BaseModel):
     enabled: bool
 
 
+class MenuTypeOut(BaseModel):
+    value: int
+    label: str
+
+
 class MenuItemOut(BaseModel):
     id: int
     label: str | None = None
diff --git a/backend/tests/integration/api/test_admin_menu.py b/backend/tests/integration/api/test_admin_menu.py
index db7c74f..7d2d87e 100644
--- a/backend/tests/integration/api/test_admin_menu.py
+++ b/backend/tests/integration/api/test_admin_menu.py
@@ -33,6 +33,63 @@ async def _create_menu_item(db: AsyncSession, **overrides) -> MenuItem:
     return item
 
 
+# ── Types ─────────────────────────────────────────────────────────────
+
+
+@pytest.mark.asyncio
+async def test_types_returns_all_menu_types(client: AsyncClient, db_session: AsyncSession):
+    # GIVEN
+    _, headers = await _create_admin(db_session)
+
+    # WHEN
+    response = await client.get("/api/admin/menu/types", headers=headers)
+
+    # THEN
+    assert response.status_code == 200
+    data = response.json()
+    assert len(data) == len(MenuItem.TYPES)
+    values = {entry["value"] for entry in data}
+    assert values == set(MenuItem.TYPES.keys())
+    for entry in data:
+        assert entry["label"] == MenuItem.TYPES[entry["value"]]
+
+
+@pytest.mark.asyncio
+async def test_types_includes_discord_voice(client: AsyncClient, db_session: AsyncSession):
+    # GIVEN
+    _, headers = await _create_admin(db_session)
+
+    # WHEN
+    response = await client.get("/api/admin/menu/types", headers=headers)
+
+    # THEN
+    data = response.json()
+    discord_entries = [e for e in data if e["value"] == MenuItem.TYPE_DISCORD_VOICE]
+    assert len(discord_entries) == 1
+    assert discord_entries[0]["label"] == "Discord (vocal)"
+
+
+@pytest.mark.asyncio
+async def test_types_unauthenticated(client: AsyncClient):
+    # WHEN
+    response = await client.get("/api/admin/menu/types")
+
+    # THEN
+    assert response.status_code == 401
+
+
+@pytest.mark.asyncio
+async def test_types_unauthorized(client: AsyncClient, db_session: AsyncSession):
+    # GIVEN
+    _, headers = await _create_user(db_session)
+
+    # WHEN
+    response = await client.get("/api/admin/menu/types", headers=headers)
+
+    # THEN
+    assert response.status_code == 403
+
+
 # ── List ──────────────────────────────────────────────────────────────