Fassung 1.7.0: verlässliche Installation, übersichtliche Verwaltung und bedienbare Bewegung

src/Controller/MenuController.php

@@ -18,24 +18,24 @@ final class MenuController extends AbstractController
     }
 
     #[Route('/%kant.admin_path%/menus', name: 'admin_menus', methods: ['GET'])]
-    public function index(): Response
+    public function index(Request $request): Response
     {
-        $menus = $this->menus->all();
-        $rows = [];
-        foreach (MenuRepository::SLOTS as $slot => $label) {
-            $rows[$slot] = $this->flatten($menus[$slot]['items'] ?? []);
-        }
-        $pages = [];
-        foreach ($this->pages->listForEditor() as $page) {
-            $document = json_decode($page['document'] ?? '{}', true, 512, JSON_THROW_ON_ERROR);
-            $pages[] = ['id' => $page['id'], 'path' => $page['path'], 'title' => $document['title'] ?? $page['slug']];
+        $slot = $request->query->getString('slot', 'header');
+        $slot = isset(MenuRepository::SLOTS[$slot]) ? $slot : 'header';
+        $menu = $this->menus->all()[$slot] ?? null;
+        $rows = $this->flatten($menu['items'] ?? []);
+        $selected = [];
+        foreach ($rows as &$row) {
+            if ($row['pageId']) {
+                $selected[$row['pageId']] ??= $this->pages->choices(id: $row['pageId'])[0] ?? ['id' => $row['pageId'], 'title' => 'Nicht mehr verfügbar', 'path' => ''];
+            }
+            $row['page'] = $selected[$row['pageId']] ?? null;
         }
+        unset($row);
 
         return $this->render('admin/menus.html.twig', [
-            'slots' => MenuRepository::SLOTS,
-            'menus' => $menus,
-            'rows' => $rows,
-            'pages' => $pages,
+            'slots' => MenuRepository::SLOTS, 'slot' => $slot, 'slotName' => MenuRepository::SLOTS[$slot],
+            'menu' => $menu, 'rows' => $rows,
         ]);
     }
 
@@ -44,7 +44,7 @@ final class MenuController extends AbstractController
     {
         $this->denyAccessUnlessGranted('ROLE_EDITOR');
         if (!$this->isCsrfTokenValid('menus', $request->request->getString('_csrf_token'))) {
-            return $this->back('Deine Sitzung ist abgelaufen. Bitte melde dich erneut an.');
+            return 'json' === $request->getPreferredFormat() ? $this->json(['error' => 'Deine Sitzung ist abgelaufen. Bitte erneut anmelden.'], 403) : $this->back('Deine Sitzung ist abgelaufen. Bitte melde dich erneut an.', slot: $slot);
         }
         try {
             $this->menus->save(
@@ -54,10 +54,14 @@ final class MenuController extends AbstractController
                 $request->request->getInt('expectedVersion', -1),
             );
         } catch (InvalidMenu|StaleWrite $e) {
-            return $this->back($e->getMessage());
+            return 'json' === $request->getPreferredFormat() ? $this->json(['error' => $e->getMessage()], $e instanceof StaleWrite ? 409 : 422) : $this->back($e->getMessage(), slot: $slot);
         }
 
-        return $this->back('Das Menü wurde gespeichert.', 'success');
+        if ('json' === $request->getPreferredFormat()) {
+            return $this->json(['message' => 'Menü gespeichert.', 'version' => $this->menus->all()[$slot]['version']]);
+        }
+
+        return $this->back('Das Menü wurde gespeichert.', 'success', $slot);
     }
 
     /**
@@ -122,10 +126,10 @@ final class MenuController extends AbstractController
         return $items;
     }
 
-    private function back(string $message, string $type = 'error'): Response
+    private function back(string $message, string $type = 'error', string $slot = 'header'): Response
     {
         $this->addFlash($type, $message);
 
-        return $this->redirectToRoute('admin_menus');
+        return $this->redirectToRoute('admin_menus', 'header' === $slot ? [] : ['slot' => $slot]);
     }
 }