From 0d7f24b28870ee3df74251b13718cc3cd523b9ed Mon Sep 17 00:00:00 2001 From: saeed Date: Fri, 26 Jan 2024 15:48:37 +0330 Subject: [PATCH] fix side menu groups order is not same for other locales --- app/Filament/Pages/Board.php | 2 +- app/Filament/Pages/JiraImport.php | 2 +- app/Filament/Pages/ManageGeneralSettings.php | 2 +- app/Filament/Pages/RoadMap.php | 2 +- app/Filament/Pages/TimesheetDashboard.php | 2 +- app/Filament/Pages/TimesheetExport.php | 2 +- app/Filament/Resources/ActivityResource.php | 4 +--- app/Filament/Resources/PermissionResource.php | 3 +-- app/Filament/Resources/ProjectResource.php | 3 ++- .../Resources/ProjectStatusResource.php | 3 +-- app/Filament/Resources/RoleResource.php | 3 +-- .../Resources/TicketPriorityResource.php | 3 +-- app/Filament/Resources/TicketResource.php | 3 +-- .../Resources/TicketStatusResource.php | 3 +-- app/Filament/Resources/TicketTypeResource.php | 3 +-- app/Filament/Resources/TimesheetResource.php | 3 +-- app/Filament/Resources/UserResource.php | 5 +---- app/Providers/AppServiceProvider.php | 19 +++++++++++-------- config/filament.php | 2 +- 19 files changed, 30 insertions(+), 39 deletions(-) diff --git a/app/Filament/Pages/Board.php b/app/Filament/Pages/Board.php index b2f3aa908..71d8279d7 100644 --- a/app/Filament/Pages/Board.php +++ b/app/Filament/Pages/Board.php @@ -40,7 +40,7 @@ protected static function getNavigationLabel(): string protected static function getNavigationGroup(): ?string { - return __('Management'); + return 'Management'; } protected function getFormSchema(): array diff --git a/app/Filament/Pages/JiraImport.php b/app/Filament/Pages/JiraImport.php index d0336cbbf..629c098cf 100644 --- a/app/Filament/Pages/JiraImport.php +++ b/app/Filament/Pages/JiraImport.php @@ -69,7 +69,7 @@ protected static function getNavigationLabel(): string protected static function getNavigationGroup(): ?string { - return __('Settings'); + return 'Settings'; } protected function getFormSchema(): array diff --git a/app/Filament/Pages/ManageGeneralSettings.php b/app/Filament/Pages/ManageGeneralSettings.php index 0d60b3c33..d10a095e7 100644 --- a/app/Filament/Pages/ManageGeneralSettings.php +++ b/app/Filament/Pages/ManageGeneralSettings.php @@ -38,7 +38,7 @@ protected static function getNavigationLabel(): string protected static function getNavigationGroup(): ?string { - return __('Settings'); + return 'Settings'; } protected function getFormSchema(): array diff --git a/app/Filament/Pages/RoadMap.php b/app/Filament/Pages/RoadMap.php index 781808541..69a19ad45 100644 --- a/app/Filament/Pages/RoadMap.php +++ b/app/Filament/Pages/RoadMap.php @@ -42,7 +42,7 @@ protected static function getNavigationLabel(): string protected static function getNavigationGroup(): ?string { - return __('Management'); + return 'Management'; } public function mount() diff --git a/app/Filament/Pages/TimesheetDashboard.php b/app/Filament/Pages/TimesheetDashboard.php index 08880cea2..cfc572551 100644 --- a/app/Filament/Pages/TimesheetDashboard.php +++ b/app/Filament/Pages/TimesheetDashboard.php @@ -27,7 +27,7 @@ protected static function getNavigationLabel(): string protected static function getNavigationGroup(): ?string { - return __('Timesheet'); + return 'Timesheet'; } protected static function shouldRegisterNavigation(): bool diff --git a/app/Filament/Pages/TimesheetExport.php b/app/Filament/Pages/TimesheetExport.php index 93646b12b..33ef13b24 100644 --- a/app/Filament/Pages/TimesheetExport.php +++ b/app/Filament/Pages/TimesheetExport.php @@ -25,7 +25,7 @@ class TimesheetExport extends Page implements HasForms protected static function getNavigationGroup(): ?string { - return __('Timesheet'); + return 'Timesheet'; } public function mount(): void diff --git a/app/Filament/Resources/ActivityResource.php b/app/Filament/Resources/ActivityResource.php index 91eff9fc5..0c94a895d 100644 --- a/app/Filament/Resources/ActivityResource.php +++ b/app/Filament/Resources/ActivityResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\ActivityResource\Pages; -use App\Filament\Resources\ActivityResource\RelationManagers; use App\Models\Activity; use Filament\Forms; use Filament\Resources\Form; @@ -18,7 +17,6 @@ class ActivityResource extends Resource protected static ?string $navigationIcon = 'heroicon-o-clipboard'; protected static ?int $navigationSort = 1; - protected static function getNavigationLabel(): string { return __('Activities'); @@ -31,7 +29,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Referential'); + return 'Referential'; } public static function form(Form $form): Form diff --git a/app/Filament/Resources/PermissionResource.php b/app/Filament/Resources/PermissionResource.php index 6e2957ba2..8aaf1c162 100644 --- a/app/Filament/Resources/PermissionResource.php +++ b/app/Filament/Resources/PermissionResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\PermissionResource\Pages; -use App\Filament\Resources\PermissionResource\RelationManagers; use App\Models\Permission; use Filament\Forms; use Filament\Resources\Form; @@ -31,7 +30,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return static::getPluralLabel(); + return 'Permissions'; } public static function form(Form $form): Form diff --git a/app/Filament/Resources/ProjectResource.php b/app/Filament/Resources/ProjectResource.php index 2952b4442..4a72880b8 100644 --- a/app/Filament/Resources/ProjectResource.php +++ b/app/Filament/Resources/ProjectResource.php @@ -40,9 +40,10 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Management'); + return 'Management'; } + public static function form(Form $form): Form { return $form diff --git a/app/Filament/Resources/ProjectStatusResource.php b/app/Filament/Resources/ProjectStatusResource.php index 2f3f17a44..c4f3af99e 100644 --- a/app/Filament/Resources/ProjectStatusResource.php +++ b/app/Filament/Resources/ProjectStatusResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\ProjectStatusResource\Pages; -use App\Filament\Resources\ProjectStatusResource\RelationManagers; use App\Models\ProjectStatus; use Filament\Forms; use Filament\Resources\Form; @@ -31,7 +30,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Referential'); + return 'Referential'; } public static function form(Form $form): Form diff --git a/app/Filament/Resources/RoleResource.php b/app/Filament/Resources/RoleResource.php index bdf0a0816..c7db1d83c 100644 --- a/app/Filament/Resources/RoleResource.php +++ b/app/Filament/Resources/RoleResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\RoleResource\Pages; -use App\Filament\Resources\RoleResource\RelationManagers; use App\Models\Permission; use App\Models\Role; use Filament\Forms; @@ -32,7 +31,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Permissions'); + return 'Permissions'; } public static function form(Form $form): Form diff --git a/app/Filament/Resources/TicketPriorityResource.php b/app/Filament/Resources/TicketPriorityResource.php index 2cba855b1..5f3ad078b 100644 --- a/app/Filament/Resources/TicketPriorityResource.php +++ b/app/Filament/Resources/TicketPriorityResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\TicketPriorityResource\Pages; -use App\Filament\Resources\TicketPriorityResource\RelationManagers; use App\Models\TicketPriority; use Filament\Forms; use Filament\Resources\Form; @@ -34,7 +33,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Referential'); + return 'Referential'; } public static function form(Form $form): Form diff --git a/app/Filament/Resources/TicketResource.php b/app/Filament/Resources/TicketResource.php index c344ca8a4..4978c0261 100644 --- a/app/Filament/Resources/TicketResource.php +++ b/app/Filament/Resources/TicketResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\TicketResource\Pages; -use App\Filament\Resources\TicketResource\RelationManagers; use App\Models\Epic; use App\Models\Project; use App\Models\Ticket; @@ -41,7 +40,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Management'); + return 'Management'; } public static function form(Form $form): Form diff --git a/app/Filament/Resources/TicketStatusResource.php b/app/Filament/Resources/TicketStatusResource.php index 5d8e3f930..0557c2c3c 100644 --- a/app/Filament/Resources/TicketStatusResource.php +++ b/app/Filament/Resources/TicketStatusResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\TicketStatusResource\Pages; -use App\Filament\Resources\TicketStatusResource\RelationManagers; use App\Models\TicketStatus; use Filament\Forms; use Filament\Resources\Form; @@ -31,7 +30,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Referential'); + return 'Referential'; } public static function form(Form $form): Form diff --git a/app/Filament/Resources/TicketTypeResource.php b/app/Filament/Resources/TicketTypeResource.php index e515ff68f..32caa43e2 100644 --- a/app/Filament/Resources/TicketTypeResource.php +++ b/app/Filament/Resources/TicketTypeResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\TicketTypeResource\Pages; -use App\Filament\Resources\TicketTypeResource\RelationManagers; use App\Models\TicketType; use Filament\Forms; use Filament\Resources\Form; @@ -33,7 +32,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Referential'); + return 'Referential'; } public static function form(Form $form): Form diff --git a/app/Filament/Resources/TimesheetResource.php b/app/Filament/Resources/TimesheetResource.php index 276371049..3c276aa24 100644 --- a/app/Filament/Resources/TimesheetResource.php +++ b/app/Filament/Resources/TimesheetResource.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources; use App\Filament\Resources\TimesheetResource\Pages; -use App\Filament\Resources\TimesheetResource\RelationManagers; use App\Models\Activity; use App\Models\TicketHour; use Filament\Forms; @@ -35,7 +34,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Timesheet'); + return 'Timesheet'; } protected static function shouldRegisterNavigation(): bool diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php index 5100d9a79..2b84feb8c 100644 --- a/app/Filament/Resources/UserResource.php +++ b/app/Filament/Resources/UserResource.php @@ -3,15 +3,12 @@ namespace App\Filament\Resources; use App\Filament\Resources\UserResource\Pages; -use App\Filament\Resources\UserResource\RelationManagers; use App\Models\User; use Filament\Forms; use Filament\Resources\Form; -use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Resource; use Filament\Resources\Table; use Filament\Tables; -use Illuminate\Support\HtmlString; class UserResource extends Resource { @@ -33,7 +30,7 @@ public static function getPluralLabel(): ?string protected static function getNavigationGroup(): ?string { - return __('Permissions'); + return 'Permissions'; } public static function form(Form $form): Form diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 67c8f5da5..b120fa66c 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,6 +4,7 @@ use App\Settings\GeneralSettings; use Filament\Facades\Filament; +use Filament\Navigation\NavigationGroup; use Illuminate\Database\QueryException; use Illuminate\Foundation\Vite; use Illuminate\Support\Facades\Config; @@ -38,6 +39,16 @@ public function boot() Filament::registerTheme( app(Vite::class)('resources/css/filament.scss'), ); + + // Register navigation groups + Filament::registerNavigationGroups([ + 'Management' => NavigationGroup::make()->label(__('Management')), + 'Referential' => NavigationGroup::make()->label( __('Referential')), + 'Security' => NavigationGroup::make()->label(__('Security')), + 'Settings' => NavigationGroup::make()->label(__('Settings')), + 'Permissions' => NavigationGroup::make()->label(__('Permissions')), + 'Timesheet' => NavigationGroup::make()->label(__('Timesheet')), + ]); }); // Register tippy styles @@ -61,14 +72,6 @@ public function boot() href="' . config('app.logo') . '">'), ]); - // Register navigation groups - Filament::registerNavigationGroups([ - __('Management'), - __('Referential'), - __('Security'), - __('Settings'), - ]); - // Force HTTPS over HTTP if (env('APP_FORCE_HTTPS') ?? false) { URL::forceScheme('https'); diff --git a/config/filament.php b/config/filament.php index 31d52a4aa..a3f59f903 100644 --- a/config/filament.php +++ b/config/filament.php @@ -328,9 +328,9 @@ ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, + LocaleMiddleware::class, DispatchServingFilamentEvent::class, MirrorConfigToSubpackages::class, - LocaleMiddleware::class ], ],