From ea146f471589793d832e9d3c4ffd337e1d1bb82b Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Thu, 25 Apr 2024 17:35:27 -0400 Subject: [PATCH] Resource changes --- .../Resources/MountResource/Pages/ListMounts.php | 3 ++- .../Resources/NodeResource/Pages/ListNodes.php | 3 ++- .../Resources/ServerResource/Pages/ListServers.php | 3 ++- .../Resources/UserResource/Pages/CreateUser.php | 11 ++--------- .../Resources/UserResource/Pages/EditUser.php | 13 +++---------- .../Resources/UserResource/Pages/ListUsers.php | 9 +++++---- 6 files changed, 16 insertions(+), 26 deletions(-) diff --git a/app/Filament/Resources/MountResource/Pages/ListMounts.php b/app/Filament/Resources/MountResource/Pages/ListMounts.php index aeb68d1a7..84005c015 100644 --- a/app/Filament/Resources/MountResource/Pages/ListMounts.php +++ b/app/Filament/Resources/MountResource/Pages/ListMounts.php @@ -47,7 +47,8 @@ class ListMounts extends ListRecords protected function getHeaderActions(): array { return [ - Actions\CreateAction::make(), + Actions\CreateAction::make() + ->label('Create Mount'), ]; } } diff --git a/app/Filament/Resources/NodeResource/Pages/ListNodes.php b/app/Filament/Resources/NodeResource/Pages/ListNodes.php index dd89dd1b8..5820cc884 100644 --- a/app/Filament/Resources/NodeResource/Pages/ListNodes.php +++ b/app/Filament/Resources/NodeResource/Pages/ListNodes.php @@ -83,7 +83,8 @@ class ListNodes extends ListRecords protected function getHeaderActions(): array { return [ - Actions\CreateAction::make(), + Actions\CreateAction::make() + ->label('Create Node'), ]; } } diff --git a/app/Filament/Resources/ServerResource/Pages/ListServers.php b/app/Filament/Resources/ServerResource/Pages/ListServers.php index daba3badf..8e01e99b7 100644 --- a/app/Filament/Resources/ServerResource/Pages/ListServers.php +++ b/app/Filament/Resources/ServerResource/Pages/ListServers.php @@ -102,7 +102,8 @@ class ListServers extends ListRecords protected function getHeaderActions(): array { return [ - Actions\CreateAction::make(), + Actions\CreateAction::make() + ->label('Create Server'), ]; } } diff --git a/app/Filament/Resources/UserResource/Pages/CreateUser.php b/app/Filament/Resources/UserResource/Pages/CreateUser.php index 20d4397ae..8a05009ce 100644 --- a/app/Filament/Resources/UserResource/Pages/CreateUser.php +++ b/app/Filament/Resources/UserResource/Pages/CreateUser.php @@ -14,6 +14,8 @@ class CreateUser extends CreateRecord { protected static string $resource = UserResource::class; + protected static bool $canCreateAnother = false; + public function form(Form $form): Form { return $form @@ -22,15 +24,6 @@ class CreateUser extends CreateRecord Forms\Components\TextInput::make('username')->required()->maxLength(191), Forms\Components\TextInput::make('email')->email()->required()->maxLength(191), - Forms\Components\TextInput::make('name_first') - ->maxLength(191) - ->hidden(fn (string $operation): bool => $operation === 'create') - ->label('First Name'), - Forms\Components\TextInput::make('name_last') - ->maxLength(191) - ->hidden(fn (string $operation): bool => $operation === 'create') - ->label('Last Name'), - Forms\Components\TextInput::make('password') ->dehydrateStateUsing(fn (string $state): string => Hash::make($state)) ->dehydrated(fn (?string $state): bool => filled($state)) diff --git a/app/Filament/Resources/UserResource/Pages/EditUser.php b/app/Filament/Resources/UserResource/Pages/EditUser.php index 9c4aa23d5..032b97118 100644 --- a/app/Filament/Resources/UserResource/Pages/EditUser.php +++ b/app/Filament/Resources/UserResource/Pages/EditUser.php @@ -22,15 +22,6 @@ class EditUser extends EditRecord Forms\Components\TextInput::make('username')->required()->maxLength(191), Forms\Components\TextInput::make('email')->email()->required()->maxLength(191), - Forms\Components\TextInput::make('name_first') - ->maxLength(191) - ->hidden(fn (string $operation): bool => $operation === 'create') - ->label('First Name'), - Forms\Components\TextInput::make('name_last') - ->maxLength(191) - ->hidden(fn (string $operation): bool => $operation === 'create') - ->label('Last Name'), - Forms\Components\TextInput::make('password') ->dehydrateStateUsing(fn (string $state): string => Hash::make($state)) ->dehydrated(fn (?string $state): bool => filled($state)) @@ -62,12 +53,14 @@ class EditUser extends EditRecord ->default(false), Forms\Components\Hidden::make('skipValidation')->default(true), + Forms\Components\Select::make('language') ->required() ->hidden() ->default('en') ->options(fn (User $user) => $user->getAvailableLanguages()), - ])->columns(2), + + ])->columns(), ]); } protected function getHeaderActions(): array diff --git a/app/Filament/Resources/UserResource/Pages/ListUsers.php b/app/Filament/Resources/UserResource/Pages/ListUsers.php index 3af989413..b107748a6 100644 --- a/app/Filament/Resources/UserResource/Pages/ListUsers.php +++ b/app/Filament/Resources/UserResource/Pages/ListUsers.php @@ -52,10 +52,10 @@ class ListUsers extends ListRecords ->label('Servers'), Tables\Columns\TextColumn::make('subusers_count') ->visibleFrom('sm') + ->label('Subusers') ->counts('subusers') - ->icon('tabler-users') - // ->formatStateUsing(fn (string $state, $record): string => (string) ($record->servers_count + $record->subusers_count)) - ->label('Subuser Accounts'), + ->icon('tabler-users'), + // ->formatStateUsing(fn (string $state, $record): string => (string) ($record->servers_count + $record->subusers_count)) ]) ->filters([ // @@ -72,7 +72,8 @@ class ListUsers extends ListRecords protected function getHeaderActions(): array { return [ - Actions\CreateAction::make(), + Actions\CreateAction::make() + ->label('Create User'), ]; } }