ci(release): bump version

.github/workflows/lint.yaml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.2, 8.3, 8.4 ]
+        php: [8.2, 8.3, 8.4]
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -68,4 +68,4 @@ jobs:
         run: composer install --no-interaction --no-suggest --no-progress --no-scripts
 
       - name: PHPStan
-        run: vendor/bin/phpstan --memory-limit=-1 --error-format=github
+        run: vendor/bin/phpstan --memory-limit=-1

.gitignore

@@ -1,6 +1,7 @@
 /.phpunit.cache
 /node_modules
 /public/build
+/public/hot
 /public/storage
 /storage/*.key
 /storage/pail
@@ -23,7 +24,8 @@ yarn-error.log
 /.vscode
 
 public/assets/manifest.json
-/database/*.sqlite*
+/database/*.sqlite
+/database/*.sqlite-journal
 filament-monaco-editor/
 _ide_helper*
 /.phpstorm.meta.php

Dockerfile

@@ -1,9 +1,16 @@
 # syntax=docker.io/docker/dockerfile:1.13-labs
 # Pelican Production Dockerfile
 
-##
-#  If you want to build this locally you want to run `docker build -f Dockerfile.dev`
-##
+
+# For those who want to build this Dockerfile themselves, uncomment lines 6-12 and replace "localhost:5000/base-php:$TARGETARCH" on lines 17 and 67 with "base".
+
+# FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine as base
+
+# ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+# RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql
+
+# RUN rm /usr/local/bin/install-php-extensions
 
 # ================================
 # Stage 1-1: Composer Install
@@ -75,16 +82,13 @@ RUN chown root:www-data ./ \
     && chmod 750 ./ \
     # Files should not have execute set, but directories need it
     && find ./ -type d -exec chmod 750 {} \; \
-    # Create necessary directories
-    && mkdir -p /pelican-data/storage /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \
-    # Symlinks for env, database, and avatars
+    # Symlink to env/database path, as www-data won't be able to write to webroot
     && ln -s /pelican-data/.env ./.env \
     && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
-    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
-    && ln -s  /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
-    && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
-    # Allow www-data write permissions where necessary
-    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
+    # Create necessary directories
+    && mkdir -p /pelican-data /var/run/supervisord /etc/supercronic \
+    # Finally allow www-data write permissions where necessary
+    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
     && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord
 
 # Configure Supervisor

Dockerfile.base

@@ -1,10 +1,10 @@
 # ================================
 # Stage 0: Build PHP Base Image
 # ================================
-FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine
+FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql pdo_pgsql
+RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql
 
-RUN rm /usr/local/bin/install-php-extensions
+RUN rm /usr/local/bin/install-php-extensions

Dockerfile.dev

@@ -1,112 +0,0 @@
-# syntax=docker.io/docker/dockerfile:1.13-labs
-# Pelican Development Dockerfile
-
-FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine AS base
-
-ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-
-RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql pdo_pgsql
-
-RUN rm /usr/local/bin/install-php-extensions
-
-# ================================
-# Stage 1-1: Composer Install
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH base AS composer
-
-WORKDIR /build
-
-COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
-
-# Copy bare minimum to install Composer dependencies
-COPY composer.json composer.lock ./
-
-RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
-
-# ================================
-# Stage 1-2: Yarn Install
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
-
-WORKDIR /build
-
-# Copy bare minimum to install Yarn dependencies
-COPY package.json yarn.lock ./
-
-RUN yarn config set network-timeout 300000 \
-    && yarn install --frozen-lockfile
-
-# ================================
-# Stage 2-1: Composer Optimize
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH composer AS composerbuild
-
-# Copy full code to optimize autoload
-COPY --exclude=Caddyfile --exclude=docker/ . ./
-
-RUN composer dump-autoload --optimize
-
-# ================================
-# Stage 2-2: Build Frontend Assets
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH yarn AS yarnbuild
-
-WORKDIR /build
-
-# Copy full code
-COPY --exclude=Caddyfile --exclude=docker/ . ./
-COPY --from=composer /build .
-
-RUN yarn run build
-
-# ================================
-# Stage 5: Build Final Application Image
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH base AS final
-
-WORKDIR /var/www/html
-
-# Install additional required libraries
-RUN apk update && apk add --no-cache \
-    caddy ca-certificates supervisor supercronic
-
-COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
-COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
-
-# Set permissions
-# First ensure all files are owned by root and restrict www-data to read access
-RUN chown root:www-data ./ \
-    && chmod 750 ./ \
-    # Files should not have execute set, but directories need it
-    && find ./ -type d -exec chmod 750 {} \; \
-    # Create necessary directories
-    && mkdir -p /pelican-data/storage /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \
-    # Symlinks for env, database, and avatars
-    && ln -s /pelican-data/.env ./.env \
-    && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
-    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
-    && ln -s  /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
-    && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
-    # Allow www-data write permissions where necessary
-    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
-    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord
-
-# Configure Supervisor
-COPY docker/supervisord.conf /etc/supervisord.conf
-COPY docker/Caddyfile /etc/caddy/Caddyfile
-# Add Laravel scheduler to crontab
-COPY docker/crontab /etc/supercronic/crontab
-
-COPY docker/entrypoint.sh ./docker/entrypoint.sh
-
-HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
-  CMD curl -f http://localhost/up || exit 1
-
-EXPOSE 80 443
-
-VOLUME /pelican-data
-
-USER www-data
-
-ENTRYPOINT [ "/bin/ash", "docker/entrypoint.sh" ]
-CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

app/Checks/NodeVersionsCheck.php

@@ -14,9 +14,9 @@ class NodeVersionsCheck extends Check
 
     public function run(): Result
     {
-        $all = Node::all();
+        $all = Node::query()->count();
 
-        if ($all->isEmpty()) {
+        if ($all === 0) {
             $result = Result::make()
                 ->notificationMessage(trans('admin/health.results.nodeversions.no_nodes_created'))
                 ->shortSummary(trans('admin/health.results.nodeversions.no_nodes'));
@@ -25,18 +25,16 @@ class NodeVersionsCheck extends Check
             return $result;
         }
 
-        $outdated = $all
-            ->filter(fn (Node $node) => !isset($node->systemInformation()['exception']) && !$this->versionService->isLatestWings($node->systemInformation()['version']))
-            ->count();
-
-        $all = $all->count();
         $latestVersion = $this->versionService->latestWingsVersion();
 
+        $outdated = Node::query()->get()
+            ->filter(fn (Node $node) => !isset($node->systemInformation()['exception']) && $node->systemInformation()['version'] !== $latestVersion)
+            ->count();
+
         $result = Result::make()
             ->meta([
                 'all' => $all,
                 'outdated' => $outdated,
-                'latestVersion' => $latestVersion,
             ])
             ->shortSummary($outdated === 0 ? trans('admin/health.results.nodeversions.all_up_to_date') : trans('admin/health.results.nodeversions.outdated', ['outdated' => $outdated, 'all' => $all]));
 

app/Console/Commands/Egg/UpdateEggIndexCommand.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Egg;
-
-use Exception;
-use Illuminate\Console\Command;
-
-class UpdateEggIndexCommand extends Command
-{
-    protected $signature = 'p:egg:update-index';
-
-    public function handle(): int
-    {
-        try {
-            $data = file_get_contents('https://raw.githubusercontent.com/pelican-eggs/pelican-eggs.github.io/refs/heads/main/content/pelican.json');
-            $data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
-        } catch (Exception $exception) {
-            $this->error($exception->getMessage());
-
-            return 1;
-        }
-
-        $index = [];
-        foreach ($data['nests'] as $nest) {
-            $nestName = $nest['nest_type'];
-
-            $this->info("Nest: $nestName");
-
-            $nestEggs = [];
-            foreach ($nest['Eggs'] as $egg) {
-                $eggName = $egg['egg']['name'];
-
-                $this->comment("Egg: $eggName");
-
-                $nestEggs[$egg['download_url']] = $eggName;
-            }
-            $index[$nestName] = $nestEggs;
-
-            $this->info('');
-        }
-
-        cache()->forever('eggs.index', $index);
-
-        return 0;
-    }
-}

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands\Environment;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
 
 class AppSettingsCommand extends Command
 {
@@ -20,13 +21,9 @@ class AppSettingsCommand extends Command
 
         if (!config('app.key')) {
             $this->comment('Generating app key');
-            $this->call('key:generate');
+            Artisan::call('key:generate');
         }
 
-        $this->comment('Creating storage link');
-        $this->call('storage:link');
-
-        $this->comment('Caching components & icons');
-        $this->call('filament:optimize');
+        Artisan::call('filament:optimize');
     }
 }

app/Console/Commands/Environment/QueueWorkerServiceCommand.php

@@ -18,17 +18,6 @@ class QueueWorkerServiceCommand extends Command
 
     public function handle(): void
     {
-        if (@file_exists('/.dockerenv')) {
-            $result = Process::run('supervisorctl restart queue-worker');
-            if ($result->failed()) {
-                $this->error('Error restarting service: ' . $result->errorOutput());
-
-                return;
-            }
-            $this->line('Queue worker service file updated successfully.');
-
-            return;
-        }
         $serviceName = $this->option('service-name') ?? $this->ask('Queue worker service name', 'pelican-queue');
         $path = '/etc/systemd/system/' . $serviceName  . '.service';
 

app/Console/Commands/Node/MakeNodeCommand.php

@@ -24,7 +24,6 @@ class MakeNodeCommand extends Command
                             {--overallocateCpu= : Enter the amount of cpu to overallocate (% or -1 to overallocate the maximum).}
                             {--uploadSize= : Enter the maximum upload filesize.}
                             {--daemonListeningPort= : Enter the daemon listening port.}
-                            {--daemonConnectingPort= : Enter the daemon connecting port.}
                             {--daemonSFTPPort= : Enter the daemon SFTP listening port.}
                             {--daemonSFTPAlias= : Enter the daemon SFTP alias.}
                             {--daemonBase= : Enter the base folder.}';
@@ -58,7 +57,6 @@ class MakeNodeCommand extends Command
         $data['cpu_overallocate'] = $this->option('overallocateCpu') ?? $this->ask(trans('commands.make_node.cpu_overallocate'), '-1');
         $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(trans('commands.make_node.upload_size'), '256');
         $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(trans('commands.make_node.daemonListen'), '8080');
-        $data['daemon_connect'] = $this->option('daemonConnectingPort') ?? $this->ask(trans('commands.make_node.daemonConnect'), '8080');
         $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(trans('commands.make_node.daemonSFTP'), '2022');
         $data['daemon_sftp_alias'] = $this->option('daemonSFTPAlias') ?? $this->ask(trans('commands.make_node.daemonSFTPAlias'), '');
         $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(trans('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');

app/Console/Kernel.php

@@ -3,11 +3,11 @@
 namespace App\Console;
 
 use App\Console\Commands\Egg\CheckEggUpdatesCommand;
-use App\Console\Commands\Egg\UpdateEggIndexCommand;
 use App\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
 use App\Console\Commands\Maintenance\PruneImagesCommand;
 use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
 use App\Console\Commands\Schedule\ProcessRunnableCommand;
+use App\Jobs\NodeStatistics;
 use App\Models\ActivityLog;
 use App\Models\Webhook;
 use Illuminate\Console\Scheduling\Schedule;
@@ -31,20 +31,17 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule): void
     {
-        if (config('cache.default') === 'redis') {
-            // https://laravel.com/docs/10.x/upgrade#redis-cache-tags
-            // This only needs to run when using redis. anything else throws an error.
-            $schedule->command('cache:prune-stale-tags')->hourly();
-        }
+        // https://laravel.com/docs/10.x/upgrade#redis-cache-tags
+        $schedule->command('cache:prune-stale-tags')->hourly();
 
         // Execute scheduled commands for servers every minute, as if there was a normal cron running.
         $schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping();
 
         $schedule->command(CleanServiceBackupFilesCommand::class)->daily();
         $schedule->command(PruneImagesCommand::class)->daily();
+        $schedule->command(CheckEggUpdatesCommand::class)->hourly();
 
-        $schedule->command(CheckEggUpdatesCommand::class)->daily();
-        $schedule->command(UpdateEggIndexCommand::class)->daily();
+        $schedule->job(new NodeStatistics())->everyFiveSeconds()->withoutOverlapping();
 
         if (config('backups.prune_age')) {
             // Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.

app/Enums/BackupStatus.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Filament\Support\Contracts\HasColor;
-use Filament\Support\Contracts\HasIcon;
-use Filament\Support\Contracts\HasLabel;
-
-enum BackupStatus: string implements HasColor, HasIcon, HasLabel
-{
-    case InProgress = 'in_progress';
-    case Successful = 'successful';
-    case Failed = 'failed';
-
-    public function getIcon(): string
-    {
-        return match ($this) {
-            self::InProgress => 'tabler-circle-dashed',
-            self::Successful => 'tabler-circle-check',
-            self::Failed => 'tabler-circle-x',
-        };
-    }
-
-    public function getColor(): string
-    {
-        return match ($this) {
-            self::InProgress => 'primary',
-            self::Successful => 'success',
-            self::Failed => 'danger',
-        };
-    }
-
-    public function getLabel(): string
-    {
-        return str($this->value)->headline();
-    }
-}

app/Enums/ContainerStatus.php

@@ -88,7 +88,7 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
 
     public function isStartable(): bool
     {
-        return !in_array($this, [ContainerStatus::Running, ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Missing]);
+        return !in_array($this, [ContainerStatus::Running, ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting]);
     }
 
     public function isRestartable(): bool
@@ -97,16 +97,18 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
             return true;
         }
 
-        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Missing]);
+        return !in_array($this, [ContainerStatus::Offline]);
     }
 
     public function isStoppable(): bool
     {
-        return !in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Exited, ContainerStatus::Offline, ContainerStatus::Missing]);
+        return !in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Exited, ContainerStatus::Offline]);
     }
 
     public function isKillable(): bool
     {
-        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Running, ContainerStatus::Exited, ContainerStatus::Missing]);
+        // [ContainerStatus::Restarting, ContainerStatus::Removing, ContainerStatus::Dead, ContainerStatus::Created]
+
+        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Running, ContainerStatus::Exited]);
     }
 }

app/Enums/HeaderActionPosition.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum HeaderActionPosition: string
-{
-    case Before = 'before';
-    case After = 'after';
-}

app/Enums/HeaderWidgetPosition.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum HeaderWidgetPosition: string
-{
-    case Before = 'before';
-    case After = 'after';
-}

app/Enums/RolePermissionModels.php

@@ -14,24 +14,4 @@ enum RolePermissionModels: string
     case Server = 'server';
     case User = 'user';
     case Webhook = 'webhook';
-
-    public function viewAny(): string
-    {
-        return RolePermissionPrefixes::ViewAny->value . ' ' . $this->value;
-    }
-
-    public function view(): string
-    {
-        return RolePermissionPrefixes::View->value . ' ' . $this->value;
-    }
-
-    public function create(): string
-    {
-        return RolePermissionPrefixes::Create->value . ' ' . $this->value;
-    }
-
-    public function update(): string
-    {
-        return RolePermissionPrefixes::Update->value . ' ' . $this->value;
-    }
 }

app/Enums/ServerState.php

@@ -27,16 +27,8 @@ enum ServerState: string implements HasColor, HasIcon, HasLabel
         };
     }
 
-    public function getColor(bool $hex = false): string
+    public function getColor(): string
     {
-        if ($hex) {
-            return match ($this) {
-                self::Normal, self::Installing, self::RestoringBackup => '#2563EB',
-                self::Suspended => '#D97706',
-                self::InstallFailed, self::ReinstallFailed => '#EF4444',
-            };
-        }
-
         return match ($this) {
             self::Normal => 'primary',
             self::Installing => 'primary',

app/Enums/WebhookType.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Filament\Support\Contracts\HasLabel;
-use Filament\Support\Contracts\HasColor;
-use Filament\Support\Contracts\HasIcon;
-
-enum WebhookType: string implements HasColor, HasIcon, HasLabel
-{
-    case Regular = 'regular';
-    case Discord = 'discord';
-
-    public function getLabel(): string
-    {
-        return trans('admin/webhook.' . $this->value);
-    }
-
-    public function getColor(): ?string
-    {
-        return match ($this) {
-            self::Regular => null,
-            self::Discord => 'blurple',
-        };
-    }
-
-    public function getIcon(): string
-    {
-        return match ($this) {
-            self::Regular => 'tabler-world-www',
-            self::Discord => 'tabler-brand-discord',
-        };
-    }
-}

app/Events/Auth/DirectLogin.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Events\Auth;
+
+use App\Models\User;
+use App\Events\Event;
+
+class DirectLogin extends Event
+{
+    public function __construct(public User $user, public bool $remember) {}
+}

app/Events/Auth/FailedPasswordReset.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Events\Auth;
+
+use App\Events\Event;
+use Illuminate\Queue\SerializesModels;
+
+class FailedPasswordReset extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public string $ip, public string $email) {}
+}

app/Exceptions/Repository/FileExistsException.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Exceptions\Repository;
-
-use Exception;
-
-class FileExistsException extends Exception {}

app/Exceptions/Service/Deployment/NoViableNodeException.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Deployment;
-
-use App\Exceptions\DisplayException;
-
-class NoViableNodeException extends DisplayException {}

app/Extensions/Avatar/AvatarProvider.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Extensions\Avatar;
+
+use Filament\AvatarProviders\Contracts\AvatarProvider as AvatarProviderContract;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+
+abstract class AvatarProvider implements AvatarProviderContract
+{
+    /**
+     * @var array<string, static>
+     */
+    protected static array $providers = [];
+
+    public static function getProvider(string $id): ?self
+    {
+        return Arr::get(static::$providers, $id);
+    }
+
+    /**
+     * @return array<string, static>
+     */
+    public static function getAll(): array
+    {
+        return static::$providers;
+    }
+
+    public function __construct()
+    {
+        static::$providers[$this->getId()] = $this;
+    }
+
+    abstract public function getId(): string;
+
+    public function getName(): string
+    {
+        return Str::title($this->getId());
+    }
+}

app/Extensions/Avatar/AvatarSchemaInterface.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Extensions\Avatar;
-
-use App\Models\User;
-
-interface AvatarSchemaInterface
-{
-    public function getId(): string;
-
-    public function getName(): string;
-
-    public function get(User $user): ?string;
-}

app/Extensions/Avatar/AvatarService.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Extensions\Avatar;
-
-use App\Models\User;
-use Illuminate\Support\Facades\Storage;
-
-class AvatarService
-{
-    /** @var AvatarSchemaInterface[] */
-    private array $schemas = [];
-
-    public function __construct(
-        private readonly bool $allowUploadedAvatars,
-        private readonly string $activeSchema,
-    ) {}
-
-    public function get(string $id): ?AvatarSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    public function getActiveSchema(): ?AvatarSchemaInterface
-    {
-        return $this->get($this->activeSchema);
-    }
-
-    public function getAvatarUrl(User $user): ?string
-    {
-        if ($this->allowUploadedAvatars) {
-            $path = "avatars/$user->id.png";
-
-            if (Storage::disk('public')->exists($path)) {
-                return Storage::url($path);
-            }
-        }
-
-        return $this->getActiveSchema()?->get($user);
-    }
-
-    public function register(AvatarSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        $this->schemas[$schema->getId()] = $schema;
-    }
-
-    /** @return array<string, string> */
-    public function getMappings(): array
-    {
-        return collect($this->schemas)->mapWithKeys(fn ($schema) => [$schema->getId() => $schema->getName()])->all();
-    }
-}

app/Extensions/Avatar/Providers/GravatarProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Extensions\Avatar\Providers;
+
+use App\Extensions\Avatar\AvatarProvider;
+use App\Models\User;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
+
+class GravatarProvider extends AvatarProvider
+{
+    public function getId(): string
+    {
+        return 'gravatar';
+    }
+
+    public function get(Model|Authenticatable $record): string
+    {
+        /** @var User $record */
+        return 'https://gravatar.com/avatar/' . md5($record->email);
+    }
+
+    public static function register(): self
+    {
+        return new self();
+    }
+}

app/Extensions/Avatar/Providers/LocalAvatarProvider.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Extensions\Avatar\Providers;
+
+use App\Extensions\Avatar\AvatarProvider;
+use Filament\AvatarProviders\UiAvatarsProvider as FilamentUiAvatarsProvider;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Storage;
+
+class LocalAvatarProvider extends AvatarProvider
+{
+    public function getId(): string
+    {
+        return 'local';
+    }
+
+    public function get(Model|Authenticatable $record): string
+    {
+        $path = 'avatars/' . $record->getKey() . '.png';
+
+        return Storage::disk('public')->exists($path) ? Storage::url($path) : (new FilamentUiAvatarsProvider())->get($record);
+    }
+
+    public static function register(): self
+    {
+        return new self();
+    }
+}

app/Extensions/Avatar/Providers/UiAvatarsProvider.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Extensions\Avatar\Providers;
+
+use App\Extensions\Avatar\AvatarProvider;
+use Filament\AvatarProviders\UiAvatarsProvider as FilamentUiAvatarsProvider;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
+
+class UiAvatarsProvider extends AvatarProvider
+{
+    public function getId(): string
+    {
+        return 'uiavatars';
+    }
+
+    public function getName(): string
+    {
+        return 'UI Avatars';
+    }
+
+    public function get(Model|Authenticatable $record): string
+    {
+        return (new FilamentUiAvatarsProvider())->get($record);
+    }
+
+    public static function register(): self
+    {
+        return new self();
+    }
+}

app/Extensions/Avatar/Schemas/GravatarSchema.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Extensions\Avatar\Schemas;
-
-use App\Extensions\Avatar\AvatarSchemaInterface;
-use App\Models\User;
-
-class GravatarSchema implements AvatarSchemaInterface
-{
-    public function getId(): string
-    {
-        return 'gravatar';
-    }
-
-    public function getName(): string
-    {
-        return 'Gravatar';
-    }
-
-    public function get(User $user): string
-    {
-        return 'https://gravatar.com/avatar/' . md5($user->email);
-    }
-}

app/Extensions/Avatar/Schemas/UiAvatarsSchema.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Extensions\Avatar\Schemas;
-
-use App\Extensions\Avatar\AvatarSchemaInterface;
-use App\Models\User;
-
-class UiAvatarsSchema implements AvatarSchemaInterface
-{
-    public function getId(): string
-    {
-        return 'uiavatars';
-    }
-
-    public function getName(): string
-    {
-        return 'UI Avatars';
-    }
-
-    public function get(User $user): ?string
-    {
-        // UI Avatars is the default of filament so just return null here
-        return null;
-    }
-}

app/Extensions/Captcha/CaptchaService.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha;
-
-use App\Extensions\Captcha\Schemas\CaptchaSchemaInterface;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-
-class CaptchaService
-{
-    /** @var array<string, CaptchaSchemaInterface> */
-    private array $schemas = [];
-
-    /**
-     * @return CaptchaSchemaInterface[]
-     */
-    public function getAll(): array
-    {
-        return $this->schemas;
-    }
-
-    public function get(string $id): ?CaptchaSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    public function register(CaptchaSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        config()->set('captcha.' . Str::lower($schema->getId()), $schema->getConfig());
-        $this->schemas[$schema->getId()] = $schema;
-    }
-
-    /** @return Collection<CaptchaSchemaInterface> */
-    public function getActiveSchemas(): Collection
-    {
-        return collect($this->schemas)
-            ->filter(fn (CaptchaSchemaInterface $schema) => $schema->isEnabled());
-    }
-
-    public function getActiveSchema(): ?CaptchaSchemaInterface
-    {
-        return $this->getActiveSchemas()->first();
-    }
-}

app/Extensions/Captcha/Providers/CaptchaProvider.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Extensions\Captcha\Providers;
+
+use Filament\Forms\Components\Component;
+use Filament\Forms\Components\TextInput;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Str;
+
+abstract class CaptchaProvider
+{
+    /**
+     * @var array<string, static>
+     */
+    protected static array $providers = [];
+
+    /**
+     * @return self|static[]
+     */
+    public static function get(?string $id = null): array|self
+    {
+        return $id ? static::$providers[$id] : static::$providers;
+    }
+
+    protected function __construct(protected Application $app)
+    {
+        if (array_key_exists($this->getId(), static::$providers)) {
+            if (!$this->app->runningUnitTests()) {
+                logger()->warning("Tried to create duplicate Captcha provider with id '{$this->getId()}'");
+            }
+
+            return;
+        }
+
+        config()->set('captcha.' . Str::lower($this->getId()), $this->getConfig());
+
+        static::$providers[$this->getId()] = $this;
+    }
+
+    abstract public function getId(): string;
+
+    abstract public function getComponent(): Component;
+
+    /**
+     * @return array<string, string|string[]|bool|null>
+     */
+    public function getConfig(): array
+    {
+        $id = Str::upper($this->getId());
+
+        return [
+            'site_key' => env("CAPTCHA_{$id}_SITE_KEY"),
+            'secret_key' => env("CAPTCHA_{$id}_SECRET_KEY"),
+        ];
+    }
+
+    /**
+     * @return Component[]
+     */
+    public function getSettingsForm(): array
+    {
+        $id = Str::upper($this->getId());
+
+        return [
+            TextInput::make("CAPTCHA_{$id}_SITE_KEY")
+                ->label('Site Key')
+                ->placeholder('Site Key')
+                ->columnSpan(2)
+                ->required()
+                ->password()
+                ->revealable()
+                ->autocomplete(false)
+                ->default(env("CAPTCHA_{$id}_SITE_KEY")),
+            TextInput::make("CAPTCHA_{$id}_SECRET_KEY")
+                ->label('Secret Key')
+                ->placeholder('Secret Key')
+                ->columnSpan(2)
+                ->required()
+                ->password()
+                ->revealable()
+                ->autocomplete(false)
+                ->default(env("CAPTCHA_{$id}_SECRET_KEY")),
+        ];
+    }
+
+    public function getName(): string
+    {
+        return Str::title($this->getId());
+    }
+
+    public function getIcon(): ?string
+    {
+        return null;
+    }
+
+    public function isEnabled(): bool
+    {
+        $id = Str::upper($this->getId());
+
+        return env("CAPTCHA_{$id}_ENABLED", false);
+    }
+
+    /**
+     * @return array<string, string|bool>
+     */
+    public function validateResponse(?string $captchaResponse = null): array
+    {
+        return [
+            'success' => false,
+            'message' => 'validateResponse not defined',
+        ];
+    }
+
+    public function verifyDomain(string $hostname, ?string $requestUrl = null): bool
+    {
+        return true;
+    }
+}

app/Extensions/Captcha/Providers/TurnstileProvider.php

@@ -1,31 +1,26 @@
 <?php
 
-namespace App\Extensions\Captcha\Schemas\Turnstile;
+namespace App\Extensions\Captcha\Providers;
 
-use App\Extensions\Captcha\Schemas\CaptchaSchemaInterface;
-use App\Extensions\Captcha\Schemas\BaseSchema;
+use App\Filament\Components\Forms\Fields\TurnstileCaptcha;
 use Exception;
-use Filament\Forms\Components\Component as BaseComponent;
+use Filament\Forms\Components\Component;
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Toggle;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\HtmlString;
 
-class TurnstileSchema extends BaseSchema implements CaptchaSchemaInterface
+class TurnstileProvider extends CaptchaProvider
 {
     public function getId(): string
     {
         return 'turnstile';
     }
 
-    public function isEnabled(): bool
+    public function getComponent(): Component
     {
-        return env('CAPTCHA_TURNSTILE_ENABLED', false);
-    }
-
-    public function getFormComponent(): BaseComponent
-    {
-        return Component::make('turnstile');
+        return TurnstileCaptcha::make('turnstile');
     }
 
     /**
@@ -39,7 +34,7 @@ class TurnstileSchema extends BaseSchema implements CaptchaSchemaInterface
     }
 
     /**
-     * @return BaseComponent[]
+     * @return Component[]
      */
     public function getSettingsForm(): array
     {
@@ -57,18 +52,24 @@ class TurnstileSchema extends BaseSchema implements CaptchaSchemaInterface
                 ->label(trans('admin/setting.captcha.info_label'))
                 ->columnSpan(2)
                 ->content(new HtmlString(trans('admin/setting.captcha.info'))),
+
         ]);
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return 'tabler-brand-cloudflare';
     }
 
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
+
     /**
-     * @throws Exception
+     * @return array<string, string|bool>
      */
-    public function validateResponse(?string $captchaResponse = null): void
+    public function validateResponse(?string $captchaResponse = null): array
     {
         $captchaResponse ??= request()->get('cf-turnstile-response');
 
@@ -83,33 +84,22 @@ class TurnstileSchema extends BaseSchema implements CaptchaSchemaInterface
             ->post('https://challenges.cloudflare.com/turnstile/v0/siteverify', [
                 'secret' => $secret,
                 'response' => $captchaResponse,
-            ])
-            ->json();
+            ]);
 
-        if (!$response['success']) {
-            match ($response['error-codes'][0] ?? null) {
-                'missing-input-secret' => throw new Exception('The secret parameter was not passed.'),
-                'invalid-input-secret' => throw new Exception('The secret parameter was invalid, did not exist, or is a testing secret key with a non-testing response.'),
-                'missing-input-response' => throw new Exception('The response parameter (token) was not passed.'),
-                'invalid-input-response' => throw new Exception('The response parameter (token) is invalid or has expired.'),
-                'bad-request' => throw new Exception('The request was rejected because it was malformed.'),
-                'timeout-or-duplicate' => throw new Exception('The response parameter (token) has already been validated before.'),
-                default => throw new Exception('An internal error happened while validating the response.'),
-            };
-        }
-
-        if (!$this->verifyDomain($response['hostname'] ?? '')) {
-            throw new Exception('Domain verification failed.');
-        }
+        return count($response->json()) ? $response->json() : [
+            'success' => false,
+            'message' => 'Unknown error occurred, please try again',
+        ];
     }
 
-    private function verifyDomain(string $hostname): bool
+    public function verifyDomain(string $hostname, ?string $requestUrl = null): bool
     {
         if (!env('CAPTCHA_TURNSTILE_VERIFY_DOMAIN', true)) {
             return true;
         }
 
-        $requestUrl = parse_url(request()->url());
+        $requestUrl ??= request()->url;
+        $requestUrl = parse_url($requestUrl);
 
         return $hostname === array_get($requestUrl, 'host');
     }

app/Extensions/Captcha/Schemas/BaseSchema.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Schemas;
-
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\TextInput;
-use Illuminate\Support\Str;
-
-abstract class BaseSchema
-{
-    abstract public function getId(): string;
-
-    public function getName(): string
-    {
-        return Str::upper($this->getId());
-    }
-
-    /**
-     * @return array<string, string|string[]|bool|null>
-     */
-    public function getConfig(): array
-    {
-        $id = Str::upper($this->getId());
-
-        return [
-            'site_key' => env("CAPTCHA_{$id}_SITE_KEY"),
-            'secret_key' => env("CAPTCHA_{$id}_SECRET_KEY"),
-        ];
-    }
-
-    /**
-     * @return Component[]
-     */
-    public function getSettingsForm(): array
-    {
-        $id = Str::upper($this->getId());
-
-        return [
-            TextInput::make("CAPTCHA_{$id}_SITE_KEY")
-                ->label('Site Key')
-                ->placeholder('Site Key')
-                ->columnSpan(2)
-                ->required()
-                ->password()
-                ->revealable()
-                ->autocomplete(false)
-                ->default(env("CAPTCHA_{$id}_SITE_KEY")),
-            TextInput::make("CAPTCHA_{$id}_SECRET_KEY")
-                ->label('Secret Key')
-                ->placeholder('Secret Key')
-                ->columnSpan(2)
-                ->required()
-                ->password()
-                ->revealable()
-                ->autocomplete(false)
-                ->default(env("CAPTCHA_{$id}_SECRET_KEY")),
-        ];
-    }
-}

app/Extensions/Captcha/Schemas/CaptchaSchemaInterface.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Schemas;
-
-use Filament\Forms\Components\Component;
-
-interface CaptchaSchemaInterface
-{
-    public function getId(): string;
-
-    public function getName(): string;
-
-    /**
-     * @return array<string, string|string[]|bool|null>
-     */
-    public function getConfig(): array;
-
-    public function isEnabled(): bool;
-
-    public function getFormComponent(): Component;
-
-    /**
-     * @return Component[]
-     */
-    public function getSettingsForm(): array;
-
-    public function getIcon(): ?string;
-
-    public function validateResponse(?string $captchaResponse = null): void;
-}

app/Extensions/Captcha/Schemas/Turnstile/Rule.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Schemas\Turnstile;
-
-use App\Extensions\Captcha\CaptchaService;
-use Closure;
-use Exception;
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Support\Facades\App;
-
-class Rule implements ValidationRule
-{
-    public function validate(string $attribute, mixed $value, Closure $fail): void
-    {
-        try {
-            App::call(fn (CaptchaService $service) => $service->get('turnstile')->validateResponse($value));
-        } catch (Exception $exception) {
-            report($exception);
-
-            $fail('Captcha validation failed: ' . $exception->getMessage());
-        }
-    }
-}

app/Extensions/DynamicDatabaseConnection.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Extensions;
+
+use App\Models\DatabaseHost;
+
+class DynamicDatabaseConnection
+{
+    public const DB_CHARSET = 'utf8';
+
+    public const DB_COLLATION = 'utf8_unicode_ci';
+
+    public const DB_DRIVER = 'mysql';
+
+    /**
+     * Adds a dynamic database connection entry to the runtime config.
+     */
+    public function set(string $connection, DatabaseHost|int $host, string $database = 'mysql'): void
+    {
+        if (!$host instanceof DatabaseHost) {
+            $host = DatabaseHost::query()->findOrFail($host);
+        }
+
+        config()->set('database.connections.' . $connection, [
+            'driver' => self::DB_DRIVER,
+            'host' => $host->host,
+            'port' => $host->port,
+            'database' => $database,
+            'username' => $host->username,
+            'password' => $host->password,
+            'charset' => self::DB_CHARSET,
+            'collation' => self::DB_COLLATION,
+        ]);
+    }
+}

app/Extensions/Features/FeatureSchemaInterface.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Extensions\Features;
-
-use Filament\Actions\Action;
-
-interface FeatureSchemaInterface
-{
-    /** @return string[] */
-    public function getListeners(): array;
-
-    public function getId(): string;
-
-    public function getAction(): Action;
-}

app/Extensions/Features/FeatureService.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Extensions\Features;
-
-class FeatureService
-{
-    /** @var FeatureSchemaInterface[] */
-    private array $schemas = [];
-
-    /**
-     * @return FeatureSchemaInterface[]
-     */
-    public function getAll(): array
-    {
-        return $this->schemas;
-    }
-
-    public function get(string $id): ?FeatureSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    /**
-     * @param  ?string[]  $features
-     * @return FeatureSchemaInterface[]
-     */
-    public function getActiveSchemas(?array $features = []): array
-    {
-        return collect($this->schemas)->only($features)->all();
-    }
-
-    public function register(FeatureSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        $this->schemas[$schema->getId()] = $schema;
-    }
-
-    /**
-     * @param  ?string[]  $features
-     * @return array<string, array<string>>
-     */
-    public function getMappings(?array $features = []): array
-    {
-        return collect($this->getActiveSchemas($features))
-            ->mapWithKeys(fn (FeatureSchemaInterface $schema) => [
-                $schema->getId() => $schema->getListeners(),
-            ])->all();
-    }
-}

app/Extensions/Features/Schemas/GSLTokenSchema.php

@@ -1,117 +0,0 @@
-<?php
-
-namespace App\Extensions\Features\Schemas;
-
-use App\Extensions\Features\FeatureSchemaInterface;
-use App\Facades\Activity;
-use App\Models\Permission;
-use App\Models\Server;
-use App\Models\ServerVariable;
-use App\Repositories\Daemon\DaemonPowerRepository;
-use Closure;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\TextInput;
-use Filament\Notifications\Notification;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\HtmlString;
-
-class GSLTokenSchema implements FeatureSchemaInterface
-{
-    /** @return array<string> */
-    public function getListeners(): array
-    {
-        return [
-            '(gsl token expired)',
-            '(account not found)',
-        ];
-    }
-
-    public function getId(): string
-    {
-        return 'gsl_token';
-    }
-
-    public function getAction(): Action
-    {
-        /** @var Server $server */
-        $server = Filament::getTenant();
-
-        /** @var ServerVariable $serverVariable */
-        $serverVariable = $server->serverVariables()->whereHas('variable', function (Builder $query) {
-            $query->where('env_variable', 'STEAM_ACC');
-        })->first();
-
-        return Action::make($this->getId())
-            ->requiresConfirmation()
-            ->modalHeading('Invalid GSL token')
-            ->modalDescription('It seems like your Gameserver Login Token (GSL token) is invalid or has expired.')
-            ->modalSubmitActionLabel('Update GSL Token')
-            ->disabledForm(fn () => !auth()->user()->can(Permission::ACTION_STARTUP_UPDATE, $server))
-            ->form([
-                Placeholder::make('info')
-                    ->label(new HtmlString(Blade::render('You can either <x-filament::link href="https://steamcommunity.com/dev/managegameservers" target="_blank">generate a new one</x-filament::link> and enter it below or leave the field blank to remove it completely.'))),
-                TextInput::make('gsltoken')
-                    ->label('GSL Token')
-                    ->rules([
-                        fn (): Closure => function (string $attribute, $value, Closure $fail) use ($serverVariable) {
-                            $validator = Validator::make(['validatorkey' => $value], [
-                                'validatorkey' => $serverVariable->variable->rules,
-                            ]);
-
-                            if ($validator->fails()) {
-                                $message = str($validator->errors()->first())->replace('validatorkey', $serverVariable->variable->name);
-
-                                $fail($message);
-                            }
-                        },
-                    ])
-                    ->hintIcon('tabler-code')
-                    ->label(fn () => $serverVariable->variable->name)
-                    ->hintIconTooltip(fn () => implode('|', $serverVariable->variable->rules))
-                    ->prefix(fn () => '{{' . $serverVariable->variable->env_variable . '}}')
-                    ->helperText(fn () => empty($serverVariable->variable->description) ? '—' : $serverVariable->variable->description),
-            ])
-            ->action(function (array $data, DaemonPowerRepository $powerRepository) use ($server, $serverVariable) {
-                /** @var Server $server */
-                $server = Filament::getTenant();
-                try {
-                    $new = $data['gsltoken'] ?? '';
-                    $original = $serverVariable->variable_value;
-
-                    $serverVariable->update([
-                        'variable_value' => $new,
-                    ]);
-
-                    if ($original !== $new) {
-
-                        Activity::event('server:startup.edit')
-                            ->property([
-                                'variable' => $serverVariable->variable->env_variable,
-                                'old' => $original,
-                                'new' => $new,
-                            ])
-                            ->log();
-                    }
-
-                    $powerRepository->setServer($server)->send('restart');
-
-                    Notification::make()
-                        ->title('GSL Token updated')
-                        ->body('Server will restart now.')
-                        ->success()
-                        ->send();
-                } catch (Exception $exception) {
-                    Notification::make()
-                        ->title('Could not update GSL Token')
-                        ->body($exception->getMessage())
-                        ->danger()
-                        ->send();
-                }
-            });
-    }
-}

app/Extensions/Features/Schemas/JavaVersionSchema.php

@@ -1,90 +0,0 @@
-<?php
-
-namespace App\Extensions\Features\Schemas;
-
-use App\Extensions\Features\FeatureSchemaInterface;
-use App\Facades\Activity;
-use App\Models\Permission;
-use App\Models\Server;
-use App\Repositories\Daemon\DaemonPowerRepository;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\Select;
-use Filament\Notifications\Notification;
-
-class JavaVersionSchema implements FeatureSchemaInterface
-{
-    /** @return array<string> */
-    public function getListeners(): array
-    {
-        return [
-            'java.lang.UnsupportedClassVersionError',
-            'unsupported major.minor version',
-            'has been compiled by a more recent version of the java runtime',
-            'minecraft 1.17 requires running the server with java 16 or above',
-            'minecraft 1.18 requires running the server with java 17 or above',
-            'minecraft 1.19 requires running the server with java 17 or above',
-        ];
-    }
-
-    public function getId(): string
-    {
-        return 'java_version';
-    }
-
-    public function getAction(): Action
-    {
-        /** @var Server $server */
-        $server = Filament::getTenant();
-
-        return Action::make($this->getId())
-            ->requiresConfirmation()
-            ->modalHeading('Unsupported Java Version')
-            ->modalDescription('This server is currently running an unsupported version of Java and cannot be started.')
-            ->modalSubmitActionLabel('Update Docker Image')
-            ->disabledForm(fn () => !auth()->user()->can(Permission::ACTION_STARTUP_DOCKER_IMAGE, $server))
-            ->form([
-                Placeholder::make('java')
-                    ->label('Please select a supported version from the list below to continue starting the server.'),
-                Select::make('image')
-                    ->label('Docker Image')
-                    ->disabled(fn () => !in_array($server->image, $server->egg->docker_images))
-                    ->options(fn () => collect($server->egg->docker_images)->mapWithKeys(fn ($key, $value) => [$key => $value]))
-                    ->selectablePlaceholder(false)
-                    ->default(fn () => $server->image)
-                    ->notIn(fn () => $server->image)
-                    ->required()
-                    ->preload()
-                    ->native(false),
-            ])
-            ->action(function (array $data, DaemonPowerRepository $powerRepository) use ($server) {
-                try {
-                    $new = $data['image'];
-                    $original = $server->image;
-                    $server->forceFill(['image' => $new])->saveOrFail();
-
-                    if ($original !== $server->image) {
-                        Activity::event('server:startup.image')
-                            ->property(['old' => $original, 'new' => $new])
-                            ->log();
-                    }
-
-                    $powerRepository->setServer($server)->send('restart');
-
-                    Notification::make()
-                        ->title('Docker image updated')
-                        ->body('Server will restart now.')
-                        ->success()
-                        ->send();
-                } catch (Exception $exception) {
-                    Notification::make()
-                        ->title('Could not update docker image')
-                        ->body($exception->getMessage())
-                        ->danger()
-                        ->send();
-                }
-            });
-    }
-}

app/Extensions/Features/Schemas/MinecraftEulaSchema.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Extensions\Features\Schemas;
-
-use App\Extensions\Features\FeatureSchemaInterface;
-use App\Models\Server;
-use App\Repositories\Daemon\DaemonFileRepository;
-use App\Repositories\Daemon\DaemonPowerRepository;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Facades\Filament;
-use Filament\Notifications\Notification;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\HtmlString;
-
-class MinecraftEulaSchema implements FeatureSchemaInterface
-{
-    /** @return array<string> */
-    public function getListeners(): array
-    {
-        return [
-            'you need to agree to the eula in order to run the server',
-        ];
-    }
-
-    public function getId(): string
-    {
-        return 'eula';
-    }
-
-    public function getAction(): Action
-    {
-        return Action::make($this->getId())
-            ->requiresConfirmation()
-            ->modalHeading('Minecraft EULA')
-            ->modalDescription(new HtmlString(Blade::render('By pressing "I Accept" below you are indicating your agreement to the <x-filament::link href="https://minecraft.net/eula" target="_blank">Minecraft EULA </x-filament::link>.')))
-            ->modalSubmitActionLabel('I Accept')
-            ->action(function (DaemonFileRepository $fileRepository, DaemonPowerRepository $powerRepository) {
-                try {
-                    /** @var Server $server */
-                    $server = Filament::getTenant();
-
-                    $fileRepository->setServer($server)->putContent('eula.txt', 'eula=true');
-
-                    $powerRepository->setServer($server)->send('restart');
-
-                    Notification::make()
-                        ->title('Minecraft EULA accepted')
-                        ->body('Server will restart now.')
-                        ->success()
-                        ->send();
-                } catch (Exception $exception) {
-                    Notification::make()
-                        ->title('Could not accept Minecraft EULA')
-                        ->body($exception->getMessage())
-                        ->danger()
-                        ->send();
-                }
-            });
-    }
-}

app/Extensions/Features/Schemas/PIDLimitSchema.php

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Extensions\Features\Schemas;
-
-use App\Extensions\Features\FeatureSchemaInterface;
-use Filament\Actions\Action;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\HtmlString;
-
-class PIDLimitSchema implements FeatureSchemaInterface
-{
-    /** @return array<string> */
-    public function getListeners(): array
-    {
-        return [
-            'pthread_create failed',
-            'failed to create thread',
-            'unable to create thread',
-            'unable to create native thread',
-            'unable to create new native thread',
-            'exception in thread "craft async scheduler management thread"',
-        ];
-    }
-
-    public function getId(): string
-    {
-        return 'pid_limit';
-    }
-
-    public function getAction(): Action
-    {
-        return Action::make($this->getId())
-            ->requiresConfirmation()
-            ->icon('tabler-alert-triangle')
-            ->modalHeading(fn () => auth()->user()->isAdmin() ? 'Memory or process limit reached...' : 'Possible resource limit reached...')
-            ->modalDescription(new HtmlString(Blade::render(
-                auth()->user()->isAdmin() ? <<<'HTML'
-                    <p>
-                        This server has reached the maximum process or memory limit.
-                    </p>
-                    <p class="mt-4">
-                        Increasing <code>container_pid_limit</code> in the wings
-                        configuration, <code>config.yml</code>, might help resolve
-                        this issue.
-                    </p>
-                    <p class="mt-4">
-                        <b>Note: Wings must be restarted for the configuration file changes to take effect</b>
-                    </p>
-                HTML
-                :
-                <<<'HTML'
-                    <p>
-                        This server is attempting to use more resources than allocated. Please contact the administrator
-                        and give them the error below.
-                    </p>
-                    <p class="mt-4">
-                        <code>
-                            pthread_create failed, Possibly out of memory or process/resource limits reached
-                        </code>
-                    </p>
-                HTML
-            )))
-            ->modalCancelActionLabel('Close')
-            ->action(fn () => null);
-    }
-}

app/Extensions/Features/Schemas/SteamDiskSpaceSchema.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Extensions\Features\Schemas;
-
-use App\Extensions\Features\FeatureSchemaInterface;
-use Filament\Actions\Action;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\HtmlString;
-
-class SteamDiskSpaceSchema implements FeatureSchemaInterface
-{
-    /** @return array<string> */
-    public function getListeners(): array
-    {
-        return [
-            'steamcmd needs 250mb of free disk space to update',
-            '0x202 after update job',
-        ];
-    }
-
-    public function getId(): string
-    {
-        return 'steam_disk_space';
-    }
-
-    public function getAction(): Action
-    {
-        return Action::make($this->getId())
-            ->requiresConfirmation()
-            ->modalHeading('Out of available disk space...')
-            ->modalDescription(new HtmlString(Blade::render(
-                auth()->user()->isAdmin() ? <<<'HTML'
-                    <p>
-                        This server has run out of available disk space and cannot complete the install or update
-                        process.
-                    </p>
-                    <p class="mt-4">
-                        Ensure the machine has enough disk space by typing{' '}
-                        <code class="rounded py-1 px-2">df -h</code> on the machine hosting
-                        this server. Delete files or increase the available disk space to resolve the issue.
-                    </p>
-                HTML
-                :
-                <<<'HTML'
-                    <p>
-                        This server has run out of available disk space and cannot complete the install or update
-                        process. Please get in touch with the administrator(s) and inform them of disk space issues.
-                    </p>
-                HTML
-            )))
-            ->modalCancelActionLabel('Close')
-            ->action(fn () => null);
-    }
-}

app/Extensions/OAuth/OAuthSchemaInterface.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth;
-
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\Wizard\Step;
-
-interface OAuthSchemaInterface
-{
-    public function getId(): string;
-
-    public function getName(): string;
-
-    public function getConfigKey(): string;
-
-    /** @return ?class-string */
-    public function getSocialiteProvider(): ?string;
-
-    /**
-     * @return array<string, string|string[]|bool|null>
-     */
-    public function getServiceConfig(): array;
-
-    /** @return Component[] */
-    public function getSettingsForm(): array;
-
-    /** @return Step[] */
-    public function getSetupSteps(): array;
-
-    public function getIcon(): ?string;
-
-    public function getHexColor(): ?string;
-
-    public function isEnabled(): bool;
-}

app/Extensions/OAuth/OAuthService.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth;
-
-use Illuminate\Support\Facades\Event;
-use SocialiteProviders\Manager\SocialiteWasCalled;
-
-class OAuthService
-{
-    /** @var OAuthSchemaInterface[] */
-    private array $schemas = [];
-
-    /** @return OAuthSchemaInterface[] */
-    public function getAll(): array
-    {
-        return $this->schemas;
-    }
-
-    public function get(string $id): ?OAuthSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    /** @return OAuthSchemaInterface[] */
-    public function getEnabled(): array
-    {
-        return collect($this->schemas)
-            ->filter(fn (OAuthSchemaInterface $schema) => $schema->isEnabled())
-            ->all();
-    }
-
-    public function register(OAuthSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        config()->set('services.' . $schema->getId(), array_merge($schema->getServiceConfig(), ['redirect' => '/auth/oauth/callback/' . $schema->getId()]));
-
-        if ($schema->getSocialiteProvider()) {
-            Event::listen(fn (SocialiteWasCalled $event) => $event->extendSocialite($schema->getId(), $schema->getSocialiteProvider()));
-        }
-
-        $this->schemas[$schema->getId()] = $schema;
-    }
-}

app/Extensions/OAuth/Providers/AuthentikProvider.php

@@ -1,19 +1,25 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+namespace App\Extensions\OAuth\Providers;
 
 use Filament\Forms\Components\ColorPicker;
 use Filament\Forms\Components\TextInput;
+use Illuminate\Foundation\Application;
 use SocialiteProviders\Authentik\Provider;
 
-final class AuthentikSchema extends OAuthSchema
+final class AuthentikProvider extends OAuthProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     public function getId(): string
     {
         return 'authentik';
     }
 
-    public function getSocialiteProvider(): string
+    public function getProviderClass(): string
     {
         return Provider::class;
     }
@@ -60,4 +66,9 @@ final class AuthentikSchema extends OAuthSchema
     {
         return env('OAUTH_AUTHENTIK_DISPLAY_COLOR', '#fd4b2d');
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/OAuth/Providers/CommonProvider.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Extensions\OAuth\Providers;
+
+use Illuminate\Foundation\Application;
+
+final class CommonProvider extends OAuthProvider
+{
+    protected function __construct(protected Application $app, private string $id, private ?string $providerClass, private ?string $icon, private ?string $hexColor)
+    {
+        parent::__construct($app);
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function getProviderClass(): ?string
+    {
+        return $this->providerClass;
+    }
+
+    public function getIcon(): ?string
+    {
+        return $this->icon;
+    }
+
+    public function getHexColor(): ?string
+    {
+        return $this->hexColor;
+    }
+
+    public static function register(Application $app, string $id, ?string $providerClass = null, ?string $icon = null, ?string $hexColor = null): static
+    {
+        return new self($app, $id, $providerClass, $icon, $hexColor);
+    }
+}

app/Extensions/OAuth/Providers/DiscordProvider.php

@@ -1,23 +1,29 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+namespace App\Extensions\OAuth\Providers;
 
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Wizard\Step;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 use SocialiteProviders\Discord\Provider;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
-final class DiscordSchema extends OAuthSchema
+final class DiscordProvider extends OAuthProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     public function getId(): string
     {
         return 'discord';
     }
 
-    public function getSocialiteProvider(): string
+    public function getProviderClass(): string
     {
         return Provider::class;
     }
@@ -50,4 +56,9 @@ final class DiscordSchema extends OAuthSchema
     {
         return '#5865F2';
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/OAuth/Providers/GithubProvider.php

@@ -1,16 +1,22 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+namespace App\Extensions\OAuth\Providers;
 
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Wizard\Step;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
-final class GithubSchema extends OAuthSchema
+final class GithubProvider extends OAuthProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     public function getId(): string
     {
         return 'github';
@@ -49,4 +55,9 @@ final class GithubSchema extends OAuthSchema
     {
         return '#4078c0';
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/OAuth/Providers/GitlabProvider.php

@@ -1,16 +1,22 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+namespace App\Extensions\OAuth\Providers;
 
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Wizard\Step;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
-final class GitlabSchema extends OAuthSchema
+final class GitlabProvider extends OAuthProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     public function getId(): string
     {
         return 'gitlab';
@@ -62,4 +68,9 @@ final class GitlabSchema extends OAuthSchema
     {
         return '#fca326';
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/OAuth/Providers/OAuthProvider.php

@@ -1,22 +1,61 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+namespace App\Extensions\OAuth\Providers;
 
-use App\Extensions\OAuth\OAuthSchemaInterface;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Wizard\Step;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
+use SocialiteProviders\Manager\SocialiteWasCalled;
 
-abstract class OAuthSchema implements OAuthSchemaInterface
+abstract class OAuthProvider
 {
+    /**
+     * @var array<string, static>
+     */
+    protected static array $providers = [];
+
+    /**
+     * @return self|static[]
+     */
+    public static function get(?string $id = null): array|self
+    {
+        return $id ? static::$providers[$id] : static::$providers;
+    }
+
+    protected function __construct(protected Application $app)
+    {
+        if (array_key_exists($this->getId(), static::$providers)) {
+            if (!$this->app->runningUnitTests()) {
+                logger()->warning("Tried to create duplicate OAuth provider with id '{$this->getId()}'");
+            }
+
+            return;
+        }
+
+        config()->set('services.' . $this->getId(), array_merge($this->getServiceConfig(), ['redirect' => '/auth/oauth/callback/' . $this->getId()]));
+
+        if ($this->getProviderClass()) {
+            Event::listen(function (SocialiteWasCalled $event) {
+                $event->extendSocialite($this->getId(), $this->getProviderClass());
+            });
+        }
+
+        static::$providers[$this->getId()] = $this;
+    }
+
     abstract public function getId(): string;
 
-    public function getSocialiteProvider(): ?string
+    public function getProviderClass(): ?string
     {
         return null;
     }
 
+    /**
+     * @return array<string, string|string[]|bool|null>
+     */
     public function getServiceConfig(): array
     {
         $id = Str::upper($this->getId());
@@ -73,13 +112,6 @@ abstract class OAuthSchema implements OAuthSchemaInterface
         return Str::title($this->getId());
     }
 
-    public function getConfigKey(): string
-    {
-        $id = Str::upper($this->getId());
-
-        return "OAUTH_{$id}_ENABLED";
-    }
-
     public function getIcon(): ?string
     {
         return null;

app/Extensions/OAuth/Providers/SteamProvider.php

@@ -1,22 +1,28 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+namespace App\Extensions\OAuth\Providers;
 
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Wizard\Step;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 use SocialiteProviders\Steam\Provider;
 
-final class SteamSchema extends OAuthSchema
+final class SteamProvider extends OAuthProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     public function getId(): string
     {
         return 'steam';
     }
 
-    public function getSocialiteProvider(): string
+    public function getProviderClass(): string
     {
         return Provider::class;
     }
@@ -67,4 +73,9 @@ final class SteamSchema extends OAuthSchema
     {
         return '#00adee';
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/OAuth/Schemas/CommonSchema.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Schemas;
-
-final class CommonSchema extends OAuthSchema
-{
-    public function __construct(
-        private readonly string $id,
-        private readonly ?string $name = null,
-        private readonly ?string $configName = null,
-        private readonly ?string $icon = null,
-        private readonly ?string $hexColor = null,
-    ) {}
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    public function getName(): string
-    {
-        return $this->name ?? parent::getName();
-    }
-
-    public function getConfigKey(): string
-    {
-        return $this->configName ?? parent::getConfigKey();
-    }
-
-    public function getIcon(): ?string
-    {
-        return $this->icon;
-    }
-
-    public function getHexColor(): ?string
-    {
-        return $this->hexColor;
-    }
-}

app/Filament/Admin/Pages/Settings.php

@@ -2,21 +2,17 @@
 
 namespace App\Filament\Admin\Pages;
 
-use App\Extensions\Avatar\AvatarService;
-use App\Extensions\Captcha\CaptchaService;
-use App\Extensions\OAuth\OAuthService;
+use App\Extensions\Avatar\AvatarProvider;
+use App\Extensions\Captcha\Providers\CaptchaProvider;
+use App\Extensions\OAuth\Providers\OAuthProvider;
 use App\Models\Backup;
 use App\Notifications\MailTested;
 use App\Traits\EnvironmentWriterTrait;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Actions;
 use Filament\Forms\Components\Actions\Action as FormAction;
 use Filament\Forms\Components\Component;
-use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Section;
@@ -37,7 +33,6 @@ use Filament\Pages\Concerns\InteractsWithHeaderActions;
 use Filament\Pages\Page;
 use Filament\Support\Enums\MaxWidth;
 use Illuminate\Http\Client\Factory;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Notification as MailNotification;
 use Illuminate\Support\Str;
@@ -47,23 +42,14 @@ use Illuminate\Support\Str;
  */
 class Settings extends Page implements HasForms
 {
-    use CanCustomizeHeaderActions, InteractsWithHeaderActions {
-        CanCustomizeHeaderActions::getHeaderActions insteadof InteractsWithHeaderActions;
-    }
-    use CanCustomizeHeaderWidgets;
     use EnvironmentWriterTrait;
     use InteractsWithForms;
+    use InteractsWithHeaderActions;
 
     protected static ?string $navigationIcon = 'tabler-settings';
 
     protected static string $view = 'filament.pages.settings';
 
-    protected OAuthService $oauthService;
-
-    protected AvatarService $avatarService;
-
-    protected CaptchaService $captchaService;
-
     /** @var array<mixed>|null */
     public ?array $data = [];
 
@@ -72,13 +58,6 @@ class Settings extends Page implements HasForms
         $this->form->fill();
     }
 
-    public function boot(OAuthService $oauthService, AvatarService $avatarService, CaptchaService $captchaService): void
-    {
-        $this->oauthService = $oauthService;
-        $this->avatarService = $avatarService;
-        $this->captchaService = $captchaService;
-    }
-
     public static function canAccess(): bool
     {
         return auth()->user()->can('view settings');
@@ -157,7 +136,8 @@ class Settings extends Page implements HasForms
                         ->placeholder('/pelican.ico'),
                 ]),
             Group::make()
-                ->columns(2)
+                ->columnSpan(2)
+                ->columns(4)
                 ->schema([
                     Toggle::make('APP_DEBUG')
                         ->label(trans('admin/setting.general.debug_mode'))
@@ -179,26 +159,13 @@ class Settings extends Page implements HasForms
                         ->formatStateUsing(fn ($state): bool => (bool) $state)
                         ->afterStateUpdated(fn ($state, Set $set) => $set('FILAMENT_TOP_NAVIGATION', (bool) $state))
                         ->default(env('FILAMENT_TOP_NAVIGATION', config('panel.filament.top-navigation'))),
-                ]),
-            Group::make()
-                ->columns(2)
-                ->schema([
                     Select::make('FILAMENT_AVATAR_PROVIDER')
                         ->label(trans('admin/setting.general.avatar_provider'))
+                        ->columnSpan(2)
                         ->native(false)
-                        ->options($this->avatarService->getMappings())
+                        ->options(collect(AvatarProvider::getAll())->mapWithKeys(fn ($provider) => [$provider->getId() => $provider->getName()]))
                         ->selectablePlaceholder(false)
                         ->default(env('FILAMENT_AVATAR_PROVIDER', config('panel.filament.avatar-provider'))),
-                    Toggle::make('FILAMENT_UPLOADABLE_AVATARS')
-                        ->label(trans('admin/setting.general.uploadable_avatars'))
-                        ->inline(false)
-                        ->onIcon('tabler-check')
-                        ->offIcon('tabler-x')
-                        ->onColor('success')
-                        ->offColor('danger')
-                        ->formatStateUsing(fn ($state) => (bool) $state)
-                        ->afterStateUpdated(fn ($state, Set $set) => $set('FILAMENT_UPLOADABLE_AVATARS', (bool) $state))
-                        ->default(env('FILAMENT_UPLOADABLE_AVATARS', config('panel.filament.uploadable-avatars'))),
                 ]),
             ToggleButtons::make('PANEL_USE_BINARY_PREFIX')
                 ->label(trans('admin/setting.general.unit_prefix'))
@@ -221,18 +188,12 @@ class Settings extends Page implements HasForms
                 ->formatStateUsing(fn ($state): int => (int) $state)
                 ->afterStateUpdated(fn ($state, Set $set) => $set('APP_2FA_REQUIRED', (int) $state))
                 ->default(env('APP_2FA_REQUIRED', config('panel.auth.2fa_required'))),
-            Select::make('FILAMENT_WIDTH')
-                ->label(trans('admin/setting.general.display_width'))
-                ->native(false)
-                ->options(MaxWidth::class)
-                ->selectablePlaceholder(false)
-                ->default(env('FILAMENT_WIDTH', config('panel.filament.display-width'))),
             TagsInput::make('TRUSTED_PROXIES')
                 ->label(trans('admin/setting.general.trusted_proxies'))
                 ->separator()
                 ->splitKeys(['Tab', ' '])
                 ->placeholder(trans('admin/setting.general.trusted_proxies_help'))
-                ->default(env('TRUSTED_PROXIES', implode(',', Arr::wrap(config('trustedproxy.proxies')))))
+                ->default(env('TRUSTED_PROXIES', implode(',', config('trustedproxy.proxies'))))
                 ->hintActions([
                     FormAction::make('clear')
                         ->label(trans('admin/setting.general.clear'))
@@ -267,6 +228,12 @@ class Settings extends Page implements HasForms
                             $set('TRUSTED_PROXIES', $ips->values()->all());
                         }),
                 ]),
+            Select::make('FILAMENT_WIDTH')
+                ->label(trans('admin/setting.general.display_width'))
+                ->native(false)
+                ->options(MaxWidth::class)
+                ->selectablePlaceholder(false)
+                ->default(env('FILAMENT_WIDTH', config('panel.filament.display-width'))),
         ];
     }
 
@@ -277,14 +244,15 @@ class Settings extends Page implements HasForms
     {
         $formFields = [];
 
-        $captchaSchemas = $this->captchaService->getAll();
-        foreach ($captchaSchemas as $schema) {
-            $id = Str::upper($schema->getId());
+        $captchaProviders = CaptchaProvider::get();
+        foreach ($captchaProviders as $captchaProvider) {
+            $id = Str::upper($captchaProvider->getId());
+            $name = Str::title($captchaProvider->getId());
 
-            $formFields[] = Section::make($schema->getName())
+            $formFields[] = Section::make($name)
                 ->columns(5)
-                ->icon($schema->getIcon() ?? 'tabler-shield')
-                ->collapsed(fn () => !$schema->isEnabled())
+                ->icon($captchaProvider->getIcon() ?? 'tabler-shield')
+                ->collapsed(fn () => !env("CAPTCHA_{$id}_ENABLED", false))
                 ->collapsible()
                 ->schema([
                     Hidden::make("CAPTCHA_{$id}_ENABLED")
@@ -295,14 +263,21 @@ class Settings extends Page implements HasForms
                             ->visible(fn (Get $get) => $get("CAPTCHA_{$id}_ENABLED"))
                             ->label(trans('admin/setting.captcha.disable'))
                             ->color('danger')
-                            ->action(fn (Set $set) => $set("CAPTCHA_{$id}_ENABLED", false)),
+                            ->action(function (Set $set) use ($id) {
+                                $set("CAPTCHA_{$id}_ENABLED", false);
+                            }),
                         FormAction::make("enable_captcha_$id")
                             ->visible(fn (Get $get) => !$get("CAPTCHA_{$id}_ENABLED"))
                             ->label(trans('admin/setting.captcha.enable'))
                             ->color('success')
-                            ->action(fn (Set $set) => $set("CAPTCHA_{$id}_ENABLED", true)),
+                            ->action(function (Set $set) use ($id, $captchaProviders) {
+                                foreach ($captchaProviders as $captchaProvider) {
+                                    $loopId = Str::upper($captchaProvider->getId());
+                                    $set("CAPTCHA_{$loopId}_ENABLED", $loopId === $id);
+                                }
+                            }),
                     ])->columnSpan(1),
-                    Group::make($schema->getSettingsForm())
+                    Group::make($captchaProvider->getSettingsForm())
                         ->visible(fn (Get $get) => $get("CAPTCHA_{$id}_ENABLED"))
                         ->columns(4)
                         ->columnSpan(4),
@@ -538,37 +513,39 @@ class Settings extends Page implements HasForms
     {
         $formFields = [];
 
-        $oauthSchemas = $this->oauthService->getAll();
-        foreach ($oauthSchemas as $schema) {
-            $id = Str::upper($schema->getId());
-            $key = $schema->getConfigKey();
+        $oauthProviders = OAuthProvider::get();
+        foreach ($oauthProviders as $oauthProvider) {
+            $id = Str::upper($oauthProvider->getId());
+            $name = Str::title($oauthProvider->getId());
 
-            $formFields[] = Section::make($schema->getName())
+            $formFields[] = Section::make($name)
                 ->columns(5)
-                ->icon($schema->getIcon() ?? 'tabler-brand-oauth')
-                ->collapsed(fn () => !env($key, false))
+                ->icon($oauthProvider->getIcon() ?? 'tabler-brand-oauth')
+                ->collapsed(fn () => !env("OAUTH_{$id}_ENABLED", false))
                 ->collapsible()
                 ->schema([
-                    Hidden::make($key)
+                    Hidden::make("OAUTH_{$id}_ENABLED")
                         ->live()
-                        ->default(env($key)),
+                        ->default(env("OAUTH_{$id}_ENABLED")),
                     Actions::make([
                         FormAction::make("disable_oauth_$id")
-                            ->visible(fn (Get $get) => $get($key))
+                            ->visible(fn (Get $get) => $get("OAUTH_{$id}_ENABLED"))
                             ->label(trans('admin/setting.oauth.disable'))
                             ->color('danger')
-                            ->action(fn (Set $set) => $set($key, false)),
+                            ->action(function (Set $set) use ($id) {
+                                $set("OAUTH_{$id}_ENABLED", false);
+                            }),
                         FormAction::make("enable_oauth_$id")
-                            ->visible(fn (Get $get) => !$get($key))
+                            ->visible(fn (Get $get) => !$get("OAUTH_{$id}_ENABLED"))
                             ->label(trans('admin/setting.oauth.enable'))
                             ->color('success')
-                            ->steps($schema->getSetupSteps())
-                            ->modalHeading(trans('admin/setting.oauth.enable') . ' ' . $schema->getName())
+                            ->steps($oauthProvider->getSetupSteps())
+                            ->modalHeading(trans('admin/setting.oauth.enable') . ' ' . $name)
                             ->modalSubmitActionLabel(trans('admin/setting.oauth.enable'))
                             ->modalCancelAction(false)
-                            ->action(function ($data, Set $set) use ($key) {
+                            ->action(function ($data, Set $set) use ($id) {
                                 $data = array_merge([
-                                    $key => 'true',
+                                    "OAUTH_{$id}_ENABLED" => 'true',
                                 ], $data);
 
                                 foreach ($data as $key => $value) {
@@ -576,8 +553,8 @@ class Settings extends Page implements HasForms
                                 }
                             }),
                     ])->columnSpan(1),
-                    Group::make($schema->getSettingsForm())
-                        ->visible(fn (Get $get) => $get($key))
+                    Group::make($oauthProvider->getSettingsForm())
+                        ->visible(fn (Get $get) => $get("OAUTH_{$id}_ENABLED"))
                         ->columns(4)
                         ->columnSpan(4),
                 ]);
@@ -639,6 +616,7 @@ class Settings extends Page implements HasForms
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
+                        ->columnSpanFull()
                         ->formatStateUsing(fn ($state): bool => (bool) $state)
                         ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_SEND_INSTALL_NOTIFICATION', (bool) $state))
                         ->default(env('PANEL_SEND_INSTALL_NOTIFICATION', config('panel.email.send_install_notification'))),
@@ -649,6 +627,7 @@ class Settings extends Page implements HasForms
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
+                        ->columnSpanFull()
                         ->formatStateUsing(fn ($state): bool => (bool) $state)
                         ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_SEND_REINSTALL_NOTIFICATION', (bool) $state))
                         ->default(env('PANEL_SEND_REINSTALL_NOTIFICATION', config('panel.email.send_reinstall_notification'))),
@@ -736,17 +715,10 @@ class Settings extends Page implements HasForms
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
-                        ->columnSpan(1)
+                        ->columnSpanFull()
                         ->formatStateUsing(fn ($state): bool => (bool) $state)
                         ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_EDITABLE_SERVER_DESCRIPTIONS', (bool) $state))
                         ->default(env('PANEL_EDITABLE_SERVER_DESCRIPTIONS', config('panel.editable_server_descriptions'))),
-                    FileUpload::make('ConsoleFonts')
-                        ->hint(trans('admin/setting.misc.server.console_font_hint'))
-                        ->label(trans('admin/setting.misc.server.console_font_upload'))
-                        ->directory('fonts')
-                        ->columnSpan(1)
-                        ->maxFiles(1)
-                        ->preserveFilenames(),
                 ]),
             Section::make(trans('admin/setting.misc.webhook.title'))
                 ->description(trans('admin/setting.misc.webhook.helper'))
@@ -775,7 +747,6 @@ class Settings extends Page implements HasForms
     {
         try {
             $data = $this->form->getState();
-            unset($data['ConsoleFonts']);
 
             // Convert bools to a string, so they are correctly written to the .env file
             $data = array_map(fn ($value) => is_bool($value) ? ($value ? 'true' : 'false') : $value, $data);
@@ -800,8 +771,7 @@ class Settings extends Page implements HasForms
         }
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             Action::make('save')

app/Filament/Admin/Resources/ApiKeyResource.php

@@ -6,16 +6,11 @@ use App\Filament\Admin\Resources\ApiKeyResource\Pages;
 use App\Filament\Admin\Resources\UserResource\Pages\EditUser;
 use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Models\ApiKey;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
-use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Actions\DeleteAction;
@@ -25,11 +20,6 @@ use Illuminate\Database\Eloquent\Builder;
 
 class ApiKeyResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-
     protected static ?string $model = ApiKey::class;
 
     protected static ?string $navigationIcon = 'tabler-key';
@@ -66,7 +56,7 @@ class ApiKeyResource extends Resource
         return trans('admin/dashboard.advanced');
     }
 
-    public static function defaultTable(Table $table): Table
+    public static function table(Table $table): Table
     {
         return $table
             ->columns([
@@ -89,7 +79,7 @@ class ApiKeyResource extends Resource
                 TextColumn::make('user.username')
                     ->label(trans('admin/apikey.table.created_by'))
                     ->icon('tabler-user')
-                    ->url(fn (ApiKey $apiKey) => auth()->user()->can('update', $apiKey->user) ? EditUser::getUrl(['record' => $apiKey->user]) : null),
+                    ->url(fn (ApiKey $apiKey) => auth()->user()->can('update user', $apiKey->user) ? EditUser::getUrl(['record' => $apiKey->user]) : null),
             ])
             ->actions([
                 DeleteAction::make(),
@@ -102,7 +92,7 @@ class ApiKeyResource extends Resource
             ]);
     }
 
-    public static function defaultForm(Form $form): Form
+    public static function form(Form $form): Form
     {
         return $form
             ->schema([
@@ -152,8 +142,7 @@ class ApiKeyResource extends Resource
             ]);
     }
 
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListApiKeys::route('/'),

app/Filament/Admin/Resources/ApiKeyResource/Pages/CreateApiKey.php

@@ -4,24 +4,16 @@ namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
 use App\Filament\Admin\Resources\ApiKeyResource;
 use App\Models\ApiKey;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 
 class CreateApiKey extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = ApiKeyResource::class;
 
     protected static bool $canCreateAnother = false;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             $this->getCreateFormAction()->formId('form'),

app/Filament/Admin/Resources/ApiKeyResource/Pages/ListApiKeys.php

@@ -4,22 +4,14 @@ namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
 use App\Filament\Admin\Resources\ApiKeyResource;
 use App\Models\ApiKey;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
 class ListApiKeys extends ListRecords
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = ApiKeyResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             CreateAction::make()

app/Filament/Admin/Resources/DatabaseHostResource.php

@@ -3,19 +3,12 @@
 namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\DatabaseHostResource\Pages;
-use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers;
 use App\Models\DatabaseHost;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Forms\Set;
-use Filament\Resources\Pages\PageRegistration;
-use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Resource;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Actions\DeleteBulkAction;
@@ -23,15 +16,9 @@ use Filament\Tables\Actions\EditAction;
 use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
 
 class DatabaseHostResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-
     protected static ?string $model = DatabaseHost::class;
 
     protected static ?string $navigationIcon = 'tabler-database';
@@ -40,7 +27,7 @@ class DatabaseHostResource extends Resource
 
     public static function getNavigationBadge(): ?string
     {
-        return (string) static::getEloquentQuery()->count() ?: null;
+        return static::getModel()::count() ?: null;
     }
 
     public static function getNavigationLabel(): string
@@ -63,7 +50,7 @@ class DatabaseHostResource extends Resource
         return trans('admin/dashboard.advanced');
     }
 
-    public static function defaultTable(Table $table): Table
+    public static function table(Table $table): Table
     {
         return $table
             ->columns([
@@ -101,7 +88,7 @@ class DatabaseHostResource extends Resource
             ]);
     }
 
-    public static function defaultForm(Form $form): Form
+    public static function form(Form $form): Form
     {
         return $form
             ->schema([
@@ -157,21 +144,12 @@ class DatabaseHostResource extends Resource
                             ->preload()
                             ->helperText(trans('admin/databasehost.linked_nodes_help'))
                             ->label(trans('admin/databasehost.linked_nodes'))
-                            ->relationship('nodes', 'name', fn (Builder $query) => $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id'))),
+                            ->relationship('nodes', 'name'),
                     ]),
             ]);
     }
 
-    /** @return class-string<RelationManager>[] */
-    public static function getDefaultRelations(): array
-    {
-        return [
-            RelationManagers\DatabasesRelationManager::class,
-        ];
-    }
-
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListDatabaseHosts::route('/'),
@@ -180,15 +158,4 @@ class DatabaseHostResource extends Resource
             'edit' => Pages\EditDatabaseHost::route('/{record}/edit'),
         ];
     }
-
-    public static function getEloquentQuery(): Builder
-    {
-        $query = parent::getEloquentQuery();
-
-        return $query->where(function (Builder $query) {
-            return $query->whereHas('nodes', function (Builder $query) {
-                $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id'));
-            })->orDoesntHave('nodes');
-        });
-    }
 }

app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php

@@ -4,8 +4,6 @@ namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Placeholder;
@@ -19,7 +17,6 @@ use Filament\Notifications\Notification;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Resources\Pages\CreateRecord\Concerns\HasWizard;
 use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
@@ -28,8 +25,6 @@ use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
 class CreateDatabaseHost extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
     use HasWizard;
 
     protected static string $resource = DatabaseHostResource::class;
@@ -150,7 +145,7 @@ class CreateDatabaseHost extends CreateRecord
                         ->preload()
                         ->helperText(trans('admin/databasehost.linked_nodes_help'))
                         ->label(trans('admin/databasehost.linked_nodes'))
-                        ->relationship('nodes', 'name', fn (Builder $query) => $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id'))),
+                        ->relationship('nodes', 'name'),
                 ]),
         ];
     }

app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php

@@ -3,12 +3,9 @@
 namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Admin\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
 use App\Models\DatabaseHost;
 use App\Services\Databases\Hosts\HostUpdateService;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
@@ -18,9 +15,6 @@ use PDOException;
 
 class EditDatabaseHost extends EditRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = DatabaseHostResource::class;
 
     private HostUpdateService $hostUpdateService;
@@ -30,8 +24,7 @@ class EditDatabaseHost extends EditRecord
         $this->hostUpdateService = $hostUpdateService;
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             DeleteAction::make()
@@ -46,6 +39,17 @@ class EditDatabaseHost extends EditRecord
         return [];
     }
 
+    public function getRelationManagers(): array
+    {
+        if (DatabasesRelationManager::canViewForRecord($this->getRecord(), static::class)) {
+            return [
+                DatabasesRelationManager::class,
+            ];
+        }
+
+        return [];
+    }
+
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
         if (!$record instanceof DatabaseHost) {

app/Filament/Admin/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php

@@ -4,22 +4,14 @@ namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Models\DatabaseHost;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
 class ListDatabaseHosts extends ListRecords
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = DatabaseHostResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             CreateAction::make()

app/Filament/Admin/Resources/DatabaseHostResource/Pages/ViewDatabaseHost.php

@@ -3,25 +3,29 @@
 namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Admin\Resources\DatabaseHostResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
+use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
 
 class ViewDatabaseHost extends ViewRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = DatabaseHostResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             EditAction::make(),
         ];
     }
+
+    public function getRelationManagers(): array
+    {
+        if (DatabasesRelationManager::canViewForRecord($this->getRecord(), static::class)) {
+            return [
+                DatabasesRelationManager::class,
+            ];
+        }
+
+        return [];
+    }
 }

app/Filament/Admin/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php

@@ -71,10 +71,10 @@ class DatabasesRelationManager extends RelationManager
             ])
             ->actions([
                 DeleteAction::make()
-                    ->authorize(fn (Database $database) => auth()->user()->can('delete', $database)),
+                    ->authorize(fn (Database $database) => auth()->user()->can('delete database', $database)),
                 ViewAction::make()
                     ->color('primary')
-                    ->hidden(fn () => !auth()->user()->can('viewAny', Database::class)),
+                    ->hidden(fn () => !auth()->user()->can('viewList database')),
             ]);
     }
 }

app/Filament/Admin/Resources/EggResource.php

@@ -3,19 +3,11 @@
 namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\EggResource\Pages;
-use App\Filament\Admin\Resources\EggResource\RelationManagers;
 use App\Models\Egg;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use Filament\Resources\Pages\PageRegistration;
-use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Resource;
 
 class EggResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-
     protected static ?string $model = Egg::class;
 
     protected static ?string $navigationIcon = 'tabler-eggs';
@@ -29,7 +21,7 @@ class EggResource extends Resource
 
     public static function getNavigationGroup(): ?string
     {
-        return config('panel.filament.top-navigation', false) ? null : trans('admin/dashboard.server');
+        return trans('admin/dashboard.server');
     }
 
     public static function getNavigationLabel(): string
@@ -52,16 +44,7 @@ class EggResource extends Resource
         return ['name', 'tags', 'uuid', 'id'];
     }
 
-    /** @return class-string<RelationManager>[] */
-    public static function getDefaultRelations(): array
-    {
-        return [
-            RelationManagers\ServersRelationManager::class,
-        ];
-    }
-
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListEggs::route('/'),

app/Filament/Admin/Resources/EggResource/Pages/CreateEgg.php

@@ -6,10 +6,6 @@ use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
 use App\Filament\Admin\Resources\EggResource;
 use App\Filament\Components\Forms\Fields\CopyFrom;
 use App\Models\EggVariable;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;
@@ -32,15 +28,11 @@ use Illuminate\Validation\Rules\Unique;
 
 class CreateEgg extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = EggResource::class;
 
     protected static bool $canCreateAnother = false;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             $this->getCreateFormAction()->formId('form'),
@@ -254,11 +246,7 @@ class CreateEgg extends CreateRecord
                                 ->native(false)
                                 ->selectablePlaceholder(false)
                                 ->default('bash')
-                                ->options([
-                                    'bash' => 'bash',
-                                    'ash' => 'ash',
-                                    '/bin/bash' => '/bin/bash',
-                                ])
+                                ->options(['bash', 'ash', '/bin/bash'])
                                 ->required(),
                             MonacoEditor::make('script_install')
                                 ->label(trans('admin/egg.script_install'))

app/Filament/Admin/Resources/EggResource/Pages/EditEgg.php

@@ -4,15 +4,12 @@ namespace App\Filament\Admin\Resources\EggResource\Pages;
 
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
 use App\Filament\Admin\Resources\EggResource;
+use App\Filament\Admin\Resources\EggResource\RelationManagers\ServersRelationManager;
 use App\Filament\Components\Actions\ExportEggAction;
 use App\Filament\Components\Actions\ImportEggAction;
 use App\Filament\Components\Forms\Fields\CopyFrom;
 use App\Models\Egg;
 use App\Models\EggVariable;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Fieldset;
@@ -34,9 +31,6 @@ use Illuminate\Validation\Rules\Unique;
 
 class EditEgg extends EditRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = EggResource::class;
 
     public function form(Form $form): Form
@@ -243,11 +237,7 @@ class EditEgg extends EditRecord
                                 ->label(trans('admin/egg.script_entry'))
                                 ->native(false)
                                 ->selectablePlaceholder(false)
-                                ->options([
-                                    'bash' => 'bash',
-                                    'ash' => 'ash',
-                                    '/bin/bash' => '/bin/bash',
-                                ])
+                                ->options(['bash', 'ash', '/bin/bash'])
                                 ->required(),
                             MonacoEditor::make('script_install')
                                 ->label(trans('admin/egg.script_install'))
@@ -261,8 +251,7 @@ class EditEgg extends EditRecord
             ]);
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             DeleteAction::make()
@@ -284,4 +273,11 @@ class EditEgg extends EditRecord
     {
         return [];
     }
+
+    public function getRelationManagers(): array
+    {
+        return [
+            ServersRelationManager::class,
+        ];
+    }
 }

app/Filament/Admin/Resources/EggResource/Pages/ListEggs.php

@@ -10,10 +10,6 @@ use App\Filament\Components\Tables\Actions\UpdateEggAction;
 use App\Filament\Components\Tables\Actions\UpdateEggBulkAction;
 use App\Filament\Components\Tables\Filters\TagsFilter;
 use App\Models\Egg;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction as CreateHeaderAction;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Actions\CreateAction;
@@ -27,9 +23,6 @@ use Illuminate\Support\Str;
 
 class ListEggs extends ListRecords
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = EggResource::class;
 
     public function table(Table $table): Table
@@ -102,8 +95,7 @@ class ListEggs extends ListRecords
             ]);
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             ImportEggHeaderAction::make()

app/Filament/Admin/Resources/EggResource/RelationManagers/ServersRelationManager.php

@@ -38,9 +38,8 @@ class ServersRelationManager extends RelationManager
                     ->label(trans('admin/server.docker_image')),
                 SelectColumn::make('allocation.id')
                     ->label(trans('admin/server.primary_allocation'))
-                    ->disabled()
-                    ->options(fn (Server $server) => $server->allocations->take(1)->mapWithKeys(fn ($allocation) => [$allocation->id => $allocation->address]))
-                    ->placeholder('None')
+                    ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->selectablePlaceholder(false)
                     ->sortable(),
             ]);
     }

app/Filament/Admin/Resources/MountResource.php

@@ -4,10 +4,6 @@ namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\MountResource\Pages;
 use App\Models\Mount;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
 use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
@@ -15,7 +11,6 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
-use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Actions\DeleteBulkAction;
@@ -23,15 +18,9 @@ use Filament\Tables\Actions\EditAction;
 use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
 
 class MountResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-
     protected static ?string $model = Mount::class;
 
     protected static ?string $navigationIcon = 'tabler-layers-linked';
@@ -55,7 +44,7 @@ class MountResource extends Resource
 
     public static function getNavigationBadge(): ?string
     {
-        return (string) static::getEloquentQuery()->count() ?: null;
+        return static::getModel()::count() ?: null;
     }
 
     public static function getNavigationGroup(): ?string
@@ -63,7 +52,7 @@ class MountResource extends Resource
         return trans('admin/dashboard.advanced');
     }
 
-    public static function defaultTable(Table $table): Table
+    public static function table(Table $table): Table
     {
         return $table
             ->columns([
@@ -86,7 +75,7 @@ class MountResource extends Resource
                     ->badge()
                     ->icon(fn ($state) => $state ? 'tabler-writing-off' : 'tabler-writing')
                     ->color(fn ($state) => $state ? 'success' : 'warning')
-                    ->formatStateUsing(fn ($state) => $state ? trans('admin/mount.toggles.read_only') : trans('admin/mount.toggles.writable')),
+                    ->formatStateUsing(fn ($state) => $state ? trans('admin/mount.toggles.read_only') : trans('admin/mount.toggles.writeable')),
             ])
             ->actions([
                 ViewAction::make()
@@ -104,7 +93,7 @@ class MountResource extends Resource
             ]);
     }
 
-    public static function defaultForm(Form $form): Form
+    public static function form(Form $form): Form
     {
         return $form
             ->schema([
@@ -158,7 +147,7 @@ class MountResource extends Resource
                             ->preload(),
                         Select::make('nodes')->multiple()
                             ->label(trans('admin/mount.nodes'))
-                            ->relationship('nodes', 'name', fn (Builder $query) => $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id')))
+                            ->relationship('nodes', 'name')
                             ->searchable(['name', 'fqdn'])
                             ->preload(),
                     ]),
@@ -172,8 +161,7 @@ class MountResource extends Resource
             ]);
     }
 
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListMounts::route('/'),
@@ -182,15 +170,4 @@ class MountResource extends Resource
             'edit' => Pages\EditMount::route('/{record}/edit'),
         ];
     }
-
-    public static function getEloquentQuery(): Builder
-    {
-        $query = parent::getEloquentQuery();
-
-        return $query->where(function (Builder $query) {
-            return $query->whereHas('nodes', function (Builder $query) {
-                $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id'));
-            })->orDoesntHave('nodes');
-        });
-    }
 }

app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php

@@ -3,25 +3,17 @@
 namespace App\Filament\Admin\Resources\MountResource\Pages;
 
 use App\Filament\Admin\Resources\MountResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
 class CreateMount extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = MountResource::class;
 
     protected static bool $canCreateAnother = false;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             $this->getCreateFormAction()->formId('form'),

app/Filament/Admin/Resources/MountResource/Pages/EditMount.php

@@ -3,22 +3,14 @@
 namespace App\Filament\Admin\Resources\MountResource\Pages;
 
 use App\Filament\Admin\Resources\MountResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
 class EditMount extends EditRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = MountResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             DeleteAction::make(),

app/Filament/Admin/Resources/MountResource/Pages/ListMounts.php

@@ -4,22 +4,14 @@ namespace App\Filament\Admin\Resources\MountResource\Pages;
 
 use App\Filament\Admin\Resources\MountResource;
 use App\Models\Mount;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
 class ListMounts extends ListRecords
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = MountResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             CreateAction::make()

app/Filament/Admin/Resources/MountResource/Pages/ViewMount.php

@@ -3,22 +3,14 @@
 namespace App\Filament\Admin\Resources\MountResource\Pages;
 
 use App\Filament\Admin\Resources\MountResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
 
 class ViewMount extends ViewRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = MountResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             EditAction::make(),

app/Filament/Admin/Resources/NodeResource.php

@@ -5,18 +5,10 @@ namespace App\Filament\Admin\Resources;
 use App\Filament\Admin\Resources\NodeResource\Pages;
 use App\Filament\Admin\Resources\NodeResource\RelationManagers;
 use App\Models\Node;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use Filament\Resources\Pages\PageRegistration;
-use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Resource;
-use Illuminate\Database\Eloquent\Builder;
 
 class NodeResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-
     protected static ?string $model = Node::class;
 
     protected static ?string $navigationIcon = 'tabler-server-2';
@@ -40,16 +32,15 @@ class NodeResource extends Resource
 
     public static function getNavigationGroup(): ?string
     {
-        return config('panel.filament.top-navigation', false) ? null : trans('admin/dashboard.server');
+        return trans('admin/dashboard.server');
     }
 
     public static function getNavigationBadge(): ?string
     {
-        return (string) static::getEloquentQuery()->count() ?: null;
+        return static::getModel()::count() ?: null;
     }
 
-    /** @return class-string<RelationManager>[] */
-    public static function getDefaultRelations(): array
+    public static function getRelations(): array
     {
         return [
             RelationManagers\AllocationsRelationManager::class,
@@ -57,8 +48,7 @@ class NodeResource extends Resource
         ];
     }
 
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListNodes::route('/'),
@@ -66,11 +56,4 @@ class NodeResource extends Resource
             'edit' => Pages\EditNode::route('/{record}/edit'),
         ];
     }
-
-    public static function getEloquentQuery(): Builder
-    {
-        $query = parent::getEloquentQuery();
-
-        return $query->whereIn('id', auth()->user()->accessibleNodes()->pluck('id'));
-    }
 }

app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php

@@ -4,12 +4,9 @@ namespace App\Filament\Admin\Resources\NodeResource\Pages;
 
 use App\Filament\Admin\Resources\NodeResource;
 use App\Models\Node;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\ToggleButtons;
@@ -23,9 +20,6 @@ use Illuminate\Support\HtmlString;
 
 class CreateNode extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = NodeResource::class;
 
     protected static bool $canCreateAnother = false;
@@ -89,14 +83,16 @@ class CreateNode extends CreateRecord
                                         return;
                                     }
 
-                                    $ip = get_ip_from_hostname($state);
-                                    if ($ip) {
+                                    $validRecords = gethostbynamel($state);
+                                    if ($validRecords) {
                                         $set('dns', true);
 
-                                        $set('ip', $ip);
-                                    } else {
-                                        $set('dns', false);
+                                        $set('ip', collect($validRecords)->first());
+
+                                        return;
                                     }
+
+                                    $set('dns', false);
                                 })
                                 ->maxLength(255),
 
@@ -127,10 +123,15 @@ class CreateNode extends CreateRecord
                                     'lg' => 1,
                                 ]),
 
-                            TextInput::make('daemon_connect')
-                                ->columnSpan(1)
-                                ->label(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port') : trans('admin/node.port'))
-                                ->helperText(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port_help') : trans('admin/node.port_help'))
+                            TextInput::make('daemon_listen')
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 1,
+                                ])
+                                ->label(trans('admin/node.port'))
+                                ->helperText(trans('admin/node.port_help'))
                                 ->minValue(1)
                                 ->maxValue(65535)
                                 ->default(8080)
@@ -148,15 +149,14 @@ class CreateNode extends CreateRecord
                                 ->required()
                                 ->maxLength(100),
 
-                            Hidden::make('scheme')
-                                ->default(fn () => request()->isSecure() ? 'https' : 'http'),
-
-                            Hidden::make('behind_proxy')
-                                ->default(false),
-
-                            ToggleButtons::make('connection')
+                            ToggleButtons::make('scheme')
                                 ->label(trans('admin/node.ssl'))
-                                ->columnSpan(1)
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 1,
+                                ])
                                 ->inline()
                                 ->helperText(function (Get $get) {
                                     if (request()->isSecure()) {
@@ -169,43 +169,20 @@ class CreateNode extends CreateRecord
 
                                     return '';
                                 })
-                                ->disableOptionWhen(fn (string $value) => $value === 'http' && request()->isSecure())
+                                ->disableOptionWhen(fn (string $value): bool => $value === 'http' && request()->isSecure())
                                 ->options([
                                     'http' => 'HTTP',
                                     'https' => 'HTTPS (SSL)',
-                                    'https_proxy' => 'HTTPS with (reverse) proxy',
                                 ])
                                 ->colors([
                                     'http' => 'warning',
                                     'https' => 'success',
-                                    'https_proxy' => 'success',
                                 ])
                                 ->icons([
                                     'http' => 'tabler-lock-open-off',
                                     'https' => 'tabler-lock',
-                                    'https_proxy' => 'tabler-shield-lock',
                                 ])
-                                ->default(fn () => request()->isSecure() ? 'https' : 'http')
-                                ->live()
-                                ->dehydrated(false)
-                                ->afterStateUpdated(function ($state, Set $set) {
-                                    $set('scheme', $state === 'http' ? 'http' : 'https');
-                                    $set('behind_proxy', $state === 'https_proxy');
-
-                                    $set('daemon_connect', $state === 'https_proxy' ? 443 : 8080);
-                                    $set('daemon_listen', 8080);
-                                }),
-
-                            TextInput::make('daemon_listen')
-                                ->columnSpan(1)
-                                ->label(trans('admin/node.listen_port'))
-                                ->helperText(trans('admin/node.listen_port_help'))
-                                ->minValue(1)
-                                ->maxValue(65535)
-                                ->default(8080)
-                                ->required()
-                                ->integer()
-                                ->visible(fn (Get $get) => $get('connection') === 'https_proxy'),
+                                ->default(fn () => request()->isSecure() ? 'https' : 'http'),
                         ]),
                     Step::make('advanced')
                         ->label(trans('admin/node.tabs.advanced_settings'))
@@ -421,13 +398,4 @@ class CreateNode extends CreateRecord
     {
         return [];
     }
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        if (!$data['behind_proxy']) {
-            $data['daemon_listen'] = $data['daemon_connect'];
-        }
-
-        return $data;
-    }
 }

app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php

@@ -8,15 +8,12 @@ use App\Repositories\Daemon\DaemonConfigurationRepository;
 use App\Services\Helpers\SoftwareVersionService;
 use App\Services\Nodes\NodeAutoDeployService;
 use App\Services\Nodes\NodeUpdateService;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Exception;
 use Filament\Actions;
 use Filament\Forms;
 use Filament\Forms\Components\Actions as FormActions;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Tabs;
 use Filament\Forms\Components\Tabs\Tab;
@@ -36,9 +33,6 @@ use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
 class EditNode extends EditRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = NodeResource::class;
 
     private DaemonConfigurationRepository $daemonConfigurationRepository;
@@ -154,14 +148,16 @@ class EditNode extends EditRecord
                                         return;
                                     }
 
-                                    $ip = get_ip_from_hostname($state);
-                                    if ($ip) {
+                                    $validRecords = gethostbynamel($state);
+                                    if ($validRecords) {
                                         $set('dns', true);
 
-                                        $set('ip', $ip);
-                                    } else {
-                                        $set('dns', false);
+                                        $set('ip', collect($validRecords)->first());
+
+                                        return;
                                     }
+
+                                    $set('dns', false);
                                 })
                                 ->maxLength(255),
                             TextInput::make('ip')
@@ -184,10 +180,10 @@ class EditNode extends EditRecord
                                     false => 'danger',
                                 ])
                                 ->columnSpan(1),
-                            TextInput::make('daemon_connect')
+                            TextInput::make('daemon_listen')
                                 ->columnSpan(1)
-                                ->label(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port') : trans('admin/node.port'))
-                                ->helperText(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port_help') : trans('admin/node.port_help'))
+                                ->label(trans('admin/node.port'))
+                                ->helperText(trans('admin/node.port_help'))
                                 ->minValue(1)
                                 ->maxValue(65535)
                                 ->default(8080)
@@ -203,9 +199,7 @@ class EditNode extends EditRecord
                                 ])
                                 ->required()
                                 ->maxLength(100),
-                            Hidden::make('scheme'),
-                            Hidden::make('behind_proxy'),
-                            ToggleButtons::make('connection')
+                            ToggleButtons::make('scheme')
                                 ->label(trans('admin/node.ssl'))
                                 ->columnSpan(1)
                                 ->inline()
@@ -220,43 +214,20 @@ class EditNode extends EditRecord
 
                                     return '';
                                 })
-                                ->disableOptionWhen(fn (string $value) => $value === 'http' && request()->isSecure())
+                                ->disableOptionWhen(fn (string $value): bool => $value === 'http' && request()->isSecure())
                                 ->options([
                                     'http' => 'HTTP',
                                     'https' => 'HTTPS (SSL)',
-                                    'https_proxy' => 'HTTPS with (reverse) proxy',
                                 ])
                                 ->colors([
                                     'http' => 'warning',
                                     'https' => 'success',
-                                    'https_proxy' => 'success',
                                 ])
                                 ->icons([
                                     'http' => 'tabler-lock-open-off',
                                     'https' => 'tabler-lock',
-                                    'https_proxy' => 'tabler-shield-lock',
                                 ])
-                                ->formatStateUsing(fn (Get $get) => $get('scheme') === 'http' ? 'http' : ($get('behind_proxy') ? 'https_proxy' : 'https'))
-                                ->live()
-                                ->dehydrated(false)
-                                ->afterStateUpdated(function ($state, Set $set) {
-                                    $set('scheme', $state === 'http' ? 'http' : 'https');
-                                    $set('behind_proxy', $state === 'https_proxy');
-
-                                    $set('daemon_connect', $state === 'https_proxy' ? 443 : 8080);
-                                    $set('daemon_listen', 8080);
-                                }),
-                            TextInput::make('daemon_listen')
-                                ->columnSpan(1)
-                                ->label(trans('admin/node.listen_port'))
-                                ->helperText(trans('admin/node.listen_port_help'))
-                                ->minValue(1)
-                                ->maxValue(65535)
-                                ->default(8080)
-                                ->required()
-                                ->integer()
-                                ->visible(fn (Get $get) => $get('connection') === 'https_proxy'),
-                        ]),
+                                ->default(fn () => request()->isSecure() ? 'https' : 'http'), ]),
                     Tab::make('adv')
                         ->label(trans('admin/node.tabs.advanced_settings'))
                         ->columns([
@@ -616,10 +587,10 @@ class EditNode extends EditRecord
         $data['config'] = $node->getYamlConfiguration();
 
         if (!is_ip($node->fqdn)) {
-            $ip = get_ip_from_hostname($node->fqdn);
-            if ($ip) {
+            $validRecords = gethostbynamel($node->fqdn);
+            if ($validRecords) {
                 $data['dns'] = true;
-                $data['ip'] = $ip;
+                $data['ip'] = collect($validRecords)->first();
             } else {
                 $data['dns'] = false;
             }
@@ -633,8 +604,7 @@ class EditNode extends EditRecord
         return [];
     }
 
-    /** @return array<Actions\Action|Actions\ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             Actions\DeleteAction::make()
@@ -644,15 +614,6 @@ class EditNode extends EditRecord
         ];
     }
 
-    protected function mutateFormDataBeforeSave(array $data): array
-    {
-        if (!$data['behind_proxy']) {
-            $data['daemon_listen'] = $data['daemon_connect'];
-        }
-
-        return $data;
-    }
-
     protected function afterSave(): void
     {
         $this->fillForm();

app/Filament/Admin/Resources/NodeResource/Pages/ListNodes.php

@@ -6,8 +6,6 @@ use App\Filament\Admin\Resources\NodeResource;
 use App\Filament\Components\Tables\Columns\NodeHealthColumn;
 use App\Filament\Components\Tables\Filters\TagsFilter;
 use App\Models\Node;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Actions\CreateAction;
@@ -18,9 +16,6 @@ use Filament\Tables\Table;
 
 class ListNodes extends ListRecords
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = NodeResource::class;
 
     public function table(Table $table): Table
@@ -78,8 +73,7 @@ class ListNodes extends ListRecords
             ]);
     }
 
-    /** @return array<Actions\Action|Actions\ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             Actions\CreateAction::make()

app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php

@@ -12,7 +12,8 @@ use Filament\Forms\Components\TextInput;
 use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables\Actions\Action;
+use Filament\Tables;
+use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\DeleteBulkAction;
 use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
@@ -31,12 +32,18 @@ class AllocationsRelationManager extends RelationManager
     public function setTitle(): string
     {
         return trans('admin/server.allocations');
+
     }
 
     public function table(Table $table): Table
     {
         return $table
-            ->recordTitleAttribute('address')
+            ->recordTitleAttribute('ip')
+
+            // Non Primary Allocations
+            // ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->id !== $allocation->server?->allocation_id)
+
+            // All assigned allocations
             ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->server_id === null)
             ->paginationPageOptions(['10', '20', '50', '100', '200', '500'])
             ->searchable()
@@ -58,33 +65,21 @@ class AllocationsRelationManager extends RelationManager
                 TextInputColumn::make('ip_alias')
                     ->searchable()
                     ->label(trans('admin/node.table.alias')),
-                TextInputColumn::make('notes')
-                    ->label(trans('admin/node.table.allocation_notes'))
-                    ->placeholder(trans('admin/node.table.no_notes')),
                 SelectColumn::make('ip')
-                    ->options(function (Allocation $allocation) {
-                        $ips = Allocation::where('port', $allocation->port)->pluck('ip');
-
-                        return collect($this->getOwnerRecord()->ipAddresses())
-                            ->diff($ips)
-                            ->unshift($allocation->ip)
-                            ->unique()
-                            ->mapWithKeys(fn (string $ip) => [$ip => $ip])
-                            ->all();
-                    })
+                    ->options(fn (Allocation $allocation) => collect($this->getOwnerRecord()->ipAddresses())->merge([$allocation->ip])->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                     ->selectablePlaceholder(false)
                     ->searchable()
                     ->label(trans('admin/node.table.ip')),
             ])
             ->headerActions([
-                Action::make('create new allocation')
+                Tables\Actions\Action::make('create new allocation')
                     ->label(trans('admin/node.create_allocation'))
                     ->form(fn () => [
                         Select::make('allocation_ip')
                             ->options(collect($this->getOwnerRecord()->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label(trans('admin/node.ip_address'))
                             ->inlineLabel()
-                            ->ip()
+                            ->ipv4()
                             ->helperText(trans('admin/node.ip_help'))
                             ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
                             ->live()
@@ -93,22 +88,27 @@ class AllocationsRelationManager extends RelationManager
                             ->label(trans('admin/node.table.alias'))
                             ->inlineLabel()
                             ->default(null)
-                            ->helperText(trans('admin/node.alias_help')),
+                            ->helperText(trans('admin/node.alias_help'))
+                            ->required(false),
                         TagsInput::make('allocation_ports')
                             ->placeholder('27015, 27017-27019')
                             ->label(trans('admin/node.ports'))
                             ->inlineLabel()
                             ->live()
                             ->disabled(fn (Get $get) => empty($get('allocation_ip')))
-                            ->afterStateUpdated(fn ($state, Set $set, Get $get) => $set('allocation_ports', CreateServer::retrieveValidPorts($this->getOwnerRecord(), $state, $get('allocation_ip'))))
+                            ->afterStateUpdated(fn ($state, Set $set, Get $get) => $set('allocation_ports',
+                                CreateServer::retrieveValidPorts($this->getOwnerRecord(), $state, $get('allocation_ip')))
+                            )
                             ->splitKeys(['Tab', ' ', ','])
                             ->required(),
                     ])
                     ->action(fn (array $data, AssignmentService $service) => $service->handle($this->getOwnerRecord(), $data)),
             ])
-            ->groupedBulkActions([
-                DeleteBulkAction::make()
-                    ->authorize(fn () => auth()->user()->can('update', $this->getOwnerRecord())),
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()
+                        ->authorize(fn () => auth()->user()->can('update node')),
+                ]),
             ]);
     }
 }

app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php

@@ -43,10 +43,8 @@ class NodesRelationManager extends RelationManager
                     ->sortable(),
                 SelectColumn::make('allocation.id')
                     ->label(trans('admin/node.primary_allocation'))
-                    ->disabled(fn (Server $server) => $server->allocations->count() <= 1)
-                    ->options(fn (Server $server) => $server->allocations->take(1)->mapWithKeys(fn ($allocation) => [$allocation->id => $allocation->address]))
-                    ->selectablePlaceholder(fn (SelectColumn $select) => !$select->isDisabled())
-                    ->placeholder('None')
+                    ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->selectablePlaceholder(false)
                     ->sortable(),
                 TextColumn::make('memory')->label(trans('admin/node.memory'))->icon('tabler-device-desktop-analytics'),
                 TextColumn::make('cpu')->label(trans('admin/node.cpu'))->icon('tabler-cpu'),

app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php

@@ -3,6 +3,7 @@
 namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
+use Carbon\Carbon;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\Number;
@@ -15,34 +16,22 @@ class NodeCpuChart extends ChartWidget
 
     public Node $node;
 
-    /**
-     * @var array<int, array{cpu: string, timestamp: string}>
-     */
-    protected array $cpuHistory = [];
-
-    protected int $threads = 0;
-
     protected function getData(): array
     {
-        $sessionKey = "node_stats.{$this->node->id}";
+        $threads = $this->node->systemInformation()['cpu_count'] ?? 0;
 
-        $data = $this->node->statistics();
-
-        $this->threads = session("{$sessionKey}.threads", $this->node->systemInformation()['cpu_count'] ?? 0);
-
-        $this->cpuHistory = session("{$sessionKey}.cpu_history", []);
-        $this->cpuHistory[] = [
-            'cpu' => round($data['cpu_percent'] * $this->threads, 2),
-            'timestamp' => now(auth()->user()->timezone ?? 'UTC')->format('H:i:s'),
-        ];
-
-        $this->cpuHistory = array_slice($this->cpuHistory, -60);
-        session()->put("{$sessionKey}.cpu_history", $this->cpuHistory);
+        $cpu = collect(cache()->get("nodes.{$this->node->id}.cpu_percent"))
+            ->slice(-10)
+            ->map(fn ($value, $key) => [
+                'cpu' => Number::format($value * $threads, maxPrecision: 2),
+                'timestamp' => Carbon::createFromTimestamp($key, auth()->user()->timezone ?? 'UTC')->format('H:i:s'),
+            ])
+            ->all();
 
         return [
             'datasets' => [
                 [
-                    'data' => array_column($this->cpuHistory, 'cpu'),
+                    'data' => array_column($cpu, 'cpu'),
                     'backgroundColor' => [
                         'rgba(96, 165, 250, 0.3)',
                     ],
@@ -50,7 +39,7 @@ class NodeCpuChart extends ChartWidget
                     'fill' => true,
                 ],
             ],
-            'labels' => array_column($this->cpuHistory, 'timestamp'),
+            'labels' => array_column($cpu, 'timestamp'),
             'locale' => auth()->user()->language ?? 'en',
         ];
     }
@@ -80,10 +69,10 @@ class NodeCpuChart extends ChartWidget
 
     public function getHeading(): string
     {
-        $data = array_slice(end($this->cpuHistory), -60);
+        $threads = $this->node->systemInformation()['cpu_count'] ?? 0;
 
-        $cpu = Number::format($data['cpu'], maxPrecision: 2, locale: auth()->user()->language);
-        $max = Number::format($this->threads * 100, locale: auth()->user()->language);
+        $cpu = Number::format(collect(cache()->get("nodes.{$this->node->id}.cpu_percent"))->last() * $threads, maxPrecision: 2, locale: auth()->user()->language);
+        $max = Number::format($threads * 100, locale: auth()->user()->language);
 
         return trans('admin/node.cpu_chart', ['cpu' => $cpu, 'max' => $max]);
     }

app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php

@@ -3,6 +3,7 @@
 namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
+use Carbon\Carbon;
 use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Support\Number;
@@ -15,36 +16,19 @@ class NodeMemoryChart extends ChartWidget
 
     public Node $node;
 
-    /**
-     * @var array<int, array{memory: string, timestamp: string}>
-     */
-    protected array $memoryHistory = [];
-
-    protected int $totalMemory = 0;
-
     protected function getData(): array
     {
-        $sessionKey = "node_stats.{$this->node->id}";
-
-        $data = $this->node->statistics();
-
-        $this->totalMemory = session("{$sessionKey}.total_memory", $data['memory_total']);
-
-        $this->memoryHistory = session("{$sessionKey}.memory_history", []);
-        $this->memoryHistory[] = [
-            'memory' => round(config('panel.use_binary_prefix')
-                ? $data['memory_used'] / 1024 / 1024 / 1024
-                : $data['memory_used'] / 1000 / 1000 / 1000, 2),
-            'timestamp' => now(auth()->user()->timezone ?? 'UTC')->format('H:i:s'),
-        ];
-
-        $this->memoryHistory = array_slice($this->memoryHistory, -60);
-        session()->put("{$sessionKey}.memory_history", $this->memoryHistory);
+        $memUsed = collect(cache()->get("nodes.{$this->node->id}.memory_used"))->slice(-10)
+            ->map(fn ($value, $key) => [
+                'memory' => Number::format(config('panel.use_binary_prefix') ? $value / 1024 / 1024 / 1024 : $value / 1000 / 1000 / 1000, maxPrecision: 2),
+                'timestamp' => Carbon::createFromTimestamp($key, auth()->user()->timezone ?? 'UTC')->format('H:i:s'),
+            ])
+            ->all();
 
         return [
             'datasets' => [
                 [
-                    'data' => array_column($this->memoryHistory, 'memory'),
+                    'data' => array_column($memUsed, 'memory'),
                     'backgroundColor' => [
                         'rgba(96, 165, 250, 0.3)',
                     ],
@@ -52,7 +36,7 @@ class NodeMemoryChart extends ChartWidget
                     'fill' => true,
                 ],
             ],
-            'labels' => array_column($this->memoryHistory, 'timestamp'),
+            'labels' => array_column($memUsed, 'timestamp'),
             'locale' => auth()->user()->language ?? 'en',
         ];
     }
@@ -82,15 +66,16 @@ class NodeMemoryChart extends ChartWidget
 
     public function getHeading(): string
     {
-        $latestMemoryUsed = array_slice(end($this->memoryHistory), -60);
+        $latestMemoryUsed = collect(cache()->get("nodes.{$this->node->id}.memory_used"))->last();
+        $totalMemory = collect(cache()->get("nodes.{$this->node->id}.memory_total"))->last();
 
         $used = config('panel.use_binary_prefix')
-            ? Number::format($latestMemoryUsed['memory'], maxPrecision: 2, locale: auth()->user()->language) .' GiB'
-            : Number::format($latestMemoryUsed['memory'], maxPrecision: 2, locale: auth()->user()->language) . ' GB';
+            ? Number::format($latestMemoryUsed / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
+            : Number::format($latestMemoryUsed / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
 
         $total = config('panel.use_binary_prefix')
-            ? Number::format($this->totalMemory / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
-            : Number::format($this->totalMemory / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
+            ? Number::format($totalMemory / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
+            : Number::format($totalMemory / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
 
         return trans('admin/node.memory_chart', ['used' => $used, 'total' => $total]);
     }

app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php

@@ -4,6 +4,7 @@ namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
 use Filament\Widgets\ChartWidget;
+use Illuminate\Support\Number;
 
 class NodeStorageChart extends ChartWidget
 {
@@ -45,8 +46,8 @@ class NodeStorageChart extends ChartWidget
 
         $unused = $total - $used;
 
-        $used = round($used, 2);
-        $unused = round($unused, 2);
+        $used = Number::format($used, maxPrecision: 2);
+        $unused = Number::format($unused, maxPrecision: 2);
 
         return [
             'datasets' => [

app/Filament/Admin/Resources/RoleResource.php

@@ -4,21 +4,15 @@ namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\RoleResource\Pages;
 use App\Models\Role;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
-use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Actions\DeleteBulkAction;
@@ -31,11 +25,6 @@ use Spatie\Permission\Contracts\Permission;
 
 class RoleResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-
     protected static ?string $model = Role::class;
 
     protected static ?string $navigationIcon = 'tabler-users-group';
@@ -59,7 +48,7 @@ class RoleResource extends Resource
 
     public static function getNavigationGroup(): ?string
     {
-        return config('panel.filament.top-navigation', false) ? trans('admin/dashboard.advanced') : trans('admin/dashboard.user');
+        return trans('admin/dashboard.user');
     }
 
     public static function getNavigationBadge(): ?string
@@ -67,7 +56,7 @@ class RoleResource extends Resource
         return static::getModel()::count() ?: null;
     }
 
-    public static function defaultTable(Table $table): Table
+    public static function table(Table $table): Table
     {
         return $table
             ->columns([
@@ -80,11 +69,6 @@ class RoleResource extends Resource
                     ->badge()
                     ->counts('permissions')
                     ->formatStateUsing(fn (Role $role, $state) => $role->isRootAdmin() ? trans('admin/role.all') : $state),
-                TextColumn::make('nodes.name')
-                    ->icon('tabler-server-2')
-                    ->label(trans('admin/role.nodes'))
-                    ->badge()
-                    ->placeholder(trans('admin/role.all')),
                 TextColumn::make('users_count')
                     ->label(trans('admin/role.users'))
                     ->counts('users')
@@ -107,7 +91,7 @@ class RoleResource extends Resource
             ]);
     }
 
-    public static function defaultForm(Form $form): Form
+    public static function form(Form $form): Form
     {
         $permissionSections = [];
 
@@ -141,14 +125,6 @@ class RoleResource extends Resource
                     ->label(trans('admin/role.permissions'))
                     ->content(trans('admin/role.root_admin', ['role' => Role::ROOT_ADMIN]))
                     ->visible(fn (Get $get) => $get('name') === Role::ROOT_ADMIN),
-                Select::make('nodes')
-                    ->label(trans('admin/role.nodes'))
-                    ->multiple()
-                    ->relationship('nodes', 'name')
-                    ->searchable(['name', 'fqdn'])
-                    ->preload()
-                    ->hint(trans('admin/role.nodes_hint'))
-                    ->hidden(fn (Get $get) => $get('name') === Role::ROOT_ADMIN),
             ]);
     }
 
@@ -157,8 +133,6 @@ class RoleResource extends Resource
      */
     private static function makeSection(string $model, array $options): Section
     {
-        $model = ucwords($model);
-
         $icon = null;
 
         if (class_exists('\App\Filament\Admin\Resources\\' . $model . 'Resource')) {
@@ -210,8 +184,7 @@ class RoleResource extends Resource
             ]);
     }
 
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListRoles::route('/'),

app/Filament/Admin/Resources/RoleResource/Pages/CreateRole.php

@@ -4,10 +4,6 @@ namespace App\Filament\Admin\Resources\RoleResource\Pages;
 
 use App\Filament\Admin\Resources\RoleResource;
 use App\Models\Role;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -18,17 +14,13 @@ use Spatie\Permission\Models\Permission;
  */
 class CreateRole extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     public Collection $permissions;
 
     protected static string $resource = RoleResource::class;
 
     protected static bool $canCreateAnother = false;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             $this->getCreateFormAction()->formId('form'),

app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php

@@ -4,10 +4,6 @@ namespace App\Filament\Admin\Resources\RoleResource\Pages;
 
 use App\Filament\Admin\Resources\RoleResource;
 use App\Models\Role;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Support\Arr;
@@ -19,9 +15,6 @@ use Spatie\Permission\Models\Permission;
  */
 class EditRole extends EditRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = RoleResource::class;
 
     public Collection $permissions;
@@ -52,8 +45,7 @@ class EditRole extends EditRecord
         $this->record->syncPermissions($permissionModels);
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             DeleteAction::make()

app/Filament/Admin/Resources/RoleResource/Pages/ListRoles.php

@@ -3,22 +3,14 @@
 namespace App\Filament\Admin\Resources\RoleResource\Pages;
 
 use App\Filament\Admin\Resources\RoleResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
 class ListRoles extends ListRecords
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = RoleResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             CreateAction::make(),

app/Filament/Admin/Resources/RoleResource/Pages/ViewRole.php

@@ -3,22 +3,14 @@
 namespace App\Filament\Admin\Resources\RoleResource\Pages;
 
 use App\Filament\Admin\Resources\RoleResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
 
 class ViewRole extends ViewRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = RoleResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             EditAction::make(),

app/Filament/Admin/Resources/ServerResource.php

@@ -3,23 +3,11 @@
 namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\ServerResource\Pages;
-use App\Filament\Admin\Resources\ServerResource\RelationManagers;
-use App\Models\Mount;
 use App\Models\Server;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Forms\Get;
-use Filament\Resources\Pages\PageRegistration;
-use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Resource;
-use Illuminate\Database\Eloquent\Builder;
 
 class ServerResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-
     protected static ?string $model = Server::class;
 
     protected static ?string $navigationIcon = 'tabler-brand-docker';
@@ -43,47 +31,15 @@ class ServerResource extends Resource
 
     public static function getNavigationGroup(): ?string
     {
-        return config('panel.filament.top-navigation', false) ? null : trans('admin/dashboard.server');
+        return trans('admin/dashboard.server');
     }
 
     public static function getNavigationBadge(): ?string
     {
-        return (string) static::getEloquentQuery()->count() ?: null;
+        return static::getModel()::count() ?: null;
     }
 
-    public static function getMountCheckboxList(Get $get): CheckboxList
-    {
-        $allowedMounts = Mount::all();
-        $node = $get('node_id');
-        $egg = $get('egg_id');
-
-        if ($node && $egg) {
-            $allowedMounts = $allowedMounts->filter(fn (Mount $mount) => ($mount->nodes->isEmpty() || $mount->nodes->contains($node)) &&
-                ($mount->eggs->isEmpty() || $mount->eggs->contains($egg))
-            );
-        }
-
-        return CheckboxList::make('mounts')
-            ->label('')
-            ->relationship('mounts')
-            ->live()
-            ->options(fn () => $allowedMounts->mapWithKeys(fn ($mount) => [$mount->id => $mount->name]))
-            ->descriptions(fn () => $allowedMounts->mapWithKeys(fn ($mount) => [$mount->id => "$mount->source -> $mount->target"]))
-            ->helperText(fn () => $allowedMounts->isEmpty() ? trans('admin/server.no_mounts') : null)
-            ->bulkToggleable()
-            ->columnSpanFull();
-    }
-
-    /** @return class-string<RelationManager>[] */
-    public static function getDefaultRelations(): array
-    {
-        return [
-            RelationManagers\AllocationsRelationManager::class,
-        ];
-    }
-
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListServers::route('/'),
@@ -91,11 +47,4 @@ class ServerResource extends Resource
             'edit' => Pages\EditServer::route('/{record}/edit'),
         ];
     }
-
-    public static function getEloquentQuery(): Builder
-    {
-        $query = parent::getEloquentQuery();
-
-        return $query->whereIn('node_id', auth()->user()->accessibleNodes()->pluck('id'));
-    }
 }

app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php

@@ -11,12 +11,11 @@ use App\Services\Allocations\AssignmentService;
 use App\Services\Servers\RandomWordService;
 use App\Services\Servers\ServerCreationService;
 use App\Services\Users\UserCreationService;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Closure;
 use Exception;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Grid;
@@ -47,9 +46,6 @@ use LogicException;
 
 class CreateServer extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = ServerResource::class;
 
     protected static bool $canCreateAnother = false;
@@ -113,27 +109,21 @@ class CreateServer extends CreateRecord
                                 ->disabledOn('edit')
                                 ->prefixIcon('tabler-server-2')
                                 ->selectablePlaceholder(false)
-                                ->default(function () {
-                                    /** @var ?Node $latestNode */
-                                    $latestNode = auth()->user()->accessibleNodes()->latest()->first();
-                                    $this->node = $latestNode;
-
-                                    return $this->node?->id;
-                                })
+                                ->default(fn () => ($this->node = Node::query()->latest()->first())?->id)
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 2,
                                     'md' => 2,
                                 ])
                                 ->live()
-                                ->relationship('node', 'name', fn (Builder $query) => $query->whereIn('id', auth()->user()->accessibleNodes()->pluck('id')))
+                                ->relationship('node', 'name')
                                 ->searchable()
-                                ->required()
                                 ->preload()
                                 ->afterStateUpdated(function (Set $set, $state) {
                                     $set('allocation_id', null);
                                     $this->node = Node::find($state);
-                                }),
+                                })
+                                ->required(),
 
                             Select::make('owner_id')
                                 ->preload()
@@ -149,7 +139,6 @@ class CreateServer extends CreateRecord
                                 ->relationship('user', 'username')
                                 ->searchable(['username', 'email'])
                                 ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->username ($user->email)")
-                                ->createOptionAction(fn (Action $action) => $action->authorize(fn () => auth()->user()->can('create', User::class)))
                                 ->createOptionForm([
                                     TextInput::make('username')
                                         ->label(trans('admin/user.username'))
@@ -194,7 +183,10 @@ class CreateServer extends CreateRecord
                                     $set('allocation_additional', null);
                                     $set('allocation_additional.needstobeastringhere.extra_allocations', null);
                                 })
-                                ->getOptionLabelFromRecordUsing(fn (Allocation $allocation) => $allocation->address ?? '')
+                                ->getOptionLabelFromRecordUsing(
+                                    fn (Allocation $allocation) => "$allocation->ip:$allocation->port" .
+                                        ($allocation->ip_alias ? " ($allocation->ip_alias)" : '')
+                                )
                                 ->placeholder(function (Get $get) {
                                     $node = Node::find($get('node_id'));
 
@@ -211,7 +203,6 @@ class CreateServer extends CreateRecord
                                         ->where('node_id', $get('node_id'))
                                         ->whereNull('server_id'),
                                 )
-                                ->createOptionAction(fn (Action $action) => $action->authorize(fn (Get $get) => auth()->user()->can('create', Node::find($get('node_id')))))
                                 ->createOptionForm(function (Get $get) {
                                     $getPage = $get;
 
@@ -221,7 +212,7 @@ class CreateServer extends CreateRecord
                                             ->label(trans('admin/server.ip_address'))->inlineLabel()
                                             ->helperText(trans('admin/server.ip_address_helper'))
                                             ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
-                                            ->ip()
+                                            ->ipv4()
                                             ->live()
                                             ->required(),
                                         TextInput::make('allocation_alias')
@@ -248,7 +239,9 @@ class CreateServer extends CreateRecord
                                     return collect(
                                         $assignmentService->handle(Node::find($get('node_id')), $data)
                                     )->first();
-                                }),
+                                })
+                                ->required(),
+
                             Repeater::make('allocation_additional')
                                 ->label(trans('admin/server.additional_allocations'))
                                 ->columnSpan([
@@ -268,9 +261,12 @@ class CreateServer extends CreateRecord
                                         ->prefixIcon('tabler-network')
                                         ->label('Additional Allocations')
                                         ->columnSpan(2)
-                                        ->disabled(fn (Get $get) => $get('../../allocation_id') === null || $get('../../node_id') === null)
+                                        ->disabled(fn (Get $get) => $get('../../node_id') === null)
                                         ->searchable(['ip', 'port', 'ip_alias'])
-                                        ->getOptionLabelFromRecordUsing(fn (Allocation $allocation) => $allocation->address)
+                                        ->getOptionLabelFromRecordUsing(
+                                            fn (Allocation $allocation) => "$allocation->ip:$allocation->port" .
+                                                ($allocation->ip_alias ? " ($allocation->ip_alias)" : '')
+                                        )
                                         ->placeholder(trans('admin/server.select_additional'))
                                         ->disableOptionsWhenSelectedInSiblingRepeaterItems()
                                         ->relationship(
@@ -430,7 +426,7 @@ class CreateServer extends CreateRecord
 
                                     Repeater::make('server_variables')
                                         ->label('')
-                                        ->relationship('serverVariables', fn (Builder $query) => $query->orderByPowerJoins('variable.sort'))
+                                        ->relationship('serverVariables')
                                         ->saveRelationshipsBeforeChildrenUsing(null)
                                         ->saveRelationshipsUsing(null)
                                         ->grid(2)
@@ -443,7 +439,6 @@ class CreateServer extends CreateRecord
 
                                             $text = TextInput::make('variable_value')
                                                 ->hidden($this->shouldHideComponent(...))
-                                                ->dehydratedWhenHidden()
                                                 ->required(fn (Get $get) => in_array('required', $get('rules')))
                                                 ->rules(
                                                     fn (Get $get): Closure => function (string $attribute, $value, Closure $fail) use ($get) {
@@ -461,7 +456,6 @@ class CreateServer extends CreateRecord
 
                                             $select = Select::make('variable_value')
                                                 ->hidden($this->shouldHideComponent(...))
-                                                ->dehydratedWhenHidden()
                                                 ->options($this->getSelectOptionsFromRules(...))
                                                 ->selectablePlaceholder(false);
 
@@ -750,7 +744,7 @@ class CreateServer extends CreateRecord
                                     'lg' => 4,
                                 ])
                                 ->columnSpan(6)
-                                ->schema(fn (Get $get) => [
+                                ->schema([
                                     Select::make('select_image')
                                         ->label(trans('admin/server.image_name'))
                                         ->live()
@@ -798,13 +792,19 @@ class CreateServer extends CreateRecord
                                         ]),
 
                                     KeyValue::make('docker_labels')
-                                        ->live()
                                         ->label('Container Labels')
                                         ->keyLabel(trans('admin/server.title'))
                                         ->valueLabel(trans('admin/server.description'))
                                         ->columnSpanFull(),
 
-                                    ServerResource::getMountCheckboxList($get),
+                                    CheckboxList::make('mounts')
+                                        ->label('Mounts')
+                                        ->live()
+                                        ->relationship('mounts')
+                                        ->options(fn () => $this->node?->mounts->mapWithKeys(fn ($mount) => [$mount->id => $mount->name]) ?? [])
+                                        ->descriptions(fn () => $this->node?->mounts->mapWithKeys(fn ($mount) => [$mount->id => "$mount->source -> $mount->target"]) ?? [])
+                                        ->helperText(fn () => $this->node?->mounts->isNotEmpty() ? '' : 'No Mounts exist for this Node')
+                                        ->columnSpanFull(),
                                 ]),
                         ]),
                 ])
@@ -833,9 +833,7 @@ class CreateServer extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        if ($allocation_additional = array_get($data, 'allocation_additional')) {
-            $data['allocation_additional'] = collect($allocation_additional)->filter()->all();
-        }
+        $data['allocation_additional'] = collect($data['allocation_additional'])->filter()->all();
 
         try {
             return $this->serverCreationService->handle($data);

app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php

@@ -2,9 +2,10 @@
 
 namespace App\Filament\Admin\Resources\ServerResource\Pages;
 
-use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
+use App\Enums\ServerState;
 use App\Enums\SuspendAction;
 use App\Filament\Admin\Resources\ServerResource;
+use App\Filament\Admin\Resources\ServerResource\RelationManagers\AllocationsRelationManager;
 use App\Filament\Components\Forms\Actions\PreviewStartupAction;
 use App\Filament\Components\Forms\Actions\RotateDatabasePasswordAction;
 use App\Filament\Server\Pages\Console;
@@ -12,6 +13,7 @@ use App\Models\Allocation;
 use App\Models\Database;
 use App\Models\DatabaseHost;
 use App\Models\Egg;
+use App\Models\Mount;
 use App\Models\Node;
 use App\Models\Server;
 use App\Models\ServerVariable;
@@ -25,14 +27,13 @@ use App\Services\Servers\ServerDeletionService;
 use App\Services\Servers\SuspensionService;
 use App\Services\Servers\ToggleInstallService;
 use App\Services\Servers\TransferServerService;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Closure;
 use Exception;
 use Filament\Actions;
 use Filament\Forms;
 use Filament\Forms\Components\Actions as FormActions;
 use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Grid;
@@ -52,7 +53,6 @@ use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Enums\Alignment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Arr;
@@ -63,9 +63,6 @@ use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
 class EditServer extends EditRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = ServerResource::class;
 
     private DaemonServerRepository $daemonServerRepository;
@@ -140,39 +137,7 @@ class EditServer extends EditRecord
                                         'sm' => 1,
                                         'md' => 1,
                                         'lg' => 1,
-                                    ])
-                                    ->hintAction(
-                                        Action::make('view_install_log')
-                                            ->label(trans('admin/server.view_install_log'))
-                                            //->visible(fn (Server $server) => $server->isFailedInstall())
-                                            ->modalHeading('')
-                                            ->modalSubmitAction(false)
-                                            ->modalFooterActionsAlignment(Alignment::Right)
-                                            ->modalCancelActionLabel(trans('filament::components/modal.actions.close.label'))
-                                            ->form([
-                                                MonacoEditor::make('logs')
-                                                    ->hiddenLabel()
-                                                    ->placeholderText(trans('admin/server.no_log'))
-                                                    ->formatStateUsing(function (Server $server, DaemonServerRepository $serverRepository) {
-                                                        try {
-                                                            return $serverRepository->setServer($server)->getInstallLogs();
-                                                        } catch (ConnectionException) {
-                                                            Notification::make()
-                                                                ->title(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
-                                                                ->body(trans('admin/server.notifications.log_failed'))
-                                                                ->color('warning')
-                                                                ->warning()
-                                                                ->send();
-                                                        } catch (Exception) {
-                                                            return '';
-                                                        }
-
-                                                        return '';
-                                                    })
-                                                    ->language('shell')
-                                                    ->view('filament.plugins.monaco-editor-logs'),
-                                            ])
-                                    ),
+                                    ]),
 
                                 Textarea::make('description')
                                     ->label(trans('admin/server.description'))
@@ -212,7 +177,7 @@ class EditServer extends EditRecord
                                     ->maxLength(255),
                                 Select::make('node_id')
                                     ->label(trans('admin/server.node'))
-                                    ->relationship('node', 'name', fn (Builder $query) => $query->whereIn('id', auth()->user()->accessibleNodes()->pluck('id')))
+                                    ->relationship('node', 'name')
                                     ->columnSpan([
                                         'default' => 2,
                                         'sm' => 1,
@@ -521,7 +486,6 @@ class EditServer extends EditRecord
                                             ]),
 
                                         KeyValue::make('docker_labels')
-                                            ->live()
                                             ->label(trans('admin/server.container_labels'))
                                             ->keyLabel(trans('admin/server.title'))
                                             ->valueLabel(trans('admin/server.description'))
@@ -631,7 +595,9 @@ class EditServer extends EditRecord
                                             ]);
                                         }
 
-                                        return $query->orderByPowerJoins('variable.sort');
+                                        return $query
+                                            ->join('egg_variables', 'server_variables.variable_id', '=', 'egg_variables.id')
+                                            ->orderBy('egg_variables.sort');
                                     })
                                     ->grid()
                                     ->mutateRelationshipDataBeforeSaveUsing(function (array &$data): array {
@@ -648,7 +614,6 @@ class EditServer extends EditRecord
 
                                         $text = TextInput::make('variable_value')
                                             ->hidden($this->shouldHideComponent(...))
-                                            ->dehydratedWhenHidden()
                                             ->required(fn (ServerVariable $serverVariable) => $serverVariable->variable->getRequiredAttribute())
                                             ->rules([
                                                 fn (ServerVariable $serverVariable): Closure => function (string $attribute, $value, Closure $fail) use ($serverVariable) {
@@ -666,7 +631,6 @@ class EditServer extends EditRecord
 
                                         $select = Select::make('variable_value')
                                             ->hidden($this->shouldHideComponent(...))
-                                            ->dehydratedWhenHidden()
                                             ->options($this->getSelectOptionsFromRules(...))
                                             ->selectablePlaceholder(false);
 
@@ -688,11 +652,17 @@ class EditServer extends EditRecord
                             ]),
                         Tab::make(trans('admin/server.mounts'))
                             ->icon('tabler-layers-linked')
-                            ->schema(fn (Get $get) => [
-                                ServerResource::getMountCheckboxList($get),
+                            ->schema([
+                                CheckboxList::make('mounts')
+                                    ->label('')
+                                    ->relationship('mounts')
+                                    ->options(fn (Server $server) => $server->node->mounts->filter(fn (Mount $mount) => $mount->eggs->contains($server->egg))->mapWithKeys(fn (Mount $mount) => [$mount->id => $mount->name]))
+                                    ->descriptions(fn (Server $server) => $server->node->mounts->mapWithKeys(fn (Mount $mount) => [$mount->id => "$mount->source -> $mount->target"]))
+                                    ->helperText(fn (Server $server) => $server->node->mounts->isNotEmpty() ? '' : trans('admin/server.no_mounts'))
+                                    ->columnSpanFull(),
                             ]),
                         Tab::make(trans('admin/server.databases'))
-                            ->hidden(fn () => !auth()->user()->can('viewAny', Database::class))
+                            ->hidden(fn () => !auth()->user()->can('viewList database'))
                             ->icon('tabler-database')
                             ->columns(4)
                             ->schema([
@@ -716,14 +686,14 @@ class EditServer extends EditRecord
                                             ->hintAction(
                                                 Action::make('Delete')
                                                     ->label(trans('filament-actions::delete.single.modal.actions.delete.label'))
-                                                    ->authorize(fn (Database $database) => auth()->user()->can('delete', $database))
+                                                    ->authorize(fn (Database $database) => auth()->user()->can('delete database', $database))
                                                     ->color('danger')
                                                     ->icon('tabler-trash')
                                                     ->requiresConfirmation()
                                                     ->modalIcon('tabler-database-x')
                                                     ->modalHeading(trans('admin/server.delete_db_heading'))
-                                                    ->modalSubmitActionLabel(trans('filament-actions::delete.single.label'))
-                                                    ->modalDescription(fn (Get $get) => trans('admin/server.delete_db', ['name' => $get('database')]))
+                                                    ->modalSubmitActionLabel(fn (Get $get) => 'Delete ' . $get('database') . '?')
+                                                    ->modalDescription(fn (Get $get) => trans('admin/server.delete_db') . $get('database') . '?')
                                                     ->action(function (DatabaseManagementService $databaseManagementService, $record) {
                                                         $databaseManagementService->delete($record);
                                                         $this->fillForm();
@@ -769,7 +739,7 @@ class EditServer extends EditRecord
                                     ->columnSpan(4),
                                 FormActions::make([
                                     Action::make('createDatabase')
-                                        ->authorize(fn () => auth()->user()->can('create', Database::class))
+                                        ->authorize(fn () => auth()->user()->can('create database'))
                                         ->disabled(fn () => DatabaseHost::query()->count() < 1)
                                         ->label(fn () => DatabaseHost::query()->count() < 1 ? trans('admin/server.no_db_hosts') : trans('admin/server.create_database'))
                                         ->color(fn () => DatabaseHost::query()->count() < 1 ? 'danger' : 'primary')
@@ -839,12 +809,12 @@ class EditServer extends EditRecord
                                                     Action::make('toggleInstall')
                                                         ->label(trans('admin/server.toggle_install'))
                                                         ->disabled(fn (Server $server) => $server->isSuspended())
-                                                        ->modal(fn (Server $server) => $server->isFailedInstall())
+                                                        ->modal(fn (Server $server) => $server->status === ServerState::InstallFailed)
                                                         ->modalHeading(trans('admin/server.toggle_install_failed_header'))
                                                         ->modalDescription(trans('admin/server.toggle_install_failed_desc'))
                                                         ->modalSubmitActionLabel(trans('admin/server.reinstall'))
                                                         ->action(function (ToggleInstallService $toggleService, ReinstallServerService $reinstallService, Server $server) {
-                                                            if ($server->isFailedInstall()) {
+                                                            if ($server->status === ServerState::InstallFailed) {
                                                                 try {
                                                                     $reinstallService->handle($server);
 
@@ -857,7 +827,7 @@ class EditServer extends EditRecord
                                                                 } catch (Exception) {
                                                                     Notification::make()
                                                                         ->title(trans('admin/server.notifications.reinstall_failed'))
-                                                                        ->body(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
+                                                                        ->body(trans('admin/server.error_connecting', ['node' => $server->node->name]))
                                                                         ->danger()
                                                                         ->send();
                                                                 }
@@ -906,7 +876,7 @@ class EditServer extends EditRecord
                                                                 Notification::make()
                                                                     ->warning()
                                                                     ->title(trans('admin/server.notifications.server_suspension'))
-                                                                    ->body(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
+                                                                    ->body(trans('admin/server.error_connecting', ['node' => $server->node->name]))
                                                                     ->send();
                                                             }
                                                         }),
@@ -928,7 +898,7 @@ class EditServer extends EditRecord
                                                                 Notification::make()
                                                                     ->warning()
                                                                     ->title(trans('admin/server.notifications.server_suspension'))
-                                                                    ->body(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
+                                                                    ->body(trans('admin/server.error_connecting', ['node' => $server->node->name]))
                                                                     ->send();
                                                             }
                                                         }),
@@ -993,7 +963,7 @@ class EditServer extends EditRecord
                                                             } catch (Exception) {
                                                                 Notification::make()
                                                                     ->title(trans('admin/server.notifications.reinstall_failed'))
-                                                                    ->body(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
+                                                                    ->body(trans('admin/server.error_connecting', ['node' => $server->node->name]))
                                                                     ->danger()
                                                                     ->send();
                                                             }
@@ -1022,28 +992,24 @@ class EditServer extends EditRecord
                 ->options(fn (Server $server) => Node::whereNot('id', $server->node->id)->pluck('name', 'id')->all()),
             Select::make('allocation_id')
                 ->label(trans('admin/server.primary_allocation'))
-                ->disabled(fn (Get $get, Server $server) => !$get('node_id') || !$server->allocation_id)
-                ->required(fn (Server $server) => $server->allocation_id)
+                ->required()
                 ->prefixIcon('tabler-network')
+                ->disabled(fn (Get $get) => !$get('node_id'))
                 ->options(fn (Get $get) => Allocation::where('node_id', $get('node_id'))->whereNull('server_id')->get()->mapWithKeys(fn (Allocation $allocation) => [$allocation->id => $allocation->address]))
                 ->searchable(['ip', 'port', 'ip_alias'])
                 ->placeholder(trans('admin/server.select_allocation')),
             Select::make('allocation_additional')
                 ->label(trans('admin/server.additional_allocations'))
-                ->disabled(fn (Get $get, Server $server) => !$get('node_id') || $server->allocations->count() <= 1)
                 ->multiple()
-                ->minItems(fn (Select $select) => $select->getMaxItems())
-                ->maxItems(fn (Select $select, Server $server) => $select->isDisabled() ? null : $server->allocations->count() - 1)
                 ->prefixIcon('tabler-network')
-                ->required(fn (Server $server) => $server->allocations->count() > 1)
+                ->disabled(fn (Get $get) => !$get('node_id'))
                 ->options(fn (Get $get) => Allocation::where('node_id', $get('node_id'))->whereNull('server_id')->when($get('allocation_id'), fn ($query) => $query->whereNot('id', $get('allocation_id')))->get()->mapWithKeys(fn (Allocation $allocation) => [$allocation->id => $allocation->address]))
                 ->searchable(['ip', 'port', 'ip_alias'])
                 ->placeholder(trans('admin/server.select_additional')),
         ];
     }
 
-    /** @return array<Actions\Action|Actions\ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         /** @var Server $server */
         $server = $this->getRecord();
@@ -1075,7 +1041,7 @@ class EditServer extends EditRecord
                     }
                 })
                 ->hidden(fn () => $canForceDelete)
-                ->authorize(fn (Server $server) => auth()->user()->can('delete', $server)),
+                ->authorize(fn (Server $server) => auth()->user()->can('delete server', $server)),
             Actions\Action::make('ForceDelete')
                 ->color('danger')
                 ->label(trans('filament-actions::force-delete.single.label'))
@@ -1092,7 +1058,7 @@ class EditServer extends EditRecord
                     }
                 })
                 ->visible(fn () => $canForceDelete)
-                ->authorize(fn (Server $server) => auth()->user()->can('delete', $server)),
+                ->authorize(fn (Server $server) => auth()->user()->can('delete server', $server)),
             Actions\Action::make('console')
                 ->label(trans('admin/server.console'))
                 ->icon('tabler-terminal')
@@ -1113,7 +1079,7 @@ class EditServer extends EditRecord
             $data['description'] = '';
         }
 
-        unset($data['docker'], $data['status'], $data['allocation_id']);
+        unset($data['docker'], $data['status']);
 
         return $data;
     }
@@ -1146,6 +1112,13 @@ class EditServer extends EditRecord
         return null;
     }
 
+    public function getRelationManagers(): array
+    {
+        return [
+            AllocationsRelationManager::class,
+        ];
+    }
+
     private function shouldHideComponent(ServerVariable $serverVariable, Forms\Components\Component $component): bool
     {
         $containsRuleIn = array_first($serverVariable->variable->rules, fn ($value) => str($value)->startsWith('in:'), false);

app/Filament/Admin/Resources/ServerResource/Pages/ListServers.php

@@ -5,8 +5,6 @@ namespace App\Filament\Admin\Resources\ServerResource\Pages;
 use App\Filament\Server\Pages\Console;
 use App\Filament\Admin\Resources\ServerResource;
 use App\Models\Server;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Actions\Action;
@@ -19,9 +17,6 @@ use Filament\Tables\Table;
 
 class ListServers extends ListRecords
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = ServerResource::class;
 
     public function table(Table $table): Table
@@ -73,17 +68,14 @@ class ListServers extends ListRecords
                     ->searchable(),
                 SelectColumn::make('allocation_id')
                     ->label(trans('admin/server.primary_allocation'))
-                    ->hidden(fn () => !auth()->user()->can('update server')) // TODO: update to policy check (fn (Server $server) --> $server is empty)
-                    ->disabled(fn (Server $server) => $server->allocations->count() <= 1)
+                    ->hidden(!auth()->user()->can('update server'))
                     ->options(fn (Server $server) => $server->allocations->mapWithKeys(fn ($allocation) => [$allocation->id => $allocation->address]))
-                    ->selectablePlaceholder(fn (Server $server) => $server->allocations->count() <= 1)
-                    ->placeholder('None')
+                    ->selectablePlaceholder(false)
                     ->sortable(),
                 TextColumn::make('allocation_id_readonly')
                     ->label(trans('admin/server.primary_allocation'))
-                    ->hidden(fn () => auth()->user()->can('update server')) // TODO: update to policy check (fn (Server $server) --> $server is empty)
-                    ->disabled(fn (Server $server) => $server->allocations->count() <= 1)
-                    ->state(fn (Server $server) => $server->allocation->address ?? 'None'),
+                    ->hidden(auth()->user()->can('update server'))
+                    ->state(fn (Server $server) => $server->allocation->address),
                 TextColumn::make('image')->hidden(),
                 TextColumn::make('backups_count')
                     ->counts('backups')
@@ -109,8 +101,7 @@ class ListServers extends ListRecords
             ]);
     }
 
-    /** @return array<Actions\Action|Actions\ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             Actions\CreateAction::make()

app/Filament/Admin/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php

@@ -12,14 +12,16 @@ use Filament\Forms\Components\TextInput;
 use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Support\Exceptions\Halt;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Actions\AssociateAction;
 use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Actions\DissociateAction;
 use Filament\Tables\Actions\DissociateBulkAction;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\TextInputColumn;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Collection;
 
 /**
  * @method Server getOwnerRecord()
@@ -32,20 +34,15 @@ class AllocationsRelationManager extends RelationManager
     {
         return $table
             ->selectCurrentPageOnly()
-            ->recordTitleAttribute('address')
-            ->recordTitle(fn (Allocation $allocation) => $allocation->address)
+            ->recordTitleAttribute('ip')
+            ->recordTitle(fn (Allocation $allocation) => "$allocation->ip:$allocation->port")
+            ->checkIfRecordIsSelectableUsing(fn (Allocation $record) => $record->id !== $this->getOwnerRecord()->allocation_id)
             ->inverseRelationship('server')
             ->heading(trans('admin/server.allocations'))
             ->columns([
-                TextColumn::make('ip')
-                    ->label(trans('admin/server.ip_address')),
-                TextColumn::make('port')
-                    ->label(trans('admin/server.port')),
-                TextInputColumn::make('ip_alias')
-                    ->label(trans('admin/server.alias')),
-                TextInputColumn::make('notes')
-                    ->label(trans('admin/server.notes'))
-                    ->placeholder(trans('admin/server.no_notes')),
+                TextColumn::make('ip')->label(trans('admin/server.ip_address')),
+                TextColumn::make('port')->label(trans('admin/server.port')),
+                TextInputColumn::make('ip_alias')->label(trans('admin/server.alias')),
                 IconColumn::make('primary')
                     ->icon(fn ($state) => match ($state) {
                         true => 'tabler-star-filled',
@@ -55,17 +52,14 @@ class AllocationsRelationManager extends RelationManager
                         true => 'warning',
                         default => 'gray',
                     })
-                    ->tooltip(fn (Allocation $allocation) => trans('admin/server.' . ($allocation->id === $this->getOwnerRecord()->allocation_id ? 'already' : 'make') . '_primary'))
                     ->action(fn (Allocation $allocation) => $this->getOwnerRecord()->update(['allocation_id' => $allocation->id]) && $this->deselectAllTableRecords())
                     ->default(fn (Allocation $allocation) => $allocation->id === $this->getOwnerRecord()->allocation_id)
                     ->label(trans('admin/server.primary')),
             ])
             ->actions([
-                DissociateAction::make()
-                    ->after(function (Allocation $allocation) {
-                        $allocation->update(['notes' => null]);
-                        $this->getOwnerRecord()->allocation_id && $this->getOwnerRecord()->update(['allocation_id' => $this->getOwnerRecord()->allocations()->first()?->id]);
-                    }),
+                Action::make('make-primary')
+                    ->action(fn (Allocation $allocation) => $this->getOwnerRecord()->update(['allocation_id' => $allocation->id]) && $this->deselectAllTableRecords())
+                    ->label(fn (Allocation $allocation) => $allocation->id === $this->getOwnerRecord()->allocation_id ? '' : trans('admin/server.make_primary')),
             ])
             ->headerActions([
                 CreateAction::make()->label(trans('admin/server.create_allocation'))
@@ -75,22 +69,23 @@ class AllocationsRelationManager extends RelationManager
                             ->options(collect($this->getOwnerRecord()->node->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label(trans('admin/server.ip_address'))
                             ->inlineLabel()
-                            ->ip()
-                            ->live()
+                            ->ipv4()
                             ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
                             ->required(),
                         TextInput::make('allocation_alias')
                             ->label(trans('admin/server.alias'))
                             ->inlineLabel()
                             ->default(null)
-                            ->helperText(trans('admin/server.alias_helper')),
+                            ->helperText(trans('admin/server.alias_helper'))
+                            ->required(false),
                         TagsInput::make('allocation_ports')
                             ->placeholder('27015, 27017-27019')
                             ->label(trans('admin/server.ports'))
                             ->inlineLabel()
                             ->live()
-                            ->disabled(fn (Get $get) => empty($get('allocation_ip')))
-                            ->afterStateUpdated(fn ($state, Set $set, Get $get) => $set('allocation_ports', CreateServer::retrieveValidPorts($this->getOwnerRecord()->node, $state, $get('allocation_ip'))))
+                            ->afterStateUpdated(fn ($state, Set $set, Get $get) => $set('allocation_ports',
+                                CreateServer::retrieveValidPorts($this->getOwnerRecord()->node, $state, $get('allocation_ip')))
+                            )
                             ->splitKeys(['Tab', ' ', ','])
                             ->required(),
                     ])
@@ -101,14 +96,22 @@ class AllocationsRelationManager extends RelationManager
                     ->preloadRecordSelect()
                     ->recordSelectOptionsQuery(fn ($query) => $query->whereBelongsTo($this->getOwnerRecord()->node)->whereNull('server_id'))
                     ->recordSelectSearchColumns(['ip', 'port'])
-                    ->label(trans('admin/server.add_allocation'))
-                    ->after(fn (array $data) => !$this->getOwnerRecord()->allocation_id && $this->getOwnerRecord()->update(['allocation_id' => $data['recordId'][0]])),
+                    ->label(trans('admin/server.add_allocation')),
             ])
             ->groupedBulkActions([
                 DissociateBulkAction::make()
-                    ->after(function () {
-                        Allocation::whereNull('server_id')->update(['notes' => null]);
-                        $this->getOwnerRecord()->allocation_id && $this->getOwnerRecord()->update(['allocation_id' => $this->getOwnerRecord()->allocations()->first()?->id]);
+                    ->before(function (DissociateBulkAction $action, Collection $records) {
+                        $records = $records->filter(function ($allocation) {
+                            /** @var Allocation $allocation */
+                            return $allocation->id !== $this->getOwnerRecord()->allocation_id;
+                        });
+
+                        if ($records->isEmpty()) {
+                            $action->failureNotificationTitle(trans('admin/server.notifications.dissociate_primary'))->failure();
+                            throw new Halt();
+                        }
+
+                        return $records;
                     }),
             ]);
     }

app/Filament/Admin/Resources/UserResource.php

@@ -6,16 +6,10 @@ use App\Filament\Admin\Resources\UserResource\Pages;
 use App\Filament\Admin\Resources\UserResource\RelationManagers;
 use App\Models\Role;
 use App\Models\User;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Resources\Pages\PageRegistration;
-use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Resource;
 use Filament\Tables\Actions\DeleteBulkAction;
 use Filament\Tables\Actions\EditAction;
@@ -28,11 +22,6 @@ use Illuminate\Database\Eloquent\Builder;
 
 class UserResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-
     protected static ?string $model = User::class;
 
     protected static ?string $navigationIcon = 'tabler-users';
@@ -56,7 +45,7 @@ class UserResource extends Resource
 
     public static function getNavigationGroup(): ?string
     {
-        return config('panel.filament.top-navigation', false) ? null : trans('admin/dashboard.user');
+        return trans('admin/dashboard.user');
     }
 
     public static function getNavigationBadge(): ?string
@@ -64,7 +53,7 @@ class UserResource extends Resource
         return static::getModel()::count() ?: null;
     }
 
-    public static function defaultTable(Table $table): Table
+    public static function table(Table $table): Table
     {
         return $table
             ->columns([
@@ -110,7 +99,7 @@ class UserResource extends Resource
             ]);
     }
 
-    public static function defaultForm(Form $form): Form
+    public static function form(Form $form): Form
     {
         return $form
             ->columns(['default' => 1, 'lg' => 3])
@@ -157,16 +146,14 @@ class UserResource extends Resource
             ]);
     }
 
-    /** @return class-string<RelationManager>[] */
-    public static function getDefaultRelations(): array
+    public static function getRelations(): array
     {
         return [
             RelationManagers\ServersRelationManager::class,
         ];
     }
 
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListUsers::route('/'),

app/Filament/Admin/Resources/UserResource/Pages/CreateUser.php

@@ -5,18 +5,11 @@ namespace App\Filament\Admin\Resources\UserResource\Pages;
 use App\Filament\Admin\Resources\UserResource;
 use App\Models\Role;
 use App\Services\Users\UserCreationService;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 
 class CreateUser extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = UserResource::class;
 
     protected static bool $canCreateAnother = false;
@@ -28,8 +21,7 @@ class CreateUser extends CreateRecord
         $this->service = $service;
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             $this->getCreateFormAction()->formId('form'),

app/Filament/Admin/Resources/UserResource/Pages/EditUser.php

@@ -5,19 +5,12 @@ namespace App\Filament\Admin\Resources\UserResource\Pages;
 use App\Filament\Admin\Resources\UserResource;
 use App\Models\User;
 use App\Services\Users\UserUpdateService;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Database\Eloquent\Model;
 
 class EditUser extends EditRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = UserResource::class;
 
     private UserUpdateService $service;
@@ -27,8 +20,7 @@ class EditUser extends EditRecord
         $this->service = $service;
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             DeleteAction::make()

app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php

@@ -3,22 +3,14 @@
 namespace App\Filament\Admin\Resources\UserResource\Pages;
 
 use App\Filament\Admin\Resources\UserResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
 class ListUsers extends ListRecords
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = UserResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             CreateAction::make(),

app/Filament/Admin/Resources/UserResource/Pages/ViewUser.php

@@ -3,22 +3,14 @@
 namespace App\Filament\Admin\Resources\UserResource\Pages;
 
 use App\Filament\Admin\Resources\UserResource;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
 
 class ViewUser extends ViewRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = UserResource::class;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             EditAction::make(),

app/Filament/Admin/Resources/UserResource/RelationManagers/ServersRelationManager.php

@@ -70,9 +70,8 @@ class ServersRelationManager extends RelationManager
                     ->sortable(),
                 SelectColumn::make('allocation.id')
                     ->label(trans('admin/server.primary_allocation'))
-                    ->disabled()
-                    ->options(fn (Server $server) => $server->allocations->take(1)->mapWithKeys(fn ($allocation) => [$allocation->id => $allocation->address]))
-                    ->placeholder('None')
+                    ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->selectablePlaceholder(false)
                     ->sortable(),
                 TextColumn::make('image')->hidden(),
                 TextColumn::make('databases_count')

app/Filament/Admin/Resources/WebhookResource.php

@@ -3,49 +3,21 @@
 namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\WebhookResource\Pages;
-use App\Filament\Admin\Resources\WebhookResource\Pages\EditWebhookConfiguration;
-use App\Livewire\AlertBanner;
 use App\Models\WebhookConfiguration;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
-use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\CheckboxList;
-use Filament\Forms\Components\ColorPicker;
-use Filament\Forms\Components\KeyValue;
-use Filament\Forms\Components\Repeater;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
-use Filament\Resources\Pages\PageRegistration;
-use Filament\Forms\Get;
 use Filament\Resources\Resource;
-use Filament\Forms\Set;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\ViewAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Actions\ReplicateAction;
 use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Columns\IconColumn;
+use Filament\Tables\Actions\DeleteAction;
+use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Tables\Actions\EditAction;
+use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
-use Livewire\Features\SupportEvents\HandlesEvents;
-use App\Enums\WebhookType;
-use Filament\Forms\Components\Component;
-use Livewire\Component as Livewire;
 
 class WebhookResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-    use HandlesEvents;
-
     protected static ?string $model = WebhookConfiguration::class;
 
     protected static ?string $navigationIcon = 'tabler-webhook';
@@ -77,16 +49,10 @@ class WebhookResource extends Resource
         return trans('admin/dashboard.advanced');
     }
 
-    public static function defaultTable(Table $table): Table
+    public static function table(Table $table): Table
     {
         return $table
             ->columns([
-                IconColumn::make('type'),
-                TextColumn::make('endpoint')
-                    ->label(trans('admin/webhook.table.endpoint'))
-                    ->formatStateUsing(fn (string $state) => str($state)->after('://'))
-                    ->limit(60)
-                    ->wrap(),
                 TextColumn::make('description')
                     ->label(trans('admin/webhook.table.description')),
                 TextColumn::make('endpoint')
@@ -94,15 +60,9 @@ class WebhookResource extends Resource
             ])
             ->actions([
                 ViewAction::make()
-                    ->hidden(fn (WebhookConfiguration $record) => static::canEdit($record)),
+                    ->hidden(fn ($record) => static::canEdit($record)),
                 EditAction::make(),
-                ReplicateAction::make()
-                    ->iconButton()
-                    ->tooltip(trans('filament-actions::replicate.single.label'))
-                    ->modal(false)
-                    ->excludeAttributes(['created_at', 'updated_at'])
-                    ->beforeReplicaSaved(fn (WebhookConfiguration $replica) => $replica->description .= ' Copy ' . now()->format('Y-m-d H:i:s'))
-                    ->successRedirectUrl(fn (WebhookConfiguration $replica) => EditWebhookConfiguration::getUrl(['record' => $replica])),
+                DeleteAction::make(),
             ])
             ->groupedBulkActions([
                 DeleteBulkAction::make(),
@@ -112,229 +72,33 @@ class WebhookResource extends Resource
             ->emptyStateHeading(trans('admin/webhook.no_webhooks'))
             ->emptyStateActions([
                 CreateAction::make(),
-            ])
-            ->persistFiltersInSession()
-            ->filters([
-                SelectFilter::make('type')
-                    ->options(WebhookType::class)
-                    ->attribute('type'),
             ]);
     }
 
-    public static function defaultForm(Form $form): Form
+    public static function form(Form $form): Form
     {
         return $form
             ->schema([
-                ToggleButtons::make('type')
-                    ->live()
-                    ->inline()
-                    ->options(WebhookType::class)
-                    ->default(WebhookType::Regular->value)
-                    ->afterStateHydrated(function (string $state) {
-                        if ($state === WebhookType::Discord->value) {
-                            self::sendHelpBanner();
-                        }
-                    })
-                    ->afterStateUpdated(function (string $state) {
-                        if ($state === WebhookType::Discord->value) {
-                            self::sendHelpBanner();
-                        }
-                    }),
-                TextInput::make('description')
-                    ->label(trans('admin/webhook.description'))
-                    ->required(),
                 TextInput::make('endpoint')
                     ->label(trans('admin/webhook.endpoint'))
                     ->activeUrl()
-                    ->required()
+                    ->required(),
+                TextInput::make('description')
+                    ->label(trans('admin/webhook.description'))
+                    ->required(),
+                CheckboxList::make('events')
+                    ->lazy()
+                    ->options(fn () => WebhookConfiguration::filamentCheckboxList())
+                    ->searchable()
+                    ->bulkToggleable()
+                    ->columns(3)
                     ->columnSpanFull()
-                    ->afterStateUpdated(fn (string $state, Set $set) => $set('type', str($state)->contains('discord.com') ? WebhookType::Discord->value : WebhookType::Regular->value)),
-                Section::make(trans('admin/webhook.regular'))
-                    ->hidden(fn (Get $get) => $get('type') === WebhookType::Discord->value)
-                    ->dehydratedWhenHidden()
-                    ->schema(fn () => self::getRegularFields())
-                    ->formBefore(),
-                Section::make(trans('admin/webhook.discord'))
-                    ->hidden(fn (Get $get) => $get('type') === WebhookType::Regular->value)
-                    ->dehydratedWhenHidden()
-                    ->afterStateUpdated(fn (Livewire $livewire) => $livewire->dispatch('refresh-widget'))
-                    ->schema(fn () => self::getDiscordFields())
-                    ->view('filament.components.webhooksection')
-                    ->aside()
-                    ->formBefore(),
-                Section::make(trans('admin/webhook.events'))
-                    ->collapsible()
-                    ->collapsed(fn (Get $get) => count($get('events') ?? []))
-                    ->schema([
-                        CheckboxList::make('events')
-                            ->live()
-                            ->options(fn () => WebhookConfiguration::filamentCheckboxList())
-                            ->searchable()
-                            ->bulkToggleable()
-                            ->columns(3)
-                            ->columnSpanFull()
-                            ->required(),
-                    ]),
+                    ->gridDirection('row')
+                    ->required(),
             ]);
     }
 
-    /** @return Component[] */
-    private static function getRegularFields(): array
-    {
-        return [
-            KeyValue::make('headers')
-                ->label(trans('admin/webhook.headers')),
-        ];
-    }
-
-    /** @return Component[] */
-    private static function getDiscordFields(): array
-    {
-        return [
-            Section::make(trans('admin/webhook.discord_message.profile'))
-                ->collapsible()
-                ->schema([
-                    TextInput::make('username')
-                        ->live(debounce: 500)
-                        ->label(trans('admin/webhook.discord_message.username')),
-                    TextInput::make('avatar_url')
-                        ->live(debounce: 500)
-                        ->label(trans('admin/webhook.discord_message.avatar_url')),
-                ]),
-            Section::make(trans('admin/webhook.discord_message.message'))
-                ->collapsible()
-                ->schema([
-                    TextInput::make('content')
-                        ->label(trans('admin/webhook.discord_message.message'))
-                        ->live(debounce: 500)
-                        ->required(fn (Get $get) => empty($get('embeds'))),
-                    TextInput::make('thread_name')
-                        ->label(trans('admin/webhook.discord_message.forum_thread')),
-                    CheckboxList::make('flags')
-                        ->label('Flags')
-                        ->options([
-                            (1 << 2) => trans('admin/webhook.discord_message.supress_embeds'),
-                            (1 << 12) => trans('admin/webhook.discord_message.supress_notifications'),
-                        ])
-                        ->descriptions([
-                            (1 << 2) => trans('admin/webhook.discord_message.supress_embeds_text'),
-                            (1 << 12) => trans('admin/webhook.discord_message.supress_notifications_text'),
-                        ]),
-                    CheckboxList::make('allowed_mentions')
-                        ->label(trans('admin/webhook.discord_embed.allowed_mentions'))
-                        ->options([
-                            'roles' => trans('admin/webhook.discord_embed.roles'),
-                            'users' => trans('admin/webhook.discord_embed.users'),
-                            'everyone' => trans('admin/webhook.discord_embed.everyone'),
-                        ]),
-                ]),
-            Repeater::make('embeds')
-                ->live(debounce: 500)
-                ->itemLabel(fn (array $state) => $state['title'])
-                ->addActionLabel(trans('admin/webhook.discord_embed.add_embed'))
-                ->required(fn (Get $get) => empty($get('content')))
-                ->reorderable()
-                ->collapsible()
-                ->maxItems(10)
-                ->schema([
-                    Section::make(trans('admin/webhook.discord_embed.author'))
-                        ->collapsible()
-                        ->collapsed()
-                        ->schema([
-                            TextInput::make('author.name')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.author'))
-                                ->required(fn (Get $get) => filled($get('author.url')) || filled($get('author.icon_url'))),
-                            TextInput::make('author.url')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.author_url')),
-                            TextInput::make('author.icon_url')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.author_icon_url')),
-                        ]),
-                    Section::make(trans('admin/webhook.discord_embed.body'))
-                        ->collapsible()
-                        ->collapsed()
-                        ->schema([
-                            TextInput::make('title')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.title'))
-                                ->required(fn (Get $get) => $get('description') === null),
-                            Textarea::make('description')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.body'))
-                                ->required(fn (Get $get) => $get('title') === null),
-                            ColorPicker::make('color')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.color'))
-                                ->hex(),
-                            TextInput::make('url')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.url')),
-                        ]),
-                    Section::make(trans('admin/webhook.discord_embed.images'))
-                        ->collapsible()
-                        ->collapsed()
-                        ->schema([
-                            TextInput::make('image.url')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.image_url')),
-                            TextInput::make('thumbnail.url')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.image_thumbnail')),
-                        ]),
-                    Section::make(trans('admin/webhook.discord_embed.footer'))
-                        ->collapsible()
-                        ->collapsed()
-                        ->schema([
-                            TextInput::make('footer.text')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.footer')),
-                            Checkbox::make('has_timestamp')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.has_timestamp')),
-                            TextInput::make('footer.icon_url')
-                                ->live(debounce: 500)
-                                ->label(trans('admin/webhook.discord_embed.footer_icon_url')),
-                        ]),
-                    Section::make(trans('admin/webhook.discord_embed.fields'))
-                        ->collapsible()->collapsed()
-                        ->schema([
-                            Repeater::make('fields')
-                                ->reorderable()
-                                ->addActionLabel(trans('admin/webhook.discord_embed.add_field'))
-                                ->collapsible()
-                                ->schema([
-                                    TextInput::make('name')
-                                        ->live(debounce: 500)
-                                        ->label(trans('admin/webhook.discord_embed.field_name'))
-                                        ->required(),
-                                    Textarea::make('value')
-                                        ->live(debounce: 500)
-                                        ->label(trans('admin/webhook.discord_embed.field_value'))
-                                        ->rows(4)
-                                        ->required(),
-                                    Checkbox::make('inline')
-                                        ->live(debounce: 500)
-                                        ->label(trans('admin/webhook.discord_embed.inline_field')),
-                                ]),
-                        ]),
-                ]),
-        ];
-    }
-
-    public static function sendHelpBanner(): void
-    {
-        AlertBanner::make('discord_webhook_help')
-            ->title(trans('admin/webhook.help'))
-            ->body(trans('admin/webhook.help_text'))
-            ->icon('tabler-question-mark')
-            ->info()
-            ->send();
-    }
-
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
             'index' => Pages\ListWebhookConfigurations::route('/'),