mirror of
https://github.com/pelican-dev/panel.git
synced 2025-05-20 04:04:45 +02:00
Remove duplicated activity.read & use relations in EditUser (#1165)
This commit is contained in:
MartinOscar
GitHub
parent
ec6529ac4c
commit
42706dba14
@ -5,7 +5,6 @@ namespace App\Filament\Server\Resources;
|
|||||||
use App\Filament\Server\Resources\UserResource\Pages;
|
use App\Filament\Server\Resources\UserResource\Pages;
|
||||||
use App\Models\Permission;
|
use App\Models\Permission;
|
||||||
use App\Models\Server;
|
use App\Models\Server;
|
||||||
use App\Models\Subuser;
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Services\Subusers\SubuserDeletionService;
|
use App\Services\Subusers\SubuserDeletionService;
|
||||||
use App\Services\Subusers\SubuserUpdateService;
|
use App\Services\Subusers\SubuserUpdateService;
|
||||||
@ -98,14 +97,14 @@ class UserResource extends Resource
|
|||||||
TextColumn::make('email')
|
TextColumn::make('email')
|
||||||
->searchable(),
|
->searchable(),
|
||||||
TextColumn::make('permissions')
|
TextColumn::make('permissions')
|
||||||
->state(fn (User $user) => count(Subuser::query()->where('user_id', $user->id)->where('server_id', $server->id)->first()->permissions)),
|
->state(fn (User $user) => count($server->subusers->where('user_id', $user->id)->first()->permissions)),
|
||||||
])
|
])
|
||||||
->actions([
|
->actions([
|
||||||
DeleteAction::make()
|
DeleteAction::make()
|
||||||
->label('Remove User')
|
->label('Remove User')
|
||||||
->hidden(fn (User $user) => auth()->user()->id === $user->id)
|
->hidden(fn (User $user) => auth()->user()->id === $user->id)
|
||||||
->action(function (User $user, SubuserDeletionService $subuserDeletionService) use ($server) {
|
->action(function (User $user, SubuserDeletionService $subuserDeletionService) use ($server) {
|
||||||
$subuser = Subuser::query()->where('user_id', $user->id)->where('server_id', $server->id)->first();
|
$subuser = $server->subusers->where('user_id', $user->id)->first();
|
||||||
$subuserDeletionService->handle($subuser, $server);
|
$subuserDeletionService->handle($subuser, $server);
|
||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
@ -119,7 +118,7 @@ class UserResource extends Resource
|
|||||||
->authorize(fn () => auth()->user()->can(Permission::ACTION_USER_UPDATE, $server))
|
->authorize(fn () => auth()->user()->can(Permission::ACTION_USER_UPDATE, $server))
|
||||||
->modalHeading(fn (User $user) => 'Editing ' . $user->email)
|
->modalHeading(fn (User $user) => 'Editing ' . $user->email)
|
||||||
->action(function (array $data, SubuserUpdateService $subuserUpdateService, User $user) use ($server) {
|
->action(function (array $data, SubuserUpdateService $subuserUpdateService, User $user) use ($server) {
|
||||||
$subuser = Subuser::query()->where('user_id', $user->id)->where('server_id', $server->id)->first();
|
$subuser = $server->subusers->where('user_id', $user->id)->first();
|
||||||
|
|
||||||
$permissions = collect($data)
|
$permissions = collect($data)
|
||||||
->forget('email')
|
->forget('email')
|
||||||
@ -216,7 +215,9 @@ class UserResource extends Resource
|
|||||||
'settings' => [
|
'settings' => [
|
||||||
'rename',
|
'rename',
|
||||||
'reinstall',
|
'reinstall',
|
||||||
'activity',
|
],
|
||||||
|
'activity' => [
|
||||||
|
'read',
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -243,11 +244,7 @@ class UserResource extends Resource
|
|||||||
->schema([
|
->schema([
|
||||||
CheckboxList::make('control')
|
CheckboxList::make('control')
|
||||||
->formatStateUsing(function (User $user, Set $set) use ($server) {
|
->formatStateUsing(function (User $user, Set $set) use ($server) {
|
||||||
$permissionsArray = Subuser::query()
|
$permissionsArray = $server->subusers->where('user_id', $user->id)->first()->permissions;
|
||||||
->where('user_id', $user->id)
|
|
||||||
->where('server_id', $server->id)
|
|
||||||
->first()
|
|
||||||
->permissions;
|
|
||||||
|
|
||||||
$transformedPermissions = [];
|
$transformedPermissions = [];
|
||||||
|
|
||||||
@ -264,6 +261,7 @@ class UserResource extends Resource
|
|||||||
})
|
})
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'console' => 'Console',
|
'console' => 'Console',
|
||||||
'start' => 'Start',
|
'start' => 'Start',
|
||||||
@ -287,6 +285,7 @@ class UserResource extends Resource
|
|||||||
CheckboxList::make('user')
|
CheckboxList::make('user')
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'read' => 'Read',
|
'read' => 'Read',
|
||||||
'create' => 'Create',
|
'create' => 'Create',
|
||||||
@ -310,6 +309,7 @@ class UserResource extends Resource
|
|||||||
CheckboxList::make('file')
|
CheckboxList::make('file')
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'read' => 'Read',
|
'read' => 'Read',
|
||||||
'read-content' => 'Read Content',
|
'read-content' => 'Read Content',
|
||||||
@ -339,6 +339,7 @@ class UserResource extends Resource
|
|||||||
CheckboxList::make('backup')
|
CheckboxList::make('backup')
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'read' => 'Read',
|
'read' => 'Read',
|
||||||
'create' => 'Create',
|
'create' => 'Create',
|
||||||
@ -364,6 +365,7 @@ class UserResource extends Resource
|
|||||||
CheckboxList::make('allocation')
|
CheckboxList::make('allocation')
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'read' => 'Read',
|
'read' => 'Read',
|
||||||
'create' => 'Create',
|
'create' => 'Create',
|
||||||
@ -387,6 +389,7 @@ class UserResource extends Resource
|
|||||||
CheckboxList::make('startup')
|
CheckboxList::make('startup')
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'read' => 'Read',
|
'read' => 'Read',
|
||||||
'update' => 'Update',
|
'update' => 'Update',
|
||||||
@ -408,6 +411,7 @@ class UserResource extends Resource
|
|||||||
CheckboxList::make('database')
|
CheckboxList::make('database')
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'read' => 'Read',
|
'read' => 'Read',
|
||||||
'create' => 'Create',
|
'create' => 'Create',
|
||||||
@ -433,6 +437,7 @@ class UserResource extends Resource
|
|||||||
CheckboxList::make('schedule')
|
CheckboxList::make('schedule')
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'read' => 'Read',
|
'read' => 'Read',
|
||||||
'create' => 'Create',
|
'create' => 'Create',
|
||||||
@ -456,15 +461,32 @@ class UserResource extends Resource
|
|||||||
CheckboxList::make('settings')
|
CheckboxList::make('settings')
|
||||||
->bulkToggleable()
|
->bulkToggleable()
|
||||||
->label('')
|
->label('')
|
||||||
|
->columns(2)
|
||||||
->options([
|
->options([
|
||||||
'rename' => 'Rename',
|
'rename' => 'Rename',
|
||||||
'reinstall' => 'Reinstall',
|
'reinstall' => 'Reinstall',
|
||||||
'activity' => 'Activity',
|
|
||||||
])
|
])
|
||||||
->descriptions([
|
->descriptions([
|
||||||
'rename' => trans('server/users.permissions.setting_rename'),
|
'rename' => trans('server/users.permissions.setting_rename'),
|
||||||
'reinstall' => trans('server/users.permissions.setting_reinstall'),
|
'reinstall' => trans('server/users.permissions.setting_reinstall'),
|
||||||
'activity' => trans('server/users.permissions.activity_desc'),
|
]),
|
||||||
|
]),
|
||||||
|
]),
|
||||||
|
Tab::make('Activity')
|
||||||
|
->schema([
|
||||||
|
Section::make()
|
||||||
|
->description(trans('server/users.permissions.activity_desc'))
|
||||||
|
->icon('tabler-stack')
|
||||||
|
->schema([
|
||||||
|
CheckboxList::make('activity')
|
||||||
|
->bulkToggleable()
|
||||||
|
->label('')
|
||||||
|
->columns(2)
|
||||||
|
->options([
|
||||||
|
'read' => 'Read',
|
||||||
|
])
|
||||||
|
->descriptions([
|
||||||
|
'read' => trans('server/users.permissions.activity_read'),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
|
|||||||
@ -16,6 +16,7 @@ use Filament\Forms\Components\CheckboxList;
|
|||||||
use Filament\Forms\Components\Grid;
|
use Filament\Forms\Components\Grid;
|
||||||
use Filament\Forms\Components\Section;
|
use Filament\Forms\Components\Section;
|
||||||
use Filament\Forms\Components\Tabs;
|
use Filament\Forms\Components\Tabs;
|
||||||
|
use Filament\Forms\Components\Tabs\Tab;
|
||||||
use Filament\Forms\Components\TextInput;
|
use Filament\Forms\Components\TextInput;
|
||||||
use Filament\Forms\Get;
|
use Filament\Forms\Get;
|
||||||
use Filament\Forms\Set;
|
use Filament\Forms\Set;
|
||||||
@ -138,7 +139,7 @@ class ListUsers extends ListRecords
|
|||||||
Tabs::make()
|
Tabs::make()
|
||||||
->columnSpanFull()
|
->columnSpanFull()
|
||||||
->schema([
|
->schema([
|
||||||
Tabs\Tab::make('Console')
|
Tab::make('Console')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.control_desc'))
|
->description(trans('server/users.permissions.control_desc'))
|
||||||
@ -162,7 +163,7 @@ class ListUsers extends ListRecords
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('User')
|
Tab::make('User')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.user_desc'))
|
->description(trans('server/users.permissions.user_desc'))
|
||||||
@ -186,7 +187,7 @@ class ListUsers extends ListRecords
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('File')
|
Tab::make('File')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.file_desc'))
|
->description(trans('server/users.permissions.file_desc'))
|
||||||
@ -216,7 +217,7 @@ class ListUsers extends ListRecords
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('Backup')
|
Tab::make('Backup')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.backup_desc'))
|
->description(trans('server/users.permissions.backup_desc'))
|
||||||
@ -242,7 +243,7 @@ class ListUsers extends ListRecords
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('Allocation')
|
Tab::make('Allocation')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.allocation_desc'))
|
->description(trans('server/users.permissions.allocation_desc'))
|
||||||
@ -266,7 +267,7 @@ class ListUsers extends ListRecords
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('Startup')
|
Tab::make('Startup')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.startup_desc'))
|
->description(trans('server/users.permissions.startup_desc'))
|
||||||
@ -288,7 +289,7 @@ class ListUsers extends ListRecords
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('Database')
|
Tab::make('Database')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.database_desc'))
|
->description(trans('server/users.permissions.database_desc'))
|
||||||
@ -314,7 +315,7 @@ class ListUsers extends ListRecords
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('Schedule')
|
Tab::make('Schedule')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.schedule_desc'))
|
->description(trans('server/users.permissions.schedule_desc'))
|
||||||
@ -338,7 +339,7 @@ class ListUsers extends ListRecords
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('Settings')
|
Tab::make('Settings')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.settings_desc'))
|
->description(trans('server/users.permissions.settings_desc'))
|
||||||
@ -351,16 +352,14 @@ class ListUsers extends ListRecords
|
|||||||
->options([
|
->options([
|
||||||
'rename' => 'Rename',
|
'rename' => 'Rename',
|
||||||
'reinstall' => 'Reinstall',
|
'reinstall' => 'Reinstall',
|
||||||
'activity' => 'Activity',
|
|
||||||
])
|
])
|
||||||
->descriptions([
|
->descriptions([
|
||||||
'rename' => trans('server/users.permissions.setting_rename'),
|
'rename' => trans('server/users.permissions.setting_rename'),
|
||||||
'reinstall' => trans('server/users.permissions.setting_reinstall'),
|
'reinstall' => trans('server/users.permissions.setting_reinstall'),
|
||||||
'activity' => trans('server/users.permissions.activity_desc'),
|
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
Tabs\Tab::make('Activity')
|
Tab::make('Activity')
|
||||||
->schema([
|
->schema([
|
||||||
Section::make()
|
Section::make()
|
||||||
->description(trans('server/users.permissions.activity_desc'))
|
->description(trans('server/users.permissions.activity_desc'))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user