Merge branch 'main' into ui/server-console

pelican-dev · Dec 7, 2024 · ce3a491 · ce3a491
2 parents 7f6adab + e27f23b
commit ce3a491
Show file tree

Hide file tree

Showing 67 changed files with 217 additions and 153 deletions.
diff --git a/app/Filament/Pages/Dashboard.php → app/Filament/Admin/Pages/Dashboard.php b/app/Filament/Pages/Dashboard.php → app/Filament/Admin/Pages/Dashboard.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace App\Filament\Admin\Pages;
 
-use App\Filament\Resources\NodeResource\Pages\CreateNode;
-use App\Filament\Resources\NodeResource\Pages\ListNodes;
+use App\Filament\Admin\Resources\NodeResource\Pages\CreateNode;
+use App\Filament\Admin\Resources\NodeResource\Pages\ListNodes;
 use App\Models\Egg;
 use App\Models\Node;
 use App\Models\Server;

diff --git a/app/Filament/Pages/Settings.php → app/Filament/Admin/Pages/Settings.php b/app/Filament/Pages/Settings.php → app/Filament/Admin/Pages/Settings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace App\Filament\Admin\Pages;
 
 use App\Models\Backup;
 use App\Notifications\MailTested;

diff --git a/app/Filament/Resources/ApiKeyResource.php → ...lament/Admin/Resources/ApiKeyResource.php b/app/Filament/Resources/ApiKeyResource.php → ...lament/Admin/Resources/ApiKeyResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\ApiKeyResource\Pages;
+use App\Filament\Admin\Resources\ApiKeyResource\Pages;
 use App\Models\ApiKey;
 use Filament\Resources\Resource;
 use Illuminate\Database\Eloquent\Model;

diff --git a/...ces/ApiKeyResource/Pages/CreateApiKey.php → ...ces/ApiKeyResource/Pages/CreateApiKey.php b/...ces/ApiKeyResource/Pages/CreateApiKey.php → ...ces/ApiKeyResource/Pages/CreateApiKey.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\ApiKeyResource\Pages;
+namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
-use App\Filament\Resources\ApiKeyResource;
+use App\Filament\Admin\Resources\ApiKeyResource;
 use App\Models\ApiKey;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;

diff --git a/...rces/ApiKeyResource/Pages/ListApiKeys.php → ...rces/ApiKeyResource/Pages/ListApiKeys.php b/...rces/ApiKeyResource/Pages/ListApiKeys.php → ...rces/ApiKeyResource/Pages/ListApiKeys.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\ApiKeyResource\Pages;
+namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
-use App\Filament\Resources\ApiKeyResource;
+use App\Filament\Admin\Resources\ApiKeyResource;
 use App\Models\ApiKey;
 use App\Tables\Columns\DateTimeColumn;
 use Filament\Actions;

diff --git a/...lament/Resources/DatabaseHostResource.php → .../Admin/Resources/DatabaseHostResource.php b/...lament/Resources/DatabaseHostResource.php → .../Admin/Resources/DatabaseHostResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\DatabaseHostResource\Pages;
+use App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 use App\Models\DatabaseHost;
 use Filament\Resources\Resource;
 

diff --git a/...HostResource/Pages/CreateDatabaseHost.php → ...HostResource/Pages/CreateDatabaseHost.php b/...HostResource/Pages/CreateDatabaseHost.php → ...HostResource/Pages/CreateDatabaseHost.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
@@ -78,12 +78,13 @@ public function form(Form $form): Form
                             ->revealable()
                             ->maxLength(255)
                             ->required(),
-                        Select::make('node_id')
+                        Select::make('node_ids')
+                            ->multiple()
                             ->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'),
+                            ->label('Linked Nodes')
+                            ->relationship('nodes', 'name'),
                     ]),
             ]);
     }

diff --git a/...seHostResource/Pages/EditDatabaseHost.php → ...seHostResource/Pages/EditDatabaseHost.php b/...seHostResource/Pages/EditDatabaseHost.php → ...seHostResource/Pages/EditDatabaseHost.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Resources\DatabaseHostResource;
-use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
+use App\Filament\Admin\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
 use App\Models\DatabaseHost;
 use App\Services\Databases\Hosts\HostUpdateService;
 use Filament\Actions;
@@ -73,12 +73,13 @@ public function form(Form $form): Form
                             ->password()
                             ->revealable()
                             ->maxLength(255),
-                        Select::make('node_id')
+                        Select::make('nodes')
+                            ->multiple()
                             ->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'),
+                            ->label('Linked Nodes')
+                            ->relationship('nodes', 'name'),
                     ]),
             ]);
     }

diff --git a/...eHostResource/Pages/ListDatabaseHosts.php → ...eHostResource/Pages/ListDatabaseHosts.php b/...eHostResource/Pages/ListDatabaseHosts.php → ...eHostResource/Pages/ListDatabaseHosts.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Models\DatabaseHost;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -36,8 +36,9 @@ public function table(Table $table): Table
                     ->counts('databases')
                     ->icon('tabler-database')
                     ->label('Databases'),
-                TextColumn::make('node.name')
+                TextColumn::make('nodes.name')
                     ->icon('tabler-server-2')
+                    ->badge()
                     ->placeholder('No Nodes')
                     ->sortable(),
             ])

diff --git a/...tionManagers/DatabasesRelationManager.php → ...tionManagers/DatabasesRelationManager.php b/...tionManagers/DatabasesRelationManager.php → ...tionManagers/DatabasesRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseHostResource\RelationManagers;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers;
 
 use App\Models\Database;
 use App\Services\Databases\DatabasePasswordService;

diff --git a/app/Filament/Resources/DatabaseResource.php → ...ment/Admin/Resources/DatabaseResource.php b/app/Filament/Resources/DatabaseResource.php → ...ment/Admin/Resources/DatabaseResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\DatabaseResource\Pages;
+use App\Filament\Admin\Resources\DatabaseResource\Pages;
 use App\Models\Database;
 use Filament\Resources\Resource;
 

diff --git a/...DatabaseResource/Pages/CreateDatabase.php → ...DatabaseResource/Pages/CreateDatabase.php b/...DatabaseResource/Pages/CreateDatabase.php → ...DatabaseResource/Pages/CreateDatabase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseResource\Pages;
 
-use App\Filament\Resources\DatabaseResource;
+use App\Filament\Admin\Resources\DatabaseResource;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;

diff --git a/...s/DatabaseResource/Pages/EditDatabase.php → ...s/DatabaseResource/Pages/EditDatabase.php b/...s/DatabaseResource/Pages/EditDatabase.php → ...s/DatabaseResource/Pages/EditDatabase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseResource\Pages;
 
-use App\Filament\Resources\DatabaseResource;
+use App\Filament\Admin\Resources\DatabaseResource;
 use Filament\Actions;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;

diff --git a/.../DatabaseResource/Pages/ListDatabases.php → .../DatabaseResource/Pages/ListDatabases.php b/.../DatabaseResource/Pages/ListDatabases.php → .../DatabaseResource/Pages/ListDatabases.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\DatabaseResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseResource\Pages;
 
-use App\Filament\Resources\DatabaseResource;
+use App\Filament\Admin\Resources\DatabaseResource;
 use App\Tables\Columns\DateTimeColumn;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;

diff --git a/app/Filament/Resources/EggResource.php → app/Filament/Admin/Resources/EggResource.php b/app/Filament/Resources/EggResource.php → app/Filament/Admin/Resources/EggResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\EggResource\Pages;
+use App\Filament\Admin\Resources\EggResource\Pages;
 use App\Models\Egg;
 use Filament\Resources\Resource;
 

diff --git a/...Resources/EggResource/Pages/CreateEgg.php → ...Resources/EggResource/Pages/CreateEgg.php b/...Resources/EggResource/Pages/CreateEgg.php → ...Resources/EggResource/Pages/CreateEgg.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\EggResource\Pages;
+namespace App\Filament\Admin\Resources\EggResource\Pages;
 
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
-use App\Filament\Resources\EggResource;
+use App\Filament\Admin\Resources\EggResource;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;

diff --git a/...t/Resources/EggResource/Pages/EditEgg.php → ...n/Resources/EggResource/Pages/EditEgg.php b/...t/Resources/EggResource/Pages/EditEgg.php → ...n/Resources/EggResource/Pages/EditEgg.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\EggResource\Pages;
+namespace App\Filament\Admin\Resources\EggResource\Pages;
 
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
-use App\Filament\Resources\EggResource;
-use App\Filament\Resources\EggResource\RelationManagers\ServersRelationManager;
+use App\Filament\Admin\Resources\EggResource;
+use App\Filament\Admin\Resources\EggResource\RelationManagers\ServersRelationManager;
 use App\Models\Egg;
 use App\Services\Eggs\Sharing\EggExporterService;
 use App\Services\Eggs\Sharing\EggImporterService;

diff --git a/.../Resources/EggResource/Pages/ListEggs.php → .../Resources/EggResource/Pages/ListEggs.php b/.../Resources/EggResource/Pages/ListEggs.php → .../Resources/EggResource/Pages/ListEggs.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\EggResource\Pages;
+namespace App\Filament\Admin\Resources\EggResource\Pages;
 
-use App\Filament\Resources\EggResource;
+use App\Filament\Admin\Resources\EggResource;
 use App\Models\Egg;
 use App\Services\Eggs\Sharing\EggExporterService;
 use App\Services\Eggs\Sharing\EggImporterService;

diff --git a/...lationManagers/ServersRelationManager.php → ...lationManagers/ServersRelationManager.php b/...lationManagers/ServersRelationManager.php → ...lationManagers/ServersRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\EggResource\RelationManagers;
+namespace App\Filament\Admin\Resources\EggResource\RelationManagers;
 
 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;

diff --git a/app/Filament/Resources/MountResource.php → ...ilament/Admin/Resources/MountResource.php b/app/Filament/Resources/MountResource.php → ...ilament/Admin/Resources/MountResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\MountResource\Pages;
+use App\Filament\Admin\Resources\MountResource\Pages;
 use App\Models\Mount;
 use Filament\Resources\Resource;
 

diff --git a/...urces/MountResource/Pages/CreateMount.php → ...urces/MountResource/Pages/CreateMount.php b/...urces/MountResource/Pages/CreateMount.php → ...urces/MountResource/Pages/CreateMount.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\MountResource\Pages;
 
-use App\Filament\Resources\MountResource;
+use App\Filament\Admin\Resources\MountResource;
 use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Section;

diff --git a/...sources/MountResource/Pages/EditMount.php → ...sources/MountResource/Pages/EditMount.php b/...sources/MountResource/Pages/EditMount.php → ...sources/MountResource/Pages/EditMount.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\MountResource\Pages;
 
-use App\Filament\Resources\MountResource;
+use App\Filament\Admin\Resources\MountResource;
 use Filament\Actions;
 use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Section;

diff --git a/...ources/MountResource/Pages/ListMounts.php → ...ources/MountResource/Pages/ListMounts.php b/...ources/MountResource/Pages/ListMounts.php → ...ources/MountResource/Pages/ListMounts.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\MountResource\Pages;
 
-use App\Filament\Resources\MountResource;
+use App\Filament\Admin\Resources\MountResource;
 use App\Models\Mount;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;

diff --git a/app/Filament/Resources/NodeResource.php → ...Filament/Admin/Resources/NodeResource.php b/app/Filament/Resources/NodeResource.php → ...Filament/Admin/Resources/NodeResource.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Resources\NodeResource\Pages;
-use App\Filament\Resources\NodeResource\RelationManagers\AllocationsRelationManager;
-use App\Filament\Resources\NodeResource\RelationManagers\NodesRelationManager;
+use App\Filament\Admin\Resources\NodeResource\Pages;
+use App\Filament\Admin\Resources\NodeResource\RelationManagers;
 use App\Models\Node;
 use Filament\Resources\Resource;
 
@@ -24,8 +23,8 @@ public static function getNavigationBadge(): ?string
     public static function getRelations(): array
     {
         return [
-            AllocationsRelationManager::class,
-            NodesRelationManager::class,
+            RelationManagers\AllocationsRelationManager::class,
+            RelationManagers\NodesRelationManager::class,
         ];
     }
 

diff --git a/...sources/NodeResource/Pages/CreateNode.php → ...sources/NodeResource/Pages/CreateNode.php b/...sources/NodeResource/Pages/CreateNode.php → ...sources/NodeResource/Pages/CreateNode.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\NodeResource\Pages;
 
-use App\Filament\Resources\NodeResource;
+use App\Filament\Admin\Resources\NodeResource;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Grid;

diff --git a/...Resources/NodeResource/Pages/EditNode.php → ...Resources/NodeResource/Pages/EditNode.php b/...Resources/NodeResource/Pages/EditNode.php → ...Resources/NodeResource/Pages/EditNode.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\NodeResource\Pages;
 
-use App\Filament\Resources\NodeResource;
+use App\Filament\Admin\Resources\NodeResource;
 use App\Models\Node;
 use App\Services\Helpers\SoftwareVersionService;
 use App\Services\Nodes\NodeAutoDeployService;

diff --git a/...esources/NodeResource/Pages/ListNodes.php → ...esources/NodeResource/Pages/ListNodes.php b/...esources/NodeResource/Pages/ListNodes.php → ...esources/NodeResource/Pages/ListNodes.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\NodeResource\Pages;
 
-use App\Filament\Resources\NodeResource;
+use App\Filament\Admin\Resources\NodeResource;
 use App\Models\Node;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;

diff --git a/...onManagers/AllocationsRelationManager.php → ...onManagers/AllocationsRelationManager.php b/...onManagers/AllocationsRelationManager.php → ...onManagers/AllocationsRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\RelationManagers;
+namespace App\Filament\Admin\Resources\NodeResource\RelationManagers;
 
 use App\Models\Allocation;
 use App\Models\Node;

diff --git a/...RelationManagers/NodesRelationManager.php → ...RelationManagers/NodesRelationManager.php b/...RelationManagers/NodesRelationManager.php → ...RelationManagers/NodesRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\RelationManagers;
+namespace App\Filament\Admin\Resources\NodeResource\RelationManagers;
 
 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;

diff --git a/...ces/NodeResource/Widgets/NodeCpuChart.php → ...ces/NodeResource/Widgets/NodeCpuChart.php b/...ces/NodeResource/Widgets/NodeCpuChart.php → ...ces/NodeResource/Widgets/NodeCpuChart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
 use Carbon\Carbon;

diff --git a/.../NodeResource/Widgets/NodeMemoryChart.php → .../NodeResource/Widgets/NodeMemoryChart.php b/.../NodeResource/Widgets/NodeMemoryChart.php → .../NodeResource/Widgets/NodeMemoryChart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
 use Carbon\Carbon;

diff --git a/...NodeResource/Widgets/NodeStorageChart.php → ...NodeResource/Widgets/NodeStorageChart.php b/...NodeResource/Widgets/NodeStorageChart.php → ...NodeResource/Widgets/NodeStorageChart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
 use Filament\Widgets\ChartWidget;