do not use Rule (deprecated), changed to Validate

This commit is contained in:
Andras Bacsai
2024-11-05 09:36:40 +01:00
parent d24d1394f7
commit 9b578b2003
26 changed files with 201 additions and 198 deletions

View File

@@ -8,7 +8,7 @@ use Exception;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Livewire\Attributes\Locked;
use Livewire\Attributes\Rule;
use Livewire\Attributes\Validate;
use Livewire\Component;
use Spatie\Url\Url;
@@ -22,37 +22,37 @@ class BackupEdit extends Component
#[Locked]
public $parameters;
#[Rule(['required', 'boolean'])]
#[Validate(['required', 'boolean'])]
public bool $delete_associated_backups_locally = false;
#[Rule(['required', 'boolean'])]
#[Validate(['required', 'boolean'])]
public bool $delete_associated_backups_s3 = false;
#[Rule(['required', 'boolean'])]
#[Validate(['required', 'boolean'])]
public bool $delete_associated_backups_sftp = false;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $status = null;
#[Rule(['required', 'boolean'])]
#[Validate(['required', 'boolean'])]
public bool $backupEnabled = false;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $frequency = '';
#[Rule(['required', 'integer', 'min:1'])]
#[Validate(['required', 'integer', 'min:1'])]
public int $numberOfBackupsLocally = 1;
#[Rule(['required', 'boolean'])]
#[Validate(['required', 'boolean'])]
public bool $saveS3 = false;
#[Rule(['required', 'integer'])]
#[Validate(['required', 'integer'])]
public int $s3StorageId = 1;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $databasesToBackup = null;
#[Rule(['required', 'boolean'])]
#[Validate(['required', 'boolean'])]
public bool $dumpAll = false;
public function mount()

View File

@@ -8,7 +8,7 @@ use App\Models\Server;
use App\Models\StandaloneClickhouse;
use Exception;
use Illuminate\Support\Facades\Auth;
use Livewire\Attributes\Rule;
use Livewire\Attributes\Validate;
use Livewire\Component;
class General extends Component
@@ -17,40 +17,40 @@ class General extends Component
public StandaloneClickhouse $database;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $name;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $description = null;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $clickhouseAdminUser;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $clickhouseAdminPassword;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $image;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $portsMappings = null;
#[Rule(['nullable', 'boolean'])]
#[Validate(['nullable', 'boolean'])]
public ?bool $isPublic = null;
#[Rule(['nullable', 'integer'])]
#[Validate(['nullable', 'integer'])]
public ?int $publicPort = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $customDockerRunOptions = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $dbUrl = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $dbUrlPublic = null;
#[Rule(['nullable', 'boolean'])]
#[Validate(['nullable', 'boolean'])]
public bool $isLogDrainEnabled = false;
public function getListeners()

View File

@@ -5,15 +5,15 @@ namespace App\Livewire\Project\Database;
use App\Models\ScheduledDatabaseBackup;
use Illuminate\Support\Collection;
use Livewire\Attributes\Locked;
use Livewire\Attributes\Rule;
use Livewire\Attributes\Validate;
use Livewire\Component;
class CreateScheduledBackup extends Component
{
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public $frequency;
#[Rule(['required', 'boolean'])]
#[Validate(['required', 'boolean'])]
public bool $saveToS3 = false;
#[Locked]
@@ -21,7 +21,7 @@ class CreateScheduledBackup extends Component
public bool $enabled = true;
#[Rule(['required', 'integer'])]
#[Validate(['required', 'integer'])]
public int $s3StorageId;
public Collection $definedS3s;

View File

@@ -8,7 +8,7 @@ use App\Models\Server;
use App\Models\StandaloneDragonfly;
use Exception;
use Illuminate\Support\Facades\Auth;
use Livewire\Attributes\Rule;
use Livewire\Attributes\Validate;
use Livewire\Component;
class General extends Component
@@ -17,37 +17,37 @@ class General extends Component
public StandaloneDragonfly $database;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $name;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $description = null;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $dragonflyPassword;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $image;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $portsMappings = null;
#[Rule(['nullable', 'boolean'])]
#[Validate(['nullable', 'boolean'])]
public ?bool $isPublic = null;
#[Rule(['nullable', 'integer'])]
#[Validate(['nullable', 'integer'])]
public ?int $publicPort = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $customDockerRunOptions = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $dbUrl = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $dbUrlPublic = null;
#[Rule(['nullable', 'boolean'])]
#[Validate(['nullable', 'boolean'])]
public bool $isLogDrainEnabled = false;
public function getListeners()

View File

@@ -4,7 +4,7 @@ namespace App\Livewire\Project\Database;
use Exception;
use Livewire\Attributes\Locked;
use Livewire\Attributes\Rule;
use Livewire\Attributes\Validate;
use Livewire\Component;
class InitScript extends Component
@@ -15,10 +15,10 @@ class InitScript extends Component
#[Locked]
public int $index;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $filename = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $content = null;
public function mount()

View File

@@ -8,7 +8,7 @@ use App\Models\Server;
use App\Models\StandaloneKeydb;
use Exception;
use Illuminate\Support\Facades\Auth;
use Livewire\Attributes\Rule;
use Livewire\Attributes\Validate;
use Livewire\Component;
class General extends Component
@@ -17,40 +17,40 @@ class General extends Component
public StandaloneKeydb $database;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $name;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $description = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $keydbConf = null;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $keydbPassword;
#[Rule(['required', 'string'])]
#[Validate(['required', 'string'])]
public string $image;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $portsMappings = null;
#[Rule(['nullable', 'boolean'])]
#[Validate(['nullable', 'boolean'])]
public ?bool $isPublic = null;
#[Rule(['nullable', 'integer'])]
#[Validate(['nullable', 'integer'])]
public ?int $publicPort = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $customDockerRunOptions = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $dbUrl = null;
#[Rule(['nullable', 'string'])]
#[Validate(['nullable', 'string'])]
public ?string $dbUrlPublic = null;
#[Rule(['nullable', 'boolean'])]
#[Validate(['nullable', 'boolean'])]
public bool $isLogDrainEnabled = false;
public function getListeners()