From 9eb1710c3a276b0afbe2bfb73a3f93454df45241 Mon Sep 17 00:00:00 2001 From: notCharles Date: Wed, 30 Apr 2025 19:12:21 -0400 Subject: [PATCH] wip --- app/Filament/Admin/Pages/Dashboard.php | 2 +- app/Filament/Admin/Pages/Health.php | 2 +- app/Filament/Admin/Pages/Settings.php | 14 ++++---- .../Admin/Resources/ApiKeyResource.php | 2 +- .../Admin/Resources/DatabaseHostResource.php | 2 +- app/Filament/Admin/Resources/EggResource.php | 2 +- .../Admin/Resources/MountResource.php | 2 +- app/Filament/Admin/Resources/NodeResource.php | 2 +- .../AllocationsRelationManager.php | 2 +- .../RelationManagers/NodesRelationManager.php | 2 +- app/Filament/Admin/Resources/RoleResource.php | 2 +- .../Admin/Resources/ServerResource.php | 2 +- .../ServerResource/Pages/EditServer.php | 35 ++++++++----------- app/Filament/Admin/Resources/UserResource.php | 2 +- .../Admin/Resources/WebhookResource.php | 2 +- app/Filament/Server/Pages/Console.php | 3 +- app/Filament/Server/Pages/ServerFormPage.php | 22 +----------- app/Filament/Server/Pages/Settings.php | 2 +- app/Filament/Server/Pages/Startup.php | 2 +- .../Server/Resources/ActivityResource.php | 2 +- .../Server/Resources/AllocationResource.php | 2 +- .../Server/Resources/BackupResource.php | 2 +- .../Server/Resources/DatabaseResource.php | 2 +- .../Server/Resources/FileResource.php | 2 +- .../FileResource/Pages/EditFiles.php | 1 - .../Server/Resources/ScheduleResource.php | 2 +- .../Server/Resources/UserResource.php | 2 +- 27 files changed, 46 insertions(+), 73 deletions(-) diff --git a/app/Filament/Admin/Pages/Dashboard.php b/app/Filament/Admin/Pages/Dashboard.php index 30622aadd..41bd33c1d 100644 --- a/app/Filament/Admin/Pages/Dashboard.php +++ b/app/Filament/Admin/Pages/Dashboard.php @@ -7,7 +7,7 @@ use Filament\Pages\Dashboard as BaseDashboard; class Dashboard extends BaseDashboard { - protected static string | \BackedEnum | null $navigationIcon = 'tabler-layout-dashboard'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-layout-dashboard'; private SoftwareVersionService $softwareVersionService; diff --git a/app/Filament/Admin/Pages/Health.php b/app/Filament/Admin/Pages/Health.php index 0fa5d4aaf..47749ef91 100644 --- a/app/Filament/Admin/Pages/Health.php +++ b/app/Filament/Admin/Pages/Health.php @@ -13,7 +13,7 @@ use Spatie\Health\ResultStores\ResultStore; class Health extends Page { - protected static string | \BackedEnum | null $navigationIcon = 'tabler-heart'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-heart'; protected string $view = 'filament.pages.health'; diff --git a/app/Filament/Admin/Pages/Settings.php b/app/Filament/Admin/Pages/Settings.php index 3a64c491d..85bb7114c 100644 --- a/app/Filament/Admin/Pages/Settings.php +++ b/app/Filament/Admin/Pages/Settings.php @@ -45,7 +45,7 @@ class Settings extends Page implements HasSchemas use InteractsWithForms; use InteractsWithHeaderActions; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-settings'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-settings'; protected string $view = 'filament.pages.settings'; @@ -237,12 +237,12 @@ class Settings extends Page implements HasSchemas $set('TRUSTED_PROXIES', $ips->values()->all()); }), ]), - Select::make('FILAMENT_WIDTH') - ->label(trans('admin/setting.general.display_width')) - ->native(false) - ->options(Width::class) - ->selectablePlaceholder(false) - ->default(env('FILAMENT_WIDTH', config('panel.filament.display-width'))), + // Select::make('FILAMENT_WIDTH') + // ->label(trans('admin/setting.general.display_width')) + // ->native(false) + // ->options(Width::class->value) + // ->selectablePlaceholder(false) + // ->default(env('FILAMENT_WIDTH', config('panel.filament.display-width'))), ]; } diff --git a/app/Filament/Admin/Resources/ApiKeyResource.php b/app/Filament/Admin/Resources/ApiKeyResource.php index 7b5a301d5..26317f7e3 100644 --- a/app/Filament/Admin/Resources/ApiKeyResource.php +++ b/app/Filament/Admin/Resources/ApiKeyResource.php @@ -22,7 +22,7 @@ class ApiKeyResource extends Resource { protected static ?string $model = ApiKey::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-key'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-key'; public static function getNavigationLabel(): string { diff --git a/app/Filament/Admin/Resources/DatabaseHostResource.php b/app/Filament/Admin/Resources/DatabaseHostResource.php index 9f7370231..d4584226d 100644 --- a/app/Filament/Admin/Resources/DatabaseHostResource.php +++ b/app/Filament/Admin/Resources/DatabaseHostResource.php @@ -21,7 +21,7 @@ class DatabaseHostResource extends Resource { protected static ?string $model = DatabaseHost::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-database'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-database'; protected static ?string $recordTitleAttribute = 'name'; diff --git a/app/Filament/Admin/Resources/EggResource.php b/app/Filament/Admin/Resources/EggResource.php index fad22565c..65a0e3ba0 100644 --- a/app/Filament/Admin/Resources/EggResource.php +++ b/app/Filament/Admin/Resources/EggResource.php @@ -10,7 +10,7 @@ class EggResource extends Resource { protected static ?string $model = Egg::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-eggs'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-eggs'; protected static ?string $recordTitleAttribute = 'name'; diff --git a/app/Filament/Admin/Resources/MountResource.php b/app/Filament/Admin/Resources/MountResource.php index 9f62ad0ac..fa8e46a58 100644 --- a/app/Filament/Admin/Resources/MountResource.php +++ b/app/Filament/Admin/Resources/MountResource.php @@ -23,7 +23,7 @@ class MountResource extends Resource { protected static ?string $model = Mount::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-layers-linked'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-layers-linked'; protected static ?string $recordTitleAttribute = 'name'; diff --git a/app/Filament/Admin/Resources/NodeResource.php b/app/Filament/Admin/Resources/NodeResource.php index e4ddf5d2e..12d640c8a 100644 --- a/app/Filament/Admin/Resources/NodeResource.php +++ b/app/Filament/Admin/Resources/NodeResource.php @@ -11,7 +11,7 @@ class NodeResource extends Resource { protected static ?string $model = Node::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-server-2'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-server-2'; protected static ?string $recordTitleAttribute = 'name'; diff --git a/app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php b/app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php index af02f9ef3..614e6c68b 100644 --- a/app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php +++ b/app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php @@ -27,7 +27,7 @@ class AllocationsRelationManager extends RelationManager { protected static string $relationship = 'allocations'; - protected static string | \BackedEnum | null $icon = 'tabler-plug-connected'; + protected static string|\BackedEnum|null $icon = 'tabler-plug-connected'; public function setTitle(): string { diff --git a/app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php b/app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php index f851a1215..75bf98626 100644 --- a/app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php +++ b/app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php @@ -12,7 +12,7 @@ class NodesRelationManager extends RelationManager { protected static string $relationship = 'servers'; - protected static string | \BackedEnum | null $icon = 'tabler-brand-docker'; + protected static string|\BackedEnum|null $icon = 'tabler-brand-docker'; public function setTitle(): string { diff --git a/app/Filament/Admin/Resources/RoleResource.php b/app/Filament/Admin/Resources/RoleResource.php index ebae491a9..d4f0d18ab 100644 --- a/app/Filament/Admin/Resources/RoleResource.php +++ b/app/Filament/Admin/Resources/RoleResource.php @@ -28,7 +28,7 @@ class RoleResource extends Resource { protected static ?string $model = Role::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-users-group'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-users-group'; protected static ?string $recordTitleAttribute = 'name'; diff --git a/app/Filament/Admin/Resources/ServerResource.php b/app/Filament/Admin/Resources/ServerResource.php index 8dc5ffcbc..e1e2c2c91 100644 --- a/app/Filament/Admin/Resources/ServerResource.php +++ b/app/Filament/Admin/Resources/ServerResource.php @@ -10,7 +10,7 @@ class ServerResource extends Resource { protected static ?string $model = Server::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-brand-docker'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-brand-docker'; protected static ?string $recordTitleAttribute = 'name'; diff --git a/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php index d3f91cf04..9870a9660 100644 --- a/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php +++ b/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php @@ -125,19 +125,19 @@ class EditServer extends EditRecord ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->username ($user->email)") ->preload() ->required(), - - ToggleButtons::make('condition') - ->label(trans('admin/server.server_status')) - ->formatStateUsing(fn (Server $server) => $server->condition) - ->options(fn ($state) => [$state->value => $state->getLabel()]) - ->colors(fn ($state) => [$state->value => $state->getColor()]) - ->icons(fn ($state) => [$state->value => $state->getIcon()]) - ->columnSpan([ - 'default' => 2, - 'sm' => 1, - 'md' => 1, - 'lg' => 1, - ]), + // + // ToggleButtons::make('condition') + // ->label(trans('admin/server.server_status')) + // ->formatStateUsing(fn (Server $server) => $server->condition) + // ->options(fn ($state) => [$state->value => $state->getLabel()]) + // ->colors(fn ($state) => [$state->value => $state->getColor()]) + // ->icons(fn ($state) => [$state->value => $state->getIcon()]) + // ->columnSpan([ + // 'default' => 2, + // 'sm' => 1, + // 'md' => 1, + // 'lg' => 1, + // ]), Textarea::make('description') ->label(trans('admin/server.description')) @@ -392,6 +392,7 @@ class EditServer extends EditRecord ->columnSpanFull() ->schema([ ToggleButtons::make('oom_killer') + ->dehydrated() ->label(trans('admin/server.oom'))->inlineLabel()->inline() ->columnSpan(2) ->options([ @@ -827,7 +828,6 @@ class EditServer extends EditRecord ->success() ->send(); - $this->refreshFormData(['status', 'docker']); } catch (Exception) { Notification::make() ->title(trans('admin/server.notifications.reinstall_failed')) @@ -844,7 +844,6 @@ class EditServer extends EditRecord ->success() ->send(); - $this->refreshFormData(['status', 'docker']); } catch (Exception $exception) { Notification::make() ->title(trans('admin/server.notifications.install_toggle_failed')) @@ -875,7 +874,6 @@ class EditServer extends EditRecord ->title(trans('admin/server.notifications.server_suspended')) ->send(); - $this->refreshFormData(['status', 'docker']); } catch (Exception) { Notification::make() ->warning() @@ -897,7 +895,6 @@ class EditServer extends EditRecord ->title(trans('admin/server.notifications.server_unsuspended')) ->send(); - $this->refreshFormData(['status', 'docker']); } catch (Exception) { Notification::make() ->warning() @@ -962,8 +959,6 @@ class EditServer extends EditRecord ->title(trans('admin/server.notifications.reinstall_started')) ->success() ->send(); - - $this->refreshFormData(['status', 'docker']); } catch (Exception) { Notification::make() ->title(trans('admin/server.notifications.reinstall_failed')) @@ -1085,7 +1080,7 @@ class EditServer extends EditRecord $data['description'] = ''; } - unset($data['docker'], $data['status']); + unset($data['docker'], $data['condition']); return $data; } diff --git a/app/Filament/Admin/Resources/UserResource.php b/app/Filament/Admin/Resources/UserResource.php index bd1b75963..9947fe4fa 100644 --- a/app/Filament/Admin/Resources/UserResource.php +++ b/app/Filament/Admin/Resources/UserResource.php @@ -24,7 +24,7 @@ class UserResource extends Resource { protected static ?string $model = User::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-users'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-users'; protected static ?string $recordTitleAttribute = 'username'; diff --git a/app/Filament/Admin/Resources/WebhookResource.php b/app/Filament/Admin/Resources/WebhookResource.php index 68b9f59b2..bbd4f40b3 100644 --- a/app/Filament/Admin/Resources/WebhookResource.php +++ b/app/Filament/Admin/Resources/WebhookResource.php @@ -21,7 +21,7 @@ class WebhookResource extends Resource { protected static ?string $model = WebhookConfiguration::class; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-webhook'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-webhook'; protected static ?string $recordTitleAttribute = 'description'; diff --git a/app/Filament/Server/Pages/Console.php b/app/Filament/Server/Pages/Console.php index aa765596e..976362350 100644 --- a/app/Filament/Server/Pages/Console.php +++ b/app/Filament/Server/Pages/Console.php @@ -14,7 +14,6 @@ use App\Filament\Server\Widgets\ServerOverview; use App\Livewire\AlertBanner; use App\Models\Permission; use App\Models\Server; -use Filament\Actions\Concerns\InteractsWithActions; use Filament\Facades\Filament; use Filament\Actions\Action; use Filament\Pages\Page; @@ -25,7 +24,7 @@ use Livewire\Attributes\On; class Console extends Page { - protected static string | \BackedEnum | null $navigationIcon = 'tabler-brand-tabler'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-brand-tabler'; protected static ?int $navigationSort = 1; diff --git a/app/Filament/Server/Pages/ServerFormPage.php b/app/Filament/Server/Pages/ServerFormPage.php index 3a2fdf97f..1b500e5ce 100644 --- a/app/Filament/Server/Pages/ServerFormPage.php +++ b/app/Filament/Server/Pages/ServerFormPage.php @@ -30,32 +30,12 @@ abstract class ServerFormPage extends Page protected function authorizeAccess(): void {} - protected function fillForm(): void + protected function fillform(): void { $data = $this->getRecord()->attributesToArray(); $this->form->fill($data); } - /** - * @return array - */ - protected function getFormSchema(): array - { - return [ - 'schema' => $this->form($this->makeSchema() - ->model($this->getRecord()) - ->statePath($this->getFormStatePath()) - ->columns($this->hasInlineLabels() ? 1 : 2) - ->inlineLabel($this->hasInlineLabels()), - ), - ]; - } - - public function getFormStatePath(): ?string - { - return 'data'; - } - public function getRecord(): Server { /** @var Server $server */ diff --git a/app/Filament/Server/Pages/Settings.php b/app/Filament/Server/Pages/Settings.php index 29528d6f4..00bb5342c 100644 --- a/app/Filament/Server/Pages/Settings.php +++ b/app/Filament/Server/Pages/Settings.php @@ -21,7 +21,7 @@ use Illuminate\Support\Number; class Settings extends ServerFormPage { - protected static string | \BackedEnum | null $navigationIcon = 'tabler-settings'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-settings'; protected static ?int $navigationSort = 10; diff --git a/app/Filament/Server/Pages/Startup.php b/app/Filament/Server/Pages/Startup.php index 7290071f4..49c660d6b 100644 --- a/app/Filament/Server/Pages/Startup.php +++ b/app/Filament/Server/Pages/Startup.php @@ -23,7 +23,7 @@ use Illuminate\Support\Facades\Validator; class Startup extends ServerFormPage { - protected static string | \BackedEnum | null $navigationIcon = 'tabler-player-play'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-player-play'; protected static ?int $navigationSort = 9; diff --git a/app/Filament/Server/Resources/ActivityResource.php b/app/Filament/Server/Resources/ActivityResource.php index dee44e5b2..98c19cf16 100644 --- a/app/Filament/Server/Resources/ActivityResource.php +++ b/app/Filament/Server/Resources/ActivityResource.php @@ -23,7 +23,7 @@ class ActivityResource extends Resource protected static ?int $navigationSort = 8; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-stack'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-stack'; public static function getEloquentQuery(): Builder { diff --git a/app/Filament/Server/Resources/AllocationResource.php b/app/Filament/Server/Resources/AllocationResource.php index 1ee28adb5..58177db25 100644 --- a/app/Filament/Server/Resources/AllocationResource.php +++ b/app/Filament/Server/Resources/AllocationResource.php @@ -20,7 +20,7 @@ class AllocationResource extends Resource protected static ?int $navigationSort = 7; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-network'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-network'; // TODO: find better way handle server conflict state public static function canAccess(): bool diff --git a/app/Filament/Server/Resources/BackupResource.php b/app/Filament/Server/Resources/BackupResource.php index bbe07c91c..69fc30ff2 100644 --- a/app/Filament/Server/Resources/BackupResource.php +++ b/app/Filament/Server/Resources/BackupResource.php @@ -16,7 +16,7 @@ class BackupResource extends Resource protected static ?int $navigationSort = 3; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-file-zip'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-file-zip'; protected static bool $canCreateAnother = false; diff --git a/app/Filament/Server/Resources/DatabaseResource.php b/app/Filament/Server/Resources/DatabaseResource.php index 22a178c91..6b0e95261 100644 --- a/app/Filament/Server/Resources/DatabaseResource.php +++ b/app/Filament/Server/Resources/DatabaseResource.php @@ -16,7 +16,7 @@ class DatabaseResource extends Resource protected static ?int $navigationSort = 6; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-database'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-database'; public const WARNING_THRESHOLD = 0.7; diff --git a/app/Filament/Server/Resources/FileResource.php b/app/Filament/Server/Resources/FileResource.php index 94d9d7bc1..332df4f94 100644 --- a/app/Filament/Server/Resources/FileResource.php +++ b/app/Filament/Server/Resources/FileResource.php @@ -16,7 +16,7 @@ class FileResource extends Resource protected static ?int $navigationSort = 2; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-files'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-files'; // TODO: find better way handle server conflict state public static function canAccess(): bool diff --git a/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php b/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php index 8b2872d1a..ed5c5c0c8 100644 --- a/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php +++ b/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php @@ -23,7 +23,6 @@ use Filament\Resources\Pages\PageRegistration; use Filament\Schemas\Schema; use Filament\Support\Enums\Alignment; use Illuminate\Contracts\Filesystem\FileNotFoundException; -use Illuminate\Http\Client\ConnectionException; use Illuminate\Routing\Route; use Illuminate\Support\Facades\Route as RouteFacade; use Livewire\Attributes\Locked; diff --git a/app/Filament/Server/Resources/ScheduleResource.php b/app/Filament/Server/Resources/ScheduleResource.php index 87b477bc2..e64d976f1 100644 --- a/app/Filament/Server/Resources/ScheduleResource.php +++ b/app/Filament/Server/Resources/ScheduleResource.php @@ -33,7 +33,7 @@ class ScheduleResource extends Resource protected static ?int $navigationSort = 4; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-clock'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-clock'; // TODO: find better way handle server conflict state public static function canAccess(): bool diff --git a/app/Filament/Server/Resources/UserResource.php b/app/Filament/Server/Resources/UserResource.php index b895d5b57..c1a71fa51 100644 --- a/app/Filament/Server/Resources/UserResource.php +++ b/app/Filament/Server/Resources/UserResource.php @@ -33,7 +33,7 @@ class UserResource extends Resource protected static ?int $navigationSort = 5; - protected static string | \BackedEnum | null $navigationIcon = 'tabler-users'; + protected static string|\BackedEnum|null $navigationIcon = 'tabler-users'; protected static ?string $tenantOwnershipRelationshipName = 'subServers';