ci(release): bump version

.env.example

@@ -13,10 +13,17 @@ LOG_LEVEL=debug
 
 DB_CONNECTION=sqlite
 
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
 CACHE_STORE=file
-QUEUE_CONNECTION=database
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 
+HASHIDS_SALT=
+HASHIDS_LENGTH=8
+
 MAIL_MAILER=log
 MAIL_HOST=smtp.example.com
 MAIL_PORT=25
@@ -30,8 +37,3 @@ MAIL_FROM_NAME="Pelican Admin"
 SESSION_ENCRYPT=false
 SESSION_PATH=/
 SESSION_DOMAIN=null
-
-# Set this to true, and set start & end ports to auto create allocations.
-PANEL_CLIENT_ALLOCATIONS_ENABLED=false
-PANEL_CLIENT_ALLOCATIONS_RANGE_START=
-PANEL_CLIENT_ALLOCATIONS_RANGE_END=

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: pelican-dev
-custom: [https://hub.pelican.dev/donors]
+custom: [https://buy.stripe.com/14kdU99SI4UT7ni9AB, https://buy.stripe.com/14kaHXc0Q9b9372eUU]

.github/workflows/build.yaml

@@ -1,9 +1,6 @@
 name: Build
 
 on:
-  push:
-    branches:
-      - '**'
   pull_request:
     branches:
       - '**'

.github/workflows/ci.yaml

@@ -1,9 +1,6 @@
 name: Tests
 
 on:
-  push:
-    branches:
-      - '**'
   pull_request:
     branches:
       - '**'
@@ -16,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.2, 8.3]
-        database: ["mysql:8"]
+        database: ["mariadb:10.2", "mysql:8"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -37,6 +34,7 @@ jobs:
       MAIL_MAILER: array
       SESSION_DRIVER: array
       QUEUE_CONNECTION: sync
+      HASHIDS_SALT: alittlebitofsalt1234
       DB_CONNECTION: mysql
       DB_HOST: 127.0.0.1
       DB_DATABASE: testing
@@ -62,79 +60,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --prefer-dist
-
-      - name: Unit tests
-        run: vendor/bin/phpunit tests/Unit
-        env:
-          DB_HOST: UNIT_NO_DB
-          SKIP_MIGRATIONS: true
-
-      - name: Integration tests
-        run: vendor/bin/phpunit tests/Integration
-        env:
-          DB_PORT: ${{ job.services.database.ports[3306] }}
-          DB_USERNAME: root
-
-  mariadb:
-    name: MariaDB
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [8.2, 8.3]
-        database: ["mariadb:10.3", "mariadb:10.11", "mariadb:11.4"]
-    services:
-      database:
-        image: ${{ matrix.database }}
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: testing
-        ports:
-          - 3306
-        options: --health-cmd="mariadb-admin ping || mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    env:
-      APP_ENV: testing
-      APP_DEBUG: "false"
-      APP_KEY: ThisIsARandomStringForTests12345
-      APP_TIMEZONE: UTC
-      APP_URL: http://localhost/
-      APP_ENVIRONMENT_ONLY: "true"
-      CACHE_DRIVER: array
-      MAIL_MAILER: array
-      SESSION_DRIVER: array
-      QUEUE_CONNECTION: sync
-      DB_CONNECTION: mariadb
-      DB_HOST: 127.0.0.1
-      DB_DATABASE: testing
-      DB_USERNAME: root
-    steps:
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
 
@@ -171,8 +97,9 @@ jobs:
       MAIL_MAILER: array
       SESSION_DRIVER: array
       QUEUE_CONNECTION: sync
+      HASHIDS_SALT: alittlebitofsalt1234
       DB_CONNECTION: sqlite
-      DB_DATABASE: testing.sqlite
+      DB_DATABASE: ${{ github.workspace }}/database/testing.sqlite
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -194,7 +121,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
 

.github/workflows/lint.yaml

@@ -6,8 +6,8 @@ on:
       - '**'
 
 jobs:
-  pint:
-    name: Pint
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - name: Code Checkout
@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.3"
+          php-version: "8.2"
           extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
@@ -29,26 +29,3 @@ jobs:
 
       - name: Pint
         run: vendor/bin/pint --test
-  phpstan:
-    name: PHPStan
-    runs-on: ubuntu-latest
-    steps:
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: "8.3"
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Setup .env
-        run: cp .env.example .env
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-progress --prefer-dist
-
-      - name: PHPStan
-        run: vendor/bin/phpstan --memory-limit=-1

.github/workflows/release.yaml

@@ -54,12 +54,31 @@ jobs:
 
       - name: Create release
         id: create_release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           draft: true
           prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
-          files: |
-            panel.tar.gz
-            checksum.txt
+
+      - name: Upload release archive
+        id: upload-release-archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: panel.tar.gz
+          asset_name: panel.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload release checksum
+        id: upload-release-checksum
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./checksum.txt
+          asset_name: checksum.txt
+          asset_content_type: text/plain

.gitignore

@@ -1,28 +1,41 @@
-/.phpunit.cache
-/node_modules
-/public/build
-/public/hot
-/public/storage
-/storage/*.key
-/storage/clockwork/*
 /vendor
 *.DS_Store*
-.env
-.env.backup
-.env.production
-.phpactor.json
-.phpunit.result.cache
-Homestead.json
-Homestead.yaml
-auth.json
-npm-debug.log
-yarn-error.log
-/.fleet
+!.env.ci
+!.env.example
+.env*
+.vagrant/*
+.vscode/*
+storage/framework/*
 /.idea
-/.vscode
+/nbproject
+/.direnv
 
+node_modules
+*.log
+_ide_helper.php
+_ide_helper_models.php
+.phpstorm.meta.php
+.yarn
 public/assets/manifest.json
-/database/*.sqlite
-filament-monaco-editor/
-_ide_helper*
-/.phpstorm.meta.php
+*.sqlite
+
+# For local development with docker
+# Remove if we ever put the Dockerfile in the repo
+.dockerignore
+docker-compose.yml
+
+# for image related files
+misc
+.php-cs-fixer.cache
+coverage.xml
+resources/lang/locales.js
+.phpunit.result.cache
+
+/public/build
+/public/hot
+result
+docker-compose.yaml
+
+public/css/filament-monaco-editor/
+
+public/js/filament-monaco-editor/

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -10,28 +10,30 @@ use Illuminate\Support\Facades\Artisan;
 class AppSettingsCommand extends Command
 {
     use EnvironmentWriterTrait;
-
     public const CACHE_DRIVERS = [
-        'file' => 'Filesystem (recommended)',
         'redis' => 'Redis',
+        'memcached' => 'Memcached',
+        'file' => 'Filesystem (recommended)',
     ];
 
     public const SESSION_DRIVERS = [
-        'file' => 'Filesystem (recommended)',
         'redis' => 'Redis',
-        'database' => 'Database',
+        'memcached' => 'Memcached',
+        'database' => 'MySQL Database',
+        'file' => 'Filesystem (recommended)',
         'cookie' => 'Cookie',
     ];
 
     public const QUEUE_DRIVERS = [
-        'database' => 'Database (recommended)',
         'redis' => 'Redis',
-        'sync' => 'Synchronous',
+        'database' => 'MySQL Database',
+        'sync' => 'Sync (recommended)',
     ];
 
     protected $description = 'Configure basic environment settings for the Panel.';
 
     protected $signature = 'p:environment:setup
+                            {--new-salt : Whether or not to generate a new salt for Hashids.}
                             {--url= : The URL that this Panel is running on.}
                             {--cache= : The cache driver backend to use.}
                             {--session= : The session driver backend to use.}
@@ -60,6 +62,10 @@ class AppSettingsCommand extends Command
     {
         $this->variables['APP_TIMEZONE'] = 'UTC';
 
+        if (empty(config('hashids.salt')) || $this->option('new-salt')) {
+            $this->variables['HASHIDS_SALT'] = str_random(20);
+        }
+
         $this->output->comment(__('commands.appsettings.comment.url'));
         $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
             'Application URL',
@@ -80,7 +86,7 @@ class AppSettingsCommand extends Command
             array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
         );
 
-        $selected = config('queue.default', 'database');
+        $selected = config('queue.default', 'sync');
         $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
             'Queue Driver',
             self::QUEUE_DRIVERS,
@@ -98,13 +104,7 @@ class AppSettingsCommand extends Command
             $this->variables['SESSION_SECURE_COOKIE'] = 'true';
         }
 
-        $redisUsed = count(collect($this->variables)->filter(function ($item) {
-            return $item === 'redis';
-        })) !== 0;
-
-        if ($redisUsed) {
-            $this->requestRedisSettings();
-        }
+        $this->checkForRedis();
 
         $path = base_path('.env');
         if (!file_exists($path)) {
@@ -117,22 +117,25 @@ class AppSettingsCommand extends Command
             Artisan::call('key:generate');
         }
 
-        if ($this->variables['QUEUE_CONNECTION'] !== 'sync') {
-            $this->call('p:environment:queue-service', [
-                '--use-redis' => $redisUsed,
-            ]);
-        }
-
         $this->info($this->console->output());
 
         return 0;
     }
 
     /**
-     * Request redis connection details and verify them.
+     * Check if redis is selected, if so, request connection details and verify them.
      */
-    private function requestRedisSettings(): void
+    private function checkForRedis()
     {
+        $items = collect($this->variables)->filter(function ($item) {
+            return $item === 'redis';
+        });
+
+        // Redis was not selected, no need to continue.
+        if (count($items) === 0) {
+            return;
+        }
+
         $this->output->note(__('commands.appsettings.redis.note'));
         $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
             'Redis Host',

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -13,7 +13,6 @@ class DatabaseSettingsCommand extends Command
 
     public const DATABASE_DRIVERS = [
         'sqlite' => 'SQLite (recommended)',
-        'mariadb' => 'MariaDB',
         'mysql' => 'MySQL',
     ];
 
@@ -22,10 +21,10 @@ class DatabaseSettingsCommand extends Command
     protected $signature = 'p:environment:database
                             {--driver= : The database driver backend to use.}
                             {--database= : The database to use.}
-                            {--host= : The connection address for the MySQL/ MariaDB server.}
-                            {--port= : The connection port for the MySQL/ MariaDB server.}
-                            {--username= : Username to use when connecting to the MySQL/ MariaDB server.}
-                            {--password= : Password to use for the MySQL/ MariaDB database.}';
+                            {--host= : The connection address for the MySQL server.}
+                            {--port= : The connection port for the MySQL server.}
+                            {--username= : Username to use when connecting to the MySQL server.}
+                            {--password= : Password to use for the MySQL database.}';
 
     protected array $variables = [];
 
@@ -83,20 +82,7 @@ class DatabaseSettingsCommand extends Command
             }
 
             try {
-                // Test connection
-                config()->set('database.connections._panel_command_test', [
-                    'driver' => 'mysql',
-                    'host' => $this->variables['DB_HOST'],
-                    'port' => $this->variables['DB_PORT'],
-                    'database' => $this->variables['DB_DATABASE'],
-                    'username' => $this->variables['DB_USERNAME'],
-                    'password' => $this->variables['DB_PASSWORD'],
-                    'charset' => 'utf8mb4',
-                    'collation' => 'utf8mb4_unicode_ci',
-                    'strict' => true,
-                ]);
-
-                $this->database->connection('_panel_command_test')->getPdo();
+                $this->testMySQLConnection();
             } catch (\PDOException $exception) {
                 $this->output->error(sprintf('Unable to connect to the MySQL server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
                 $this->output->error(__('commands.database_settings.DB_error_2'));
@@ -107,72 +93,12 @@ class DatabaseSettingsCommand extends Command
                     return $this->handle();
                 }
 
-                return 1;
-            }
-        } elseif ($this->variables['DB_CONNECTION'] === 'mariadb') {
-            $this->output->note(__('commands.database_settings.DB_HOST_note'));
-            $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
-                'Database Host',
-                config('database.connections.mariadb.host', '127.0.0.1')
-            );
-
-            $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
-                'Database Port',
-                config('database.connections.mariadb.port', 3306)
-            );
-
-            $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
-                'Database Name',
-                config('database.connections.mariadb.database', 'panel')
-            );
-
-            $this->output->note(__('commands.database_settings.DB_USERNAME_note'));
-            $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
-                'Database Username',
-                config('database.connections.mariadb.username', 'pelican')
-            );
-
-            $askForMariaDBPassword = true;
-            if (!empty(config('database.connections.mariadb.password')) && $this->input->isInteractive()) {
-                $this->variables['DB_PASSWORD'] = config('database.connections.mariadb.password');
-                $askForMariaDBPassword = $this->confirm(__('commands.database_settings.DB_PASSWORD_note'));
-            }
-
-            if ($askForMariaDBPassword) {
-                $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
-            }
-
-            try {
-                // Test connection
-                config()->set('database.connections._panel_command_test', [
-                    'driver' => 'mariadb',
-                    'host' => $this->variables['DB_HOST'],
-                    'port' => $this->variables['DB_PORT'],
-                    'database' => $this->variables['DB_DATABASE'],
-                    'username' => $this->variables['DB_USERNAME'],
-                    'password' => $this->variables['DB_PASSWORD'],
-                    'charset' => 'utf8mb4',
-                    'collation' => 'utf8mb4_unicode_ci',
-                    'strict' => true,
-                ]);
-
-                $this->database->connection('_panel_command_test')->getPdo();
-            } catch (\PDOException $exception) {
-                $this->output->error(sprintf('Unable to connect to the MariaDB server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
-                $this->output->error(__('commands.database_settings.DB_error_2'));
-
-                if ($this->confirm(__('commands.database_settings.go_back'))) {
-                    $this->database->disconnect('_panel_command_test');
-
-                    return $this->handle();
-                }
-
                 return 1;
             }
         } elseif ($this->variables['DB_CONNECTION'] === 'sqlite') {
             $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
                 'Database Path',
-                env('DB_DATABASE', 'database.sqlite')
+                config('database.connections.sqlite.database', database_path('database.sqlite'))
             );
         }
 
@@ -182,4 +108,24 @@ class DatabaseSettingsCommand extends Command
 
         return 0;
     }
+
+    /**
+     * Test that we can connect to the provided MySQL instance and perform a selection.
+     */
+    private function testMySQLConnection()
+    {
+        config()->set('database.connections._panel_command_test', [
+            'driver' => 'mysql',
+            'host' => $this->variables['DB_HOST'],
+            'port' => $this->variables['DB_PORT'],
+            'database' => $this->variables['DB_DATABASE'],
+            'username' => $this->variables['DB_USERNAME'],
+            'password' => $this->variables['DB_PASSWORD'],
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'strict' => true,
+        ]);
+
+        $this->database->connection('_panel_command_test')->getPdo();
+    }
 }

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -31,7 +31,7 @@ class EmailSettingsCommand extends Command
      */
     public function handle(): void
     {
-        $this->variables['MAIL_MAILER'] = $this->option('driver') ?? $this->choice(
+        $this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice(
             trans('command/messages.environment.mail.ask_driver'),
             [
                 'log' => 'Log',
@@ -41,10 +41,10 @@ class EmailSettingsCommand extends Command
                 'mandrill' => 'Mandrill',
                 'postmark' => 'Postmark',
             ],
-            env('MAIL_MAILER', env('MAIL_DRIVER', 'smtp')),
+            'smtp',
         );
 
-        $method = 'setup' . studly_case($this->variables['MAIL_MAILER']) . 'DriverVariables';
+        $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
         if (method_exists($this, $method)) {
             $this->{$method}();
         }

app/Console/Commands/Environment/QueueWorkerServiceCommand.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Process;
-
-class QueueWorkerServiceCommand extends Command
-{
-    protected $description = 'Create the service for the queue worker.';
-
-    protected $signature = 'p:environment:queue-service
-        {--service-name= : Name of the queue worker service.}
-        {--user= : The user that PHP runs under.}
-        {--group= : The group that PHP runs under.}
-        {--use-redis : Whether redis is used.}
-        {--overwrite : Force overwrite if the service file already exists.}';
-
-    public function handle(): void
-    {
-        $serviceName = $this->option('service-name') ?? $this->ask('Queue worker service name', 'pelican-queue');
-        $path = '/etc/systemd/system/' . $serviceName  . '.service';
-
-        $fileExists = file_exists($path);
-        if ($fileExists && !$this->option('overwrite') && !$this->confirm('The service file already exists. Do you want to overwrite it?')) {
-            $this->line('Creation of queue worker service file aborted because service file already exists.');
-
-            return;
-        }
-
-        $user = $this->option('user') ?? $this->ask('Webserver User', 'www-data');
-        $group = $this->option('group') ?? $this->ask('Webserver Group', 'www-data');
-
-        $afterRedis = $this->option('use-redis') ? '
-After=redis-server.service' : '';
-
-        $basePath = base_path();
-
-        $success = File::put($path, "# Pelican Queue File
-# ----------------------------------
-
-[Unit]
-Description=Pelican Queue Service$afterRedis
-
-[Service]
-User=$user
-Group=$group
-Restart=always
-ExecStart=/usr/bin/php $basePath/artisan queue:work --tries=3
-StartLimitInterval=180
-StartLimitBurst=30
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
-        ");
-
-        if (!$success) {
-            $this->error('Error creating service file');
-
-            return;
-        }
-
-        if ($fileExists) {
-            $result = Process::run("systemctl restart $serviceName.service");
-            if ($result->failed()) {
-                $this->error('Error restarting service: ' . $result->errorOutput());
-
-                return;
-            }
-
-            $this->line('Queue worker service file updated successfully.');
-        } else {
-            $result = Process::run("systemctl enable --now $serviceName.service");
-            if ($result->failed()) {
-                $this->error('Error enabling service: ' . $result->errorOutput());
-
-                return;
-            }
-
-            $this->line('Queue worker service file created successfully.');
-        }
-    }
-}

app/Console/Commands/InfoCommand.php

@@ -7,12 +7,12 @@ use App\Services\Helpers\SoftwareVersionService;
 
 class InfoCommand extends Command
 {
-    protected $description = 'Displays the application, database, email and backup configurations along with the panel version.';
+    protected $description = 'Displays the application, database, and email configurations along with the panel version.';
 
     protected $signature = 'p:info';
 
     /**
-     * InfoCommand constructor.
+     * VersionCommand constructor.
      */
     public function __construct(private SoftwareVersionService $versionService)
     {
@@ -26,76 +26,45 @@ class InfoCommand extends Command
     {
         $this->output->title('Version Information');
         $this->table([], [
-            ['Panel Version', $this->versionService->versionData()['version']],
+            ['Panel Version', config('app.version')],
             ['Latest Version', $this->versionService->getPanel()],
             ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
         ], 'compact');
 
         $this->output->title('Application Configuration');
         $this->table([], [
-            ['Environment', config('app.env') === 'production' ? config('app.env') : $this->formatText(config('app.env'), 'bg=red')],
-            ['Debug Mode', config('app.debug') ? $this->formatText('Yes', 'bg=red') : 'No'],
-            ['Application Name', config('app.name')],
-            ['Application URL', config('app.url')],
+            ['Environment', $this->formatText(config('app.env'), config('app.env') === 'production' ?: 'bg=red')],
+            ['Debug Mode', $this->formatText(config('app.debug') ? 'Yes' : 'No', !config('app.debug') ?: 'bg=red')],
+            ['Installation URL', config('app.url')],
             ['Installation Directory', base_path()],
             ['Cache Driver', config('cache.default')],
-            ['Queue Driver', config('queue.default') === 'sync' ? $this->formatText(config('queue.default'), 'bg=red') : config('queue.default')],
+            ['Queue Driver', config('queue.default')],
             ['Session Driver', config('session.driver')],
             ['Filesystem Driver', config('filesystems.default')],
+            ['Default Theme', config('themes.active')],
         ], 'compact');
 
         $this->output->title('Database Configuration');
         $driver = config('database.default');
-        if ($driver === 'sqlite') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Database', config("database.connections.$driver.database")],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Host', config("database.connections.$driver.host")],
-                ['Port', config("database.connections.$driver.port")],
-                ['Database', config("database.connections.$driver.database")],
-                ['Username', config("database.connections.$driver.username")],
-            ], 'compact');
-        }
+        $this->table([], [
+            ['Driver', $driver],
+            ['Host', config("database.connections.$driver.host")],
+            ['Port', config("database.connections.$driver.port")],
+            ['Database', config("database.connections.$driver.database")],
+            ['Username', config("database.connections.$driver.username")],
+        ], 'compact');
 
+        // TODO: Update this to handle other mail drivers
         $this->output->title('Email Configuration');
-        $driver = config('mail.default');
-        if ($driver === 'smtp') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Host', config("mail.mailers.$driver.host")],
-                ['Port', config("mail.mailers.$driver.port")],
-                ['Username', config("mail.mailers.$driver.username")],
-                ['Encryption', config("mail.mailers.$driver.encryption")],
-                ['From Address', config('mail.from.address')],
-                ['From Name', config('mail.from.name')],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-                ['From Address', config('mail.from.address')],
-                ['From Name', config('mail.from.name')],
-            ], 'compact');
-        }
-
-        $this->output->title('Backup Configuration');
-        $driver = config('backups.default');
-        if ($driver === 's3') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Region', config("backups.disks.$driver.region")],
-                ['Bucket', config("backups.disks.$driver.bucket")],
-                ['Endpoint', config("backups.disks.$driver.endpoint")],
-                ['Use path style endpoint', config("backups.disks.$driver.use_path_style_endpoint") ? 'Yes' : 'No'],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-            ], 'compact');
-        }
+        $this->table([], [
+            ['Driver', config('mail.default')],
+            ['Host', config('mail.mailers.smtp.host')],
+            ['Port', config('mail.mailers.smtp.port')],
+            ['Username', config('mail.mailers.smtp.username')],
+            ['From Address', config('mail.from.address')],
+            ['From Name', config('mail.from.name')],
+            ['Encryption', config('mail.mailers.smtp.encryption')],
+        ], 'compact');
     }
 
     /**

app/Console/Commands/Node/MakeNodeCommand.php

@@ -20,12 +20,9 @@ class MakeNodeCommand extends Command
                             {--overallocateMemory= : Enter the amount of ram to overallocate (% or -1 to overallocate the maximum).}
                             {--maxDisk= : Set the max disk amount.}
                             {--overallocateDisk= : Enter the amount of disk to overallocate (% or -1 to overallocate the maximum).}
-                            {--maxCpu= : Set the max cpu amount.}
-                            {--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.}
                             {--daemonSFTPPort= : Enter the daemon SFTP listening port.}
-                            {--daemonSFTPAlias= : Enter the daemon SFTP alias.}
                             {--daemonBase= : Enter the base folder.}';
 
     protected $description = 'Creates a new node on the system via the CLI.';
@@ -57,19 +54,16 @@ class MakeNodeCommand extends Command
         $data['public'] = $this->option('public') ?? $this->confirm(__('commands.make_node.public'), true);
         $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm(__('commands.make_node.behind_proxy'));
         $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm(__('commands.make_node.maintenance_mode'));
-        $data['memory'] = $this->option('maxMemory') ?? $this->ask(__('commands.make_node.memory'), '0');
-        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(__('commands.make_node.memory_overallocate'), '-1');
-        $data['disk'] = $this->option('maxDisk') ?? $this->ask(__('commands.make_node.disk'), '0');
-        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(__('commands.make_node.disk_overallocate'), '-1');
-        $data['cpu'] = $this->option('maxCpu') ?? $this->ask(__('commands.make_node.cpu'), '0');
-        $data['cpu_overallocate'] = $this->option('overallocateCpu') ?? $this->ask(__('commands.make_node.cpu_overallocate'), '-1');
-        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(__('commands.make_node.upload_size'), '256');
+        $data['memory'] = $this->option('maxMemory') ?? $this->ask(__('commands.make_node.memory'));
+        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(__('commands.make_node.memory_overallocate'));
+        $data['disk'] = $this->option('maxDisk') ?? $this->ask(__('commands.make_node.disk'));
+        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(__('commands.make_node.disk_overallocate'));
+        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(__('commands.make_node.upload_size'), '100');
         $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(__('commands.make_node.daemonListen'), '8080');
         $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(__('commands.make_node.daemonSFTP'), '2022');
-        $data['daemon_sftp_alias'] = $this->option('daemonSFTPAlias') ?? $this->ask(__('commands.make_node.daemonSFTPAlias'), '');
         $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(__('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
 
         $node = $this->creationService->handle($data);
-        $this->line(__('commands.make_node.success', ['name' => $data['name'], 'id' => $node->id]));
+        $this->line(__('commands.make_node.succes1') . $data['name'] . __('commands.make_node.succes2')  . $node->id . '.');
     }
 }

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -24,7 +24,7 @@ class ProcessRunnableCommand extends Command
             ->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
             ->where('is_active', true)
             ->where('is_processing', false)
-            ->where('next_run_at', '<=', Carbon::now()->toDateTimeString())
+            ->whereDate('next_run_at', '<=', Carbon::now()->toDateString())
             ->get();
 
         if ($schedules->count() < 1) {
@@ -62,7 +62,7 @@ class ProcessRunnableCommand extends Command
 
             $this->line(trans('command/messages.schedule.output_line', [
                 'schedule' => $schedule->name,
-                'id' => $schedule->id,
+                'hash' => $schedule->hashid,
             ]));
         } catch (\Throwable|\Exception $exception) {
             logger()->error($exception, ['schedule_id' => $schedule->id]);

app/Console/Commands/User/MakeUserCommand.php

@@ -30,7 +30,7 @@ class MakeUserCommand extends Command
     public function handle(): int
     {
         try {
-            DB::connection()->getPdo();
+            DB::select('select 1 where 1');
         } catch (Exception $exception) {
             $this->error($exception->getMessage());
 

app/Contracts/Extensions/HashidsInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Contracts\Extensions;
+
+use Hashids\HashidsInterface as VendorHashidsInterface;
+
+interface HashidsInterface extends VendorHashidsInterface
+{
+    /**
+     * Decode an encoded hashid and return the first result.
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function decodeFirst(string $encoded, string $default = null): mixed;
+}

app/Enums/ContainerStatus.php

@@ -12,7 +12,6 @@ enum ContainerStatus: string
     case Paused = 'paused';
     case Dead = 'dead';
     case Removing = 'removing';
-    case Offline = 'offline';
 
     // HTTP Based
     case Missing = 'missing';
@@ -28,7 +27,6 @@ enum ContainerStatus: string
             self::Dead => 'tabler-heart-x',
             self::Removing => 'tabler-heart-down',
             self::Missing => 'tabler-heart-question',
-            self::Offline => 'tabler-heart-bolt',
         };
     }
 
@@ -43,7 +41,6 @@ enum ContainerStatus: string
             self::Dead => 'danger',
             self::Removing => 'warning',
             self::Missing => 'danger',
-            self::Offline => 'gray',
         };
     }
 }

app/Exceptions/DisplayException.php

@@ -7,7 +7,9 @@ use Filament\Notifications\Notification;
 use Illuminate\Http\Request;
 use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Container\Container;
+use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
@@ -48,7 +50,7 @@ class DisplayException extends PanelException implements HttpExceptionInterface
      */
     public function render(Request $request)
     {
-        if ($request->is('livewire/update')) {
+        if (str($request->url())->contains('livewire')) {
             Notification::make()
                 ->title(static::class)
                 ->body($this->getMessage())

app/Exceptions/Handler.php

@@ -215,7 +215,7 @@ class Handler extends ExceptionHandler
                         ->map(fn ($trace) => Arr::except($trace, ['args']))
                         ->all(),
                     'previous' => Collection::make($this->extractPrevious($e))
-                        ->map(fn ($exception) => $exception->getTrace())
+                        ->map(fn ($exception) => $e->getTrace())
                         ->map(fn ($trace) => Arr::except($trace, ['args']))
                         ->all(),
                 ],

app/Exceptions/Service/Deployment/NoViableNodeException.php

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

app/Exceptions/Service/Helper/CdnVersionFetchingException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Exceptions\Service\Helper;
+
+class CdnVersionFetchingException extends \Exception
+{
+}

app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php

@@ -6,9 +6,9 @@ use App\Exceptions\DisplayException;
 
 class TwoFactorAuthenticationTokenInvalid extends DisplayException
 {
-    public string $title = 'Invalid 2FA Code';
-    public string $icon = 'tabler-2fa';
-
+    /**
+     * TwoFactorAuthenticationTokenInvalid constructor.
+     */
     public function __construct()
     {
         parent::__construct('The provided two-factor authentication token was not valid.');

app/Extensions/DynamicDatabaseConnection.php

@@ -25,7 +25,7 @@ class DynamicDatabaseConnection
             'port' => $host->port,
             'database' => $database,
             'username' => $host->username,
-            'password' => $host->password,
+            'password' => decrypt($host->password),
             'charset' => self::DB_CHARSET,
             'collation' => self::DB_COLLATION,
         ]);

app/Extensions/Hashids.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Extensions;
+
+use Hashids\Hashids as VendorHashids;
+use App\Contracts\Extensions\HashidsInterface;
+
+class Hashids extends VendorHashids implements HashidsInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function decodeFirst(string $encoded, string $default = null): mixed
+    {
+        $result = $this->decode($encoded);
+        if (!is_array($result)) {
+            return $default;
+        }
+
+        return array_first($result, null, $default);
+    }
+}

app/Filament/Pages/Dashboard.php

@@ -7,7 +7,6 @@ use App\Models\Egg;
 use App\Models\Node;
 use App\Models\Server;
 use App\Models\User;
-use App\Services\Helpers\SoftwareVersionService;
 use Filament\Actions\CreateAction;
 use Filament\Pages\Page;
 
@@ -30,14 +29,8 @@ class Dashboard extends Page
 
     public function getViewData(): array
     {
-        /** @var SoftwareVersionService $softwareVersionService */
-        $softwareVersionService = app(SoftwareVersionService::class);
-
         return [
             'inDevelopment' => config('app.version') === 'canary',
-            'version' => $softwareVersionService->versionData()['version'],
-            'latestVersion' => $softwareVersionService->getPanel(),
-            'isLatest' => $softwareVersionService->isLatestPanel(),
             'eggsCount' => Egg::query()->count(),
             'nodesList' => ListNodes::getUrl(),
             'nodesCount' => Node::query()->count(),
@@ -46,17 +39,15 @@ class Dashboard extends Page
 
             'devActions' => [
                 CreateAction::make()
-                    ->label('Bugs & Features')
+                    ->label(trans('dashboard/index.sections.intro-developers.button_issues'))
+                    ->icon('tabler-brand-github')
+                    ->url('https://github.com/pelican-dev/panel/issues/new/choose', true)
+                    ->color('warning'),
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-developers.button_features'))
                     ->icon('tabler-brand-github')
                     ->url('https://github.com/pelican-dev/panel/discussions', true),
             ],
-            'updateActions' => [
-                CreateAction::make()
-                    ->label('Read Documentation')
-                    ->icon('tabler-clipboard-text')
-                    ->url('https://pelican.dev/docs/panel/update', true)
-                    ->color('warning'),
-            ],
             'nodeActions' => [
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-first-node.button_label'))
@@ -64,10 +55,14 @@ class Dashboard extends Page
                     ->url(route('filament.admin.resources.nodes.create')),
             ],
             'supportActions' => [
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-support.button_translate'))
+                    ->icon('tabler-language')
+                    ->url('https://crowdin.com/project/pelican-dev', true),
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-support.button_donate'))
                     ->icon('tabler-cash')
-                    ->url($softwareVersionService->getDonations(), true)
+                    ->url('https://pelican.dev/donate', true)
                     ->color('success'),
             ],
             'helpActions' => [
@@ -75,6 +70,11 @@ class Dashboard extends Page
                     ->label(trans('dashboard/index.sections.intro-help.button_docs'))
                     ->icon('tabler-speedboat')
                     ->url('https://pelican.dev/docs', true),
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-help.button_discord'))
+                    ->icon('tabler-brand-discord')
+                    ->url('https://discord.gg/pelican-panel', true)
+                    ->color('blurple'),
             ],
         ];
     }

app/Filament/Resources/ApiKeyResource.php

@@ -4,25 +4,36 @@ namespace App\Filament\Resources;
 
 use App\Filament\Resources\ApiKeyResource\Pages;
 use App\Models\ApiKey;
+use Filament\Resources\Components\Tab;
 use Filament\Resources\Resource;
+use Illuminate\Database\Eloquent\Builder;
 
 class ApiKeyResource extends Resource
 {
     protected static ?string $model = ApiKey::class;
     protected static ?string $label = 'API Key';
-    protected static ?string $navigationIcon = 'tabler-key';
-    protected static ?string $navigationGroup = 'Advanced';
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::where('key_type', '2')->count() ?: null;
-    }
+    protected static ?string $navigationIcon = 'tabler-key';
 
     public static function canEdit($record): bool
     {
         return false;
     }
 
+    public function getTabs(): array
+    {
+        return [
+            'all' => Tab::make('All Keys'),
+            'application' => Tab::make('Application Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION)),
+        ];
+    }
+
+    public function getDefaultActiveTab(): string|int|null
+    {
+        return 'application';
+    }
+
     public static function getRelations(): array
     {
         return [

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

@@ -4,13 +4,9 @@ namespace App\Filament\Resources\ApiKeyResource\Pages;
 
 use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\Hidden;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Forms;
 
 class CreateApiKey extends CreateRecord
 {
@@ -22,26 +18,40 @@ class CreateApiKey extends CreateRecord
     {
         return $form
             ->schema([
-                Hidden::make('identifier')->default(ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION)),
-                Hidden::make('token')->default(str_random(ApiKey::KEY_LENGTH)),
+                Forms\Components\Hidden::make('identifier')->default(ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION)),
+                Forms\Components\Hidden::make('token')->default(encrypt(str_random(ApiKey::KEY_LENGTH))),
 
-                Hidden::make('user_id')
+                Forms\Components\Hidden::make('user_id')
                     ->default(auth()->user()->id)
                     ->required(),
 
-                Hidden::make('key_type')
+                Forms\Components\Select::make('key_type')
                     ->inlineLabel()
-                    ->default(ApiKey::TYPE_APPLICATION)
-                    ->required(),
+                    ->options(function (ApiKey $apiKey) {
+                        $originalOptions = [
+                            //ApiKey::TYPE_NONE => 'None',
+                            ApiKey::TYPE_ACCOUNT => 'Account',
+                            ApiKey::TYPE_APPLICATION => 'Application',
+                            //ApiKey::TYPE_DAEMON_USER => 'Daemon User',
+                            //ApiKey::TYPE_DAEMON_APPLICATION => 'Daemon Application',
+                        ];
 
-                Fieldset::make('Permissions')
+                        return collect($originalOptions)
+                            ->filter(fn ($value, $key) => $key <= ApiKey::TYPE_APPLICATION || $apiKey->key_type === $key)
+                            ->all();
+                    })
+                    ->selectablePlaceholder(false)
+                    ->required()
+                    ->default(ApiKey::TYPE_APPLICATION),
+
+                Forms\Components\Fieldset::make('Permissions')
                     ->columns([
                         'default' => 1,
                         'sm' => 1,
                         'md' => 2,
                     ])
                     ->schema(
-                        collect(ApiKey::RESOURCES)->map(fn ($resource) => ToggleButtons::make("r_$resource")
+                        collect(ApiKey::RESOURCES)->map(fn ($resource) => Forms\Components\ToggleButtons::make("r_$resource")
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => 'None',
@@ -71,13 +81,15 @@ class CreateApiKey extends CreateRecord
                         )->all(),
                     ),
 
-                TagsInput::make('allowed_ips')
+                Forms\Components\TagsInput::make('allowed_ips')
                     ->placeholder('Example: 127.0.0.1 or 192.168.1.1')
                     ->label('Whitelisted IPv4 Addresses')
                     ->helperText('Press enter to add a new IP address or leave blank to allow any IP address')
-                    ->columnSpanFull(),
+                    ->columnSpanFull()
+                    ->hidden()
+                    ->default(null),
 
-                Textarea::make('memo')
+                Forms\Components\Textarea::make('memo')
                     ->required()
                     ->label('Description')
                     ->helperText('

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

@@ -5,10 +5,11 @@ namespace App\Filament\Resources\ApiKeyResource\Pages;
 use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
 use Filament\Actions;
+use Filament\Resources\Components\Tab;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\DeleteAction;
-use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use Filament\Tables;
 
 class ListApiKeys extends ListRecords
 {
@@ -18,39 +19,42 @@ class ListApiKeys extends ListRecords
     {
         return $table
             ->searchable(false)
-            ->modifyQueryUsing(fn ($query) => $query->where('key_type', ApiKey::TYPE_APPLICATION))
             ->columns([
-                TextColumn::make('key')
+                Tables\Columns\TextColumn::make('user.username')
+                    ->hidden()
+                    ->searchable()
+                    ->sortable(),
+
+                Tables\Columns\TextColumn::make('key')
                     ->copyable()
                     ->icon('tabler-clipboard-text')
-                    ->state(fn (ApiKey $key) => $key->identifier . $key->token),
+                    ->state(fn (ApiKey $key) => $key->identifier . decrypt($key->token)),
 
-                TextColumn::make('memo')
+                Tables\Columns\TextColumn::make('memo')
                     ->label('Description')
                     ->wrap()
                     ->limit(50),
 
-                TextColumn::make('identifier')
+                Tables\Columns\TextColumn::make('identifier')
                     ->hidden()
                     ->searchable(),
 
-                TextColumn::make('last_used_at')
+                Tables\Columns\TextColumn::make('last_used_at')
                     ->label('Last Used')
-                    ->placeholder('Not Used')
                     ->dateTime()
                     ->sortable(),
 
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->label('Created')
                     ->dateTime()
                     ->sortable(),
-
-                TextColumn::make('user.username')
-                    ->label('Created By')
-                    ->url(fn (ApiKey $apiKey): string => route('filament.admin.resources.users.edit', ['record' => $apiKey->user])),
+            ])
+            ->filters([
+                //
             ])
             ->actions([
-                DeleteAction::make(),
+                Tables\Actions\DeleteAction::make(),
+                //Tables\Actions\EditAction::make()
             ]);
     }
 
@@ -60,4 +64,22 @@ class ListApiKeys extends ListRecords
             Actions\CreateAction::make(),
         ];
     }
+
+    public function getTabs(): array
+    {
+        return [
+            'all' => Tab::make('All Keys'),
+            'application' => Tab::make('Application Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION)
+                ),
+            'account' => Tab::make('Account Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_ACCOUNT)
+                ),
+        ];
+    }
+
+    public function getDefaultActiveTab(): string|int|null
+    {
+        return 'application';
+    }
 }

app/Filament/Resources/DatabaseHostResource.php

@@ -13,12 +13,6 @@ class DatabaseHostResource extends Resource
     protected static ?string $label = 'Databases';
 
     protected static ?string $navigationIcon = 'tabler-database';
-    protected static ?string $navigationGroup = 'Advanced';
-
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
 
     public static function getRelations(): array
     {

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

@@ -3,16 +3,10 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
-use App\Services\Databases\Hosts\HostCreationService;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
-use Illuminate\Database\Eloquent\Model;
-use PDOException;
 
 class CreateDatabaseHost extends CreateRecord
 {
@@ -28,87 +22,55 @@ class CreateDatabaseHost extends CreateRecord
     {
         return $form
             ->schema([
-                Section::make()
-                    ->columns([
-                        'default' => 2,
-                        'sm' => 3,
-                        'md' => 3,
-                        'lg' => 4,
-                    ])
-                    ->schema([
-                        TextInput::make('host')
-                            ->columnSpan(2)
-                            ->helperText('The IP address or Domain name that should be used when attempting to connect to this MySQL host from this Panel to create new databases.')
-                            ->required()
-                            ->live(onBlur: true)
-                            ->afterStateUpdated(fn ($state, Forms\Set $set) => $set('name', $state))
-                            ->maxLength(255),
-                        TextInput::make('port')
-                            ->columnSpan(1)
-                            ->helperText('The port that MySQL is running on for this host.')
-                            ->required()
-                            ->numeric()
-                            ->default(3306)
-                            ->minValue(0)
-                            ->maxValue(65535),
-                        TextInput::make('max_databases')
-                            ->label('Max databases')
-                            ->helpertext('Blank is unlimited.')
-                            ->numeric(),
-                        TextInput::make('name')
-                            ->label('Display Name')
-                            ->helperText('A short identifier used to distinguish this location from others. Must be between 1 and 60 characters, for example, us.nyc.lvl3.')
-                            ->required()
-                            ->maxLength(60),
-                        TextInput::make('username')
-                            ->helperText('The username of an account that has enough permissions to create new users and databases on the system.')
-                            ->required()
-                            ->maxLength(255),
-                        TextInput::make('password')
-                            ->helperText('The password for the database user.')
-                            ->password()
-                            ->revealable()
-                            ->maxLength(255)
-                            ->required(),
-                        Select::make('node_id')
-                            ->searchable()
-                            ->preload()
-                            ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
-                            ->label('Linked Node')
-                            ->relationship('node', 'name'),
-                    ]),
+                Section::make()->schema([
+                    Forms\Components\TextInput::make('host')
+                        ->helperText('The IP address or Domain name that should be used when attempting to connect to this MySQL host from this Panel to create new databases.')
+                        ->required()
+                        ->live()
+                        ->debounce(500)
+                        ->afterStateUpdated(fn ($state, Forms\Set $set) => $set('name', $state))
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('port')
+                        ->helperText('The port that MySQL is running on for this host.')
+                        ->required()
+                        ->numeric()
+                        ->default(3306)
+                        ->minValue(0)
+                        ->maxValue(65535),
+                    Forms\Components\TextInput::make('username')
+                        ->helperText('The username of an account that has enough permissions to create new users and databases on the system.')
+                        ->required()
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('password')
+                        ->helperText('The password for the database user.')
+                        ->password()
+                        ->revealable()
+                        ->maxLength(191)
+                        ->required(),
+                    Forms\Components\TextInput::make('name')
+                        ->helperText('A short identifier used to distinguish this location from others. Must be between 1 and 60 characters, for example, us.nyc.lvl3.')
+                        ->required()
+                        ->maxLength(60),
+                    Forms\Components\Select::make('node_id')
+                        ->searchable()
+                        ->preload()
+                        ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
+                        ->label('Linked Node')
+                        ->relationship('node', 'name'),
+                ])->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
             ]);
+
     }
 
-    protected function getHeaderActions(): array
+    protected function mutateFormDataBeforeSave(array $data): array
     {
-        return [
-            $this->getCreateFormAction()->formId('form'),
-        ];
-    }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
-
-    protected function handleRecordCreation(array $data): Model
-    {
-        return resolve(HostCreationService::class)->handle($data);
-    }
-
-    public function exception($e, $stopPropagation): void
-    {
-        if ($e instanceof PDOException) {
-            Notification::make()
-                ->title('Error connecting to database host')
-                ->body($e->getMessage())
-                ->color('danger')
-                ->icon('tabler-database')
-                ->danger()
-                ->send();
-
-            $stopPropagation();
+        if (isset($data['password'])) {
+            $data['password'] = encrypt($data['password']);
         }
+
+        return $data;
     }
 }

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

@@ -3,19 +3,11 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
-use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
-use App\Models\DatabaseHost;
-use App\Services\Databases\Hosts\HostUpdateService;
 use Filament\Actions;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
-use Illuminate\Database\Eloquent\Model;
-use PDOException;
 
 class EditDatabaseHost extends EditRecord
 {
@@ -25,96 +17,61 @@ class EditDatabaseHost extends EditRecord
     {
         return $form
             ->schema([
-                Section::make()
-                    ->columns([
-                        'default' => 2,
-                        'sm' => 3,
-                        'md' => 3,
-                        'lg' => 4,
-                    ])
-                    ->schema([
-                        TextInput::make('host')
-                            ->columnSpan(2)
-                            ->helperText('The IP address or Domain name that should be used when attempting to connect to this MySQL host from this Panel to create new databases.')
-                            ->required()
-                            ->live(onBlur: true)
-                            ->afterStateUpdated(fn ($state, Forms\Set $set) => $set('name', $state))
-                            ->maxLength(255),
-                        TextInput::make('port')
-                            ->columnSpan(1)
-                            ->helperText('The port that MySQL is running on for this host.')
-                            ->required()
-                            ->numeric()
-                            ->minValue(0)
-                            ->maxValue(65535),
-                        TextInput::make('max_databases')
-                            ->label('Max databases')
-                            ->helpertext('Blank is unlimited.')
-                            ->numeric(),
-                        TextInput::make('name')
-                            ->label('Display Name')
-                            ->helperText('A short identifier used to distinguish this location from others. Must be between 1 and 60 characters, for example, us.nyc.lvl3.')
-                            ->required()
-                            ->maxLength(60),
-                        TextInput::make('username')
-                            ->helperText('The username of an account that has enough permissions to create new users and databases on the system.')
-                            ->required()
-                            ->maxLength(255),
-                        TextInput::make('password')
-                            ->helperText('The password for the database user.')
-                            ->password()
-                            ->revealable()
-                            ->maxLength(255)
-                            ->required(),
-                        Select::make('node_id')
-                            ->searchable()
-                            ->preload()
-                            ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
-                            ->label('Linked Node')
-                            ->relationship('node', 'name'),
-                    ]),
+                Section::make()->schema([
+                    Forms\Components\TextInput::make('host')
+                        ->helperText('The IP address or Domain name that should be used when attempting to connect to this MySQL host from this Panel to create new databases.')
+                        ->required()
+                        ->live()
+                        ->debounce(500)
+                        ->afterStateUpdated(fn ($state, Forms\Set $set) => $set('name', $state))
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('port')
+                        ->helperText('The port that MySQL is running on for this host.')
+                        ->required()
+                        ->numeric()
+                        ->default(3306)
+                        ->minValue(0)
+                        ->maxValue(65535),
+                    Forms\Components\TextInput::make('username')
+                        ->helperText('The username of an account that has enough permissions to create new users and databases on the system.')
+                        ->required()
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('password')
+                        ->helperText('The password for the database user.')
+                        ->password()
+                        ->revealable()
+                        ->maxLength(191)
+                        ->required(),
+                    Forms\Components\TextInput::make('name')
+                        ->helperText('A short identifier used to distinguish this location from others. Must be between 1 and 60 characters, for example, us.nyc.lvl3.')
+                        ->required()
+                        ->maxLength(60),
+                    Forms\Components\Select::make('node_id')
+                        ->searchable()
+                        ->preload()
+                        ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
+                        ->label('Linked Node')
+                        ->relationship('node', 'name'),
+                ])->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
             ]);
     }
 
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->label(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0 ? 'Database Host Has Databases' : 'Delete')
-                ->disabled(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0),
-            $this->getSaveFormAction()->formId('form'),
+            Actions\DeleteAction::make(),
         ];
     }
 
-    protected function getFormActions(): array
+    protected function mutateFormDataBeforeSave(array $data): array
     {
-        return [];
-    }
-
-    public function getRelationManagers(): array
-    {
-        return [
-            DatabasesRelationManager::class,
-        ];
-    }
-
-    protected function handleRecordUpdate($record, array $data): Model
-    {
-        return resolve(HostUpdateService::class)->handle($record->id, $data);
-    }
-
-    public function exception($e, $stopPropagation): void
-    {
-        if ($e instanceof PDOException) {
-            Notification::make()
-                ->title('Error connecting to database host')
-                ->body($e->getMessage())
-                ->color('danger')
-                ->icon('tabler-database')
-                ->danger()
-                ->send();
-
-            $stopPropagation();
+        if (isset($data['password'])) {
+            $data['password'] = encrypt($data['password']);
         }
+
+        return $data;
     }
 }

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

@@ -5,44 +5,42 @@ namespace App\Filament\Resources\DatabaseHostResource\Pages;
 use App\Filament\Resources\DatabaseHostResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\BulkActionGroup;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Table;
 
 class ListDatabaseHosts extends ListRecords
 {
     protected static string $resource = DatabaseHostResource::class;
 
-    protected ?string $heading = 'Database Hosts';
-
     public function table(Table $table): Table
     {
         return $table
             ->searchable(false)
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable(),
-                TextColumn::make('host')
+                Tables\Columns\TextColumn::make('host')
                     ->searchable(),
-                TextColumn::make('port')
+                Tables\Columns\TextColumn::make('port')
                     ->sortable(),
-                TextColumn::make('username')
+                Tables\Columns\TextColumn::make('username')
                     ->searchable(),
-                TextColumn::make('max_databases')
+                Tables\Columns\TextColumn::make('max_databases')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('node.name')
+                Tables\Columns\TextColumn::make('node.name')
                     ->numeric()
                     ->sortable(),
             ])
+            ->filters([
+                //
+            ])
             ->actions([
-                EditAction::make(),
+                Tables\Actions\EditAction::make(),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
@@ -50,7 +48,7 @@ class ListDatabaseHosts extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make('create')->label('New Database Host'),
+            Actions\CreateAction::make(),
         ];
     }
 }

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

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\DatabaseHostResource\RelationManagers;
-
-use App\Models\Database;
-use App\Services\Databases\DatabasePasswordService;
-use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Forms\Get;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables\Actions\DeleteAction;
-use Filament\Tables\Actions\ViewAction;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Table;
-
-class DatabasesRelationManager extends RelationManager
-{
-    protected static string $relationship = 'databases';
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                TextInput::make('database')->columnSpanFull(),
-                TextInput::make('username'),
-                TextInput::make('password')
-                    ->hintAction(
-                        Action::make('rotate')
-                            ->icon('tabler-refresh')
-                            ->requiresConfirmation()
-                            ->action(fn (DatabasePasswordService $service, Database $database, $set, $get) => $this->rotatePassword($service, $database, $set, $get))
-                    )
-                    ->formatStateUsing(fn (Database $database) => $database->password),
-                TextInput::make('remote')->label('Connections From'),
-                TextInput::make('max_connections'),
-                TextInput::make('JDBC')
-                    ->label('JDBC Connection String')
-                    ->columnSpanFull()
-                    ->formatStateUsing(fn (Get $get, Database $database) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($database->password) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database')),
-            ]);
-    }
-    public function table(Table $table): Table
-    {
-        return $table
-            ->recordTitleAttribute('servers')
-            ->columns([
-                TextColumn::make('database')->icon('tabler-database'),
-                TextColumn::make('username')->icon('tabler-user'),
-                TextColumn::make('remote'),
-                TextColumn::make('server.name')
-                    ->icon('tabler-brand-docker')
-                    ->url(fn (Database $database) => route('filament.admin.resources.servers.edit', ['record' => $database->server_id])),
-                TextColumn::make('max_connections'),
-                TextColumn::make('created_at')->dateTime(),
-            ])
-            ->actions([
-                DeleteAction::make(),
-                ViewAction::make()->color('primary'),
-            ]);
-    }
-
-    protected function rotatePassword(DatabasePasswordService $service, Database $database, $set, $get): void
-    {
-        $newPassword = $service->handle($database);
-        $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database');
-
-        $set('password', $newPassword);
-        $set('JDBC', $jdbcString);
-    }
-}

app/Filament/Resources/DatabaseResource.php

@@ -13,12 +13,6 @@ class DatabaseResource extends Resource
     protected static ?string $navigationIcon = 'tabler-database';
 
     protected static bool $shouldRegisterNavigation = false;
-    protected static ?string $navigationGroup = 'Advanced';
-
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
 
     public static function getRelations(): array
     {

app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php

@@ -3,10 +3,9 @@
 namespace App\Filament\Resources\DatabaseResource\Pages;
 
 use App\Filament\Resources\DatabaseResource;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Forms;
 
 class CreateDatabase extends CreateRecord
 {
@@ -16,29 +15,29 @@ class CreateDatabase extends CreateRecord
     {
         return $form
             ->schema([
-                Select::make('server_id')
+                Forms\Components\Select::make('server_id')
                     ->relationship('server', 'name')
                     ->searchable()
                     ->preload()
                     ->required(),
-                TextInput::make('database_host_id')
+                Forms\Components\TextInput::make('database_host_id')
                     ->required()
                     ->numeric(),
-                TextInput::make('database')
+                Forms\Components\TextInput::make('database')
                     ->required()
-                    ->maxLength(255),
-                TextInput::make('remote')
+                    ->maxLength(191),
+                Forms\Components\TextInput::make('remote')
                     ->required()
-                    ->maxLength(255)
+                    ->maxLength(191)
                     ->default('%'),
-                TextInput::make('username')
+                Forms\Components\TextInput::make('username')
                     ->required()
-                    ->maxLength(255),
-                TextInput::make('password')
+                    ->maxLength(191),
+                Forms\Components\TextInput::make('password')
                     ->password()
                     ->revealable()
                     ->required(),
-                TextInput::make('max_connections')
+                Forms\Components\TextInput::make('max_connections')
                     ->numeric()
                     ->minValue(0)
                     ->default(0),

app/Filament/Resources/DatabaseResource/Pages/EditDatabase.php

@@ -4,10 +4,9 @@ namespace App\Filament\Resources\DatabaseResource\Pages;
 
 use App\Filament\Resources\DatabaseResource;
 use Filament\Actions;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Forms;
 
 class EditDatabase extends EditRecord
 {
@@ -17,29 +16,29 @@ class EditDatabase extends EditRecord
     {
         return $form
             ->schema([
-                Select::make('server_id')
+                Forms\Components\Select::make('server_id')
                     ->relationship('server', 'name')
                     ->searchable()
                     ->preload()
                     ->required(),
-                TextInput::make('database_host_id')
+                Forms\Components\TextInput::make('database_host_id')
                     ->required()
                     ->numeric(),
-                TextInput::make('database')
+                Forms\Components\TextInput::make('database')
                     ->required()
-                    ->maxLength(255),
-                TextInput::make('remote')
+                    ->maxLength(191),
+                Forms\Components\TextInput::make('remote')
                     ->required()
-                    ->maxLength(255)
+                    ->maxLength(191)
                     ->default('%'),
-                TextInput::make('username')
+                Forms\Components\TextInput::make('username')
                     ->required()
-                    ->maxLength(255),
-                TextInput::make('password')
+                    ->maxLength(191),
+                Forms\Components\TextInput::make('password')
                     ->password()
                     ->revealable()
                     ->required(),
-                TextInput::make('max_connections')
+                Forms\Components\TextInput::make('max_connections')
                     ->numeric()
                     ->minValue(0)
                     ->default(0),

app/Filament/Resources/DatabaseResource/Pages/ListDatabases.php

@@ -4,12 +4,9 @@ namespace App\Filament\Resources\DatabaseResource\Pages;
 
 use App\Filament\Resources\DatabaseResource;
 use Filament\Actions;
-use Filament\Tables\Actions\EditAction;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\BulkActionGroup;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
+use Filament\Tables;
 
 class ListDatabases extends ListRecords
 {
@@ -19,36 +16,39 @@ class ListDatabases extends ListRecords
     {
         return $table
             ->columns([
-                TextColumn::make('server.name')
+                Tables\Columns\TextColumn::make('server.name')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('database_host_id')
+                Tables\Columns\TextColumn::make('database_host_id')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('database')
+                Tables\Columns\TextColumn::make('database')
                     ->searchable(),
-                TextColumn::make('username')
+                Tables\Columns\TextColumn::make('username')
                     ->searchable(),
-                TextColumn::make('remote')
+                Tables\Columns\TextColumn::make('remote')
                     ->searchable(),
-                TextColumn::make('max_connections')
+                Tables\Columns\TextColumn::make('max_connections')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
             ])
+            ->filters([
+                //
+            ])
             ->actions([
-                EditAction::make(),
+                Tables\Actions\EditAction::make(),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }

app/Filament/Resources/EggResource.php

@@ -16,11 +16,6 @@ class EggResource extends Resource
 
     protected static ?string $recordRouteKeyName = 'id';
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
-
     public static function getRelations(): array
     {
         return [

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

@@ -3,18 +3,6 @@
 namespace App\Filament\Resources\EggResource\Pages;
 
 use App\Filament\Resources\EggResource;
-use Filament\Forms\Components\Checkbox;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\Hidden;
-use Filament\Forms\Components\KeyValue;
-use Filament\Forms\Components\Repeater;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
 use Filament\Resources\Pages\CreateRecord;
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
 use Filament\Forms;
@@ -31,26 +19,25 @@ class CreateEgg extends CreateRecord
     {
         return $form
             ->schema([
-                Tabs::make()->tabs([
-                    Tab::make('Configuration')
+                Forms\Components\Tabs::make()->tabs([
+                    Forms\Components\Tabs\Tab::make('Configuration')
                         ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
                         ->schema([
-                            TextInput::make('name')
+                            Forms\Components\TextInput::make('name')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('A simple, human-readable name to use as an identifier for this Egg.'),
-                            TextInput::make('author')
-                                ->maxLength(255)
+                            Forms\Components\TextInput::make('author')
+                                ->maxLength(191)
                                 ->required()
-                                ->email()
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('The author of this version of the Egg.'),
-                            Textarea::make('description')
+                            Forms\Components\Textarea::make('description')
                                 ->rows(3)
                                 ->columnSpanFull()
                                 ->helperText('A description of this Egg that will be displayed throughout the Panel as needed.'),
-                            Textarea::make('startup')
+                            Forms\Components\Textarea::make('startup')
                                 ->rows(3)
                                 ->columnSpanFull()
                                 ->required()
@@ -58,26 +45,26 @@ class CreateEgg extends CreateRecord
                                     'java -Xms128M -XX:MaxRAMPercentage=95.0 -jar {{SERVER_JARFILE}}',
                                 ]))
                                 ->helperText('The default startup command that should be used for new servers using this Egg.'),
-                            TagsInput::make('features')
+                            Forms\Components\TagsInput::make('features')
                                 ->placeholder('Add Feature')
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            Toggle::make('force_outgoing_ip')
+                            Forms\Components\Toggle::make('force_outgoing_ip')
                                 ->hintIcon('tabler-question-mark')
                                 ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary allocation IP.
                                     Required for certain games to work properly when the Node has multiple public IP addresses.
                                     Enabling this option will disable internal networking for any servers using this egg, causing them to be unable to internally access other servers on the same node."),
-                            Hidden::make('script_is_privileged')
+                            Forms\Components\Hidden::make('script_is_privileged')
                                 ->default(1),
-                            TagsInput::make('tags')
+                            Forms\Components\TagsInput::make('tags')
                                 ->placeholder('Add Tags')
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            TextInput::make('update_url')
+                            Forms\Components\TextInput::make('update_url')
                                 ->disabled()
                                 ->helperText('Not implemented.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            KeyValue::make('docker_images')
+                            Forms\Components\KeyValue::make('docker_images')
                                 ->live()
                                 ->columnSpanFull()
                                 ->required()
@@ -89,37 +76,37 @@ class CreateEgg extends CreateRecord
                                 ->helperText('The docker images available to servers using this egg.'),
                         ]),
 
-                    Tab::make('Process Management')
+                    Forms\Components\Tabs\Tab::make('Process Management')
                         ->columns()
                         ->schema([
-                            Hidden::make('config_from')
+                            Forms\Components\Hidden::make('config_from')
                                 ->default(null)
                                 ->label('Copy Settings From')
                                 // ->placeholder('None')
                                 // ->relationship('configFrom', 'name', ignoreRecord: true)
                                 ->helperText('If you would like to default to settings from another Egg select it from the menu above.'),
-                            TextInput::make('config_stop')
+                            Forms\Components\TextInput::make('config_stop')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->label('Stop Command')
                                 ->helperText('The command that should be sent to server processes to stop them gracefully. If you need to send a SIGINT you should enter ^C here.'),
-                            Textarea::make('config_startup')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_startup')->rows(10)->json()
                                 ->label('Start Configuration')
                                 ->default('{}')
                                 ->helperText('List of values the daemon should be looking for when booting a server to determine completion.'),
-                            Textarea::make('config_files')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_files')->rows(10)->json()
                                 ->label('Configuration Files')
                                 ->default('{}')
                                 ->helperText('This should be a JSON representation of configuration files to modify and what parts should be changed.'),
-                            Textarea::make('config_logs')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_logs')->rows(10)->json()
                                 ->label('Log Configuration')
                                 ->default('{}')
                                 ->helperText('This should be a JSON representation of where log files are stored, and whether or not the daemon should be creating custom logs.'),
                         ]),
-                    Tab::make('Egg Variables')
+                    Forms\Components\Tabs\Tab::make('Egg Variables')
                         ->columnSpanFull()
                         ->schema([
-                            Repeater::make('variables')
+                            Forms\Components\Repeater::make('variables')
                                 ->label('')
                                 ->addActionLabel('Add New Egg Variable')
                                 ->grid()
@@ -149,46 +136,46 @@ class CreateEgg extends CreateRecord
                                     return $data;
                                 })
                                 ->schema([
-                                    TextInput::make('name')
+                                    Forms\Components\TextInput::make('name')
                                         ->live()
                                         ->debounce(750)
-                                        ->maxLength(255)
+                                        ->maxLength(191)
                                         ->columnSpanFull()
                                         ->afterStateUpdated(fn (Forms\Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString())
                                         )
                                         ->required(),
-                                    Textarea::make('description')->columnSpanFull(),
-                                    TextInput::make('env_variable')
+                                    Forms\Components\Textarea::make('description')->columnSpanFull(),
+                                    Forms\Components\TextInput::make('env_variable')
                                         ->label('Environment Variable')
-                                        ->maxLength(255)
+                                        ->maxLength(191)
                                         ->prefix('{{')
                                         ->suffix('}}')
                                         ->hintIcon('tabler-code')
                                         ->hintIconTooltip(fn ($state) => "{{{$state}}}")
                                         ->required(),
-                                    TextInput::make('default_value')->maxLength(255),
-                                    Fieldset::make('User Permissions')
+                                    Forms\Components\TextInput::make('default_value')->maxLength(191),
+                                    Forms\Components\Fieldset::make('User Permissions')
                                         ->schema([
-                                            Checkbox::make('user_viewable')->label('Viewable'),
-                                            Checkbox::make('user_editable')->label('Editable'),
+                                            Forms\Components\Checkbox::make('user_viewable')->label('Viewable'),
+                                            Forms\Components\Checkbox::make('user_editable')->label('Editable'),
                                         ]),
-                                    Textarea::make('rules')->columnSpanFull(),
+                                    Forms\Components\Textarea::make('rules')->columnSpanFull(),
                                 ]),
                         ]),
-                    Tab::make('Install Script')
+                    Forms\Components\Tabs\Tab::make('Install Script')
                         ->columns(3)
                         ->schema([
 
-                            Hidden::make('copy_script_from'),
+                            Forms\Components\Hidden::make('copy_script_from'),
                             //->placeholder('None')
                             //->relationship('scriptFrom', 'name', ignoreRecord: true),
 
-                            TextInput::make('script_container')
+                            Forms\Components\TextInput::make('script_container')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->default('alpine:3.4'),
 
-                            Select::make('script_entry')
+                            Forms\Components\Select::make('script_entry')
                                 ->selectablePlaceholder(false)
                                 ->default('bash')
                                 ->options(['bash', 'ash', '/bin/bash'])

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

@@ -3,29 +3,10 @@
 namespace App\Filament\Resources\EggResource\Pages;
 
 use App\Filament\Resources\EggResource;
-use App\Filament\Resources\EggResource\RelationManagers\ServersRelationManager;
 use App\Models\Egg;
-use App\Services\Eggs\Sharing\EggImporterService;
-use Exception;
 use Filament\Actions;
-use Filament\Forms\Components\Checkbox;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\FileUpload;
-use Filament\Forms\Components\Hidden;
-use Filament\Forms\Components\KeyValue;
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\Repeater;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
-use App\Services\Eggs\Sharing\EggExporterService;
 use Filament\Forms;
 use Filament\Forms\Form;
 
@@ -37,64 +18,59 @@ class EditEgg extends EditRecord
     {
         return $form
             ->schema([
-                Tabs::make()->tabs([
-                    Tab::make('Configuration')
+                Forms\Components\Tabs::make()->tabs([
+                    Forms\Components\Tabs\Tab::make('Configuration')
                         ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
                         ->schema([
-                            TextInput::make('name')
+                            Forms\Components\TextInput::make('name')
                                 ->required()
-                                ->maxLength(255)
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
+                                ->maxLength(191)
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('A simple, human-readable name to use as an identifier for this Egg.'),
-                            TextInput::make('uuid')
-                                ->label('Egg UUID')
+                            Forms\Components\TextInput::make('uuid')
                                 ->disabled()
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('This is the globally unique identifier for this Egg which Wings uses as an identifier.'),
-                            TextInput::make('id')
-                                ->label('Egg ID')
-                                ->disabled(),
-                            Textarea::make('description')
+                            Forms\Components\Textarea::make('description')
                                 ->rows(3)
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('A description of this Egg that will be displayed throughout the Panel as needed.'),
-                            TextInput::make('author')
+                            Forms\Components\TextInput::make('author')
                                 ->required()
-                                ->maxLength(255)
-                                ->email()
+                                ->maxLength(191)
                                 ->disabled()
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('The author of this version of the Egg. Uploading a new Egg configuration from a different author will change this.'),
-                            Textarea::make('startup')
+                            Forms\Components\Textarea::make('startup')
                                 ->rows(2)
                                 ->columnSpanFull()
                                 ->required()
                                 ->helperText('The default startup command that should be used for new servers using this Egg.'),
-                            TagsInput::make('file_denylist')
+                            Forms\Components\TagsInput::make('file_denylist')
                                 ->hidden() // latest wings breaks it.
                                 ->placeholder('denied-file.txt')
                                 ->helperText('A list of files that the end user is not allowed to edit.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            TagsInput::make('features')
+                            Forms\Components\TagsInput::make('features')
                                 ->placeholder('Add Feature')
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            Toggle::make('force_outgoing_ip')
+                            Forms\Components\Toggle::make('force_outgoing_ip')
                                 ->hintIcon('tabler-question-mark')
                                 ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary allocation IP.
                                     Required for certain games to work properly when the Node has multiple public IP addresses.
                                     Enabling this option will disable internal networking for any servers using this egg, causing them to be unable to internally access other servers on the same node."),
-                            Hidden::make('script_is_privileged')
+                            Forms\Components\Hidden::make('script_is_privileged')
                                 ->helperText('The docker images available to servers using this egg.'),
-                            TagsInput::make('tags')
+                            Forms\Components\TagsInput::make('tags')
                                 ->placeholder('Add Tags')
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            TextInput::make('update_url')
+                            Forms\Components\TextInput::make('update_url')
                                 ->disabled()
                                 ->helperText('Not implemented.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            KeyValue::make('docker_images')
+                            Forms\Components\KeyValue::make('docker_images')
                                 ->live()
                                 ->columnSpanFull()
                                 ->required()
@@ -104,32 +80,32 @@ class EditEgg extends EditRecord
                                 ->helperText('The docker images available to servers using this egg.'),
                         ]),
 
-                    Tab::make('Process Management')
+                    Forms\Components\Tabs\Tab::make('Process Management')
                         ->columns()
                         ->schema([
-                            Select::make('config_from')
+                            Forms\Components\Select::make('config_from')
                                 ->label('Copy Settings From')
                                 ->placeholder('None')
                                 ->relationship('configFrom', 'name', ignoreRecord: true)
                                 ->helperText('If you would like to default to settings from another Egg select it from the menu above.'),
-                            TextInput::make('config_stop')
-                                ->maxLength(255)
+                            Forms\Components\TextInput::make('config_stop')
+                                ->maxLength(191)
                                 ->label('Stop Command')
                                 ->helperText('The command that should be sent to server processes to stop them gracefully. If you need to send a SIGINT you should enter ^C here.'),
-                            Textarea::make('config_startup')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_startup')->rows(10)->json()
                                 ->label('Start Configuration')
                                 ->helperText('List of values the daemon should be looking for when booting a server to determine completion.'),
-                            Textarea::make('config_files')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_files')->rows(10)->json()
                                 ->label('Configuration Files')
                                 ->helperText('This should be a JSON representation of configuration files to modify and what parts should be changed.'),
-                            Textarea::make('config_logs')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_logs')->rows(10)->json()
                                 ->label('Log Configuration')
                                 ->helperText('This should be a JSON representation of where log files are stored, and whether or not the daemon should be creating custom logs.'),
                         ]),
-                    Tab::make('Egg Variables')
+                    Forms\Components\Tabs\Tab::make('Egg Variables')
                         ->columnSpanFull()
                         ->schema([
-                            Repeater::make('variables')
+                            Forms\Components\Repeater::make('variables')
                                 ->label('')
                                 ->grid()
                                 ->relationship('variables')
@@ -158,48 +134,48 @@ class EditEgg extends EditRecord
                                     return $data;
                                 })
                                 ->schema([
-                                    TextInput::make('name')
+                                    Forms\Components\TextInput::make('name')
                                         ->live()
                                         ->debounce(750)
-                                        ->maxLength(255)
+                                        ->maxLength(191)
                                         ->columnSpanFull()
                                         ->afterStateUpdated(fn (Forms\Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString())
                                         )
                                         ->required(),
-                                    Textarea::make('description')->columnSpanFull(),
-                                    TextInput::make('env_variable')
+                                    Forms\Components\Textarea::make('description')->columnSpanFull(),
+                                    Forms\Components\TextInput::make('env_variable')
                                         ->label('Environment Variable')
-                                        ->maxLength(255)
+                                        ->maxLength(191)
                                         ->prefix('{{')
                                         ->suffix('}}')
                                         ->hintIcon('tabler-code')
                                         ->hintIconTooltip(fn ($state) => "{{{$state}}}")
                                         ->required(),
-                                    TextInput::make('default_value')->maxLength(255),
-                                    Fieldset::make('User Permissions')
+                                    Forms\Components\TextInput::make('default_value')->maxLength(191),
+                                    Forms\Components\Fieldset::make('User Permissions')
                                         ->schema([
-                                            Checkbox::make('user_viewable')->label('Viewable'),
-                                            Checkbox::make('user_editable')->label('Editable'),
+                                            Forms\Components\Checkbox::make('user_viewable')->label('Viewable'),
+                                            Forms\Components\Checkbox::make('user_editable')->label('Editable'),
                                         ]),
-                                    TextInput::make('rules')->columnSpanFull(),
+                                    Forms\Components\TextInput::make('rules')->columnSpanFull(),
                                 ]),
                         ]),
-                    Tab::make('Install Script')
+                    Forms\Components\Tabs\Tab::make('Install Script')
                         ->columns(3)
                         ->schema([
 
-                            Select::make('copy_script_from')
+                            Forms\Components\Select::make('copy_script_from')
                                 ->placeholder('None')
                                 ->relationship('scriptFrom', 'name', ignoreRecord: true),
 
-                            TextInput::make('script_container')
+                            Forms\Components\TextInput::make('script_container')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->default('alpine:3.4'),
 
-                            TextInput::make('script_entry')
+                            Forms\Components\TextInput::make('script_entry')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->default('ash'),
 
                             MonacoEditor::make('script_install')
@@ -217,106 +193,15 @@ class EditEgg extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make('deleteEgg')
+            Actions\DeleteAction::make()
                 ->disabled(fn (Egg $egg): bool => $egg->servers()->count() > 0)
-                ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? 'Delete' : 'In Use'),
-
-            Actions\Action::make('exportEgg')
-                ->label('Export')
+                ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? 'Delete Egg' : 'Egg In Use'),
+            Actions\ExportAction::make()
+                ->icon('tabler-download')
+                ->label('Export Egg')
                 ->color('primary')
-                ->action(fn (EggExporterService $service, Egg $egg) => response()->streamDownload(function () use ($service, $egg) {
-                    echo $service->handle($egg->id);
-                }, 'egg-' . $egg->getKebabName() . '.json')),
-
-            Actions\Action::make('importEgg')
-                ->label('Import')
-                ->form([
-                    Placeholder::make('warning')
-                        ->label('This will overwrite the current egg to the one you upload.'),
-                    Tabs::make('Tabs')
-                        ->tabs([
-                            Tab::make('From File')
-                                ->icon('tabler-file-upload')
-                                ->schema([
-                                    FileUpload::make('egg')
-                                        ->label('Egg')
-                                        ->hint('eg. minecraft.json')
-                                        ->acceptedFileTypes(['application/json'])
-                                        ->storeFiles(false),
-                                ]),
-                            Tab::make('From URL')
-                                ->icon('tabler-world-upload')
-                                ->schema([
-                                    TextInput::make('url')
-                                        ->label('URL')
-                                        ->hint('Link to the egg file (eg. minecraft.json)')
-                                        ->url(),
-                                ]),
-                        ])
-                        ->contained(false),
-
-                ])
-                ->action(function (array $data, Egg $egg): void {
-                    /** @var EggImporterService $eggImportService */
-                    $eggImportService = resolve(EggImporterService::class);
-
-                    if (!empty($data['egg'])) {
-                        try {
-                            $eggImportService->fromFile($data['egg'], $egg);
-                        } catch (Exception $exception) {
-                            Notification::make()
-                                ->title('Import Failed')
-                                ->body($exception->getMessage())
-                                ->danger()
-                                ->send();
-
-                            report($exception);
-
-                            return;
-                        }
-                    }
-
-                    if (!empty($data['url'])) {
-                        try {
-                            $eggImportService->fromUrl($data['url'], $egg);
-                        } catch (Exception $exception) {
-                            Notification::make()
-                                ->title('Import Failed')
-                                ->body($exception->getMessage())
-                                ->danger()
-                                ->send();
-
-                            report($exception);
-
-                            return;
-                        }
-                    }
-
-                    $this->refreshForm();
-                    Notification::make()
-                        ->title('Import Success')
-                        ->success()
-                        ->send();
-                }),
-
-            $this->getSaveFormAction()->formId('form'),
-        ];
-    }
-
-    public function refreshForm(): void
-    {
-        $this->fillForm();
-    }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
-
-    public function getRelationManagers(): array
-    {
-        return [
-            ServersRelationManager::class,
+                // TODO uses old admin panel export service
+                ->url(fn (Egg $egg): string => route('admin.eggs.export', ['egg' => $egg['id']])),
         ];
     }
 }

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

@@ -4,20 +4,12 @@ namespace App\Filament\Resources\EggResource\Pages;
 
 use App\Filament\Resources\EggResource;
 use App\Models\Egg;
-use App\Services\Eggs\Sharing\EggExporterService;
 use App\Services\Eggs\Sharing\EggImporterService;
 use Exception;
 use Filament\Actions;
-use Filament\Forms\Components\FileUpload;
-use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\TextInput;
+use Filament\Forms;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\BulkActionGroup;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 use Filament\Tables;
@@ -29,37 +21,54 @@ class ListEggs extends ListRecords
     public function table(Table $table): Table
     {
         return $table
-            ->searchable(true)
+            ->searchable(false)
             ->defaultPaginationPageOption(25)
             ->checkIfRecordIsSelectableUsing(fn (Egg $egg) => $egg->servers_count <= 0)
             ->columns([
-                TextColumn::make('id')
+                Tables\Columns\TextColumn::make('id')
                     ->label('Id')
-                    ->hidden(),
-                TextColumn::make('name')
+                    ->hidden()
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-egg')
-                    ->description(fn ($record): ?string => (strlen($record->description) > 120) ? substr($record->description, 0, 120).'...' : $record->description)
+                    ->description(fn ($record): ?string => $record->description)
                     ->wrap()
-                    ->searchable()
-                    ->sortable(),
-                TextColumn::make('servers_count')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('author')
+                    ->hidden()
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('servers_count')
                     ->counts('servers')
                     ->icon('tabler-server')
                     ->label('Servers'),
+                Tables\Columns\TextColumn::make('script_container')
+                    ->searchable()
+                    ->hidden(),
+                Tables\Columns\TextColumn::make('copyFrom.name')
+                    ->hidden()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('script_entry')
+                    ->hidden()
+                    ->searchable(),
+            ])
+            ->filters([
+                //
             ])
             ->actions([
-                EditAction::make(),
-                Tables\Actions\Action::make('export')
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\ExportAction::make()
                     ->icon('tabler-download')
                     ->label('Export')
                     ->color('primary')
-                    ->action(fn (EggExporterService $service, Egg $egg) => response()->streamDownload(function () use ($service, $egg) {
-                        echo $service->handle($egg->id);
-                    }, 'egg-' . $egg->getKebabName() . '.json')),
+                    // TODO uses old admin panel export service
+                    ->url(fn (Egg $egg): string => route('admin.eggs.export', ['egg' => $egg])),
+            ])
+            ->headerActions([
+                //
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
@@ -71,57 +80,21 @@ class ListEggs extends ListRecords
             Actions\Action::make('import')
                 ->label('Import')
                 ->form([
-                    Tabs::make('Tabs')
-                        ->tabs([
-                            Tab::make('From File')
-                                ->icon('tabler-file-upload')
-                                ->schema([
-                                    FileUpload::make('egg')
-                                        ->label('Egg')
-                                        ->hint('This should be the json file ( egg-minecraft.json )')
-                                        ->acceptedFileTypes(['application/json'])
-                                        ->storeFiles(false)
-                                        ->multiple(),
-                                ]),
-                            Tab::make('From URL')
-                                ->icon('tabler-world-upload')
-                                ->schema([
-                                    TextInput::make('url')
-                                        ->label('URL')
-                                        ->hint('This URL should point to a single json file')
-                                        ->url(),
-                                ]),
-                        ])
-                        ->contained(false),
-
+                    Forms\Components\FileUpload::make('egg')
+                        ->acceptedFileTypes(['application/json'])
+                        ->storeFiles(false)
+                        ->multiple(),
                 ])
                 ->action(function (array $data): void {
+                    /** @var TemporaryUploadedFile $eggFile */
+                    $eggFile = $data['egg'];
+
                     /** @var EggImporterService $eggImportService */
                     $eggImportService = resolve(EggImporterService::class);
 
-                    if (!empty($data['egg'])) {
-                        /** @var TemporaryUploadedFile[] $eggFile */
-                        $eggFile = $data['egg'];
-
-                        foreach ($eggFile as $file) {
-                            try {
-                                $eggImportService->fromFile($file);
-                            } catch (Exception $exception) {
-                                Notification::make()
-                                    ->title('Import Failed')
-                                    ->danger()
-                                    ->send();
-
-                                report($exception);
-
-                                return;
-                            }
-                        }
-                    }
-
-                    if (!empty($data['url'])) {
+                    foreach ($eggFile as $file) {
                         try {
-                            $eggImportService->fromUrl($data['url']);
+                            $eggImportService->handle($file);
                         } catch (Exception $exception) {
                             Notification::make()
                                 ->title('Import Failed')

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

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\EggResource\RelationManagers;
-
-use App\Models\Server;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables\Columns\SelectColumn;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Table;
-
-class ServersRelationManager extends RelationManager
-{
-    protected static string $relationship = 'servers';
-
-    public function table(Table $table): Table
-    {
-        return $table
-            ->recordTitleAttribute('servers')
-            ->emptyStateDescription('No Servers')->emptyStateHeading('No servers are assigned this egg.')
-            ->searchable(false)
-            ->columns([
-                TextColumn::make('user.username')
-                    ->label('Owner')
-                    ->icon('tabler-user')
-                    ->url(fn (Server $server): string => route('filament.admin.resources.users.edit', ['record' => $server->user]))
-                    ->sortable(),
-                TextColumn::make('name')
-                    ->icon('tabler-brand-docker')
-                    ->url(fn (Server $server): string => route('filament.admin.resources.servers.edit', ['record' => $server]))
-                    ->sortable(),
-                TextColumn::make('node.name')
-                    ->icon('tabler-server-2')
-                    ->url(fn (Server $server): string => route('filament.admin.resources.nodes.edit', ['record' => $server->node])),
-                TextColumn::make('image')
-                    ->label('Docker Image'),
-                SelectColumn::make('allocation.id')
-                    ->label('Primary Allocation')
-                    ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
-                    ->selectablePlaceholder(false)
-                    ->sortable(),
-            ]);
-    }
-}

app/Filament/Resources/MountResource.php

@@ -11,12 +11,6 @@ class MountResource extends Resource
     protected static ?string $model = Mount::class;
 
     protected static ?string $navigationIcon = 'tabler-layers-linked';
-    protected static ?string $navigationGroup = 'Advanced';
-
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
 
     public static function getRelations(): array
     {

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

@@ -3,15 +3,13 @@
 namespace App\Filament\Resources\MountResource\Pages;
 
 use App\Filament\Resources\MountResource;
+use App\Services\Servers\ServerCreationService;
 use Filament\Forms\Components\Group;
-use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Forms;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
@@ -26,11 +24,11 @@ class CreateMount extends CreateRecord
         return $form
             ->schema([
                 Section::make()->schema([
-                    TextInput::make('name')
+                    Forms\Components\TextInput::make('name')
                         ->required()
                         ->helperText('Unique name used to separate this mount from another.')
                         ->maxLength(64),
-                    ToggleButtons::make('read_only')
+                    Forms\Components\ToggleButtons::make('read_only')
                         ->label('Read only?')
                         ->helperText('Is the mount read only inside the container?')
                         ->options([
@@ -48,15 +46,15 @@ class CreateMount extends CreateRecord
                         ->inline()
                         ->default(false)
                         ->required(),
-                    TextInput::make('source')
+                    Forms\Components\TextInput::make('source')
                         ->required()
                         ->helperText('File path on the host system to mount to a container.')
-                        ->maxLength(255),
-                    TextInput::make('target')
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('target')
                         ->required()
                         ->helperText('Where the mount will be accessible inside a container.')
-                        ->maxLength(255),
-                    ToggleButtons::make('user_mountable')
+                        ->maxLength(191),
+                    Forms\Components\ToggleButtons::make('user_mountable')
                         ->hidden()
                         ->label('User mountable?')
                         ->options([
@@ -74,10 +72,10 @@ class CreateMount extends CreateRecord
                         ->default(false)
                         ->inline()
                         ->required(),
-                    Textarea::make('description')
+                    Forms\Components\Textarea::make('description')
                         ->helperText('A longer description for this mount.')
                         ->columnSpanFull(),
-                    Hidden::make('user_mountable')->default(1),
+                    Forms\Components\Hidden::make('user_mountable')->default(1),
                 ])->columnSpan(1)->columns([
                     'default' => 1,
                     'lg' => 2,

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

@@ -4,10 +4,8 @@ namespace App\Filament\Resources\MountResource\Pages;
 
 use App\Filament\Resources\MountResource;
 use Filament\Actions;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Forms;
 use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
@@ -22,11 +20,11 @@ class EditMount extends EditRecord
         return $form
             ->schema([
                 Section::make()->schema([
-                    TextInput::make('name')
+                    Forms\Components\TextInput::make('name')
                         ->required()
                         ->helperText('Unique name used to separate this mount from another.')
                         ->maxLength(64),
-                    ToggleButtons::make('read_only')
+                    Forms\Components\ToggleButtons::make('read_only')
                         ->label('Read only?')
                         ->helperText('Is the mount read only inside the container?')
                         ->options([
@@ -44,15 +42,15 @@ class EditMount extends EditRecord
                         ->inline()
                         ->default(false)
                         ->required(),
-                    TextInput::make('source')
+                    Forms\Components\TextInput::make('source')
                         ->required()
                         ->helperText('File path on the host system to mount to a container.')
-                        ->maxLength(255),
-                    TextInput::make('target')
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('target')
                         ->required()
                         ->helperText('Where the mount will be accessible inside a container.')
-                        ->maxLength(255),
-                    ToggleButtons::make('user_mountable')
+                        ->maxLength(191),
+                    Forms\Components\ToggleButtons::make('user_mountable')
                         ->hidden()
                         ->label('User mountable?')
                         ->options([
@@ -70,7 +68,7 @@ class EditMount extends EditRecord
                         ->default(false)
                         ->inline()
                         ->required(),
-                    Textarea::make('description')
+                    Forms\Components\Textarea::make('description')
                         ->helperText('A longer description for this mount.')
                         ->columnSpanFull(),
                 ])->columnSpan(1)->columns([
@@ -100,12 +98,6 @@ class EditMount extends EditRecord
     {
         return [
             Actions\DeleteAction::make(),
-            $this->getSaveFormAction()->formId('form'),
         ];
     }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
 }

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

@@ -6,13 +6,9 @@ use App\Filament\Resources\MountResource;
 use App\Models\Mount;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Columns\IconColumn;
-use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
+use Filament\Tables;
 
 class ListMounts extends ListRecords
 {
@@ -22,28 +18,31 @@ class ListMounts extends ListRecords
         return $table
             ->searchable(false)
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable(),
-                TextColumn::make('source')
+                Tables\Columns\TextColumn::make('source')
                     ->searchable(),
-                TextColumn::make('target')
+                Tables\Columns\TextColumn::make('target')
                     ->searchable(),
-                IconColumn::make('read_only')
+                Tables\Columns\IconColumn::make('read_only')
                     ->icon(fn (bool $state) => $state ? 'tabler-circle-check-filled' : 'tabler-circle-x-filled')
                     ->color(fn (bool $state) => $state ? 'success' : 'danger')
                     ->sortable(),
-                IconColumn::make('user_mountable')
+                Tables\Columns\IconColumn::make('user_mountable')
                     ->hidden()
                     ->icon(fn (bool $state) => $state ? 'tabler-circle-check-filled' : 'tabler-circle-x-filled')
                     ->color(fn (bool $state) => $state ? 'success' : 'danger')
                     ->sortable(),
             ])
+            ->filters([
+                //
+            ])
             ->actions([
-                EditAction::make(),
+                Tables\Actions\EditAction::make(),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon('tabler-layers-linked')

app/Filament/Resources/NodeResource.php

@@ -3,8 +3,7 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\NodeResource\Pages;
-use App\Filament\Resources\NodeResource\RelationManagers\AllocationsRelationManager;
-use App\Filament\Resources\NodeResource\RelationManagers\NodesRelationManager;
+use App\Filament\Resources\NodeResource\RelationManagers;
 use App\Models\Node;
 use Filament\Resources\Resource;
 
@@ -16,16 +15,11 @@ class NodeResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
-
     public static function getRelations(): array
     {
         return [
-            AllocationsRelationManager::class,
-            NodesRelationManager::class,
+            RelationManagers\AllocationsRelationManager::class,
+            RelationManagers\NodesRelationManager::class,
         ];
     }
 

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

@@ -3,18 +3,8 @@
 namespace App\Filament\Resources\NodeResource\Pages;
 
 use App\Filament\Resources\NodeResource;
-use Filament\Forms\Components\Actions\Action;
 use Filament\Forms;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Components\Wizard;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
 use Filament\Resources\Pages\CreateRecord;
-use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 
 class CreateNode extends CreateRecord
@@ -28,375 +18,177 @@ class CreateNode extends CreateRecord
     public function form(Forms\Form $form): Forms\Form
     {
         return $form
+            ->columns([
+                'default' => 2,
+                'sm' => 3,
+                'md' => 3,
+                'lg' => 4,
+            ])
             ->schema([
-                Wizard::make([
-                    Step::make('basic')
-                        ->label('Basic Settings')
-                        ->icon('tabler-server')
-                        ->columnSpanFull()
-                        ->columns([
-                            'default' => 2,
-                            'sm' => 3,
-                            'md' => 3,
-                            'lg' => 4,
-                        ])
-                        ->schema([
-                            TextInput::make('fqdn')
-                                ->columnSpan(2)
-                                ->required()
-                                ->autofocus()
-                                ->live(debounce: 1500)
-                                ->rule('prohibited', fn ($state) => is_ip($state) && request()->isSecure())
-                                ->label(fn ($state) => is_ip($state) ? 'IP Address' : 'Domain Name')
-                                ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
-                                ->helperText(function ($state) {
-                                    if (is_ip($state)) {
-                                        if (request()->isSecure()) {
-                                            return '
+                Forms\Components\TextInput::make('fqdn')
+                    ->columnSpan(2)
+                    ->required()
+                    ->autofocus()
+                    ->live(debounce: 1500)
+                    ->rule('prohibited', fn ($state) => is_ip($state) && request()->isSecure())
+                    ->label(fn ($state) => is_ip($state) ? 'IP Address' : 'Domain Name')
+                    ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
+                    ->helperText(function ($state) {
+                        if (is_ip($state)) {
+                            if (request()->isSecure()) {
+                                return '
                                     Your panel is currently secured via an SSL certificate and that means your nodes require one too.
                                     You must use a domain name, because you cannot get SSL certificates for IP Addresses
                                 ';
-                                        }
+                            }
 
-                                        return '';
-                                    }
+                            return '';
+                        }
 
-                                    return "
+                        return "
                             This is the domain name that points to your node's IP Address.
                             If you've already set up this, you can verify it by checking the next field!
-                            ";
-                                })
-                                ->hintColor('danger')
-                                ->hint(function ($state) {
-                                    if (is_ip($state) && request()->isSecure()) {
-                                        return 'You cannot connect to an IP Address over SSL';
-                                    }
+                        ";
+                    })
+                    ->hintColor('danger')
+                    ->hint(function ($state) {
+                        if (is_ip($state) && request()->isSecure()) {
+                            return 'You cannot connect to an IP Address over SSL';
+                        }
 
-                                    return '';
-                                })
-                                ->afterStateUpdated(function (Set $set, ?string $state) {
-                                    $set('dns', null);
-                                    $set('ip', null);
+                        return '';
+                    })
+                    ->afterStateUpdated(function (Forms\Set $set, ?string $state) {
+                        $set('dns', null);
+                        $set('ip', null);
 
-                                    [$subdomain] = str($state)->explode('.', 2);
-                                    if (!is_numeric($subdomain)) {
-                                        $set('name', $subdomain);
-                                    }
+                        [$subdomain] = str($state)->explode('.', 2);
+                        if (!is_numeric($subdomain)) {
+                            $set('name', $subdomain);
+                        }
 
-                                    if (!$state || is_ip($state)) {
-                                        $set('dns', null);
+                        if (!$state || is_ip($state)) {
+                            $set('dns', null);
 
-                                        return;
-                                    }
+                            return;
+                        }
 
-                                    $validRecords = gethostbynamel($state);
-                                    if ($validRecords) {
-                                        $set('dns', true);
+                        $validRecords = gethostbynamel($state);
+                        if ($validRecords) {
+                            $set('dns', true);
 
-                                        $set('ip', collect($validRecords)->first());
+                            $set('ip', collect($validRecords)->first());
 
-                                        return;
-                                    }
+                            return;
+                        }
 
-                                    $set('dns', false);
-                                })
-                                ->maxLength(255),
+                        $set('dns', false);
+                    })
+                    ->maxLength(191),
 
-                            TextInput::make('ip')
-                                ->disabled()
-                                ->hidden(),
+                Forms\Components\TextInput::make('ip')
+                    ->disabled()
+                    ->hidden(),
 
-                            ToggleButtons::make('dns')
-                                ->label('DNS Record Check')
-                                ->helperText('This lets you know if your DNS record correctly points to an IP Address.')
-                                ->disabled()
-                                ->inline()
-                                ->default(null)
-                                ->hint(fn (Get $get) => $get('ip'))
-                                ->hintColor('success')
-                                ->options([
-                                    true => 'Valid',
-                                    false => 'Invalid',
-                                ])
-                                ->colors([
-                                    true => 'success',
-                                    false => 'danger',
-                                ])
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ]),
+                Forms\Components\ToggleButtons::make('dns')
+                    ->label('DNS Record Check')
+                    ->helperText('This lets you know if your DNS record correctly points to an IP Address.')
+                    ->disabled()
+                    ->inline()
+                    ->default(null)
+                    ->hint(fn (Forms\Get $get) => $get('ip'))
+                    ->hintColor('success')
+                    ->options([
+                        true => 'Valid',
+                        false => 'Invalid',
+                    ])
+                    ->colors([
+                        true => 'success',
+                        false => 'danger',
+                    ])
+                    ->columnSpan([
+                        'default' => 1,
+                        'sm' => 1,
+                        'md' => 1,
+                        'lg' => 1,
+                    ]),
 
-                            TextInput::make('daemon_listen')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ])
-                                ->label(trans('strings.port'))
-                                ->helperText('If you are running the daemon behind Cloudflare you should set the daemon port to 8443 to allow websocket proxying over SSL.')
-                                ->minValue(1)
-                                ->maxValue(65535)
-                                ->default(8080)
-                                ->required()
-                                ->integer(),
+                Forms\Components\TextInput::make('daemon_listen')
+                    ->columnSpan([
+                        'default' => 1,
+                        'sm' => 1,
+                        'md' => 1,
+                        'lg' => 1,
+                    ])
+                    ->label(trans('strings.port'))
+                    ->helperText('If you are running the daemon behind Cloudflare you should set the daemon port to 8443 to allow websocket proxying over SSL.')
+                    ->minValue(0)
+                    ->maxValue(65536)
+                    ->default(8080)
+                    ->required()
+                    ->integer(),
 
-                            TextInput::make('name')
-                                ->label('Display Name')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 2,
-                                ])
-                                ->required()
-                                ->regex('/[a-zA-Z0-9_\.\- ]+/')
-                                ->helperText('This name is for display only and can be changed later.')
-                                ->maxLength(100),
+                Forms\Components\TextInput::make('name')
+                    ->label('Display Name')
+                    ->columnSpan([
+                        'default' => 1,
+                        'sm' => 1,
+                        'md' => 1,
+                        'lg' => 2,
+                    ])
+                    ->required()
+                    ->regex('/[a-zA-Z0-9_\.\- ]+/')
+                    ->helperText('This name is for display only and can be changed later.')
+                    ->maxLength(100),
 
-                            ToggleButtons::make('scheme')
-                                ->label('Communicate over SSL')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ])
-                                ->inline()
-                                ->helperText(function (Get $get) {
-                                    if (request()->isSecure()) {
-                                        return new HtmlString('Your Panel is using a secure SSL connection,<br>so your Daemon must too.');
-                                    }
+                Forms\Components\ToggleButtons::make('scheme')
+                    ->label('Communicate over SSL')
+                    ->columnSpan([
+                        'default' => 1,
+                        'sm' => 1,
+                        'md' => 1,
+                        'lg' => 1,
+                    ])
+                    ->required()
+                    ->inline()
+                    ->helperText(function (Forms\Get $get) {
+                        if (request()->isSecure()) {
+                            return new HtmlString('Your Panel is using a secure SSL connection,<br>so your Daemon must too.');
+                        }
 
-                                    if (is_ip($get('fqdn'))) {
-                                        return 'An IP address cannot use SSL.';
-                                    }
+                        if (is_ip($get('fqdn'))) {
+                            return 'An IP address cannot use SSL.';
+                        }
 
-                                    return '';
-                                })
-                                ->disableOptionWhen(fn (string $value): bool => $value === 'http' && request()->isSecure())
-                                ->options([
-                                    'http' => 'HTTP',
-                                    'https' => 'HTTPS (SSL)',
-                                ])
-                                ->colors([
-                                    'http' => 'warning',
-                                    'https' => 'success',
-                                ])
-                                ->icons([
-                                    'http' => 'tabler-lock-open-off',
-                                    'https' => 'tabler-lock',
-                                ])
-                                ->default(fn () => request()->isSecure() ? 'https' : 'http'),
-                        ]),
-                    Step::make('advanced')
-                        ->label('Advanced Settings')
-                        ->icon('tabler-server-cog')
-                        ->columnSpanFull()
-                        ->columns([
-                            'default' => 2,
-                            'sm' => 3,
-                            'md' => 3,
-                            'lg' => 4,
-                        ])
-                        ->schema([
-                            ToggleButtons::make('maintenance_mode')
-                                ->label('Maintenance Mode')->inline()
-                                ->columnSpan(1)
-                                ->default(false)
-                                ->hinticon('tabler-question-mark')
-                                ->hintIconTooltip("If the node is marked 'Under Maintenance' users won't be able to access servers that are on this node.")
-                                ->options([
-                                    true => 'Enable',
-                                    false => 'Disable',
-                                ])
-                                ->colors([
-                                    true => 'danger',
-                                    false => 'success',
-                                ]),
-                            ToggleButtons::make('public')
-                                ->default(true)
-                                ->columnSpan(1)
-                                ->label('Automatic Allocation')->inline()
-                                ->options([
-                                    true => 'Yes',
-                                    false => 'No',
-                                ])
-                                ->colors([
-                                    true => 'success',
-                                    false => 'danger',
-                                ]),
-                            TagsInput::make('tags')
-                                ->label('Tags')
-                                ->disabled()
-                                ->placeholder('Not Implemented')
-                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('Not Implemented')
-                                ->columnSpan(2),
-                            TextInput::make('upload_size')
-                                ->label('Upload Limit')
-                                ->helperText('Enter the maximum size of files that can be uploaded through the web-based file manager.')
-                                ->columnSpan(1)
-                                ->numeric()->required()
-                                ->default(256)
-                                ->minValue(1)
-                                ->maxValue(1024)
-                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
-                            TextInput::make('daemon_sftp')
-                                ->columnSpan(1)
-                                ->label('SFTP Port')
-                                ->minValue(1)
-                                ->maxValue(65535)
-                                ->default(2022)
-                                ->required()
-                                ->integer(),
-                            TextInput::make('daemon_sftp_alias')
-                                ->columnSpan(2)
-                                ->label('SFTP Alias')
-                                ->helperText('Display alias for the SFTP address. Leave empty to use the Node FQDN.'),
-                            Grid::make()
-                                ->columns(6)
-                                ->columnSpanFull()
-                                ->schema([
-                                    ToggleButtons::make('unlimited_mem')
-                                        ->label('Memory')->inlineLabel()->inline()
-                                        ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('memory_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
-                                        ->live()
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(2),
-                                    TextInput::make('memory')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
-                                        ->label('Memory Limit')->inlineLabel()
-                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->minValue(0)
-                                        ->default(0)
-                                        ->required(),
-                                    TextInput::make('memory_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->default(0)
-                                        ->suffix('%')
-                                        ->required(),
-                                ]),
-                            Grid::make()
-                                ->columns(6)
-                                ->columnSpanFull()
-                                ->schema([
-                                    ToggleButtons::make('unlimited_disk')
-                                        ->label('Disk')->inlineLabel()->inline()
-                                        ->live()
-                                        ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('disk_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(2),
-                                    TextInput::make('disk')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->label('Disk Limit')->inlineLabel()
-                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->minValue(0)
-                                        ->default(0)
-                                        ->required(),
-                                    TextInput::make('disk_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->default(0)
-                                        ->suffix('%')
-                                        ->required(),
-                                ]),
-                            Grid::make()
-                                ->columns(6)
-                                ->columnSpanFull()
-                                ->schema([
-                                    ToggleButtons::make('unlimited_cpu')
-                                        ->label('CPU')->inlineLabel()->inline()
-                                        ->live()
-                                        ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('cpu_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(2),
-                                    TextInput::make('cpu')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label('CPU Limit')->inlineLabel()
-                                        ->suffix('%')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->default(0)
-                                        ->minValue(0)
-                                        ->required(),
-                                    TextInput::make('cpu_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->default(0)
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%')
-                                        ->required(),
-                                ]),
-                        ]),
-                ])->columnSpanFull()
-                    ->nextAction(fn (Action $action) => $action->label('Next Step'))
-                    ->submitAction(new HtmlString(Blade::render(<<<'BLADE'
-                                        <x-filament::button
-                                                type="submit"
-                                                size="sm"
-                                            >
-                                                Create Node
-                                            </x-filament::button>
-                                        BLADE))),
+                        return '';
+                    })
+                    ->disableOptionWhen(fn (string $value): bool => $value === 'http' && request()->isSecure())
+                    ->options([
+                        'http' => 'HTTP',
+                        'https' => 'HTTPS (SSL)',
+                    ])
+                    ->colors([
+                        'http' => 'warning',
+                        'https' => 'success',
+                    ])
+                    ->icons([
+                        'http' => 'tabler-lock-open-off',
+                        'https' => 'tabler-lock',
+                    ])
+                    ->default(fn () => request()->isSecure() ? 'https' : 'http'),
+
+                Forms\Components\Textarea::make('description')
+                    ->label('strings.description')
+                    ->hidden()
+                    ->columnSpan([
+                        'default' => 1,
+                        'sm' => 1,
+                        'md' => 2,
+                        'lg' => 4,
+                    ])
+                    ->rows(5),
+
+                Forms\Components\Hidden::make('skipValidation')->default(true),
             ]);
     }
 
@@ -406,9 +198,4 @@ class CreateNode extends CreateRecord
             'tab' => '-configuration-tab',
         ];
     }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
 }

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

@@ -6,20 +6,9 @@ use App\Filament\Resources\NodeResource;
 use App\Filament\Resources\NodeResource\Widgets\NodeMemoryChart;
 use App\Filament\Resources\NodeResource\Widgets\NodeStorageChart;
 use App\Models\Node;
-use App\Services\Nodes\NodeUpdateService;
 use Filament\Actions;
 use Filament\Forms;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Support\HtmlString;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
@@ -41,374 +30,28 @@ class EditNode extends EditRecord
                 ->persistTabInQueryString()
                 ->columnSpanFull()
                 ->tabs([
-                    Tab::make('Basic Settings')
+                    Tabs\Tab::make('Basic Settings')
                         ->icon('tabler-server')
-                        ->schema([
-                            TextInput::make('fqdn')
-                                ->columnSpan(2)
-                                ->required()
-                                ->autofocus()
-                                ->live(debounce: 1500)
-                                ->rule('prohibited', fn ($state) => is_ip($state) && request()->isSecure())
-                                ->label(fn ($state) => is_ip($state) ? 'IP Address' : 'Domain Name')
-                                ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
-                                ->helperText(function ($state) {
-                                    if (is_ip($state)) {
-                                        if (request()->isSecure()) {
-                                            return '
-                                    Your panel is currently secured via an SSL certificate and that means your nodes require one too.
-                                    You must use a domain name, because you cannot get SSL certificates for IP Addresses
-                                ';
-                                        }
-
-                                        return '';
-                                    }
-
-                                    return "
-                            This is the domain name that points to your node's IP Address.
-                            If you've already set up this, you can verify it by checking the next field!
-                        ";
-                                })
-                                ->hintColor('danger')
-                                ->hint(function ($state) {
-                                    if (is_ip($state) && request()->isSecure()) {
-                                        return 'You cannot connect to an IP Address over SSL';
-                                    }
-
-                                    return '';
-                                })
-                                ->afterStateUpdated(function (Set $set, ?string $state) {
-                                    $set('dns', null);
-                                    $set('ip', null);
-
-                                    [$subdomain] = str($state)->explode('.', 2);
-                                    if (!is_numeric($subdomain)) {
-                                        $set('name', $subdomain);
-                                    }
-
-                                    if (!$state || is_ip($state)) {
-                                        $set('dns', null);
-
-                                        return;
-                                    }
-
-                                    $validRecords = gethostbynamel($state);
-                                    if ($validRecords) {
-                                        $set('dns', true);
-
-                                        $set('ip', collect($validRecords)->first());
-
-                                        return;
-                                    }
-
-                                    $set('dns', false);
-                                })
-                                ->maxLength(255),
-
-                            TextInput::make('ip')
-                                ->disabled()
-                                ->hidden(),
-
-                            ToggleButtons::make('dns')
-                                ->label('DNS Record Check')
-                                ->helperText('This lets you know if your DNS record correctly points to an IP Address.')
-                                ->disabled()
-                                ->inline()
-                                ->default(null)
-                                ->hint(fn (Get $get) => $get('ip'))
-                                ->hintColor('success')
-                                ->options([
-                                    true => 'Valid',
-                                    false => 'Invalid',
-                                ])
-                                ->colors([
-                                    true => 'success',
-                                    false => 'danger',
-                                ])
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ]),
-
-                            TextInput::make('daemon_listen')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ])
-                                ->label(trans('strings.port'))
-                                ->helperText('If you are running the daemon behind Cloudflare you should set the daemon port to 8443 to allow websocket proxying over SSL.')
-                                ->minValue(1)
-                                ->maxValue(65535)
-                                ->default(8080)
-                                ->required()
-                                ->integer(),
-
-                            TextInput::make('name')
-                                ->label('Display Name')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 2,
-                                ])
-                                ->required()
-                                ->regex('/[a-zA-Z0-9_\.\- ]+/')
-                                ->helperText('This name is for display only and can be changed later.')
-                                ->maxLength(100),
-
-                            ToggleButtons::make('scheme')
-                                ->label('Communicate over SSL')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ])
-                                ->inline()
-                                ->helperText(function (Get $get) {
-                                    if (request()->isSecure()) {
-                                        return new HtmlString('Your Panel is using a secure SSL connection,<br>so your Daemon must too.');
-                                    }
-
-                                    if (is_ip($get('fqdn'))) {
-                                        return 'An IP address cannot use SSL.';
-                                    }
-
-                                    return '';
-                                })
-                                ->disableOptionWhen(fn (string $value): bool => $value === 'http' && request()->isSecure())
-                                ->options([
-                                    'http' => 'HTTP',
-                                    'https' => 'HTTPS (SSL)',
-                                ])
-                                ->colors([
-                                    'http' => 'warning',
-                                    'https' => 'success',
-                                ])
-                                ->icons([
-                                    'http' => 'tabler-lock-open-off',
-                                    'https' => 'tabler-lock',
-                                ])
-                                ->default(fn () => request()->isSecure() ? 'https' : 'http'), ]),
-                    Tab::make('Advanced Settings')
-                        ->columns(['default' => 1, 'sm' => 1, 'md' => 4, 'lg' => 6])
-                        ->icon('tabler-server-cog')
-                        ->schema([
-                            TextInput::make('id')
-                                ->label('Node ID')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
-                                ->disabled(),
-                            TextInput::make('uuid')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                                ->label('Node UUID')
-                                ->hintAction(CopyAction::make())
-                                ->disabled(),
-                            TagsInput::make('tags')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                                ->label('Tags')
-                                ->disabled()
-                                ->placeholder('Not Implemented')
-                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('Not Implemented'),
-                            TextInput::make('upload_size')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
-                                ->label('Upload Limit')
-                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('Enter the maximum size of files that can be uploaded through the web-based file manager.')
-                                ->numeric()->required()
-                                ->minValue(1)
-                                ->maxValue(1024)
-                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
-                            TextInput::make('daemon_sftp')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
-                                ->label('SFTP Port')
-                                ->minValue(1)
-                                ->maxValue(65535)
-                                ->default(2022)
-                                ->required()
-                                ->integer(),
-                            TextInput::make('daemon_sftp_alias')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
-                                ->label('SFTP Alias')
-                                ->helperText('Display alias for the SFTP address. Leave empty to use the Node FQDN.'),
-                            ToggleButtons::make('public')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
-                                ->label('Automatic Allocation')->inline()
-                                ->options([
-                                    true => 'Yes',
-                                    false => 'No',
-                                ])
-                                ->colors([
-                                    true => 'success',
-                                    false => 'danger',
-                                ]),
-                            ToggleButtons::make('maintenance_mode')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
-                                ->label('Maintenance Mode')->inline()
-                                ->hinticon('tabler-question-mark')
-                                ->hintIconTooltip("If the node is marked 'Under Maintenance' users won't be able to access servers that are on this node.")
-                                ->options([
-                                    false => 'Disable',
-                                    true => 'Enable',
-                                ])
-                                ->colors([
-                                    false => 'success',
-                                    true => 'danger',
-                                ]),
-                            Grid::make()
-                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
-                                ->columnSpanFull()
-                                ->schema([
-                                    ToggleButtons::make('unlimited_mem')
-                                        ->label('Memory')->inlineLabel()->inline()
-                                        ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('memory_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
-                                        ->live()
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]),
-                                    TextInput::make('memory')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
-                                        ->label('Memory Limit')->inlineLabel()
-                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
-                                        ->required()
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
-                                        ->numeric()
-                                        ->minValue(0),
-                                    TextInput::make('memory_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->required()
-                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
-                                        ->numeric()
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%'),
-                                ]),
-                            Grid::make()
-                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
-                                ->schema([
-                                    ToggleButtons::make('unlimited_disk')
-                                        ->label('Disk')->inlineLabel()->inline()
-                                        ->live()
-                                        ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('disk_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]),
-                                    TextInput::make('disk')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->label('Disk Limit')->inlineLabel()
-                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
-                                        ->required()
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
-                                        ->numeric()
-                                        ->minValue(0),
-                                    TextInput::make('disk_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
-                                        ->required()
-                                        ->numeric()
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%'),
-                                ]),
-                            Grid::make()
-                                ->columns(6)
-                                ->columnSpanFull()
-                                ->schema([
-                                    ToggleButtons::make('unlimited_cpu')
-                                        ->label('CPU')->inlineLabel()->inline()
-                                        ->live()
-                                        ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('cpu_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(2),
-                                    TextInput::make('cpu')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label('CPU Limit')->inlineLabel()
-                                        ->suffix('%')
-                                        ->required()
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->minValue(0),
-                                    TextInput::make('cpu_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(2)
-                                        ->required()
-                                        ->numeric()
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%'),
-                                ]),
-                        ]),
-                    Tab::make('Configuration File')
+                        ->schema((new CreateNode())->form($form)->getComponents()),
+                    //                    Tabs\Tab::make('Advanced Settings')
+                    //                        ->icon('tabler-server-cog')
+                    //                        ->schema([
+                    //                            Forms\Components\Placeholder::make('Coming soon!'),
+                    //                        ]),
+                    Tabs\Tab::make('Configuration')
                         ->icon('tabler-code')
                         ->schema([
-                            Placeholder::make('instructions')
+                            Forms\Components\Placeholder::make('instructions')
                                 ->columnSpanFull()
                                 ->content(new HtmlString('
                                   Save this file to your <span title="usually /etc/pelican/">daemon\'s root directory</span>, named <code>config.yml</code>
                             ')),
-                            Textarea::make('config')
+                            Forms\Components\Textarea::make('config')
                                 ->label('/etc/pelican/config.yml')
                                 ->disabled()
                                 ->rows(19)
                                 ->hintAction(CopyAction::make())
                                 ->columnSpanFull(),
-                            Forms\Components\Actions::make([
-                                Forms\Components\Actions\Action::make('resetKey')
-                                    ->label('Reset Daemon Token')
-                                    ->color('danger')
-                                    ->requiresConfirmation()
-                                    ->modalHeading('Reset Daemon Token?')
-                                    ->modalDescription('Resetting the daemon token will void any request coming from the old token. This token is used for all sensitive operations on the daemon including server creation and deletion. We suggest changing this token regularly for security.')
-                                    ->action(function (NodeUpdateService $nodeUpdateService, Node $node) {
-                                        $nodeUpdateService->handle($node, [], true);
-                                        Notification::make()->success()->title('Daemon Key Reset')->send();
-                                        $this->fillForm();
-                                    }),
-                            ]),
                         ]),
                 ]),
         ]);
@@ -423,17 +66,18 @@ class EditNode extends EditRecord
         return $data;
     }
 
-    protected function getFormActions(): array
+    protected function getSteps(): array
     {
-        return [];
+        return [
+        ];
     }
+
     protected function getHeaderActions(): array
     {
         return [
             Actions\DeleteAction::make()
                 ->disabled(fn (Node $node) => $node->servers()->count() > 0)
                 ->label(fn (Node $node) => $node->servers()->count() > 0 ? 'Node Has Servers' : 'Delete'),
-            $this->getSaveFormAction()->formId('form'),
         ];
     }
 
@@ -444,9 +88,4 @@ class EditNode extends EditRecord
             NodeMemoryChart::class,
         ];
     }
-
-    protected function afterSave(): void
-    {
-        $this->fillForm();
-    }
 }

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

@@ -6,13 +6,9 @@ use App\Filament\Resources\NodeResource;
 use App\Models\Node;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Columns\IconColumn;
-use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
+use Filament\Tables;
 
 class ListNodes extends ListRecords
 {
@@ -24,67 +20,64 @@ class ListNodes extends ListRecords
             ->searchable(false)
             ->checkIfRecordIsSelectableUsing(fn (Node $node) => $node->servers_count <= 0)
             ->columns([
-                TextColumn::make('uuid')
+                Tables\Columns\TextColumn::make('uuid')
                     ->label('UUID')
                     ->searchable()
                     ->hidden(),
-                IconColumn::make('health')
+                Tables\Columns\IconColumn::make('health')
                     ->alignCenter()
                     ->state(fn (Node $node) => $node)
                     ->view('livewire.columns.version-column'),
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-server-2')
                     ->sortable()
                     ->searchable(),
-                TextColumn::make('fqdn')
+                Tables\Columns\TextColumn::make('fqdn')
                     ->visibleFrom('md')
                     ->label('Address')
                     ->icon('tabler-network')
                     ->sortable()
                     ->searchable(),
-                TextColumn::make('memory')
+                Tables\Columns\TextColumn::make('memory')
                     ->visibleFrom('sm')
                     ->icon('tabler-device-desktop-analytics')
                     ->numeric()
-                    ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
-                    ->formatStateUsing(fn ($state) => number_format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), 2))
+                    ->suffix(' GB')
+                    ->formatStateUsing(fn ($state) => number_format($state / 1000, 2))
                     ->sortable(),
-                TextColumn::make('disk')
+                Tables\Columns\TextColumn::make('disk')
                     ->visibleFrom('sm')
                     ->icon('tabler-file')
                     ->numeric()
-                    ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
-                    ->formatStateUsing(fn ($state) => number_format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), 2))
+                    ->suffix(' GB')
+                    ->formatStateUsing(fn ($state) => number_format($state / 1000, 2))
                     ->sortable(),
-                TextColumn::make('cpu')
-                    ->visibleFrom('sm')
-                    ->icon('tabler-file')
-                    ->numeric()
-                    ->suffix(' %')
-                    ->sortable(),
-                IconColumn::make('scheme')
+                Tables\Columns\IconColumn::make('scheme')
                     ->visibleFrom('xl')
                     ->label('SSL')
                     ->trueIcon('tabler-lock')
                     ->falseIcon('tabler-lock-open-off')
                     ->state(fn (Node $node) => $node->scheme === 'https'),
-                IconColumn::make('public')
+                Tables\Columns\IconColumn::make('public')
                     ->visibleFrom('lg')
                     ->trueIcon('tabler-eye-check')
                     ->falseIcon('tabler-eye-cancel'),
-                TextColumn::make('servers_count')
+                Tables\Columns\TextColumn::make('servers_count')
                     ->visibleFrom('sm')
                     ->counts('servers')
                     ->label('Servers')
                     ->sortable()
                     ->icon('tabler-brand-docker'),
             ])
+            ->filters([
+                //
+            ])
             ->actions([
-                EditAction::make(),
+                Tables\Actions\EditAction::make(),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon('tabler-server-2')

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

@@ -3,24 +3,15 @@
 namespace App\Filament\Resources\NodeResource\RelationManagers;
 
 use App\Models\Allocation;
-use App\Models\Node;
+use App\Models\Server;
 use App\Services\Allocations\AssignmentService;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Set;
-use Filament\Tables\Actions\BulkActionGroup;
-use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Columns\TextInputColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\HtmlString;
 
-/**
- * @method Node getOwnerRecord()
- */
 class AllocationsRelationManager extends RelationManager
 {
     protected static string $relationship = 'allocations';
@@ -31,7 +22,7 @@ class AllocationsRelationManager extends RelationManager
     {
         return $form
             ->schema([
-                TextInput::make('ip')
+                Forms\Components\TextInput::make('ip')
                     ->required()
                     ->maxLength(255),
             ]);
@@ -49,21 +40,17 @@ class AllocationsRelationManager extends RelationManager
             ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->server_id === null)
             ->searchable()
             ->columns([
-                TextColumn::make('id'),
-                TextColumn::make('port')
-                    ->searchable()
-                    ->label('Port'),
-                TextColumn::make('server.name')
+                Tables\Columns\TextColumn::make('server.name')
                     ->label('Server')
                     ->icon('tabler-brand-docker')
-                    ->searchable()
                     ->url(fn (Allocation $allocation): string => $allocation->server ? route('filament.admin.resources.servers.edit', ['record' => $allocation->server]) : ''),
-                TextInputColumn::make('ip_alias')
-                    ->searchable()
+                Tables\Columns\TextColumn::make('ip_alias')
                     ->label('Alias'),
-                TextInputColumn::make('ip')
-                    ->searchable()
+                Tables\Columns\TextColumn::make('ip')
                     ->label('IP'),
+                Tables\Columns\TextColumn::make('port')
+                    ->searchable()
+                    ->label('Port'),
             ])
             ->filters([
                 //
@@ -74,20 +61,20 @@ class AllocationsRelationManager extends RelationManager
             ->headerActions([
                 Tables\Actions\Action::make('create new allocation')->label('Create Allocations')
                     ->form(fn () => [
-                        TextInput::make('allocation_ip')
-                            ->datalist($this->getOwnerRecord()->ipAddresses())
+                        Forms\Components\TextInput::make('allocation_ip')
+                            ->datalist($this->getOwnerRecord()->ipAddresses() ?? [])
                             ->label('IP Address')
                             ->inlineLabel()
                             ->ipv4()
                             ->helperText("Usually your machine's public IP unless you are port forwarding.")
                             ->required(),
-                        TextInput::make('allocation_alias')
+                        Forms\Components\TextInput::make('allocation_alias')
                             ->label('Alias')
                             ->inlineLabel()
                             ->default(null)
                             ->helperText('Optional display name to help you remember what these are.')
                             ->required(false),
-                        TagsInput::make('allocation_ports')
+                        Forms\Components\TagsInput::make('allocation_ports')
                             ->placeholder('Examples: 27015, 27017-27019')
                             ->helperText(new HtmlString('
                                 These are the ports that users can connect to this Server through.
@@ -97,7 +84,7 @@ class AllocationsRelationManager extends RelationManager
                             ->label('Ports')
                             ->inlineLabel()
                             ->live()
-                            ->afterStateUpdated(function ($state, Set $set) {
+                            ->afterStateUpdated(function ($state, Forms\Set $set) {
                                 $ports = collect();
                                 $update = false;
                                 foreach ($state as $portEntry) {
@@ -122,7 +109,7 @@ class AllocationsRelationManager extends RelationManager
 
                                     $start = max((int) $start, 0);
                                     $end = min((int) $end, 2 ** 16 - 1);
-                                    foreach (range($start, $end) as $i) {
+                                    for ($i = $start; $i <= $end; $i++) {
                                         $ports->push($i);
                                     }
                                 }
@@ -139,8 +126,6 @@ class AllocationsRelationManager extends RelationManager
                                     $ports = $sortedPorts;
                                 }
 
-                                $ports = $ports->filter(fn ($port) => $port > 1024 && $port < 65535)->values();
-
                                 if ($update) {
                                     $set('allocation_ports', $ports->all());
                                 }
@@ -151,8 +136,9 @@ class AllocationsRelationManager extends RelationManager
                     ->action(fn (array $data) => resolve(AssignmentService::class)->handle($this->getOwnerRecord(), $data)),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+                Tables\Actions\BulkActionGroup::make([
+                    // Tables\Actions\DissociateBulkAction::make(),
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }

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

@@ -3,8 +3,7 @@
 namespace App\Filament\Resources\NodeResource\RelationManagers;
 
 use App\Models\Server;
-use Filament\Tables\Columns\SelectColumn;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Table;
 use Filament\Resources\RelationManagers\RelationManager;
 
@@ -19,34 +18,34 @@ class NodesRelationManager extends RelationManager
         return $table
             ->searchable(false)
             ->columns([
-                TextColumn::make('user.username')
+                Tables\Columns\TextColumn::make('user.username')
                     ->label('Owner')
                     ->icon('tabler-user')
                     ->url(fn (Server $server): string => route('filament.admin.resources.users.edit', ['record' => $server->user]))
                     ->searchable(),
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-brand-docker')
                     ->url(fn (Server $server): string => route('filament.admin.resources.servers.edit', ['record' => $server]))
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('egg.name')
+                Tables\Columns\TextColumn::make('egg.name')
                     ->icon('tabler-egg')
                     ->url(fn (Server $server): string => route('filament.admin.resources.eggs.edit', ['record' => $server->user]))
                     ->sortable(),
-                SelectColumn::make('allocation.id')
+                Tables\Columns\SelectColumn::make('allocation.id')
                     ->label('Primary Allocation')
-                    ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->options(fn ($state, Server $server) => [$server->allocation->id => $server->allocation->address])
                     ->selectablePlaceholder(false)
                     ->sortable(),
-                TextColumn::make('memory')->icon('tabler-device-desktop-analytics'),
-                TextColumn::make('cpu')->icon('tabler-cpu'),
-                TextColumn::make('databases_count')
+                Tables\Columns\TextColumn::make('memory')->icon('tabler-device-desktop-analytics'),
+                Tables\Columns\TextColumn::make('cpu')->icon('tabler-cpu'),
+                Tables\Columns\TextColumn::make('databases_count')
                     ->counts('databases')
                     ->label('Databases')
                     ->icon('tabler-database')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('backups_count')
+                Tables\Columns\TextColumn::make('backups_count')
                     ->counts('backups')
                     ->label('Backups')
                     ->icon('tabler-file-download')

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

@@ -40,8 +40,8 @@ class NodeMemoryChart extends ChartWidget
         /** @var Node $node */
         $node = $this->record;
 
-        $total = ($node->statistics()['memory_total'] ?? 0) / 1024 / 1024 / 1024;
-        $used = ($node->statistics()['memory_used'] ?? 0) / 1024 / 1024 / 1024;
+        $total = $node->statistics()['memory_total'] ?? 0;
+        $used = $node->statistics()['memory_used'] ?? 0;
         $unused = $total - $used;
 
         return [

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

@@ -40,8 +40,8 @@ class NodeStorageChart extends ChartWidget
         /** @var Node $node */
         $node = $this->record;
 
-        $total = ($node->statistics()['disk_total'] ?? 0) / 1024 / 1024 / 1024;
-        $used = ($node->statistics()['disk_used'] ?? 0) / 1024 / 1024 / 1024;
+        $total = $node->statistics()['disk_total'] ?? 0;
+        $used = $node->statistics()['disk_used'] ?? 0;
         $unused = $total - $used;
 
         return [

app/Filament/Resources/ServerResource.php

@@ -14,11 +14,6 @@ class ServerResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
-
     public static function getRelations(): array
     {
         return [

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

@@ -7,7 +7,6 @@ use App\Models\Server;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Grouping\Group;
 use Filament\Tables\Table;
 use Filament\Tables;
 
@@ -19,18 +18,35 @@ class ListServers extends ListRecords
     {
         return $table
             ->searchable(false)
-            ->defaultGroup('node.name')
-            ->groups([
-                Group::make('node.name')->getDescriptionFromRecordUsing(fn (Server $server): string => str($server->node->description)->limit(150)),
-                Group::make('user.username')->getDescriptionFromRecordUsing(fn (Server $server): string => $server->user->email),
-                Group::make('egg.name')->getDescriptionFromRecordUsing(fn (Server $server): string => str($server->egg->description)->limit(150)),
-            ])
             ->columns([
-                Tables\Columns\TextColumn::make('condition')
+                Tables\Columns\TextColumn::make('status')
                     ->default('unknown')
                     ->badge()
-                    ->icon(fn (Server $server) => $server->conditionIcon())
-                    ->color(fn (Server $server) => $server->conditionColor()),
+                    ->default(function (Server $server) {
+                        if ($server->status !== null) {
+                            return $server->status;
+                        }
+
+                        return $server->retrieveStatus() ?? 'node_fail';
+                    })
+                    ->icon(fn ($state) => match ($state) {
+                        'node_fail' => 'tabler-server-off',
+                        'running' => 'tabler-heartbeat',
+                        'removing' => 'tabler-heart-x',
+                        'offline' => 'tabler-heart-off',
+                        'paused' => 'tabler-heart-pause',
+                        'installing' => 'tabler-heart-bolt',
+                        'suspended' => 'tabler-heart-cancel',
+                        default => 'tabler-heart-question',
+                    })
+                    ->color(fn ($state): string => match ($state) {
+                        'running' => 'success',
+                        'installing', 'restarting' => 'primary',
+                        'paused', 'removing' => 'warning',
+                        'node_fail', 'install_failed', 'suspended' => 'danger',
+                        default => 'gray',
+                    }),
+
                 Tables\Columns\TextColumn::make('uuid')
                     ->hidden()
                     ->label('UUID')
@@ -42,25 +58,19 @@ class ListServers extends ListRecords
                 Tables\Columns\TextColumn::make('node.name')
                     ->icon('tabler-server-2')
                     ->url(fn (Server $server): string => route('filament.admin.resources.nodes.edit', ['record' => $server->node]))
-                    ->hidden(fn (Table $table) => $table->getGrouping()?->getId() === 'node.name')
-                    ->sortable()
-                    ->searchable(),
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('egg.name')
                     ->icon('tabler-egg')
                     ->url(fn (Server $server): string => route('filament.admin.resources.eggs.edit', ['record' => $server->egg]))
-                    ->hidden(fn (Table $table) => $table->getGrouping()?->getId() === 'egg.name')
-                    ->sortable()
-                    ->searchable(),
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('user.username')
                     ->icon('tabler-user')
                     ->label('Owner')
                     ->url(fn (Server $server): string => route('filament.admin.resources.users.edit', ['record' => $server->user]))
-                    ->hidden(fn (Table $table) => $table->getGrouping()?->getId() === 'user.username')
-                    ->sortable()
-                    ->searchable(),
+                    ->sortable(),
                 Tables\Columns\SelectColumn::make('allocation_id')
                     ->label('Primary Allocation')
-                    ->options(fn (Server $server) => $server->allocations->mapWithKeys(
+                    ->options(fn ($state, Server $server) => $server->allocations->mapWithKeys(
                         fn ($allocation) => [$allocation->id => $allocation->address])
                     )
                     ->selectablePlaceholder(false)
@@ -73,6 +83,9 @@ class ListServers extends ListRecords
                     ->numeric()
                     ->sortable(),
             ])
+            ->filters([
+                //
+            ])
             ->actions([
                 Tables\Actions\Action::make('View')
                     ->icon('tabler-terminal')
@@ -80,7 +93,6 @@ class ListServers extends ListRecords
                 Tables\Actions\EditAction::make(),
             ])
             ->emptyStateIcon('tabler-brand-docker')
-            ->searchable()
             ->emptyStateDescription('')
             ->emptyStateHeading('No Servers')
             ->emptyStateActions([

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

@@ -3,16 +3,12 @@
 namespace App\Filament\Resources\ServerResource\RelationManagers;
 
 use App\Models\Allocation;
-use App\Models\Server;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
 
-/**
- * @method Server getOwnerRecord()
- */
 class AllocationsRelationManager extends RelationManager
 {
     protected static string $relationship = 'allocations';
@@ -31,23 +27,21 @@ class AllocationsRelationManager extends RelationManager
     {
         return $table
             ->recordTitleAttribute('ip')
-            ->recordTitle(fn (Allocation $allocation) => "$allocation->ip:$allocation->port")
             ->checkIfRecordIsSelectableUsing(fn (Allocation $record) => $record->id !== $this->getOwnerRecord()->allocation_id)
             // ->actions
             // ->groups
-            ->inverseRelationship('server')
             ->columns([
+                Tables\Columns\TextColumn::make('ip_alias')->label('Alias'),
                 Tables\Columns\TextColumn::make('ip')->label('IP'),
                 Tables\Columns\TextColumn::make('port')->label('Port'),
-                Tables\Columns\TextInputColumn::make('ip_alias')->label('Alias'),
                 Tables\Columns\IconColumn::make('primary')
                     ->icon(fn ($state) => match ($state) {
+                        false => 'tabler-star',
                         true => 'tabler-star-filled',
-                        default => 'tabler-star',
                     })
                     ->color(fn ($state) => match ($state) {
+                        false => 'gray',
                         true => 'warning',
-                        default => 'gray',
                     })
                     ->action(fn (Allocation $allocation) => $this->getOwnerRecord()->update(['allocation_id' => $allocation->id]))
                     ->default(fn (Allocation $allocation) => $allocation->id === $this->getOwnerRecord()->allocation_id)
@@ -62,16 +56,13 @@ class AllocationsRelationManager extends RelationManager
                     ->label(fn (Allocation $allocation) => $allocation->id === $this->getOwnerRecord()->allocation_id ? '' : 'Make Primary'),
             ])
             ->headerActions([
-                //TODO Tables\Actions\CreateAction::make()->label('Create Allocation'),
-                Tables\Actions\AssociateAction::make()
-                    ->multiple()
-                    ->preloadRecordSelect()
-                    ->recordSelectOptionsQuery(fn ($query) => $query->whereBelongsTo($this->getOwnerRecord()->node))
-                    ->label('Add Allocation'),
+                Tables\Actions\CreateAction::make()->label('Create Allocation'),
+                //Tables\Actions\AssociateAction::make()->label('Add Allocation'),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
                     Tables\Actions\DissociateBulkAction::make(),
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }

app/Filament/Resources/UserResource.php

@@ -3,7 +3,7 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\UserResource\Pages;
-use App\Filament\Resources\UserResource\RelationManagers\ServersRelationManager;
+use App\Filament\Resources\UserResource\RelationManagers;
 use App\Models\User;
 use Filament\Resources\Resource;
 
@@ -15,15 +15,10 @@ class UserResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'username';
 
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
-
     public static function getRelations(): array
     {
         return [
-            ServersRelationManager::class,
+            RelationManagers\ServersRelationManager::class,
         ];
     }
 
@@ -31,6 +26,7 @@ class UserResource extends Resource
     {
         return [
             'index' => Pages\ListUsers::route('/'),
+            'create' => Pages\CreateUser::route('/create'),
             'edit' => Pages\EditUser::route('/{record}/edit'),
         ];
     }

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

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Filament\Resources\UserResource\Pages;
+
+use App\Filament\Resources\UserResource;
+use Filament\Resources\Pages\CreateRecord;
+use App\Models\User;
+use Filament\Forms;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Form;
+use Illuminate\Support\Facades\Hash;
+
+class CreateUser extends CreateRecord
+{
+    protected static string $resource = UserResource::class;
+
+    protected static bool $canCreateAnother = false;
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Section::make()->schema([
+                    Forms\Components\TextInput::make('username')->required()->maxLength(191),
+                    Forms\Components\TextInput::make('email')->email()->required()->maxLength(191),
+
+                    Forms\Components\TextInput::make('password')
+                        ->dehydrateStateUsing(fn (string $state): string => Hash::make($state))
+                        ->dehydrated(fn (?string $state): bool => filled($state))
+                        ->required(fn (string $operation): bool => $operation === 'create')
+                        ->password(),
+
+                    Forms\Components\ToggleButtons::make('root_admin')
+                        ->label('Administrator (Root)')
+                        ->options([
+                            false => 'No',
+                            true => 'Admin',
+                        ])
+                        ->colors([
+                            false => 'primary',
+                            true => 'danger',
+                        ])
+                        ->disableOptionWhen(function (string $operation, $value, User $user) {
+                            if ($operation !== 'edit' || $value) {
+                                return false;
+                            }
+
+                            return $user->isLastRootAdmin();
+                        })
+                        ->hint(fn (User $user) => $user->isLastRootAdmin() ? 'This is the last root administrator!' : '')
+                        ->helperText(fn (User $user) => $user->isLastRootAdmin() ? 'You must have at least one root administrator in your system.' : '')
+                        ->hintColor('warning')
+                        ->inline()
+                        ->required()
+                        ->default(false),
+
+                    Forms\Components\Hidden::make('skipValidation')->default(true),
+                    Forms\Components\Select::make('language')
+                        ->required()
+                        ->hidden()
+                        ->default('en')
+                        ->options(fn (User $user) => $user->getAvailableLanguages()),
+                ])->columns(2),
+            ]);
+    }
+}

app/Filament/Resources/UserResource/Pages/EditProfile.php

@@ -2,18 +2,15 @@
 
 namespace App\Filament\Resources\UserResource\Pages;
 
-use App\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid;
 use App\Facades\Activity;
 use App\Models\ActivityLog;
 use App\Models\ApiKey;
 use App\Models\User;
-use App\Services\Users\ToggleTwoFactorService;
 use App\Services\Users\TwoFactorSetupService;
 use chillerlan\QRCode\Common\EccLevel;
 use chillerlan\QRCode\Common\Version;
 use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
-use DateTimeZone;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Placeholder;
@@ -23,18 +20,13 @@ use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Get;
-use Filament\Notifications\Notification;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\HtmlString;
 use Illuminate\Validation\Rules\Password;
 
-/**
- * @method User getUser()
- */
 class EditProfile extends \Filament\Pages\Auth\EditProfile
 {
     protected function getForms(): array
@@ -53,7 +45,7 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                             ->label(trans('strings.username'))
                                             ->disabled()
                                             ->readOnly()
-                                            ->maxLength(255)
+                                            ->maxLength(191)
                                             ->unique(ignoreRecord: true)
                                             ->autofocus(),
 
@@ -62,7 +54,7 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                             ->label(trans('strings.email'))
                                             ->email()
                                             ->required()
-                                            ->maxLength(255)
+                                            ->maxLength(191)
                                             ->unique(ignoreRecord: true),
 
                                         TextInput::make('password')
@@ -86,12 +78,6 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                             ->visible(fn (Get $get): bool => filled($get('password')))
                                             ->dehydrated(false),
 
-                                        Select::make('timezone')
-                                            ->required()
-                                            ->prefixIcon('tabler-clock-pin')
-                                            ->options(fn () => collect(DateTimeZone::listIdentifiers())->mapWithKeys(fn ($tz) => [$tz => $tz]))
-                                            ->searchable(),
-
                                         Select::make('language')
                                             ->label(trans('strings.language'))
                                             ->required()
@@ -113,31 +99,15 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
 
                                         if ($this->getUser()->use_totp) {
                                             return [
-                                                Placeholder::make('2fa-already-enabled')
-                                                    ->label('Two Factor Authentication is currently enabled!'),
-                                                Textarea::make('backup-tokens')
-                                                    ->hidden(fn () => !cache()->get("users.{$this->getUser()->id}.2fa.tokens"))
-                                                    ->rows(10)
-                                                    ->readOnly()
-                                                    ->formatStateUsing(fn () => cache()->get("users.{$this->getUser()->id}.2fa.tokens"))
-                                                    ->helperText('These will not be shown again!')
-                                                    ->label('Backup Tokens:'),
-                                                TextInput::make('2fa-disable-code')
-                                                    ->label('Disable 2FA')
-                                                    ->helperText('Enter your current 2FA code to disable Two Factor Authentication'),
+                                                Placeholder::make('2FA already enabled!'),
                                             ];
                                         }
-                                        /** @var TwoFactorSetupService */
                                         $setupService = app(TwoFactorSetupService::class);
 
-                                        ['image_url_data' => $url, 'secret' => $secret] = cache()->remember(
-                                            "users.{$this->getUser()->id}.2fa.state",
-                                            now()->addMinutes(5), fn () => $setupService->handle($this->getUser())
-                                        );
+                                        ['image_url_data' => $url] = $setupService->handle($this->getUser());
 
                                         $options = new QROptions([
                                             'svgLogo' => public_path('pelican.svg'),
-                                            'svgLogoScale' => 0.05,
                                             'addLogoSpace' => true,
                                             'logoSpaceWidth' => 13,
                                             'logoSpaceHeight' => 13,
@@ -145,24 +115,22 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
 
                                         // https://github.com/chillerlan/php-qrcode/blob/main/examples/svgWithLogo.php
 
+                                        // SVG logo options (see extended class)
+                                        $options->svgLogo = public_path('pelican.svg'); // logo from: https://github.com/simple-icons/simple-icons
+                                        $options->svgLogoScale = 0.05;
+                                        // $options->svgLogoCssClass     = 'dark';
+
                                         // QROptions
-                                        // @phpstan-ignore property.protected
                                         $options->version = Version::AUTO;
                                         // $options->outputInterface     = QRSvgWithLogo::class;
-                                        // @phpstan-ignore property.protected
                                         $options->outputBase64 = false;
-                                        // @phpstan-ignore property.protected
                                         $options->eccLevel = EccLevel::H; // ECC level H is necessary when using logos
-                                        // @phpstan-ignore property.protected
                                         $options->addQuietzone = true;
                                         // $options->drawLightModules    = true;
-                                        // @phpstan-ignore property.protected
                                         $options->connectPaths = true;
-                                        // @phpstan-ignore property.protected
                                         $options->drawCircularModules = true;
                                         // $options->circleRadius        = 0.45;
 
-                                        // @phpstan-ignore property.protected
                                         $options->svgDefs = '<linearGradient id="gradient" x1="100%" y2="100%">
                                             <stop stop-color="#7dd4fc" offset="0"/>
                                             <stop stop-color="#38bdf8" offset="0.5"/>
@@ -179,19 +147,9 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                             Placeholder::make('qr')
                                                 ->label('Scan QR Code')
                                                 ->content(fn () => new HtmlString("
-                                                <div style='width: 300px; background-color: rgb(24, 24, 27);'>$image</div>
+                                                <div style='width: 300px'>$image</div>
                                             "))
-                                                ->helperText('Setup Key: '. $secret),
-                                            TextInput::make('2facode')
-                                                ->label('Code')
-                                                ->requiredWith('2fapassword')
-                                                ->helperText('Scan the QR code above using your two-step authentication app, then enter the code generated.'),
-                                            TextInput::make('2fapassword')
-                                                ->label('Current Password')
-                                                ->requiredWith('2facode')
-                                                ->currentPassword()
-                                                ->password()
-                                                ->helperText('Enter your current password to verify.'),
+                                                ->default('asdfasdf'),
                                         ];
                                     }),
 
@@ -200,12 +158,8 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                     ->schema([
                                         Grid::make('asdf')->columns(5)->schema([
                                             Section::make('Create API Key')->columnSpan(3)->schema([
-
-                                                TextInput::make('description')
-                                                    ->live(),
-
+                                                TextInput::make('description'),
                                                 TagsInput::make('allowed_ips')
-                                                    ->live()
                                                     ->splitKeys([',', ' ', 'Tab'])
                                                     ->placeholder('Example: 127.0.0.1 or 192.168.1.1')
                                                     ->label('Whitelisted IP\'s')
@@ -213,10 +167,9 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                                     ->columnSpanFull(),
                                             ])->headerActions([
                                                 Action::make('Create')
-                                                    ->disabled(fn (Get $get) => $get('description') === null)
                                                     ->successRedirectUrl(route('filament.admin.auth.profile', ['tab' => '-api-keys-tab']))
-                                                    ->action(function (Get $get, Action $action, $user) {
-                                                        $token = $user->createToken(
+                                                    ->action(function (Get $get, Action $action) {
+                                                        $token = auth()->user()->createToken(
                                                             $get('description'),
                                                             $get('allowed_ips'),
                                                         );
@@ -229,9 +182,8 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
                                                         $action->success();
                                                     }),
                                             ]),
-                                            Section::make('Keys')->columnSpan(2)->schema([
+                                            Section::make('API Keys')->columnSpan(2)->schema([
                                                 Repeater::make('keys')
-                                                    ->label('')
                                                     ->relationship('apiKeys')
                                                     ->addable(false)
                                                     ->itemLabel(fn ($state) => $state['identifier'])
@@ -283,43 +235,4 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
             ),
         ];
     }
-
-    protected function handleRecordUpdate($record, $data): \Illuminate\Database\Eloquent\Model
-    {
-        if ($token = $data['2facode'] ?? null) {
-            /** @var ToggleTwoFactorService $service */
-            $service = resolve(ToggleTwoFactorService::class);
-
-            $tokens = $service->handle($record, $token, true);
-            cache()->set("users.$record->id.2fa.tokens", implode("\n", $tokens), now()->addSeconds(15));
-
-            $this->redirectRoute('filament.admin.auth.profile', ['tab' => '-2fa-tab']);
-        }
-
-        if ($token = $data['2fa-disable-code'] ?? null) {
-            /** @var ToggleTwoFactorService $service */
-            $service = resolve(ToggleTwoFactorService::class);
-
-            $service->handle($record, $token, false);
-
-            cache()->forget("users.$record->id.2fa.state");
-        }
-
-        return parent::handleRecordUpdate($record, $data);
-    }
-
-    public function exception($e, $stopPropagation): void
-    {
-        if ($e instanceof TwoFactorAuthenticationTokenInvalid) {
-            Notification::make()
-                ->title('Invalid 2FA Code')
-                ->body($e->getMessage())
-                ->color('danger')
-                ->icon('tabler-2fa')
-                ->danger()
-                ->send();
-
-            $stopPropagation();
-        }
-    }
 }

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

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources\UserResource\Pages;
 
 use App\Filament\Resources\UserResource;
-use App\Services\Exceptions\FilamentExceptionHandler;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use App\Models\User;
@@ -20,8 +19,8 @@ class EditUser extends EditRecord
         return $form
             ->schema([
                 Section::make()->schema([
-                    Forms\Components\TextInput::make('username')->required()->maxLength(255),
-                    Forms\Components\TextInput::make('email')->email()->required()->maxLength(255),
+                    Forms\Components\TextInput::make('username')->required()->maxLength(191),
+                    Forms\Components\TextInput::make('email')->email()->required()->maxLength(191),
 
                     Forms\Components\TextInput::make('password')
                         ->dehydrateStateUsing(fn (string $state): string => Hash::make($state))
@@ -67,20 +66,7 @@ class EditUser extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->label(fn (User $user) => auth()->user()->id === $user->id ? 'Can\'t Delete Yourself' : ($user->servers()->count() > 0 ? 'User Has Servers' : 'Delete'))
-                ->disabled(fn (User $user) => auth()->user()->id === $user->id || $user->servers()->count() > 0),
-            $this->getSaveFormAction()->formId('form'),
+            Actions\DeleteAction::make(),
         ];
     }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
-
-    public function exception($exception, $stopPropagation): void
-    {
-        (new FilamentExceptionHandler())->handle($exception, $stopPropagation);
-    }
 }

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

@@ -4,13 +4,10 @@ namespace App\Filament\Resources\UserResource\Pages;
 
 use App\Filament\Resources\UserResource;
 use App\Models\User;
-use App\Services\Users\UserCreationService;
 use Filament\Actions;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Table;
 use Filament\Tables;
-use Filament\Forms;
 
 class ListUsers extends ListRecords
 {
@@ -66,7 +63,7 @@ class ListUsers extends ListRecords
             ->actions([
                 Tables\Actions\EditAction::make(),
             ])
-            ->checkIfRecordIsSelectableUsing(fn (User $user) => auth()->user()->id !== $user->id && !$user->servers_count)
+            ->checkIfRecordIsSelectableUsing(fn (User $user) => !$user->servers_count)
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
                     Tables\Actions\DeleteBulkAction::make(),
@@ -76,49 +73,8 @@ class ListUsers extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make('create')
-                ->label('Create User')
-                ->createAnother(false)
-                ->form([
-                    Forms\Components\Grid::make()
-                        ->schema([
-                            Forms\Components\TextInput::make('username')
-                                ->alphaNum()
-                                ->required()
-                                ->maxLength(255),
-                            Forms\Components\TextInput::make('email')
-                                ->email()
-                                ->required()
-                                ->unique()
-                                ->maxLength(255),
-
-                            Forms\Components\TextInput::make('password')
-                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('Providing a user password is optional. New user email will prompt users to create a password the first time they login.')
-                                ->password(),
-
-                            Forms\Components\ToggleButtons::make('root_admin')
-                                ->label('Administrator (Root)')
-                                ->options([
-                                    false => 'No',
-                                    true => 'Admin',
-                                ])
-                                ->colors([
-                                    false => 'primary',
-                                    true => 'danger',
-                                ])
-                                ->inline()
-                                ->required()
-                                ->default(false),
-                        ]),
-                ])
-                ->successRedirectUrl(route('filament.admin.resources.users.index'))
-                ->action(function (array $data) {
-                    resolve(UserCreationService::class)->handle($data);
-                    Notification::make()->title('User Created!')->success()->send();
-
-                    return redirect()->route('filament.admin.resources.users.index');
-                }),
+            Actions\CreateAction::make()
+                ->label('Create User'),
         ];
     }
 }

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

@@ -68,7 +68,7 @@ class ServersRelationManager extends RelationManager
                     ->sortable(),
                 Tables\Columns\SelectColumn::make('allocation.id')
                     ->label('Primary Allocation')
-                    ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->options(fn ($state, Server $server) => [$server->allocation->id => $server->allocation->address])
                     ->selectablePlaceholder(false)
                     ->sortable(),
                 Tables\Columns\TextColumn::make('image')->hidden(),

app/Http/Controllers/Admin/Eggs/EggController.php

@@ -2,15 +2,15 @@
 
 namespace App\Http\Controllers\Admin\Eggs;
 
-use App\Exceptions\Service\Egg\NoParentConfigurationFoundException;
 use Illuminate\View\View;
 use App\Models\Egg;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Illuminate\View\Factory as ViewFactory;
 use App\Http\Controllers\Controller;
+use App\Services\Eggs\EggUpdateService;
+use App\Services\Eggs\EggCreationService;
 use App\Http\Requests\Admin\Egg\EggFormRequest;
-use Ramsey\Uuid\Uuid;
 
 class EggController extends Controller
 {
@@ -19,6 +19,8 @@ class EggController extends Controller
      */
     public function __construct(
         protected AlertsMessageBag $alert,
+        protected EggCreationService $creationService,
+        protected EggUpdateService $updateService,
         protected ViewFactory $view
     ) {
     }
@@ -56,16 +58,7 @@ class EggController extends Controller
         $data['docker_images'] = $this->normalizeDockerImages($data['docker_images'] ?? null);
         $data['author'] = $request->user()->email;
 
-        $data['config_from'] = array_get($data, 'config_from');
-        if (!is_null($data['config_from'])) {
-            $parentEgg = Egg::query()->find(array_get($data, 'config_from'));
-            throw_unless($parentEgg, new NoParentConfigurationFoundException(trans('exceptions.egg.invalid_copy_id')));
-        }
-
-        $egg = Egg::query()->create(array_merge($data, [
-            'uuid' => Uuid::uuid4()->toString(),
-        ]));
-
+        $egg = $this->creationService->handle($data);
         $this->alert->success(trans('admin/eggs.notices.egg_created'))->flash();
 
         return redirect()->route('admin.eggs.view', $egg->id);
@@ -97,13 +90,7 @@ class EggController extends Controller
         $data = $request->validated();
         $data['docker_images'] = $this->normalizeDockerImages($data['docker_images'] ?? null);
 
-        $eggId = array_get($data, 'config_from');
-        $copiedFromEgg = Egg::query()->find($eggId);
-
-        throw_unless($copiedFromEgg, new NoParentConfigurationFoundException(trans('exceptions.egg.invalid_copy_id')));
-
-        $egg->update($data);
-
+        $this->updateService->handle($egg, $data);
         $this->alert->success(trans('admin/eggs.notices.updated'))->flash();
 
         return redirect()->route('admin.eggs.view', $egg->id);

app/Http/Controllers/Admin/Eggs/EggShareController.php

@@ -10,6 +10,7 @@ use Symfony\Component\HttpFoundation\Response;
 use App\Services\Eggs\Sharing\EggExporterService;
 use App\Services\Eggs\Sharing\EggImporterService;
 use App\Http\Requests\Admin\Egg\EggImportFormRequest;
+use App\Services\Eggs\Sharing\EggUpdateImporterService;
 
 class EggShareController extends Controller
 {
@@ -20,6 +21,7 @@ class EggShareController extends Controller
         protected AlertsMessageBag $alert,
         protected EggExporterService $exporterService,
         protected EggImporterService $importerService,
+        protected EggUpdateImporterService $updateImporterService
     ) {
     }
 
@@ -44,7 +46,7 @@ class EggShareController extends Controller
      */
     public function import(EggImportFormRequest $request): RedirectResponse
     {
-        $egg = $this->importerService->fromFile($request->file('import_file'));
+        $egg = $this->importerService->handle($request->file('import_file'));
         $this->alert->success(trans('admin/eggs.notices.imported'))->flash();
 
         return redirect()->route('admin.eggs.view', ['egg' => $egg->id]);
@@ -59,7 +61,7 @@ class EggShareController extends Controller
      */
     public function update(EggImportFormRequest $request, Egg $egg): RedirectResponse
     {
-        $this->importerService->fromFile($request->file('import_file'), $egg);
+        $this->updateImporterService->handle($egg, $request->file('import_file'));
         $this->alert->success(trans('admin/eggs.notices.updated_via_import'))->flash();
 
         return redirect()->route('admin.eggs.view', ['egg' => $egg]);

app/Http/Controllers/Admin/NodeAutoDeployController.php

@@ -56,7 +56,7 @@ class NodeAutoDeployController extends Controller
 
         return new JsonResponse([
             'node' => $node->id,
-            'token' => $key->identifier . $key->token,
+            'token' => $key->identifier . decrypt($key->token),
         ]);
     }
 }

app/Http/Controllers/Admin/Nodes/NodeController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Nodes;
 
 use Illuminate\View\View;
+use Illuminate\Http\Request;
 use App\Models\Node;
 use Spatie\QueryBuilder\QueryBuilder;
 use App\Http\Controllers\Controller;
@@ -12,7 +13,7 @@ class NodeController extends Controller
     /**
      * Returns a listing of nodes on the system.
      */
-    public function index(): View
+    public function index(Request $request): View
     {
         $nodes = QueryBuilder::for(
             Node::query()->withCount('servers')

app/Http/Controllers/Admin/Nodes/NodeViewController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Nodes;
 
 use Illuminate\View\View;
+use Illuminate\Http\Request;
 use App\Models\Node;
 use Illuminate\Support\Collection;
 use App\Models\Allocation;
@@ -28,10 +29,16 @@ class NodeViewController extends Controller
     /**
      * Returns index view for a specific node on the system.
      */
-    public function index(Node $node): View
+    public function index(Request $request, Node $node): View
     {
         $node->loadCount('servers');
 
+        $stats = Node::query()
+            ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
+            ->join('servers', 'servers.node_id', '=', 'nodes.id')
+            ->where('node_id', '=', $node->id)
+            ->first();
+
         return view('admin.nodes.view.index', [
             'node' => $node,
             'version' => $this->versionService,
@@ -41,7 +48,7 @@ class NodeViewController extends Controller
     /**
      * Returns the settings page for a specific node.
      */
-    public function settings(Node $node): View
+    public function settings(Request $request, Node $node): View
     {
         return view('admin.nodes.view.settings', [
             'node' => $node,
@@ -51,7 +58,7 @@ class NodeViewController extends Controller
     /**
      * Return the node configuration page for a specific node.
      */
-    public function configuration(Node $node): View
+    public function configuration(Request $request, Node $node): View
     {
         return view('admin.nodes.view.configuration', compact('node'));
     }
@@ -59,7 +66,7 @@ class NodeViewController extends Controller
     /**
      * Return the node allocation management page.
      */
-    public function allocations(Node $node): View
+    public function allocations(Request $request, Node $node): View
     {
         $node->setRelation(
             'allocations',
@@ -85,7 +92,7 @@ class NodeViewController extends Controller
     /**
      * Return a listing of servers that exist for this specific node.
      */
-    public function servers(Node $node): View
+    public function servers(Request $request, Node $node): View
     {
         $this->plainInject([
             'node' => Collection::wrap($node->makeVisible(['daemon_token_id', 'daemon_token']))

app/Http/Controllers/Admin/Servers/CreateServerController.php

@@ -53,6 +53,7 @@ class CreateServerController extends Controller
      * @throws \Illuminate\Validation\ValidationException
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Service\Deployment\NoViableAllocationException
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      * @throws \Throwable
      */
     public function store(ServerFormRequest $request): RedirectResponse

app/Http/Controllers/Admin/Servers/ServerController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Servers;
 
 use Illuminate\View\View;
+use Illuminate\Http\Request;
 use App\Models\Server;
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\AllowedFilter;
@@ -15,7 +16,7 @@ class ServerController extends Controller
      * Returns all the servers that exist on the system using a paginated result set. If
      * a query is passed along in the request it is also passed to the repository function.
      */
-    public function index(): View
+    public function index(Request $request): View
     {
         $servers = QueryBuilder::for(Server::query()->with('node', 'user', 'allocation'))
             ->allowedFilters([

app/Http/Controllers/Admin/Servers/ServerTransferController.php

@@ -2,12 +2,21 @@
 
 namespace App\Http\Controllers\Admin\Servers;
 
-use App\Http\Controllers\Controller;
-use App\Models\Server;
-use App\Services\Servers\TransferServerService;
-use Illuminate\Http\RedirectResponse;
+use App\Exceptions\Http\Connection\DaemonConnectionException;
+use App\Models\Allocation;
+use App\Models\Node;
+use Carbon\CarbonImmutable;
+use GuzzleHttp\Exception\TransferException;
 use Illuminate\Http\Request;
+use App\Models\Server;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Http;
+use Lcobucci\JWT\Token\Plain;
 use Prologue\Alerts\AlertsMessageBag;
+use App\Models\ServerTransfer;
+use Illuminate\Database\ConnectionInterface;
+use App\Http\Controllers\Controller;
+use App\Services\Nodes\NodeJWTService;
 
 class ServerTransferController extends Controller
 {
@@ -16,10 +25,30 @@ class ServerTransferController extends Controller
      */
     public function __construct(
         private AlertsMessageBag $alert,
-        private TransferServerService $transferServerService,
+        private ConnectionInterface $connection,
+        private NodeJWTService $nodeJWTService,
     ) {
     }
 
+    private function notify(Server $server, Plain $token): void
+    {
+        try {
+            Http::daemon($server->node)->post('/api/transfer', [
+                'json' => [
+                    'server_id' => $server->uuid,
+                    'url' => $server->node->getConnectionAddress() . "/api/servers/$server->uuid/archive",
+                    'token' => 'Bearer ' . $token->toString(),
+                    'server' => [
+                        'uuid' => $server->uuid,
+                        'start_on_completion' => false,
+                    ],
+                ],
+            ])->toPsrResponse();
+        } catch (TransferException $exception) {
+            throw new DaemonConnectionException($exception);
+        }
+    }
+
     /**
      * Starts a transfer of a server to a new node.
      *
@@ -33,12 +62,85 @@ class ServerTransferController extends Controller
             'allocation_additional' => 'nullable',
         ]);
 
-        if ($this->transferServerService->handle($server, $validatedData)) {
-            $this->alert->success(trans('admin/server.alerts.transfer_started'))->flash();
-        } else {
+        $node_id = $validatedData['node_id'];
+        $allocation_id = intval($validatedData['allocation_id']);
+        $additional_allocations = array_map('intval', $validatedData['allocation_additional'] ?? []);
+
+        // Check if the node is viable for the transfer.
+        $node = Node::query()
+            ->select(['nodes.id', 'nodes.fqdn', 'nodes.scheme', 'nodes.daemon_token', 'nodes.daemon_listen', 'nodes.memory', 'nodes.disk', 'nodes.memory_overallocate', 'nodes.disk_overallocate'])
+            ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
+            ->leftJoin('servers', 'servers.node_id', '=', 'nodes.id')
+            ->where('nodes.id', $node_id)
+            ->first();
+
+        if (!$node->isViable($server->memory, $server->disk)) {
             $this->alert->danger(trans('admin/server.alerts.transfer_not_viable'))->flash();
+
+            return redirect()->route('admin.servers.view.manage', $server->id);
         }
 
+        $server->validateTransferState();
+
+        $this->connection->transaction(function () use ($server, $node_id, $allocation_id, $additional_allocations) {
+            // Create a new ServerTransfer entry.
+            $transfer = new ServerTransfer();
+
+            $transfer->server_id = $server->id;
+            $transfer->old_node = $server->node_id;
+            $transfer->new_node = $node_id;
+            $transfer->old_allocation = $server->allocation_id;
+            $transfer->new_allocation = $allocation_id;
+            $transfer->old_additional_allocations = $server->allocations->where('id', '!=', $server->allocation_id)->pluck('id')->all();
+            $transfer->new_additional_allocations = $additional_allocations;
+
+            $transfer->save();
+
+            // Add the allocations to the server, so they cannot be automatically assigned while the transfer is in progress.
+            $this->assignAllocationsToServer($server, $node_id, $allocation_id, $additional_allocations);
+
+            // Generate a token for the destination node that the source node can use to authenticate with.
+            $token = $this->nodeJWTService
+                ->setExpiresAt(CarbonImmutable::now()->addMinutes(15))
+                ->setSubject($server->uuid)
+                ->handle($transfer->newNode, $server->uuid, 'sha256');
+
+            // Notify the source node of the pending outgoing transfer.
+            $this->notify($server, $token);
+
+            return $transfer;
+        });
+
+        $this->alert->success(trans('admin/server.alerts.transfer_started'))->flash();
+
         return redirect()->route('admin.servers.view.manage', $server->id);
     }
+
+    /**
+     * Assigns the specified allocations to the specified server.
+     */
+    private function assignAllocationsToServer(Server $server, int $node_id, int $allocation_id, array $additional_allocations)
+    {
+        $allocations = $additional_allocations;
+        $allocations[] = $allocation_id;
+
+        $node = Node::query()->findOrFail($node_id);
+        $unassigned = $node->allocations()
+            ->whereNull('server_id')
+            ->pluck('id')
+            ->toArray();
+
+        $updateIds = [];
+        foreach ($allocations as $allocation) {
+            if (!in_array($allocation, $unassigned)) {
+                continue;
+            }
+
+            $updateIds[] = $allocation;
+        }
+
+        if (!empty($updateIds)) {
+            Allocation::query()->whereIn('id', $updateIds)->update(['server_id' => $server->id]);
+        }
+    }
 }

app/Http/Controllers/Admin/ServersController.php

@@ -3,13 +3,13 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Enums\ServerState;
-use Filament\Notifications\Notification;
 use Illuminate\Http\Request;
 use App\Models\User;
 use Illuminate\Http\Response;
 use App\Models\Mount;
 use App\Models\Server;
 use App\Models\Database;
+use App\Models\MountServer;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use App\Exceptions\DisplayException;
@@ -70,7 +70,7 @@ class ServersController extends Controller
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Model\DataValidationException
      */
-    public function toggleInstall(Server $server)
+    public function toggleInstall(Server $server): RedirectResponse
     {
         if ($server->status === ServerState::InstallFailed) {
             throw new DisplayException(trans('admin/server.exceptions.marked_as_failed'));
@@ -79,13 +79,9 @@ class ServersController extends Controller
         $server->status = $server->isInstalled() ? ServerState::Installing : null;
         $server->save();
 
-        Notification::make()
-            ->title('Success!')
-            ->body(trans('admin/server.alerts.install_toggled'))
-            ->success()
-            ->send();
+        $this->alert->success(trans('admin/server.alerts.install_toggled'))->flash();
 
-        return null;
+        return redirect()->route('admin.servers.view.manage', $server->id);
     }
 
     /**
@@ -94,15 +90,12 @@ class ServersController extends Controller
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Model\DataValidationException
      */
-    public function reinstallServer(Server $server)
+    public function reinstallServer(Server $server): RedirectResponse
     {
         $this->reinstallService->handle($server);
+        $this->alert->success(trans('admin/server.alerts.server_reinstalled'))->flash();
 
-        Notification::make()
-            ->title('Success!')
-            ->body(trans('admin/server.alerts.server_reinstalled'))
-            ->success()
-            ->send();
+        return redirect()->route('admin.servers.view.manage', $server->id);
     }
 
     /**
@@ -133,7 +126,7 @@ class ServersController extends Controller
             $this->buildModificationService->handle($server, $request->only([
                 'allocation_id', 'add_allocations', 'remove_allocations',
                 'memory', 'swap', 'io', 'cpu', 'threads', 'disk',
-                'database_limit', 'allocation_limit', 'backup_limit', 'oom_killer',
+                'database_limit', 'allocation_limit', 'backup_limit', 'oom_disabled',
             ]));
         } catch (DataValidationException $exception) {
             throw new ValidationException($exception->getValidator());
@@ -235,7 +228,12 @@ class ServersController extends Controller
      */
     public function addMount(Request $request, Server $server): RedirectResponse
     {
-        $server->mounts()->attach($request->input('mount_id'));
+        $mountServer = (new MountServer())->forceFill([
+            'mount_id' => $request->input('mount_id'),
+            'server_id' => $server->id,
+        ]);
+
+        $mountServer->saveOrFail();
 
         $this->alert->success('Mount was added successfully.')->flash();
 
@@ -247,7 +245,7 @@ class ServersController extends Controller
      */
     public function deleteMount(Server $server, Mount $mount): RedirectResponse
     {
-        $server->mounts()->detach($mount);
+        MountServer::where('mount_id', $mount->id)->where('server_id', $server->id)->delete();
 
         $this->alert->success('Mount was removed successfully.')->flash();
 

app/Http/Controllers/Admin/UserController.php

@@ -37,7 +37,7 @@ class UserController extends Controller
     /**
      * Display user index page.
      */
-    public function index(): View
+    public function index(Request $request): View
     {
         $users = QueryBuilder::for(
             User::query()->select('users.*')

app/Http/Controllers/Api/Application/DatabaseHosts/DatabaseHostController.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\Application\DatabaseHosts;
-
-use Illuminate\Http\Response;
-use Illuminate\Http\JsonResponse;
-use App\Models\DatabaseHost;
-use Spatie\QueryBuilder\QueryBuilder;
-use App\Services\Databases\Hosts\HostUpdateService;
-use App\Services\Databases\Hosts\HostCreationService;
-use App\Transformers\Api\Application\DatabaseHostTransformer;
-use App\Http\Controllers\Api\Application\ApplicationApiController;
-use App\Http\Requests\Api\Application\DatabaseHosts\GetDatabaseHostRequest;
-use App\Http\Requests\Api\Application\DatabaseHosts\StoreDatabaseHostRequest;
-use App\Http\Requests\Api\Application\DatabaseHosts\DeleteDatabaseHostRequest;
-use App\Http\Requests\Api\Application\DatabaseHosts\UpdateDatabaseHostRequest;
-
-class DatabaseHostController extends ApplicationApiController
-{
-    /**
-     * DatabaseHostController constructor.
-     */
-    public function __construct(
-        private HostCreationService $creationService,
-        private HostUpdateService $updateService
-    ) {
-        parent::__construct();
-    }
-
-    /**
-     * Return all the database hosts currently registered on the Panel.
-     */
-    public function index(GetDatabaseHostRequest $request): array
-    {
-        $databases = QueryBuilder::for(DatabaseHost::query())
-            ->allowedFilters(['name', 'host'])
-            ->allowedSorts(['id', 'name', 'host'])
-            ->paginate($request->query('per_page') ?? 10);
-
-        return $this->fractal->collection($databases)
-            ->transformWith($this->getTransformer(DatabaseHostTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Return a single database host.
-     */
-    public function view(GetDatabaseHostRequest $request, DatabaseHost $databaseHost): array
-    {
-        return $this->fractal->item($databaseHost)
-            ->transformWith($this->getTransformer(DatabaseHostTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Store a new database host on the Panel and return an HTTP/201 response code with the
-     * new database host attached.
-     *
-     * @throws \Throwable
-     */
-    public function store(StoreDatabaseHostRequest $request): JsonResponse
-    {
-        $databaseHost = $this->creationService->handle($request->validated());
-
-        return $this->fractal->item($databaseHost)
-            ->transformWith($this->getTransformer(DatabaseHostTransformer::class))
-            ->addMeta([
-                'resource' => route('api.application.databases.view', [
-                    'database_host' => $databaseHost->id,
-                ]),
-            ])
-            ->respond(201);
-    }
-
-    /**
-     * Update a database host on the Panel and return the updated record to the user.
-     *
-     * @throws \Throwable
-     */
-    public function update(UpdateDatabaseHostRequest $request, DatabaseHost $databaseHost): array
-    {
-        $databaseHost = $this->updateService->handle($databaseHost->id, $request->validated());
-
-        return $this->fractal->item($databaseHost)
-            ->transformWith($this->getTransformer(DatabaseHostTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Delete a database host from the Panel.
-     *
-     * @throws \Exception
-     */
-    public function delete(DeleteDatabaseHostRequest $request, DatabaseHost $databaseHost): Response
-    {
-        $databaseHost->delete();
-
-        return $this->returnNoContent();
-    }
-}

app/Http/Controllers/Api/Application/Mounts/MountController.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\Application\Mounts;
-
-use Ramsey\Uuid\Uuid;
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Contracts\Translation\Translator;
-use Spatie\QueryBuilder\QueryBuilder;
-use App\Models\Mount;
-use App\Http\Controllers\Api\Application\ApplicationApiController;
-use App\Transformers\Api\Application\MountTransformer;
-use App\Http\Requests\Api\Application\Mounts\GetMountRequest;
-use App\Http\Requests\Api\Application\Mounts\StoreMountRequest;
-use App\Http\Requests\Api\Application\Mounts\DeleteMountRequest;
-use App\Http\Requests\Api\Application\Mounts\UpdateMountRequest;
-use App\Exceptions\Service\HasActiveServersException;
-
-class MountController extends ApplicationApiController
-{
-    /**
-     * MountController constructor.
-     */
-    public function __construct(
-        protected Translator $translator
-    ) {
-        parent::__construct();
-    }
-
-    /**
-     * Return all the mounts currently available on the Panel.
-     */
-    public function index(GetMountRequest $request): array
-    {
-        $mounts = QueryBuilder::for(Mount::query())
-            ->allowedFilters(['uuid', 'name'])
-            ->allowedSorts(['id', 'uuid'])
-            ->paginate($request->query('per_page') ?? 50);
-
-        return $this->fractal->collection($mounts)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Return data for a single instance of a mount.
-     */
-    public function view(GetMountRequest $request, Mount $mount): array
-    {
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Create a new mount on the Panel. Returns the created mount and an HTTP/201
-     * status response on success.
-     *
-     * @throws \App\Exceptions\Model\DataValidationException
-     */
-    public function store(StoreMountRequest $request): JsonResponse
-    {
-        $model = (new Mount())->fill($request->validated());
-        $model->forceFill(['uuid' => Uuid::uuid4()->toString()]);
-
-        $model->saveOrFail();
-        $mount = $model->fresh();
-
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->addMeta([
-                'resource' => route('api.application.mounts.view', [
-                    'mount' => $mount->id,
-                ]),
-            ])
-            ->respond(201);
-    }
-
-    /**
-     * Update an existing mount on the Panel.
-     *
-     * @throws \Throwable
-     */
-    public function update(UpdateMountRequest $request, Mount $mount): array
-    {
-        $mount->forceFill($request->validated())->save();
-
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Deletes a given mount from the Panel as long as there are no servers
-     * currently attached to it.
-     *
-     * @throws \App\Exceptions\Service\HasActiveServersException
-     */
-    public function delete(DeleteMountRequest $request, Mount $mount): JsonResponse
-    {
-        if ($mount->servers()->count() > 0) {
-            throw new HasActiveServersException($this->translator->get('exceptions.mount.servers_attached'));
-        }
-
-        $mount->delete();
-
-        return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
-    }
-
-    /**
-     * Adds eggs to the mount's many-to-many relation.
-     */
-    public function addEggs(Request $request, Mount $mount): array
-    {
-        $validatedData = $request->validate([
-            'eggs' => 'required|exists:eggs,id',
-        ]);
-
-        $eggs = $validatedData['eggs'] ?? [];
-        if (count($eggs) > 0) {
-            $mount->eggs()->attach($eggs);
-        }
-
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Adds nodes to the mount's many-to-many relation.
-     */
-    public function addNodes(Request $request, Mount $mount): array
-    {
-        $data = $request->validate(['nodes' => 'required|exists:nodes,id']);
-
-        $nodes = $data['nodes'] ?? [];
-        if (count($nodes) > 0) {
-            $mount->nodes()->attach($nodes);
-        }
-
-        return $this->fractal->item($mount)
-            ->transformWith($this->getTransformer(MountTransformer::class))
-            ->toArray();
-    }
-
-    /**
-     * Deletes an egg from the mount's many-to-many relation.
-     */
-    public function deleteEgg(Mount $mount, int $egg_id): JsonResponse
-    {
-        $mount->eggs()->detach($egg_id);
-
-        return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
-    }
-
-    /**
-     * Deletes a node from the mount's many-to-many relation.
-     */
-    public function deleteNode(Mount $mount, int $node_id): JsonResponse
-    {
-        $mount->nodes()->detach($node_id);
-
-        return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
-    }
-}

app/Http/Controllers/Api/Application/Nodes/NodeController.php

@@ -36,7 +36,7 @@ class NodeController extends ApplicationApiController
     {
         $nodes = QueryBuilder::for(Node::query())
             ->allowedFilters(['uuid', 'name', 'fqdn', 'daemon_token_id'])
-            ->allowedSorts(['id', 'uuid', 'memory', 'disk', 'cpu'])
+            ->allowedSorts(['id', 'uuid', 'memory', 'disk'])
             ->paginate($request->query('per_page') ?? 50);
 
         return $this->fractal->collection($nodes)

app/Http/Controllers/Api/Application/Nodes/NodeDeploymentController.php

@@ -9,6 +9,9 @@ use App\Http\Requests\Api\Application\Nodes\GetDeployableNodesRequest;
 
 class NodeDeploymentController extends ApplicationApiController
 {
+    /**
+     * NodeDeploymentController constructor.
+     */
     public function __construct(private FindViableNodesService $viableNodesService)
     {
         parent::__construct();
@@ -18,17 +21,16 @@ class NodeDeploymentController extends ApplicationApiController
      * Finds any nodes that are available using the given deployment criteria. This works
      * similarly to the server creation process, but allows you to pass the deployment object
      * to this endpoint and get back a list of all Nodes satisfying the requirements.
+     *
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      */
     public function __invoke(GetDeployableNodesRequest $request): array
     {
         $data = $request->validated();
-
-        $nodes = $this->viableNodesService->handle(
-            $data['memory'] ?? 0,
-            $data['disk'] ?? 0,
-            $data['cpu'] ?? 0,
-            $data['tags'] ?? $data['location_ids'] ?? [],
-        );
+        $nodes = $this->viableNodesService
+            ->setMemory($data['memory'])
+            ->setDisk($data['disk'])
+            ->handle((int) $request->query('per_page'), (int) $request->query('page'));
 
         return $this->fractal->collection($nodes)
             ->transformWith($this->getTransformer(NodeTransformer::class))

app/Http/Controllers/Api/Application/Servers/ServerController.php

@@ -50,6 +50,7 @@ class ServerController extends ApplicationApiController
      * @throws \App\Exceptions\DisplayException
      * @throws \App\Exceptions\Model\DataValidationException
      * @throws \App\Exceptions\Service\Deployment\NoViableAllocationException
+     * @throws \App\Exceptions\Service\Deployment\NoViableNodeException
      */
     public function store(StoreServerRequest $request): JsonResponse
     {

app/Http/Controllers/Api/Application/Servers/ServerManagementController.php

@@ -2,14 +2,12 @@
 
 namespace App\Http\Controllers\Api\Application\Servers;
 
-use App\Http\Controllers\Api\Application\ApplicationApiController;
-use App\Http\Requests\Api\Application\Servers\ServerWriteRequest;
-use App\Models\Server;
-use App\Repositories\Daemon\DaemonServerRepository;
-use App\Services\Servers\ReinstallServerService;
-use App\Services\Servers\SuspensionService;
-use App\Services\Servers\TransferServerService;
 use Illuminate\Http\Response;
+use App\Models\Server;
+use App\Services\Servers\SuspensionService;
+use App\Services\Servers\ReinstallServerService;
+use App\Http\Requests\Api\Application\Servers\ServerWriteRequest;
+use App\Http\Controllers\Api\Application\ApplicationApiController;
 
 class ServerManagementController extends ApplicationApiController
 {
@@ -18,9 +16,7 @@ class ServerManagementController extends ApplicationApiController
      */
     public function __construct(
         private ReinstallServerService $reinstallServerService,
-        private SuspensionService $suspensionService,
-        private TransferServerService $transferServerService,
-        private DaemonServerRepository $daemonServerRepository,
+        private SuspensionService $suspensionService
     ) {
         parent::__construct();
     }
@@ -61,44 +57,4 @@ class ServerManagementController extends ApplicationApiController
 
         return $this->returnNoContent();
     }
-
-    /**
-     * Starts a transfer of a server to a new node.
-     */
-    public function startTransfer(ServerWriteRequest $request, Server $server): Response
-    {
-        $validatedData = $request->validate([
-            'node_id' => 'required|exists:nodes,id',
-            'allocation_id' => 'required|bail|unique:servers|exists:allocations,id',
-            'allocation_additional' => 'nullable',
-        ]);
-
-        if ($this->transferServerService->handle($server, $validatedData)) {
-            // Transfer started
-            return $this->returnNoContent();
-        }
-
-        // Node was not viable
-        return new Response('', Response::HTTP_NOT_ACCEPTABLE);
-    }
-
-    /**
-     * Cancels a transfer of a server to a new node.
-     *
-     * @throws \App\Exceptions\Http\Connection\DaemonConnectionException
-     */
-    public function cancelTransfer(ServerWriteRequest $request, Server $server): Response
-    {
-        if (!$transfer = $server->transfer) {
-            // Server is not transferring
-            return new Response('', Response::HTTP_NOT_ACCEPTABLE);
-        }
-
-        $transfer->successful = true;
-        $transfer->save();
-
-        $this->daemonServerRepository->setServer($server)->cancelTransfer();
-
-        return $this->returnNoContent();
-    }
 }

app/Http/Controllers/Api/Client/AccountController.php

@@ -8,9 +8,9 @@ use Illuminate\Auth\AuthManager;
 use Illuminate\Http\JsonResponse;
 use App\Facades\Activity;
 use App\Services\Users\UserUpdateService;
+use App\Transformers\Api\Client\AccountTransformer;
 use App\Http\Requests\Api\Client\Account\UpdateEmailRequest;
 use App\Http\Requests\Api\Client\Account\UpdatePasswordRequest;
-use App\Transformers\Api\Client\UserTransformer;
 
 class AccountController extends ClientApiController
 {
@@ -25,7 +25,7 @@ class AccountController extends ClientApiController
     public function index(Request $request): array
     {
         return $this->fractal->item($request->user())
-            ->transformWith($this->getTransformer(UserTransformer::class))
+            ->transformWith($this->getTransformer(AccountTransformer::class))
             ->toArray();
     }
 

app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php

@@ -11,7 +11,6 @@ use App\Extensions\Backups\BackupManager;
 use App\Extensions\Filesystem\S3Filesystem;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use App\Exceptions\Http\HttpForbiddenException;
 
 class BackupRemoteUploadController extends Controller
 {
@@ -33,32 +32,18 @@ class BackupRemoteUploadController extends Controller
      */
     public function __invoke(Request $request, string $backup): JsonResponse
     {
-        // Get the node associated with the request.
-        /** @var \App\Models\Node $node */
-        $node = $request->attributes->get('node');
-
         // Get the size query parameter.
         $size = (int) $request->query('size');
         if (empty($size)) {
             throw new BadRequestHttpException('A non-empty "size" query parameter must be provided.');
         }
 
-        /** @var \App\Models\Backup $model */
-        $model = Backup::query()
-            ->where('uuid', $backup)
-            ->firstOrFail();
-
-        // Check that the backup is "owned" by the node making the request. This avoids other nodes
-        // from messing with backups that they don't own.
-        /** @var \App\Models\Server $server */
-        $server = $model->server;
-        if ($server->node_id !== $node->id) {
-            throw new HttpForbiddenException('You do not have permission to access that backup.');
-        }
+        /** @var \App\Models\Backup $backup */
+        $backup = Backup::query()->where('uuid', $backup)->firstOrFail();
 
         // Prevent backups that have already been completed from trying to
         // be uploaded again.
-        if (!is_null($model->completed_at)) {
+        if (!is_null($backup->completed_at)) {
             throw new ConflictHttpException('This backup is already in a completed state.');
         }
 
@@ -69,7 +54,7 @@ class BackupRemoteUploadController extends Controller
         }
 
         // The path where backup will be uploaded to
-        $path = sprintf('%s/%s.tar.gz', $model->server->uuid, $model->uuid);
+        $path = sprintf('%s/%s.tar.gz', $backup->server->uuid, $backup->uuid);
 
         // Get the S3 client
         $client = $adapter->getClient();
@@ -107,7 +92,7 @@ class BackupRemoteUploadController extends Controller
         }
 
         // Set the upload_id on the backup in the database.
-        $model->update(['upload_id' => $params['UploadId']]);
+        $backup->update(['upload_id' => $params['UploadId']]);
 
         return new JsonResponse([
             'parts' => $parts,

app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php

@@ -13,7 +13,6 @@ use App\Extensions\Backups\BackupManager;
 use App\Extensions\Filesystem\S3Filesystem;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use App\Http\Requests\Api\Remote\ReportBackupCompleteRequest;
-use App\Exceptions\Http\HttpForbiddenException;
 
 class BackupStatusController extends Controller
 {
@@ -31,22 +30,8 @@ class BackupStatusController extends Controller
      */
     public function index(ReportBackupCompleteRequest $request, string $backup): JsonResponse
     {
-        // Get the node associated with the request.
-        /** @var \App\Models\Node $node */
-        $node = $request->attributes->get('node');
-
         /** @var \App\Models\Backup $model */
-        $model = Backup::query()
-            ->where('uuid', $backup)
-            ->firstOrFail();
-
-        // Check that the backup is "owned" by the node making the request. This avoids other nodes
-        // from messing with backups that they don't own.
-        /** @var \App\Models\Server $server */
-        $server = $model->server;
-        if ($server->node_id !== $node->id) {
-            throw new HttpForbiddenException('You do not have permission to access that backup.');
-        }
+        $model = Backup::query()->where('uuid', $backup)->firstOrFail();
 
         if ($model->is_successful) {
             throw new BadRequestHttpException('Cannot update the status of a backup that is already marked as completed.');

app/Http/Controllers/Auth/AbstractLoginController.php

@@ -83,7 +83,7 @@ abstract class AbstractLoginController extends Controller
             'data' => [
                 'complete' => true,
                 'intended' => $this->redirectPath(),
-                'user' => $user->toReactObject(),
+                'user' => $user->toVueObject(),
             ],
         ]);
     }

app/Http/Controllers/Auth/LoginCheckpointController.php

@@ -65,7 +65,9 @@ class LoginCheckpointController extends AbstractLoginController
                 return $this->sendLoginResponse($user, $request);
             }
         } else {
-            if ($this->google2FA->verifyKey($user->totp_secret, (string) $request->input('authentication_code'), config('panel.auth.2fa.window'))) {
+            $decrypted = decrypt($user->totp_secret);
+
+            if ($this->google2FA->verifyKey($decrypted, (string) $request->input('authentication_code'), config('panel.auth.2fa.window'))) {
                 Event::dispatch(new ProvidedAuthenticationToken($user));
 
                 return $this->sendLoginResponse($user, $request);

app/Http/Controllers/Auth/OAuthController.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use Illuminate\Auth\AuthManager;
-use Illuminate\Http\RedirectResponse;
-use Laravel\Socialite\Facades\Socialite;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Services\Users\UserUpdateService;
-use Exception;
-use Illuminate\Http\Request;
-
-class OAuthController extends Controller
-{
-    /**
-     * OAuthController constructor.
-     */
-    public function __construct(
-        private AuthManager $auth,
-        private UserUpdateService $updateService
-    ) {
-    }
-
-    /**
-     * Redirect user to the OAuth provider
-     */
-    protected function redirect(string $driver): RedirectResponse
-    {
-        return Socialite::with($driver)->redirect();
-    }
-
-    /**
-     * Callback from OAuth provider.
-     */
-    protected function callback(Request $request, string $driver): RedirectResponse
-    {
-        $oauthUser = Socialite::driver($driver)->user();
-
-        // User is already logged in and wants to link a new OAuth Provider
-        if ($request->user()) {
-            $oauth = $request->user()->oauth;
-            $oauth[$driver] = $oauthUser->getId();
-
-            $this->updateService->handle($request->user(), ['oauth' => $oauth]);
-
-            return redirect()->route('account');
-        }
-
-        try {
-            $user = User::query()->whereJsonContains('oauth->'. $driver, $oauthUser->getId())->firstOrFail();
-
-            $this->auth->guard()->login($user, true);
-        } catch (Exception $e) {
-            // No user found - redirect to normal login
-            return redirect()->route('auth.login');
-        }
-
-        return redirect('/');
-    }
-}

app/Http/Controllers/Base/OAuthController.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Base;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\RedirectResponse;
-use Laravel\Socialite\Facades\Socialite;
-use App\Http\Controllers\Controller;
-use App\Services\Users\UserUpdateService;
-use Illuminate\Http\Response;
-
-class OAuthController extends Controller
-{
-    /**
-     * OAuthController constructor.
-     */
-    public function __construct(
-        private UserUpdateService $updateService
-    ) {
-    }
-
-    /**
-     * Link a new OAuth
-     */
-    protected function link(Request $request): RedirectResponse
-    {
-        $driver = $request->get('driver');
-
-        return Socialite::with($driver)->redirect();
-    }
-
-    /**
-     * Remove a OAuth link
-     */
-    protected function unlink(Request $request): Response
-    {
-        $oauth = $request->user()->oauth;
-        unset($oauth[$request->get('driver')]);
-
-        $this->updateService->handle($request->user(), ['oauth' => $oauth]);
-
-        return new Response('', Response::HTTP_NO_CONTENT);
-    }
-}

app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php

@@ -41,7 +41,7 @@ class DaemonAuthenticate
         /** @var Node $node */
         $node = Node::query()->where('daemon_token_id', $parts[0])->firstOrFail();
 
-        if (hash_equals((string) $node->daemon_token, $parts[1])) {
+        if (hash_equals((string) decrypt($node->daemon_token), $parts[1])) {
             $request->attributes->set('node', $node);
 
             return $next($request);

app/Http/Requests/Admin/Egg/EggFormRequest.php

@@ -9,14 +9,14 @@ class EggFormRequest extends AdminFormRequest
     public function rules(): array
     {
         $rules = [
-            'name' => 'required|string|max:255',
+            'name' => 'required|string|max:191',
             'description' => 'nullable|string',
             'docker_images' => 'required|string',
             'force_outgoing_ip' => 'sometimes|boolean',
             'file_denylist' => 'array',
             'startup' => 'required|string',
             'config_from' => 'sometimes|bail|nullable|numeric',
-            'config_stop' => 'required_without:config_from|nullable|string|max:255',
+            'config_stop' => 'required_without:config_from|nullable|string|max:191',
             'config_startup' => 'required_without:config_from|nullable|json',
             'config_logs' => 'required_without:config_from|nullable|json',
             'config_files' => 'required_without:config_from|nullable|json',

app/Http/Requests/Admin/Egg/EggVariableFormRequest.php

@@ -13,9 +13,9 @@ class EggVariableFormRequest extends AdminFormRequest
     public function rules(): array
     {
         return [
-            'name' => 'required|string|min:1|max:255',
+            'name' => 'required|string|min:1|max:191',
             'description' => 'sometimes|nullable|string',
-            'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
+            'env_variable' => 'required|regex:/^[\w]{1,191}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
             'options' => 'sometimes|required|array',
             'rules' => 'bail|required|string',
             'default_value' => 'present',

app/Http/Requests/Admin/Node/AllocationFormRequest.php

@@ -10,7 +10,7 @@ class AllocationFormRequest extends AdminFormRequest
     {
         return [
             'allocation_ip' => 'required|string',
-            'allocation_alias' => 'sometimes|nullable|string|max:255',
+            'allocation_alias' => 'sometimes|nullable|string|max:191',
             'allocation_ports' => 'required|array',
         ];
     }

app/Http/Requests/Admin/Settings/AdvancedSettingsFormRequest.php

@@ -13,8 +13,8 @@ class AdvancedSettingsFormRequest extends AdminFormRequest
     {
         return [
             'recaptcha:enabled' => 'required|in:true,false',
-            'recaptcha:secret_key' => 'required|string|max:255',
-            'recaptcha:website_key' => 'required|string|max:255',
+            'recaptcha:secret_key' => 'required|string|max:191',
+            'recaptcha:website_key' => 'required|string|max:191',
             'panel:guzzle:timeout' => 'required|integer|between:1,60',
             'panel:guzzle:connect_timeout' => 'required|integer|between:1,60',
             'panel:client_features:allocations:enabled' => 'required|in:true,false',

app/Http/Requests/Admin/Settings/BaseSettingsFormRequest.php

@@ -13,7 +13,7 @@ class BaseSettingsFormRequest extends AdminFormRequest
     public function rules(): array
     {
         return [
-            'app:name' => 'required|string|max:255',
+            'app:name' => 'required|string|max:191',
             'panel:auth:2fa_required' => 'required|integer|in:0,1,2',
             'app:locale' => ['required', 'string', Rule::in(array_keys($this->getAvailableLanguages()))],
         ];

app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php

@@ -16,10 +16,10 @@ class MailSettingsFormRequest extends AdminFormRequest
             'mail:mailers:smtp:host' => 'required|string',
             'mail:mailers:smtp:port' => 'required|integer|between:1,65535',
             'mail:mailers:smtp:encryption' => ['present', Rule::in([null, 'tls', 'ssl'])],
-            'mail:mailers:smtp:username' => 'nullable|string|max:255',
-            'mail:mailers:smtp:password' => 'nullable|string|max:255',
+            'mail:mailers:smtp:username' => 'nullable|string|max:191',
+            'mail:mailers:smtp:password' => 'nullable|string|max:191',
             'mail:from:address' => 'required|string|email',
-            'mail:from:name' => 'nullable|string|max:255',
+            'mail:from:name' => 'nullable|string|max:191',
         ];
     }
 

app/Http/Requests/Api/Application/Allocations/StoreAllocationRequest.php

@@ -15,7 +15,7 @@ class StoreAllocationRequest extends ApplicationApiRequest
     {
         return [
             'ip' => 'required|string',
-            'alias' => 'sometimes|nullable|string|max:255',
+            'alias' => 'sometimes|nullable|string|max:191',
             'ports' => 'required|array',
             'ports.*' => 'string',
         ];

app/Http/Requests/Api/Application/DatabaseHosts/DeleteDatabaseHostRequest.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\DatabaseHosts;
-
-use App\Services\Acl\Api\AdminAcl;
-use App\Http\Requests\Api\Application\ApplicationApiRequest;
-
-class DeleteDatabaseHostRequest extends ApplicationApiRequest
-{
-    protected ?string $resource = AdminAcl::RESOURCE_DATABASE_HOSTS;
-
-    protected int $permission = AdminAcl::WRITE;
-}

app/Http/Requests/Api/Application/DatabaseHosts/GetDatabaseHostRequest.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\DatabaseHosts;
-
-use App\Services\Acl\Api\AdminAcl;
-use App\Http\Requests\Api\Application\ApplicationApiRequest;
-
-class GetDatabaseHostRequest extends ApplicationApiRequest
-{
-    protected ?string $resource = AdminAcl::RESOURCE_DATABASE_HOSTS;
-
-    protected int $permission = AdminAcl::READ;
-}

app/Http/Requests/Api/Application/DatabaseHosts/StoreDatabaseHostRequest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\DatabaseHosts;
-
-use App\Models\DatabaseHost;
-use App\Services\Acl\Api\AdminAcl;
-use App\Http\Requests\Api\Application\ApplicationApiRequest;
-
-class StoreDatabaseHostRequest extends ApplicationApiRequest
-{
-    protected ?string $resource = AdminAcl::RESOURCE_DATABASE_HOSTS;
-
-    protected int $permission = AdminAcl::WRITE;
-
-    public function rules(array $rules = null): array
-    {
-        return $rules ?? DatabaseHost::getRules();
-    }
-}

app/Http/Requests/Api/Application/DatabaseHosts/UpdateDatabaseHostRequest.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api\Application\DatabaseHosts;
-
-use App\Models\DatabaseHost;
-
-class UpdateDatabaseHostRequest extends StoreDatabaseHostRequest
-{
-    public function rules(array $rules = null): array
-    {
-        /** @var DatabaseHost $databaseHost */
-        $databaseHost = $this->route()->parameter('database_host');
-
-        return $rules ?? DatabaseHost::getRulesForUpdate($databaseHost->id);
-    }
-}