From 2fe26977946950ce65321f1c1fed6df56c32f947 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 2 Sep 2025 13:41:19 +0200 Subject: [PATCH] only add copyable when using ssl and fix import --- .../Admin/Resources/ApiKeys/ApiKeyResource.php | 2 +- .../DatabaseHosts/Pages/CreateDatabaseHost.php | 4 ++-- .../Admin/Resources/Servers/Pages/EditServer.php | 4 ++-- app/Filament/Server/Pages/Settings.php | 4 ++-- .../Server/Resources/Databases/DatabaseResource.php | 10 +++++----- app/Providers/AppServiceProvider.php | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php b/app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php index f8a512078..5020b055b 100644 --- a/app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php +++ b/app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php @@ -79,7 +79,7 @@ class ApiKeyResource extends Resource ->label(trans('admin/apikey.table.key')) ->icon('tabler-clipboard-text') ->state(fn (ApiKey $key) => $key->identifier . $key->token) - ->copyable(), + ->copyable(fn () => request()->isSecure()), TextColumn::make('memo') ->label(trans('admin/apikey.table.description')) ->wrap() diff --git a/app/Filament/Admin/Resources/DatabaseHosts/Pages/CreateDatabaseHost.php b/app/Filament/Admin/Resources/DatabaseHosts/Pages/CreateDatabaseHost.php index 7f970d83a..dbd4eba9b 100644 --- a/app/Filament/Admin/Resources/DatabaseHosts/Pages/CreateDatabaseHost.php +++ b/app/Filament/Admin/Resources/DatabaseHosts/Pages/CreateDatabaseHost.php @@ -97,14 +97,14 @@ class CreateDatabaseHost extends CreateRecord ->default(fn (Get $get) => "CREATE USER '{$get('username')}'@'{$get('panel_ip')}' IDENTIFIED BY '{$get('password')}';") ->disabled() ->dehydrated(false) - ->copyable() + ->copyable(fn () => request()->isSecure()) ->columnSpanFull(), TextInput::make('assign_permissions') ->label(trans('admin/databasehost.setup.command_assign_permissions')) ->default(fn (Get $get) => "GRANT ALL PRIVILEGES ON *.* TO '{$get('username')}'@'{$get('panel_ip')}' WITH GRANT OPTION;") ->disabled() ->dehydrated(false) - ->copyable() + ->copyable(fn () => request()->isSecure()) ->columnSpanFull(), TextEntry::make('cli_exit') ->hiddenLabel() diff --git a/app/Filament/Admin/Resources/Servers/Pages/EditServer.php b/app/Filament/Admin/Resources/Servers/Pages/EditServer.php index e23c7652d..9b239d5f4 100644 --- a/app/Filament/Admin/Resources/Servers/Pages/EditServer.php +++ b/app/Filament/Admin/Resources/Servers/Pages/EditServer.php @@ -176,7 +176,7 @@ class EditServer extends EditRecord TextInput::make('uuid') ->label(trans('admin/server.uuid')) - ->copyable() + ->copyable(fn () => request()->isSecure()) ->columnSpan([ 'default' => 2, 'sm' => 1, @@ -187,7 +187,7 @@ class EditServer extends EditRecord ->dehydrated(false), TextInput::make('uuid_short') ->label(trans('admin/server.short_uuid')) - ->copyable() + ->copyable(fn () => request()->isSecure()) ->columnSpan([ 'default' => 2, 'sm' => 1, diff --git a/app/Filament/Server/Pages/Settings.php b/app/Filament/Server/Pages/Settings.php index d4137c043..583549399 100644 --- a/app/Filament/Server/Pages/Settings.php +++ b/app/Filament/Server/Pages/Settings.php @@ -168,7 +168,7 @@ class Settings extends ServerFormPage ->label(trans('server/setting.node_info.sftp.connection')) ->columnSpan(1) ->disabled() - ->copyable() + ->copyable(fn () => request()->isSecure()) ->hintAction( Action::make('connect_sftp') ->label(trans('server/setting.node_info.sftp.action')) @@ -188,7 +188,7 @@ class Settings extends ServerFormPage TextInput::make('username') ->label(trans('server/setting.node_info.sftp.username')) ->columnSpan(1) - ->copyable() + ->copyable(fn () => request()->isSecure()) ->disabled() ->formatStateUsing(fn (Server $server) => auth()->user()->username . '.' . $server->uuid_short), TextEntry::make('password') diff --git a/app/Filament/Server/Resources/Databases/DatabaseResource.php b/app/Filament/Server/Resources/Databases/DatabaseResource.php index 428e67de2..ce8e22c13 100644 --- a/app/Filament/Server/Resources/Databases/DatabaseResource.php +++ b/app/Filament/Server/Resources/Databases/DatabaseResource.php @@ -76,13 +76,13 @@ class DatabaseResource extends Resource TextInput::make('host') ->label(trans('server/database.host')) ->formatStateUsing(fn (Database $database) => $database->address()) - ->copyable(), + ->copyable(fn () => request()->isSecure()), TextInput::make('database') ->label(trans('server/database.database')) - ->copyable(), + ->copyable(fn () => request()->isSecure()), TextInput::make('username') ->label(trans('server/database.username')) - ->copyable(), + ->copyable(fn () => request()->isSecure()), TextInput::make('password') ->label(trans('server/database.password')) ->password()->revealable() @@ -91,7 +91,7 @@ class DatabaseResource extends Resource RotateDatabasePasswordAction::make() ->authorize(fn () => auth()->user()->can(Permission::ACTION_DATABASE_UPDATE, $server)) ) - ->copyable() + ->copyable(fn () => request()->isSecure()) ->formatStateUsing(fn (Database $database) => $database->password), TextInput::make('remote') ->label(trans('server/database.remote')), @@ -102,7 +102,7 @@ class DatabaseResource extends Resource ->label(trans('server/database.jdbc')) ->password()->revealable() ->hidden(!auth()->user()->can(Permission::ACTION_DATABASE_VIEW_PASSWORD, $server)) - ->copyable() + ->copyable(fn () => request()->isSecure()) ->columnSpanFull() ->formatStateUsing(fn (Database $database) => $database->jdbc), ]); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c9e90972c..bc90eeb35 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -22,12 +22,12 @@ use App\Checks\NodeVersionsCheck; use App\Checks\PanelVersionCheck; use App\Checks\ScheduleCheck; use App\Checks\UsedDiskSpaceCheck; -use App\Filament\Components\Actions\CopyAction; use App\Services\Helpers\SoftwareVersionService; use Dedoc\Scramble\Scramble; use Dedoc\Scramble\Support\Generator\OpenApi; use Dedoc\Scramble\Support\Generator\SecurityScheme; use Filament\Forms\Components\Field; +use Filament\Forms\Components\TextInput\Actions\CopyAction; use Filament\Support\Colors\Color; use Filament\Support\Facades\FilamentColor; use Filament\Support\Facades\FilamentView; @@ -152,7 +152,7 @@ class AppServiceProvider extends ServiceProvider Field::macro('hintCopy', function () { /** @var Field $this */ - return $this->hintAction(fn (?string $state) => request()->isSecure() ? CopyAction::make()->copyable($state) : null); // @phpstan-ignore varTag.nativeType + return $this->hintAction(fn () => request()->isSecure() ? CopyAction::make() : null); // @phpstan-ignore varTag.nativeType }); // Don't run any health checks during tests