improve admin user profile + image hosting

app/Filament/Resources/User/ExamUserResource.php

@@ -100,7 +100,7 @@ class ExamUserResource extends Resource
             ->actions([
                 Tables\Actions\ViewAction::make(),
             ])
-            ->prependBulkActions([
+            ->groupedBulkActions([
                 Tables\Actions\BulkAction::make('Avoid')->action(function (Collection $records) {
                     $idArr = $records->pluck('id')->toArray();
                     $rep = new ExamRepository();

app/Filament/Resources/User/HitAndRunResource.php

@@ -75,7 +75,7 @@ class HitAndRunResource extends Resource
             ->actions([
                 Tables\Actions\ViewAction::make(),
             ])
-            ->prependBulkActions([
+            ->groupedBulkActions([
                 Tables\Actions\BulkAction::make('Pardon')->action(function (Collection $records) {
                     $idArr = $records->pluck('id')->toArray();
                     $rep = new HitAndRunRepository();

app/Filament/Resources/User/UserResource.php

@@ -7,12 +7,16 @@ use App\Filament\Resources\User\UserResource\Pages;
 use App\Filament\Resources\User\UserResource\RelationManagers;
 use App\Models\User;
 use App\Repositories\UserRepository;
+use Filament\Actions\Action;
 use Filament\Forms;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables\Table;
 use Filament\Tables;
+use Filament\Infolists;
+use Filament\Infolists\Infolist;
+use Filament\Infolists\Components;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
@@ -32,6 +36,16 @@ class UserResource extends Resource
 
     protected static ?int $navigationSort = 1;
 
+    private static $rep;
+
+    private static function getRep(): UserRepository
+    {
+        if (!self::$rep) {
+            self::$rep = new UserRepository();
+        }
+        return self::$rep;
+    }
+
     public static function getNavigationLabel(): string
     {
         return __('admin.sidebar.users_list');
@@ -102,6 +116,198 @@ class UserResource extends Resource
             ->bulkActions(self::getBulkActions());
     }
 
+    public static function infolist(Infolist $infolist): Infolist
+    {
+        return $infolist
+            ->schema([
+                Components\Grid::make(2)->schema([
+                    Components\Group::make([
+                        Infolists\Components\TextEntry::make('id')->label("UID"),
+                        Infolists\Components\TextEntry::make('username')
+                            ->label(__("label.user.username"))
+                            ->formatStateUsing(fn ($record) => get_username($record->id, false, true, true, true))
+                            ->html()
+                        ,
+                        Infolists\Components\TextEntry::make('email')
+                            ->label(__("label.email"))
+                        ,
+                        Infolists\Components\TextEntry::make('passkey'),
+                        Infolists\Components\TextEntry::make('added')->label(__("label.added")),
+                        Infolists\Components\TextEntry::make('last_access')->label(__("label.last_access")),
+                        Infolists\Components\TextEntry::make('inviter.username')->label(__("label.user.invite_by")),
+                        Infolists\Components\TextEntry::make('parked')->label(__("label.user.parked")),
+                        Infolists\Components\TextEntry::make('offer_allowed_count')->label(__("label.user.offer_allowed_count")),
+                        Infolists\Components\TextEntry::make('seed_points')->label(__("label.user.seed_points")),
+                        Infolists\Components\TextEntry::make('uploadedText')->label(__("label.uploaded")),
+                        Infolists\Components\TextEntry::make('downloadedText')->label(__("label.downloaded")),
+                        Infolists\Components\TextEntry::make('seedbonus')->label(__("label.user.seedbonus")),
+                    ])->columns(2),
+                    Components\Group::make([
+                        Infolists\Components\TextEntry::make('status')
+                            ->label(__('label.user.status'))
+                            ->badge()
+                            ->colors(['success' => User::STATUS_CONFIRMED, 'warning' => User::STATUS_PENDING])
+                            ->hintAction(self::buildActionConfirm())
+                        ,
+
+                        Infolists\Components\TextEntry::make('classText')
+                            ->label(__("label.user.class"))
+                            ->hintAction(self::buildActionChangeClass())
+                        ,
+
+                        Infolists\Components\TextEntry::make('enabled')
+                            ->label(__("label.user.enabled"))
+                            ->badge()
+                            ->colors(['success' => 'yes', 'warning' => 'no'])
+                            ->hintAction(self::buildActionEnableDisable())
+                        ,
+                        Infolists\Components\TextEntry::make('downloadpos')
+                            ->label(__("label.user.downloadpos"))
+                            ->badge()
+                            ->colors(['success' => 'yes', 'warning' => 'no'])
+                            ->hintAction(self::buildActionChangeDownloadPos())
+                        ,
+                        Infolists\Components\TextEntry::make('twoFactorAuthenticationStatus')
+                            ->label(__("label.user.two_step_authentication"))
+                            ->badge()
+                            ->colors(['success' => 'yes', 'warning' => 'no'])
+                            ->hintAction(self::buildActionCancelTwoStepAuthentication())
+                        ,
+                    ])
+                ]),
+            ]);
+    }
+
+    private static function buildActionChangeClass(): Infolists\Components\Actions\Action
+    {
+        return Infolists\Components\Actions\Action::make("changeClass")
+            ->label(__('label.change'))
+            ->button()
+            ->visible(fn (User $record): bool => (Auth::user()->class > $record->class))
+            ->form([
+                Forms\Components\Select::make('class')
+                    ->options(User::listClass(User::CLASS_PEASANT, Auth::user()->class - 1))
+                    ->default(fn (User $record) => $record->class)
+                    ->label(__('user.labels.class'))
+                    ->required()
+                    ->reactive()
+                ,
+                Forms\Components\Radio::make('vip_added')
+                    ->options(self::getYesNoOptions('yes', 'no'))
+                    ->default(fn (User $record) => $record->vip_added)
+                    ->label(__('user.labels.vip_added'))
+                    ->helperText(__('user.labels.vip_added_help'))
+                    ->hidden(fn (\Filament\Forms\Get $get) => $get('class') != User::CLASS_VIP)
+                ,
+                Forms\Components\DateTimePicker::make('vip_until')
+                    ->default(fn (User $record) => $record->vip_until)
+                    ->label(__('user.labels.vip_until'))
+                    ->helperText(__('user.labels.vip_until_help'))
+                    ->hidden(fn (\Filament\Forms\Get $get) => $get('class') != User::CLASS_VIP)
+                ,
+                Forms\Components\TextInput::make('reason')
+                    ->label(__('admin.resources.user.actions.enable_disable_reason'))
+                    ->placeholder(__('admin.resources.user.actions.enable_disable_reason_placeholder'))
+                ,
+            ])
+            ->action(function (User $record, array $data) {
+                $userRep = self::getRep();
+                try {
+                    $userRep->changeClass(Auth::user(), $record, $data['class'], $data['reason'], $data);
+                    send_admin_success_notification();
+                } catch (\Exception $exception) {
+                    send_admin_fail_notification($exception->getMessage());
+                }
+            });
+    }
+
+    private static function buildActionConfirm(): Infolists\Components\Actions\Action
+    {
+        return Infolists\Components\Actions\Action::make(__('admin.resources.user.actions.confirm_btn'))
+            ->modalHeading(__('admin.resources.user.actions.confirm_btn'))
+            ->requiresConfirmation()
+            ->visible(fn (User $record): bool => (Auth::user()->class > $record->class))
+            ->button()
+            ->color('success')
+            ->visible(fn ($record) => $record->status == User::STATUS_PENDING)
+            ->action(function (User $record) {
+                if (Auth::user()->class <= $record->class) {
+                    send_admin_fail_notification("No Permission!");
+                    return;
+                }
+                $record->status = User::STATUS_CONFIRMED;
+                $record->info= null;
+                $record->save();
+                send_admin_success_notification();
+            });
+    }
+
+    private static function buildActionEnableDisable(): Infolists\Components\Actions\Action
+    {
+        return Infolists\Components\Actions\Action::make("changeClass")
+            ->label(fn (User $record) => $record->enabled == 'yes' ? __('admin.resources.user.actions.disable_modal_btn') : __('admin.resources.user.actions.enable_modal_btn'))
+            ->modalHeading(fn (User $record) => $record->enabled == 'yes' ? __('admin.resources.user.actions.disable_modal_title') : __('admin.resources.user.actions.enable_modal_title'))
+            ->button()
+            ->visible(fn (User $record): bool => (Auth::user()->class > $record->class))
+            ->form([
+                Forms\Components\TextInput::make('reason')->label(__('admin.resources.user.actions.enable_disable_reason'))->placeholder(__('admin.resources.user.actions.enable_disable_reason_placeholder')),
+                Forms\Components\Hidden::make('action')->default(fn (User $record) => $record->enabled == 'yes' ? 'disable' : 'enable'),
+                Forms\Components\Hidden::make('uid')->default(fn (User $record) => $record->id),
+            ])
+            ->action(function (User $record, array $data) {
+                $userRep = self::getRep();
+                try {
+                    if ($data['action'] == 'enable') {
+                        $userRep->enableUser(Auth::user(), $data['uid'], $data['reason']);
+                    } elseif ($data['action'] == 'disable') {
+                        $userRep->disableUser(Auth::user(), $data['uid'], $data['reason']);
+                    }
+                    send_admin_success_notification();
+                } catch (\Exception $exception) {
+                    send_admin_fail_notification($exception->getMessage());
+                }
+            });
+    }
+
+    private static function buildActionChangeDownloadPos(): Infolists\Components\Actions\Action
+    {
+        return Infolists\Components\Actions\Action::make("changeDownloadPos")
+            ->label(fn (User $record) => $record->downloadpos == 'yes' ? __('admin.resources.user.actions.disable_download_privileges_btn') : __('admin.resources.user.actions.enable_download_privileges_btn'))
+            ->button()
+            ->requiresConfirmation()
+            ->visible(fn (User $record): bool => (Auth::user()->class > $record->class))
+            ->action(function (User $record) {
+                $userRep = self::getRep();
+                try {
+                    $userRep->updateDownloadPrivileges(Auth::user(), $record->id, $record->downloadpos == 'yes' ? 'no' : 'yes');
+                    send_admin_success_notification();
+                } catch (\Exception $exception) {
+                    send_admin_fail_notification($exception->getMessage());
+                }
+            });
+
+    }
+
+    private static function buildActionCancelTwoStepAuthentication(): Infolists\Components\Actions\Action
+    {
+        return Infolists\Components\Actions\Action::make("twoStepAuthentication")
+            ->label(__('admin.resources.user.actions.disable_two_step_authentication'))
+            ->button()
+            ->visible(fn (User $record) => $record->two_step_secret != "")
+            ->modalHeading(__('admin.resources.user.actions.disable_two_step_authentication'))
+            ->requiresConfirmation()
+            ->action(function (user $record) {
+                $userRep = self::getRep();
+                try {
+                    $userRep->removeTwoStepAuthentication(Auth::user(), $record->id);
+                    send_admin_success_notification();
+                } catch (\Exception $exception) {
+                    send_admin_fail_notification($exception->getMessage());
+                }
+            });
+
+    }
+
     public static function getRelations(): array
     {
         return [
@@ -123,13 +329,13 @@ class UserResource extends Resource
     public static function getBulkActions(): array
     {
         $actions = [];
-        if (Auth::user()->class >= User::CLASS_SYSOP) {
+        if (filament()->auth()->user()->class >= User::CLASS_SYSOP) {
             $actions[] = Tables\Actions\BulkAction::make('confirm')
                 ->label(__('admin.resources.user.actions.confirm_bulk'))
                 ->requiresConfirmation()
                 ->deselectRecordsAfterCompletion()
                 ->action(function (Collection $records) {
-                    $rep = new UserRepository();
+                    $rep = self::getRep();
                     $rep->confirmUser($records->pluck('id')->toArray());
                 });
         }

app/Filament/Resources/User/UserResource/Pages/UserProfile.php

@@ -13,10 +13,11 @@ use App\Repositories\ExamRepository;
 use App\Repositories\MedalRepository;
 use App\Repositories\UserRepository;
 use Carbon\Carbon;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\Concerns\HasRelationManagers;
 use Filament\Resources\Pages\Concerns\InteractsWithRecord;
 use Filament\Resources\Pages\Page;
-use Filament\Pages\Actions;
+use Filament\Actions;
 use Filament\Forms;
 use Filament\Resources\Pages\ViewRecord;
 use Illuminate\Support\Facades\Auth;
@@ -32,13 +33,7 @@ class UserProfile extends ViewRecord
 
     protected static string $resource = UserResource::class;
 
-    protected static string $view = 'filament.resources.user.user-resource.pages.user-profile';
-
-    const EVENT_RECORD_UPDATED = 'recordUpdated';
-
-    protected $listeners = [
-        self::EVENT_RECORD_UPDATED => 'updateRecord'
-    ];
+//    protected static string $view = 'filament.resources.user.user-resource.pages.user-profile';
 
     private function getRep(): UserRepository
     {
@@ -48,11 +43,6 @@ class UserProfile extends ViewRecord
         return self::$rep;
     }
 
-    public function updateRecord($id)
-    {
-        $this->record = $this->resolveRecord($id);
-    }
-
     protected function getHeaderActions(): array
     {
         $actions = [];
@@ -61,18 +51,18 @@ class UserProfile extends ViewRecord
             $actions[] = $this->buildGrantMedalAction();
             $actions[] = $this->buildAssignExamAction();
             $actions[] = $this->buildChangeBonusEtcAction();
-            if ($this->record->two_step_secret) {
-                $actions[] = $this->buildDisableTwoStepAuthenticationAction();
-            }
-            if ($this->record->status == User::STATUS_PENDING) {
-                $actions[] = $this->buildConfirmAction();
-            }
+//            if ($this->record->two_step_secret) {
+//                $actions[] = $this->buildDisableTwoStepAuthenticationAction();
+//            }
+//            if ($this->record->status == User::STATUS_PENDING) {
+//                $actions[] = $this->buildConfirmAction();
+//            }
             $actions[] = $this->buildResetPasswordAction();
-            $actions[] = $this->buildEnableDisableAction();
-            $actions[] = $this->buildEnableDisableDownloadPrivilegesAction();
-            if (user_can('user-change-class')) {
-                $actions[] = $this->buildChangeClassAction();
-            }
+//            $actions[] = $this->buildEnableDisableAction();
+//            $actions[] = $this->buildEnableDisableDownloadPrivilegesAction();
+//            if (user_can('user-change-class')) {
+//                $actions[] = $this->buildChangeClassAction();
+//            }
             if (user_can('user-delete')) {
                 $actions[] = $this->buildDeleteAction();
             }
@@ -101,10 +91,9 @@ class UserProfile extends ViewRecord
                     } elseif ($data['action'] == 'disable') {
                         $userRep->disableUser(Auth::user(), $data['uid'], $data['reason']);
                     }
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $data['uid']);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
@@ -118,10 +107,9 @@ class UserProfile extends ViewRecord
                 $userRep = $this->getRep();
                 try {
                     $userRep->removeTwoStepAuthentication(Auth::user(), $this->record->id);
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
@@ -175,10 +163,9 @@ class UserProfile extends ViewRecord
                     } else {
                         $userRep->incrementDecrement(Auth::user(), $this->record->id, $data['action'], $data['field'], $data['value'], $data['reason']);
                     }
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
@@ -198,10 +185,9 @@ class UserProfile extends ViewRecord
                 $userRep = $this->getRep();
                 try {
                     $userRep->resetPassword($this->record->id, $data['password'], $data['password_confirmation']);
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
@@ -223,10 +209,9 @@ class UserProfile extends ViewRecord
                 $examRep = new ExamRepository();
                 try {
                     $examRep->assignToUser($this->record->id, $data['exam_id'], $data['begin'], $data['end']);
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
@@ -251,10 +236,9 @@ class UserProfile extends ViewRecord
                 $medalRep = new MedalRepository();
                 try {
                     $medalRep->grantToUser($this->record->id, $data['medal_id'], $data['duration']);
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
@@ -272,8 +256,7 @@ class UserProfile extends ViewRecord
                 $this->record->status = User::STATUS_CONFIRMED;
                 $this->record->info= null;
                 $this->record->save();
-                $this->notify('success', 'Success!');
-                $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                $this->sendSuccessNotification();
             });
     }
 
@@ -287,10 +270,9 @@ class UserProfile extends ViewRecord
                 $userRep = $this->getRep();
                 try {
                     $userRep->updateDownloadPrivileges(Auth::user(), $this->record->id, $this->record->downloadpos == 'yes' ? 'no' : 'yes');
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
@@ -311,15 +293,14 @@ class UserProfile extends ViewRecord
                 $rep = $this->getRep();
                 try {
                     $rep->addMeta($this->record, $data, $data);
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
 
-    private function buildDeleteAction(): Actions\Action
+    private function buildDeleteAction(): Actions\DeleteAction
     {
         return Actions\DeleteAction::make()->using(function () {
             $this->getRep()->destroy($this->record->id);
@@ -345,7 +326,7 @@ class UserProfile extends ViewRecord
         $props = [];
         foreach ($metaList as $metaKey => $metas) {
             $meta = $metas->first();
-            $text = sprintf('[%s]', $meta->metaKeyText, );
+            $text = sprintf('[%s]', $meta->metaKeyText);
             if ($meta->meta_key == UserMeta::META_KEY_PERSONALIZED_USERNAME) {
                 $text .= sprintf('(%s)', $meta->getDeadlineText());
             }
@@ -397,11 +378,28 @@ class UserProfile extends ViewRecord
                 $userRep = $this->getRep();
                 try {
                     $userRep->changeClass(Auth::user(), $this->record, $data['class'], $data['reason'], $data);
-                    $this->notify('success', 'Success!');
-                    $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
+                    $this->sendSuccessNotification();
                 } catch (\Exception $exception) {
-                    $this->notify('danger', $exception->getMessage());
+                    $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
+
+    private function sendSuccessNotification(string $msg = ""): void
+    {
+        Notification::make()
+            ->success()
+            ->title($msg ?: "Success!")
+            ->send()
+        ;
+    }
+
+    private function sendFailNotification(string $msg = ""): void
+    {
+        Notification::make()
+            ->danger()
+            ->title($msg ?: "Fail!")
+            ->send()
+        ;
+    }
 }