This commit is contained in:
Scai 2024-04-13 16:30:20 +03:00
parent c54217f236
commit f26373dfd5
23 changed files with 42 additions and 71 deletions

View File

@ -73,8 +73,7 @@ class ApiKeyResource extends Resource
->default(ApiKey::TYPE_APPLICATION), ->default(ApiKey::TYPE_APPLICATION),
Forms\Components\Fieldset::make('Permissions')->schema( Forms\Components\Fieldset::make('Permissions')->schema(
collect(ApiKey::RESOURCES)->map(fn ($resource) => collect(ApiKey::RESOURCES)->map(fn ($resource) => Forms\Components\ToggleButtons::make("r_$resource")
Forms\Components\ToggleButtons::make("r_$resource")
->label(str($resource)->replace('_', ' ')->title()) ->label(str($resource)->replace('_', ' ')->title())
->options([ ->options([
0 => 'None', 0 => 'None',

View File

@ -3,7 +3,6 @@
namespace App\Filament\Resources\ApiKeyResource\Pages; namespace App\Filament\Resources\ApiKeyResource\Pages;
use App\Filament\Resources\ApiKeyResource; use App\Filament\Resources\ApiKeyResource;
use Filament\Actions;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
class CreateApiKey extends CreateRecord class CreateApiKey extends CreateRecord

View File

@ -25,12 +25,10 @@ class ListApiKeys extends ListRecords
return [ return [
'all' => Tab::make('All Keys'), 'all' => Tab::make('All Keys'),
'application' => Tab::make('Application Keys') 'application' => Tab::make('Application Keys')
->modifyQueryUsing(fn (Builder $query) => ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION)
$query->where('key_type', ApiKey::TYPE_APPLICATION)
), ),
'account' => Tab::make('Account Keys') 'account' => Tab::make('Account Keys')
->modifyQueryUsing(fn (Builder $query) => ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_ACCOUNT)
$query->where('key_type', ApiKey::TYPE_ACCOUNT)
), ),
]; ];
} }

View File

@ -3,15 +3,12 @@
namespace App\Filament\Resources; namespace App\Filament\Resources;
use App\Filament\Resources\DatabaseHostResource\Pages; use App\Filament\Resources\DatabaseHostResource\Pages;
use App\Filament\Resources\DatabaseHostResource\RelationManagers;
use App\Models\DatabaseHost; use App\Models\DatabaseHost;
use Filament\Forms; use Filament\Forms;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; use Filament\Tables;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
class DatabaseHostResource extends Resource class DatabaseHostResource extends Resource
{ {

View File

@ -3,7 +3,6 @@
namespace App\Filament\Resources\DatabaseHostResource\Pages; namespace App\Filament\Resources\DatabaseHostResource\Pages;
use App\Filament\Resources\DatabaseHostResource; use App\Filament\Resources\DatabaseHostResource;
use Filament\Actions;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
class CreateDatabaseHost extends CreateRecord class CreateDatabaseHost extends CreateRecord

View File

@ -3,15 +3,12 @@
namespace App\Filament\Resources; namespace App\Filament\Resources;
use App\Filament\Resources\DatabaseResource\Pages; use App\Filament\Resources\DatabaseResource\Pages;
use App\Filament\Resources\DatabaseResource\RelationManagers;
use App\Models\Database; use App\Models\Database;
use Filament\Forms; use Filament\Forms;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; use Filament\Tables;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
class DatabaseResource extends Resource class DatabaseResource extends Resource
{ {

View File

@ -3,7 +3,6 @@
namespace App\Filament\Resources\DatabaseResource\Pages; namespace App\Filament\Resources\DatabaseResource\Pages;
use App\Filament\Resources\DatabaseResource; use App\Filament\Resources\DatabaseResource;
use Filament\Actions;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
class CreateDatabase extends CreateRecord class CreateDatabase extends CreateRecord

View File

@ -20,7 +20,6 @@ class EggResource extends Resource
protected static ?string $recordRouteKeyName = 'id'; protected static ?string $recordRouteKeyName = 'id';
public static function form(Form $form): Form public static function form(Form $form): Form
{ {
return $form return $form
@ -94,7 +93,7 @@ class EggResource extends Resource
Forms\Components\TextInput::make('env_variable')->maxLength(191), Forms\Components\TextInput::make('env_variable')->maxLength(191),
Forms\Components\TextInput::make('default_value')->maxLength(191), Forms\Components\TextInput::make('default_value')->maxLength(191),
Forms\Components\Textarea::make('rules')->rows(3)->columnSpanFull()->required(), Forms\Components\Textarea::make('rules')->rows(3)->columnSpanFull()->required(),
]) ]),
]), ]),
Forms\Components\Tabs\Tab::make('Install Script') Forms\Components\Tabs\Tab::make('Install Script')
->columns(3) ->columns(3)

View File

@ -3,7 +3,6 @@
namespace App\Filament\Resources\EggResource\Pages; namespace App\Filament\Resources\EggResource\Pages;
use App\Filament\Resources\EggResource; use App\Filament\Resources\EggResource;
use Filament\Actions;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
class CreateEgg extends CreateRecord class CreateEgg extends CreateRecord

View File

@ -53,7 +53,7 @@ class ListEggs extends ListRecords
->send(); ->send();
redirect()->route('filament.admin.resources.eggs.edit', [$newEgg]); redirect()->route('filament.admin.resources.eggs.edit', [$newEgg]);
}) }),
]; ];
} }
} }

View File

@ -88,7 +88,7 @@ class MountResource extends Resource
->relationship('nodes', 'name') ->relationship('nodes', 'name')
->searchable(['name', 'fqdn']) ->searchable(['name', 'fqdn'])
->preload(), ->preload(),
]) ]),
])->columns([ ])->columns([
'default' => 1, 'default' => 1,
]), ]),

View File

@ -3,7 +3,6 @@
namespace App\Filament\Resources\MountResource\Pages; namespace App\Filament\Resources\MountResource\Pages;
use App\Filament\Resources\MountResource; use App\Filament\Resources\MountResource;
use Filament\Actions;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
class CreateMount extends CreateRecord class CreateMount extends CreateRecord

View File

@ -3,10 +3,7 @@
namespace App\Filament\Resources\NodeResource\Pages; namespace App\Filament\Resources\NodeResource\Pages;
use App\Filament\Resources\NodeResource; use App\Filament\Resources\NodeResource;
use App\Models\Node;
use Filament\Actions\Action;
use Filament\Forms; use Filament\Forms;
use Filament\Notifications\Notification;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
use Illuminate\Support\HtmlString; use Illuminate\Support\HtmlString;
@ -98,11 +95,11 @@ class CreateNode extends CreateRecord
->hintColor('success') ->hintColor('success')
->options([ ->options([
true => 'Valid', true => 'Valid',
false => 'Invalid' false => 'Invalid',
]) ])
->colors([ ->colors([
true => 'success', true => 'success',
false => 'danger' false => 'danger',
]), ]),
Forms\Components\TextInput::make('daemonListen') Forms\Components\TextInput::make('daemonListen')
@ -115,8 +112,6 @@ class CreateNode extends CreateRecord
->required() ->required()
->integer(), ->integer(),
Forms\Components\TextInput::make('name') Forms\Components\TextInput::make('name')
->label('Display Name') ->label('Display Name')
->columnSpan(2) ->columnSpan(2)

View File

@ -64,9 +64,9 @@ class EditNode extends EditRecord
->maxValue(65535) ->maxValue(65535)
->numeric(), ->numeric(),
Forms\Components\Select::make('server_id')->relationship('server', 'name'), Forms\Components\Select::make('server_id')->relationship('server', 'name'),
])
]), ]),
]) ]),
]),
]); ]);
} }

View File

@ -16,7 +16,6 @@ use Filament\Tables;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Illuminate\Support\HtmlString;
class ServerResource extends Resource class ServerResource extends Resource
{ {
@ -359,7 +358,7 @@ class ServerResource extends Resource
->helperText(fn (Forms\Get $get) => empty($get('description')) ? '—' : $get('description')) ->helperText(fn (Forms\Get $get) => empty($get('description')) ? '—' : $get('description'))
->maxLength(191), ->maxLength(191),
Forms\Components\Hidden::make('variable_id')->default(0) Forms\Components\Hidden::make('variable_id')->default(0),
]) ])
->columnSpanFull(), ->columnSpanFull(),
]), ]),

View File

@ -3,7 +3,6 @@
namespace App\Filament\Resources\ServerResource\Pages; namespace App\Filament\Resources\ServerResource\Pages;
use App\Filament\Resources\ServerResource; use App\Filament\Resources\ServerResource;
use Filament\Actions;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
class CreateServer extends CreateRecord class CreateServer extends CreateRecord

View File

@ -3,9 +3,7 @@
namespace App\Filament\Resources\ServerResource\Pages; namespace App\Filament\Resources\ServerResource\Pages;
use App\Filament\Resources\ServerResource; use App\Filament\Resources\ServerResource;
use App\Models\Allocation;
use Filament\Actions; use Filament\Actions;
use Filament\Forms;
use Filament\Resources\Pages\EditRecord; use Filament\Resources\Pages\EditRecord;
class EditServer extends EditRecord class EditServer extends EditRecord

View File

@ -3,15 +3,12 @@
namespace App\Filament\Resources; namespace App\Filament\Resources;
use App\Filament\Resources\UserResource\Pages; use App\Filament\Resources\UserResource\Pages;
use App\Filament\Resources\UserResource\RelationManagers;
use App\Models\User; use App\Models\User;
use Filament\Forms; use Filament\Forms;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; use Filament\Tables;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
class UserResource extends Resource class UserResource extends Resource

View File

@ -3,7 +3,6 @@
namespace App\Filament\Resources\UserResource\Pages; namespace App\Filament\Resources\UserResource\Pages;
use App\Filament\Resources\UserResource; use App\Filament\Resources\UserResource;
use Filament\Actions;
use Filament\Resources\Pages\CreateRecord; use Filament\Resources\Pages\CreateRecord;
class CreateUser extends CreateRecord class CreateUser extends CreateRecord

View File

@ -8,7 +8,6 @@ use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Tabs; use Filament\Forms\Components\Tabs;
use Filament\Forms\Components\Tabs\Tab; use Filament\Forms\Components\Tabs\Tab;
use Filament\Forms\Components\TextInput; use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Forms\Get; use Filament\Forms\Get;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\HtmlString; use Illuminate\Support\HtmlString;
@ -85,7 +84,7 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
->schema([ ->schema([
Placeholder::make('activity!')->label('')->content(fn (ActivityLog $log) => new HtmlString($log->htmlable())), Placeholder::make('activity!')->label('')->content(fn (ActivityLog $log) => new HtmlString($log->htmlable())),
]) ]),
]), ]),
]), ]),
]) ])

View File

@ -126,7 +126,6 @@ class Node extends Model
return 'id'; return 'id';
} }
protected static function booted(): void protected static function booted(): void
{ {
static::creating(function (self $node) { static::creating(function (self $node) {

View File

@ -83,7 +83,7 @@ use App\Notifications\SendPasswordReset as ResetPasswordNotification;
* *
* @mixin \Eloquent * @mixin \Eloquent
*/ */
class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, FilamentUser, HasName, HasAvatar class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, FilamentUser, HasAvatar, HasName
{ {
use Authenticatable; use Authenticatable;
use Authorizable {can as protected canned; } use Authorizable {can as protected canned; }

View File

@ -25,6 +25,7 @@ class EggParserService
$parsed = json_decode($file->getContent(), true, 512, JSON_THROW_ON_ERROR); $parsed = json_decode($file->getContent(), true, 512, JSON_THROW_ON_ERROR);
$version = $parsed['meta']['version'] ?? ''; $version = $parsed['meta']['version'] ?? '';
return match ($version) { return match ($version) {
'PTDL_v1' => $this->convertToV2($parsed), 'PTDL_v1' => $this->convertToV2($parsed),
'PTDL_v2' => $parsed, 'PTDL_v2' => $parsed,