migration script

# Conflicts:
#	app/Filament/Resources/Torrent/AnnounceLogResource.php

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

@@ -2,13 +2,15 @@
 
 namespace App\Filament\Resources\User\UserResource\Pages;
 
+use Filament\Actions\Contracts\HasActions;
+use Exception;
 use App\Filament\Resources\User\UserResource;
 use App\Repositories\UserRepository;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 
-class CreateUser extends CreateRecord
+class CreateUser extends CreateRecord implements HasActions
 {
     protected static string $resource = UserResource::class;
 
@@ -20,7 +22,7 @@ class CreateUser extends CreateRecord
             $this->record = $userRep->store($data);
             send_admin_success_notification();
             $this->redirect($this->getRedirectUrl());
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             send_admin_fail_notification($exception->getMessage());
         }
     }

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

@@ -2,18 +2,20 @@
 
 namespace App\Filament\Resources\User\UserResource\Pages;
 
+use Filament\Actions\Contracts\HasActions;
+use Filament\Actions\DeleteAction;
 use App\Filament\Resources\User\UserResource;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\EditRecord;
 
-class EditUser extends EditRecord
+class EditUser extends EditRecord implements HasActions
 {
     protected static string $resource = UserResource::class;
 
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make(),
+            DeleteAction::make(),
         ];
     }
 }

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

@@ -2,6 +2,9 @@
 
 namespace App\Filament\Resources\User\UserResource\Pages;
 
+use Filament\Actions\Contracts\HasActions;
+use Filament\Actions\CreateAction;
+use Filament\Tables\Enums\FiltersLayout;
 use App\Filament\PageList;
 use App\Filament\Resources\User\UserResource;
 use Filament\Pages\Actions;
@@ -9,14 +12,14 @@ use Filament\Resources\Pages\ListRecords;
 use Illuminate\Database\Eloquent\Model;
 use Filament\Tables\Filters\Layout;
 
-class ListUsers extends PageList
+class ListUsers extends PageList implements HasActions
 {
     protected static string $resource = UserResource::class;
 
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make(),
+            CreateAction::make(),
         ];
     }
 
@@ -28,7 +31,7 @@ class ListUsers extends PageList
 
     protected function getTableFiltersLayout(): ?string
     {
-        return \Filament\Tables\Enums\FiltersLayout::AboveContent;
+        return FiltersLayout::AboveContent;
     }
 
 }

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

@@ -2,6 +2,16 @@
 
 namespace App\Filament\Resources\User\UserResource\Pages;
 
+use Filament\Actions\Contracts\HasActions;
+use Filament\Actions\Action;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Hidden;
+use Exception;
+use Filament\Forms\Components\Radio;
+use Filament\Schemas\Components\Utilities\Get;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\DateTimePicker;
+use Filament\Actions\DeleteAction;
 use App\Filament\OptionsTrait;
 use App\Filament\Resources\User\UserResource;
 use App\Models\Exam;
@@ -23,7 +33,7 @@ use Filament\Resources\Pages\ViewRecord;
 use Illuminate\Support\Facades\Auth;
 use Nexus\Database\NexusDB;
 
-class UserProfile extends ViewRecord
+class UserProfile extends ViewRecord implements HasActions
 {
     use InteractsWithRecord;
     use HasRelationManagers;
@@ -71,15 +81,15 @@ class UserProfile extends ViewRecord
         return $actions;
     }
 
-    private function buildEnableDisableAction(): Actions\Action
+    private function buildEnableDisableAction(): Action
     {
-        return Actions\Action::make('enable_disable')
+        return Action::make('enable_disable')
             ->label($this->record->enabled == 'yes' ? __('admin.resources.user.actions.disable_modal_btn') : __('admin.resources.user.actions.enable_modal_btn'))
             ->modalHeading($this->record->enabled == 'yes' ? __('admin.resources.user.actions.disable_modal_title') : __('admin.resources.user.actions.enable_modal_title'))
-            ->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($this->record->enabled == 'yes' ? 'disable' : 'enable'),
-                Forms\Components\Hidden::make('uid')->default($this->record->id),
+            ->schema([
+                TextInput::make('reason')->label(__('admin.resources.user.actions.enable_disable_reason'))->placeholder(__('admin.resources.user.actions.enable_disable_reason_placeholder')),
+                Hidden::make('action')->default($this->record->enabled == 'yes' ? 'disable' : 'enable'),
+                Hidden::make('uid')->default($this->record->id),
             ])
 //            ->visible(false)
 //            ->hidden(true)
@@ -92,15 +102,15 @@ class UserProfile extends ViewRecord
                         $userRep->disableUser(Auth::user(), $data['uid'], $data['reason']);
                     }
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
 
-    private function buildDisableTwoStepAuthenticationAction(): Actions\Action
+    private function buildDisableTwoStepAuthenticationAction(): Action
     {
-        return Actions\Action::make(__('admin.resources.user.actions.disable_two_step_authentication'))
+        return Action::make(__('admin.resources.user.actions.disable_two_step_authentication'))
             ->modalHeading(__('admin.resources.user.actions.disable_two_step_authentication'))
             ->requiresConfirmation()
             ->action(function ($data) {
@@ -108,18 +118,18 @@ class UserProfile extends ViewRecord
                 try {
                     $userRep->removeTwoStepAuthentication(Auth::user(), $this->record->id);
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
 
-    private function buildChangeBonusEtcAction(): Actions\Action
+    private function buildChangeBonusEtcAction(): Action
     {
-        return Actions\Action::make(__('admin.resources.user.actions.change_bonus_etc_btn'))
+        return Action::make(__('admin.resources.user.actions.change_bonus_etc_btn'))
             ->modalHeading(__('admin.resources.user.actions.change_bonus_etc_btn'))
-            ->form([
-                Forms\Components\Radio::make('field')->options([
+            ->schema([
+                Radio::make('field')->options([
                     'uploaded' => __('label.user.uploaded'),
                     'downloaded' => __('label.user.downloaded'),
                     'invites' => __('label.user.invites'),
@@ -132,7 +142,7 @@ class UserProfile extends ViewRecord
                     ->required()
                     ->reactive()
                 ,
-                Forms\Components\Radio::make('action')->options([
+                Radio::make('action')->options([
                     'Increment' => __("admin.resources.user.actions.change_bonus_etc_action_increment"),
                     'Decrement' => __("admin.resources.user.actions.change_bonus_etc_action_decrement"),
                 ])
@@ -140,18 +150,18 @@ class UserProfile extends ViewRecord
                     ->inline()
                     ->required()
                 ,
-                Forms\Components\TextInput::make('value')->integer()->required()
+                TextInput::make('value')->integer()->required()
                     ->label(__('admin.resources.user.actions.change_bonus_etc_value_label'))
                     ->helperText(__('admin.resources.user.actions.change_bonus_etc_value_help'))
                 ,
 
-                Forms\Components\TextInput::make('duration')->integer()
+                TextInput::make('duration')->integer()
                     ->label(__('admin.resources.user.actions.change_bonus_etc_duration_label'))
                     ->helperText(__('admin.resources.user.actions.change_bonus_etc_duration_help'))
-                    ->hidden(fn (\Filament\Forms\Get $get) => $get('field') != 'tmp_invites')
+                    ->hidden(fn (Get $get) => $get('field') != 'tmp_invites')
                 ,
 
-                Forms\Components\TextInput::make('reason')
+                TextInput::make('reason')
                     ->label(__('admin.resources.user.actions.change_bonus_etc_reason_label'))
                 ,
             ])
@@ -164,7 +174,7 @@ class UserProfile extends ViewRecord
                         $userRep->incrementDecrement(Auth::user(), $this->record->id, $data['action'], $data['field'], $data['value'], $data['reason']);
                     }
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });
@@ -172,11 +182,11 @@ class UserProfile extends ViewRecord
 
     private function buildResetPasswordAction()
     {
-        return Actions\Action::make(__('admin.resources.user.actions.reset_password_btn'))
+        return Action::make(__('admin.resources.user.actions.reset_password_btn'))
             ->modalHeading(__('admin.resources.user.actions.reset_password_btn'))
-            ->form([
-                Forms\Components\TextInput::make('password')->label(__('admin.resources.user.actions.reset_password_label'))->required(),
-                Forms\Components\TextInput::make('password_confirmation')
+            ->schema([
+                TextInput::make('password')->label(__('admin.resources.user.actions.reset_password_label'))->required(),
+                TextInput::make('password_confirmation')
                     ->label(__('admin.resources.user.actions.reset_password_confirmation_label'))
                     ->same('password')
                     ->required(),
@@ -186,7 +196,7 @@ class UserProfile extends ViewRecord
                 try {
                     $userRep->resetPassword($this->record->id, $data['password'], $data['password_confirmation']);
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });
@@ -194,14 +204,14 @@ class UserProfile extends ViewRecord
 
     private function buildAssignExamAction()
     {
-        return Actions\Action::make(__('admin.resources.user.actions.assign_exam_btn'))
+        return Action::make(__('admin.resources.user.actions.assign_exam_btn'))
             ->modalHeading(__('admin.resources.user.actions.assign_exam_btn'))
-            ->form([
-                Forms\Components\Select::make('exam_id')
+            ->schema([
+                Select::make('exam_id')
                     ->options((new ExamRepository())->listMatchExam($this->record->id)->pluck('name', 'id'))
                     ->label(__('admin.resources.user.actions.assign_exam_exam_label'))->required(),
-                Forms\Components\DateTimePicker::make('begin')->label(__('admin.resources.user.actions.assign_exam_begin_label')),
-                Forms\Components\DateTimePicker::make('end')->label(__('admin.resources.user.actions.assign_exam_end_label'))
+                DateTimePicker::make('begin')->label(__('admin.resources.user.actions.assign_exam_begin_label')),
+                DateTimePicker::make('end')->label(__('admin.resources.user.actions.assign_exam_end_label'))
                     ->helperText(__('admin.resources.user.actions.assign_exam_end_help')),
 
             ])
@@ -210,7 +220,7 @@ class UserProfile extends ViewRecord
                 try {
                     $examRep->assignToUser($this->record->id, $data['exam_id'], $data['begin'], $data['end']);
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });
@@ -218,15 +228,15 @@ class UserProfile extends ViewRecord
 
     private function buildGrantMedalAction()
     {
-        return Actions\Action::make(__('admin.resources.user.actions.grant_medal_btn'))
+        return Action::make(__('admin.resources.user.actions.grant_medal_btn'))
             ->modalHeading(__('admin.resources.user.actions.grant_medal_btn'))
-            ->form([
-                Forms\Components\Select::make('medal_id')
+            ->schema([
+                Select::make('medal_id')
                     ->options(Medal::query()->pluck('name', 'id'))
                     ->label(__('admin.resources.user.actions.grant_medal_medal_label'))
                     ->required(),
 
-                Forms\Components\TextInput::make('duration')
+                TextInput::make('duration')
                     ->label(__('admin.resources.user.actions.grant_medal_duration_label'))
                     ->helperText(__('admin.resources.user.actions.grant_medal_duration_help'))
                     ->integer(),
@@ -237,7 +247,7 @@ class UserProfile extends ViewRecord
                 try {
                     $medalRep->grantToUser($this->record->id, $data['medal_id'], $data['duration']);
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });
@@ -245,7 +255,7 @@ class UserProfile extends ViewRecord
 
     private function buildConfirmAction()
     {
-        return Actions\Action::make(__('admin.resources.user.actions.confirm_btn'))
+        return Action::make(__('admin.resources.user.actions.confirm_btn'))
             ->modalHeading(__('admin.resources.user.actions.confirm_btn'))
             ->requiresConfirmation()
             ->action(function () {
@@ -261,9 +271,9 @@ class UserProfile extends ViewRecord
     }
 
 
-    private function buildEnableDisableDownloadPrivilegesAction(): Actions\Action
+    private function buildEnableDisableDownloadPrivilegesAction(): Action
     {
-        return Actions\Action::make($this->record->downloadpos == 'yes' ? __('admin.resources.user.actions.disable_download_privileges_btn') : __('admin.resources.user.actions.enable_download_privileges_btn'))
+        return Action::make($this->record->downloadpos == 'yes' ? __('admin.resources.user.actions.disable_download_privileges_btn') : __('admin.resources.user.actions.enable_download_privileges_btn'))
 //            ->modalHeading($this->record->enabled == 'yes' ? __('admin.resources.user.actions.disable_modal_title') : __('admin.resources.user.actions.enable_modal_title'))
             ->requiresConfirmation()
             ->action(function () {
@@ -271,7 +281,7 @@ class UserProfile extends ViewRecord
                 try {
                     $userRep->updateDownloadPrivileges(Auth::user(), $this->record->id, $this->record->downloadpos == 'yes' ? 'no' : 'yes');
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });
@@ -279,13 +289,13 @@ class UserProfile extends ViewRecord
 
     private function buildGrantPropsAction()
     {
-        return Actions\Action::make(__('admin.resources.user.actions.grant_prop_btn'))
+        return Action::make(__('admin.resources.user.actions.grant_prop_btn'))
             ->modalHeading(__('admin.resources.user.actions.grant_prop_btn'))
-            ->form([
-                Forms\Components\Select::make('meta_key')
+            ->schema([
+                Select::make('meta_key')
                     ->options(UserMeta::listProps())
                     ->label(__('admin.resources.user.actions.grant_prop_form_prop'))->required(),
-                Forms\Components\TextInput::make('duration')->label(__('admin.resources.user.actions.grant_prop_form_duration'))
+                TextInput::make('duration')->label(__('admin.resources.user.actions.grant_prop_form_duration'))
                     ->helperText(__('admin.resources.user.actions.grant_prop_form_duration_help')),
 
             ])
@@ -294,15 +304,15 @@ class UserProfile extends ViewRecord
                 try {
                     $rep->addMeta($this->record, $data, $data);
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });
     }
 
-    private function buildDeleteAction(): Actions\DeleteAction
+    private function buildDeleteAction(): DeleteAction
     {
-        return Actions\DeleteAction::make()->using(function () {
+        return DeleteAction::make()->using(function () {
             $this->getRep()->destroy($this->record->id);
             return redirect(self::$resource::getUrl('index'));
         });
@@ -344,32 +354,32 @@ class UserProfile extends ViewRecord
             ->count();
     }
 
-    private function buildChangeClassAction(): Actions\Action
+    private function buildChangeClassAction(): Action
     {
-        return Actions\Action::make('change_class')
+        return Action::make('change_class')
             ->label(__('admin.resources.user.actions.change_class_btn'))
-            ->form([
-                Forms\Components\Select::make('class')
+            ->schema([
+                Select::make('class')
                     ->options(User::listClass(User::CLASS_PEASANT, Auth::user()->class - 1))
                     ->default($this->record->class)
                     ->label(__('user.labels.class'))
                     ->required()
                     ->reactive()
                 ,
-                Forms\Components\Radio::make('vip_added')
+                Radio::make('vip_added')
                     ->options(self::getYesNoOptions('yes', 'no'))
                     ->default($this->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)
+                    ->hidden(fn (Get $get) => $get('class') != User::CLASS_VIP)
                 ,
-                Forms\Components\DateTimePicker::make('vip_until')
+                DateTimePicker::make('vip_until')
                     ->default($this->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)
+                    ->hidden(fn (Get $get) => $get('class') != User::CLASS_VIP)
                 ,
-                Forms\Components\TextInput::make('reason')
+                TextInput::make('reason')
                     ->label(__('admin.resources.user.actions.enable_disable_reason'))
                     ->placeholder(__('admin.resources.user.actions.enable_disable_reason_placeholder'))
                 ,
@@ -379,7 +389,7 @@ class UserProfile extends ViewRecord
                 try {
                     $userRep->changeClass(Auth::user(), $this->record, $data['class'], $data['reason'], $data);
                     $this->sendSuccessNotification();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     $this->sendFailNotification($exception->getMessage());
                 }
             });

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

@@ -2,11 +2,12 @@
 
 namespace App\Filament\Resources\User\UserResource\Pages;
 
+use Filament\Actions\Contracts\HasActions;
 use App\Filament\Resources\User\UserResource;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\ViewRecord;
 
-class ViewUser extends ViewRecord
+class ViewUser extends ViewRecord implements HasActions
 {
     protected static string $resource = UserResource::class;
 }

app/Filament/Resources/User/UserResource/RelationManagers/MedalsRelationManager.php

@@ -2,25 +2,31 @@
 
 namespace App\Filament\Resources\User\UserResource\RelationManagers;
 
+use Filament\Actions\Contracts\HasActions;
+use Filament\Schemas\Schema;
+use Filament\Forms\Components\TextInput;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Columns\ImageColumn;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\DeleteBulkAction;
 use Filament\Forms;
-use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables\Table;
 use Filament\Tables;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
 
-class MedalsRelationManager extends RelationManager
+class MedalsRelationManager extends RelationManager implements HasActions
 {
     protected static string $relationship = 'medals';
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
     {
-        return $form
-            ->schema([
-                Forms\Components\TextInput::make('name')
+        return $schema
+            ->components([
+                TextInput::make('name')
                     ->required()
                     ->maxLength(255),
             ]);
@@ -30,9 +36,9 @@ class MedalsRelationManager extends RelationManager
     {
         return $table
             ->columns([
-                Tables\Columns\TextColumn::make('name')->label(__('label.name')),
-                Tables\Columns\ImageColumn::make('image_large')->label(__('label.image')),
-                Tables\Columns\ImageColumn::make('expire_at')->label(__('label.expire_at')),
+                TextColumn::make('name')->label(__('label.name')),
+                ImageColumn::make('image_large')->label(__('label.image')),
+                ImageColumn::make('expire_at')->label(__('label.expire_at')),
             ])
             ->filters([
                 //
@@ -40,12 +46,12 @@ class MedalsRelationManager extends RelationManager
             ->headerActions([
 //                Tables\Actions\CreateAction::make(),
             ])
-            ->actions([
+            ->recordActions([
 //                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
+                DeleteAction::make(),
             ])
-            ->bulkActions([
-                Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                DeleteBulkAction::make(),
             ]);
     }
 }