From eadbe6e8fdd19719e595e803638e56aca431dce9 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 13 Jan 2026 05:33:20 -0500 Subject: [PATCH] fix client side view database unlimited state (#2047) Co-authored-by: Boy132 --- .../RelationManagers/DatabasesRelationManager.php | 4 ++-- .../Servers/RelationManagers/DatabasesRelationManager.php | 4 ++-- app/Filament/Server/Resources/Databases/DatabaseResource.php | 2 +- app/Models/Database.php | 2 +- lang/en/server/database.php | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Filament/Admin/Resources/DatabaseHosts/RelationManagers/DatabasesRelationManager.php b/app/Filament/Admin/Resources/DatabaseHosts/RelationManagers/DatabasesRelationManager.php index a1c1bd992..74053ff5d 100644 --- a/app/Filament/Admin/Resources/DatabaseHosts/RelationManagers/DatabasesRelationManager.php +++ b/app/Filament/Admin/Resources/DatabaseHosts/RelationManagers/DatabasesRelationManager.php @@ -37,7 +37,7 @@ class DatabasesRelationManager extends RelationManager ->formatStateUsing(fn (Database $record) => $record->remote === '%' ? trans('admin/databasehost.anywhere'). ' ( % )' : $record->remote), TextInput::make('max_connections') ->label(trans('admin/databasehost.table.max_connections')) - ->formatStateUsing(fn (Database $record) => $record->max_connections === 0 ? trans('admin/databasehost.unlimited') : $record->max_connections), + ->formatStateUsing(fn (Database $record) => $record->max_connections ?: trans('admin/databasehost.unlimited')), TextInput::make('jdbc') ->label(trans('admin/databasehost.table.connection_string')) ->columnSpanFull() @@ -63,7 +63,7 @@ class DatabasesRelationManager extends RelationManager ->url(fn (Database $database) => route('filament.admin.resources.servers.edit', ['record' => $database->server_id])), TextColumn::make('max_connections') ->label(trans('admin/databasehost.table.max_connections')) - ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? trans('admin/databasehost.unlimited') : $record->max_connections), + ->formatStateUsing(fn ($record) => $record->max_connections ?: trans('server/database.unlimited')), DateTimeColumn::make('created_at') ->label(trans('admin/databasehost.table.created_at')), ]) diff --git a/app/Filament/Admin/Resources/Servers/RelationManagers/DatabasesRelationManager.php b/app/Filament/Admin/Resources/Servers/RelationManagers/DatabasesRelationManager.php index e7ec97881..b78d365f6 100644 --- a/app/Filament/Admin/Resources/Servers/RelationManagers/DatabasesRelationManager.php +++ b/app/Filament/Admin/Resources/Servers/RelationManagers/DatabasesRelationManager.php @@ -49,7 +49,7 @@ class DatabasesRelationManager extends RelationManager ->formatStateUsing(fn (Database $record) => $record->remote === '%' ? trans('admin/databasehost.anywhere'). ' ( % )' : $record->remote), TextInput::make('max_connections') ->label(trans('admin/databasehost.table.max_connections')) - ->formatStateUsing(fn (Database $record) => $record->max_connections === 0 ? trans('admin/databasehost.unlimited') : $record->max_connections), + ->formatStateUsing(fn (Database $record) => $record->max_connections ?: trans('admin/databasehost.unlimited')), TextInput::make('jdbc') ->label(trans('admin/databasehost.table.connection_string')) ->columnSpanFull() @@ -75,7 +75,7 @@ class DatabasesRelationManager extends RelationManager ->url(fn (Database $database) => route('filament.admin.resources.servers.edit', ['record' => $database->server_id])), TextColumn::make('max_connections') ->label(trans('admin/databasehost.table.max_connections')) - ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? trans('admin/databasehost.unlimited') : $record->max_connections), + ->formatStateUsing(fn ($record) => $record->max_connections ?: trans('admin/databasehost.unlimited')), DateTimeColumn::make('created_at') ->label(trans('admin/databasehost.table.created_at')), ]) diff --git a/app/Filament/Server/Resources/Databases/DatabaseResource.php b/app/Filament/Server/Resources/Databases/DatabaseResource.php index c93e4a8a7..7d0eed5eb 100644 --- a/app/Filament/Server/Resources/Databases/DatabaseResource.php +++ b/app/Filament/Server/Resources/Databases/DatabaseResource.php @@ -98,7 +98,7 @@ class DatabaseResource extends Resource ->label(trans('server/database.remote')), TextInput::make('max_connections') ->label(trans('server/database.max_connections')) - ->formatStateUsing(fn (Database $database) => $database->max_connections === 0 ? $database->max_connections : 'Unlimited'), + ->formatStateUsing(fn (Database $database) => $database->max_connections ?: trans('server/database.unlimited')), TextInput::make('jdbc') ->label(trans('server/database.jdbc')) ->password()->revealable() diff --git a/app/Models/Database.php b/app/Models/Database.php index 4cfa61064..4c2acbcf5 100644 --- a/app/Models/Database.php +++ b/app/Models/Database.php @@ -19,7 +19,7 @@ use PDOException; * @property string $username * @property string $remote * @property string $password - * @property int $max_connections + * @property ?int $max_connections * @property string $jdbc * @property Carbon $created_at * @property Carbon $updated_at diff --git a/lang/en/server/database.php b/lang/en/server/database.php index 867498cb9..c8a880239 100644 --- a/lang/en/server/database.php +++ b/lang/en/server/database.php @@ -11,6 +11,7 @@ return [ 'username' => 'Username', 'password' => 'Password', 'remote' => 'Remote', + 'unlimited' => 'Unlimited', 'created_at' => 'Created at', 'name' => 'Database Name', 'name_hint' => 'Leaving this blank will auto generate a random name',