feat(validation): centralize validation patterns for names and descriptions
- Introduced `ValidationPatterns` class to standardize validation rules and messages for name and description fields across the application. - Updated various components and models to utilize the new validation patterns, ensuring consistent sanitization and validation logic. - Replaced the `HasSafeNameAttribute` trait with `HasSafeStringAttribute` to enhance attribute handling and maintain consistency in name sanitization. - Enhanced the `CleanupNames` command to align with the new validation rules, allowing for a broader range of valid characters in names.
This commit is contained in:
@@ -3,23 +3,28 @@
|
||||
namespace App\Livewire\Project;
|
||||
|
||||
use App\Models\Project;
|
||||
use Livewire\Attributes\Validate;
|
||||
use App\Support\ValidationPatterns;
|
||||
use Livewire\Component;
|
||||
use Visus\Cuid2\Cuid2;
|
||||
|
||||
class AddEmpty extends Component
|
||||
{
|
||||
#[Validate(['required', 'string', 'min:3', 'max:255', 'regex:/^[a-zA-Z0-9\s\-_.]+$/'])]
|
||||
public string $name;
|
||||
|
||||
#[Validate(['nullable', 'string'])]
|
||||
public string $description = '';
|
||||
|
||||
protected $messages = [
|
||||
'name.regex' => 'The name may only contain letters, numbers, spaces, dashes, underscores, and dots.',
|
||||
'name.min' => 'The name must be at least 3 characters.',
|
||||
'name.max' => 'The name may not be greater than 255 characters.',
|
||||
];
|
||||
protected function rules(): array
|
||||
{
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
];
|
||||
}
|
||||
|
||||
protected function messages(): array
|
||||
{
|
||||
return ValidationPatterns::combinedMessages();
|
||||
}
|
||||
|
||||
public function submit()
|
||||
{
|
||||
|
||||
@@ -11,6 +11,7 @@ use App\Jobs\VolumeCloneJob;
|
||||
use App\Models\Environment;
|
||||
use App\Models\Project;
|
||||
use App\Models\Server;
|
||||
use App\Support\ValidationPatterns;
|
||||
use Livewire\Component;
|
||||
use Visus\Cuid2\Cuid2;
|
||||
|
||||
@@ -42,14 +43,14 @@ class CloneMe extends Component
|
||||
|
||||
public bool $cloneVolumeData = false;
|
||||
|
||||
protected $messages = [
|
||||
'selectedServer' => 'Please select a server.',
|
||||
'selectedDestination' => 'Please select a server & destination.',
|
||||
'newName.required' => 'Please enter a name for the new project or environment.',
|
||||
'newName.regex' => 'The name may only contain letters, numbers, spaces, dashes, underscores, and dots.',
|
||||
'newName.min' => 'The name must be at least 3 characters.',
|
||||
'newName.max' => 'The name may not be greater than 255 characters.',
|
||||
];
|
||||
protected function messages(): array
|
||||
{
|
||||
return array_merge([
|
||||
'selectedServer' => 'Please select a server.',
|
||||
'selectedDestination' => 'Please select a server & destination.',
|
||||
'newName.required' => 'Please enter a name for the new project or environment.',
|
||||
], ValidationPatterns::nameMessages());
|
||||
}
|
||||
|
||||
public function mount($project_uuid)
|
||||
{
|
||||
@@ -93,7 +94,7 @@ class CloneMe extends Component
|
||||
try {
|
||||
$this->validate([
|
||||
'selectedDestination' => 'required',
|
||||
'newName' => ['required', 'string', 'min:3', 'max:255', 'regex:/^[a-zA-Z0-9\s\-_.]+$/'],
|
||||
'newName' => ValidationPatterns::nameRules(),
|
||||
]);
|
||||
if ($type === 'project') {
|
||||
$foundProject = Project::where('name', $this->newName)->first();
|
||||
|
||||
@@ -3,24 +3,29 @@
|
||||
namespace App\Livewire\Project;
|
||||
|
||||
use App\Models\Project;
|
||||
use Livewire\Attributes\Validate;
|
||||
use App\Support\ValidationPatterns;
|
||||
use Livewire\Component;
|
||||
|
||||
class Edit extends Component
|
||||
{
|
||||
public Project $project;
|
||||
|
||||
#[Validate(['required', 'string', 'min:3', 'max:255', 'regex:/^[a-zA-Z0-9\s\-_.]+$/'])]
|
||||
public string $name;
|
||||
|
||||
#[Validate(['nullable', 'string', 'max:255'])]
|
||||
public ?string $description = null;
|
||||
|
||||
protected $messages = [
|
||||
'name.regex' => 'The name may only contain letters, numbers, spaces, dashes, underscores, and dots.',
|
||||
'name.min' => 'The name must be at least 3 characters.',
|
||||
'name.max' => 'The name may not be greater than 255 characters.',
|
||||
];
|
||||
protected function rules(): array
|
||||
{
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
];
|
||||
}
|
||||
|
||||
protected function messages(): array
|
||||
{
|
||||
return ValidationPatterns::combinedMessages();
|
||||
}
|
||||
|
||||
public function mount(string $project_uuid)
|
||||
{
|
||||
|
||||
@@ -4,8 +4,8 @@ namespace App\Livewire\Project;
|
||||
|
||||
use App\Models\Application;
|
||||
use App\Models\Project;
|
||||
use App\Support\ValidationPatterns;
|
||||
use Livewire\Attributes\Locked;
|
||||
use Livewire\Attributes\Validate;
|
||||
use Livewire\Component;
|
||||
|
||||
class EnvironmentEdit extends Component
|
||||
@@ -17,17 +17,22 @@ class EnvironmentEdit extends Component
|
||||
#[Locked]
|
||||
public $environment;
|
||||
|
||||
#[Validate(['required', 'string', 'min:3', 'max:255', 'regex:/^[a-zA-Z0-9\s\-_.]+$/'])]
|
||||
public string $name;
|
||||
|
||||
#[Validate(['nullable', 'string', 'max:255'])]
|
||||
public ?string $description = null;
|
||||
|
||||
protected $messages = [
|
||||
'name.regex' => 'The environment name may only contain letters, numbers, spaces, dashes, underscores, and dots.',
|
||||
'name.min' => 'The environment name must be at least 3 characters.',
|
||||
'name.max' => 'The environment name may not be greater than 255 characters.',
|
||||
];
|
||||
protected function rules(): array
|
||||
{
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
];
|
||||
}
|
||||
|
||||
protected function messages(): array
|
||||
{
|
||||
return ValidationPatterns::combinedMessages();
|
||||
}
|
||||
|
||||
public function mount(string $project_uuid, string $environment_uuid)
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@ namespace App\Livewire\Project;
|
||||
|
||||
use App\Models\Environment;
|
||||
use App\Models\Project;
|
||||
use Livewire\Attributes\Validate;
|
||||
use App\Support\ValidationPatterns;
|
||||
use Livewire\Component;
|
||||
use Visus\Cuid2\Cuid2;
|
||||
|
||||
@@ -12,17 +12,22 @@ class Show extends Component
|
||||
{
|
||||
public Project $project;
|
||||
|
||||
#[Validate(['required', 'string', 'min:3', 'max:255', 'regex:/^[a-zA-Z0-9\s\-_.]+$/'])]
|
||||
public string $name;
|
||||
|
||||
#[Validate(['nullable', 'string'])]
|
||||
public ?string $description = null;
|
||||
|
||||
protected $messages = [
|
||||
'name.regex' => 'The environment name may only contain letters, numbers, spaces, dashes, underscores, and dots.',
|
||||
'name.min' => 'The environment name must be at least 3 characters.',
|
||||
'name.max' => 'The environment name may not be greater than 255 characters.',
|
||||
];
|
||||
protected function rules(): array
|
||||
{
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
];
|
||||
}
|
||||
|
||||
protected function messages(): array
|
||||
{
|
||||
return ValidationPatterns::combinedMessages();
|
||||
}
|
||||
|
||||
public function mount(string $project_uuid)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user