bug #6596 fix(AbstractDashboard): fix defaults icons in AbstractDashboard (SebastienXD)

javiereguiluz · javiereguiluz · commit 4e772c0f9eef · 2024-11-28T20:46:07.000+01:00
This PR was merged into the 4.x branch. Discussion ---------- fix(AbstractDashboard): fix defaults icons in AbstractDashboard Fix impersonate and home icons in AbstractDashboard to be compatible with ux-icon Fixes #6595 Commits ------- d2a4ded fix(AbstractDashboard): fix defaults icons in AbstractDashboard
diff --git a/assets/icons/internal/user-lock.svg b/assets/icons/internal/user-lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" fill="currentColor"><!--! Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2024 Fonticons, Inc. --><path d="M224 256A128 128 0 1 0 224 0a128 128 0 1 0 0 256zm-45.7 48C79.8 304 0 383.8 0 482.3C0 498.7 13.3 512 29.7 512l362.8 0c-5.4-9.4-8.6-20.3-8.6-32l0-128c0-2.1 .1-4.2 .3-6.3c-31-26-71-41.7-114.6-41.7l-91.4 0zM528 240c17.7 0 32 14.3 32 32l0 48-64 0 0-48c0-17.7 14.3-32 32-32zm-80 32l0 48c-17.7 0-32 14.3-32 32l0 128c0 17.7 14.3 32 32 32l160 0c17.7 0 32-14.3 32-32l0-128c0-17.7-14.3-32-32-32l0-48c0-44.2-35.8-80-80-80s-80 35.8-80 80z"/></svg>
diff --git a/src/Controller/AbstractDashboardController.php b/src/Controller/AbstractDashboardController.php
@@ -55,7 +55,7 @@ public function configureAssets(): Assets
 
     public function configureMenuItems(): iterable
     {
-        yield MenuItem::linkToDashboard(t('page_title.dashboard', domain: 'EasyAdminBundle'), 'fa fa-home');
+        yield MenuItem::linkToDashboard(t('page_title.dashboard', domain: 'EasyAdminBundle'), 'internal:home');
     }
 
     public function configureUserMenu(UserInterface $user): UserMenu
@@ -67,7 +67,7 @@ public function configureUserMenu(UserInterface $user): UserMenu
             $userMenuItems[] = MenuItem::linkToLogout(t('user.sign_out', domain: 'EasyAdminBundle'), 'internal:sign-out');
         }
         if ($this->isGranted(Permission::EA_EXIT_IMPERSONATION)) {
-            $userMenuItems[] = MenuItem::linkToExitImpersonation(t('user.exit_impersonation', domain: 'EasyAdminBundle'), 'fa-user-lock');
+            $userMenuItems[] = MenuItem::linkToExitImpersonation(t('user.exit_impersonation', domain: 'EasyAdminBundle'), 'internal:user-lock');
         }
 
         $userName = method_exists($user, '__toString') ? (string) $user : $user->getUserIdentifier();

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function configureAssets(): Assets`
`55`	`55`
`56`	`56`	`public function configureMenuItems(): iterable`
`57`	`57`	`{`
`58`		`- yield MenuItem::linkToDashboard(t('page_title.dashboard', domain: 'EasyAdminBundle'), 'fa fa-home');`
	`58`	`+ yield MenuItem::linkToDashboard(t('page_title.dashboard', domain: 'EasyAdminBundle'), 'internal:home');`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public function configureUserMenu(UserInterface $user): UserMenu`
`@@ -67,7 +67,7 @@ public function configureUserMenu(UserInterface $user): UserMenu`
`67`	`67`	`$userMenuItems[] = MenuItem::linkToLogout(t('user.sign_out', domain: 'EasyAdminBundle'), 'internal:sign-out');`
`68`	`68`	`}`
`69`	`69`	`if ($this->isGranted(Permission::EA_EXIT_IMPERSONATION)) {`
`70`		`- $userMenuItems[] = MenuItem::linkToExitImpersonation(t('user.exit_impersonation', domain: 'EasyAdminBundle'), 'fa-user-lock');`
	`70`	`+ $userMenuItems[] = MenuItem::linkToExitImpersonation(t('user.exit_impersonation', domain: 'EasyAdminBundle'), 'internal:user-lock');`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`$userName = method_exists($user, '__toString') ? (string) $user : $user->getUserIdentifier();`