Release 2.5.0 (#4454)

- added command to list users
- corrected wrong german translation
- work contract validations
- prevent error with missing params
- use collapsible, minor UI improvement
- added classes to target menu buttons in custom rules
- disable webpack notifier, incompatible with mac arm
- use explicit menu service to generate menu
- bump to fontawesome 6 and replace restart icon
- change repeat icon for recent activities
- moved user bookmarks (favorites) to top nav
- fix totp seconds window (leeway)
- new migration to fix remaining user preferences with dots in name
- remove duplicate named column in user screen
- unify and added translations
- added missing filter and tags to InvoiceSecurity

src/EventSubscriber/MenuBuilderSubscriber.php

@@ -9,13 +9,10 @@
 
 namespace App\EventSubscriber;
 
-use App\Entity\User;
-use App\Event\ConfigureMainMenuEvent;
 use App\Utils\MenuItemModel;
+use App\Utils\MenuService;
 use KevinPapst\TablerBundle\Event\MenuEvent;
 use KevinPapst\TablerBundle\Model\MenuItemInterface;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -24,7 +21,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 final class MenuBuilderSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private EventDispatcherInterface $eventDispatcher, private Security $security)
+    public function __construct(private MenuService $menuService)
     {
     }
 
@@ -37,15 +34,7 @@ final class MenuBuilderSubscriber implements EventSubscriberInterface
 
     public function onSetupNavbar(MenuEvent $event): void
     {
-        $menuEvent = new ConfigureMainMenuEvent();
-
-        /** @var User $user */
-        $user = $this->security->getUser();
-
-        // error pages don't have a user and will fail when is_granted() is called
-        if (null !== $user) {
-            $this->eventDispatcher->dispatch($menuEvent);
-        }
+        $menuEvent = $this->menuService->getKimaiMenu();
 
         foreach ($menuEvent->getMenu()->getChildren() as $child) {
             if ($child->getRoute() === null && !$child->hasChildren()) {

src/EventSubscriber/MenuFavoritesSubscriber.php

@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of the Kimai time-tracking app.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace App\EventSubscriber;
-
-use App\Entity\User;
-use App\Event\ConfigureMainMenuEvent;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-final class MenuFavoritesSubscriber implements EventSubscriberInterface
-{
-    public function __construct(private Security $security)
-    {
-    }
-
-    public static function getSubscribedEvents(): array
-    {
-        return [
-            ConfigureMainMenuEvent::class => ['onMainMenuConfigure', 90], // see MenuSubscriber
-        ];
-    }
-
-    public function onMainMenuConfigure(ConfigureMainMenuEvent $menuEvent): void
-    {
-        /** @var User|null $user */
-        $user = $this->security->getUser();
-        if (null === $user) {
-            return;
-        }
-
-        $userFavorites = $user->getPreferenceValue('favorite_routes');
-        if (!\is_string($userFavorites) || trim($userFavorites) === '') {
-            return;
-        }
-
-        $favMenu = $menuEvent->findById('favorites');
-        if ($favMenu === null) {
-            return;
-        }
-
-        $userFavorites = explode(',', $userFavorites);
-        foreach ($userFavorites as $fav) {
-            $tmp = $menuEvent->findById($fav);
-            if ($tmp !== null && !$tmp->hasChildren()) {
-                $favMenu->addChild(clone $tmp);
-            }
-        }
-
-        if ($favMenu->hasChildren()) {
-            $favMenu->setExpanded(true);
-            $menuEvent->getTimesheetMenu()?->setExpanded(false);
-        }
-    }
-}