mirror of
https://github.com/tiennm99/coolify.git
synced 2026-04-17 17:21:04 +00:00
refactor: remove duplicated validation messages
This commit is contained in:
@@ -32,7 +32,7 @@ class CleanupNames extends Command
|
|||||||
{--backup : Create database backup before changes}
|
{--backup : Create database backup before changes}
|
||||||
{--force : Skip confirmation prompt}';
|
{--force : Skip confirmation prompt}';
|
||||||
|
|
||||||
protected $description = 'Sanitize name fields by removing invalid characters (keeping only letters, numbers, spaces, dashes, underscores, dots, slashes, colons, parentheses)';
|
protected $description = 'Sanitize name fields by removing dangerous characters';
|
||||||
|
|
||||||
protected array $modelsToClean = [
|
protected array $modelsToClean = [
|
||||||
'Project' => Project::class,
|
'Project' => Project::class,
|
||||||
|
|||||||
@@ -232,8 +232,6 @@ class General extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'gitRepository.required' => 'The Git Repository field is required.',
|
'gitRepository.required' => 'The Git Repository field is required.',
|
||||||
'gitBranch.required' => 'The Git Branch field is required.',
|
'gitBranch.required' => 'The Git Branch field is required.',
|
||||||
'buildPack.required' => 'The Build Pack field is required.',
|
'buildPack.required' => 'The Build Pack field is required.',
|
||||||
|
|||||||
@@ -91,8 +91,6 @@ class General extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'mariadbRootPassword.required' => 'The Root Password field is required.',
|
'mariadbRootPassword.required' => 'The Root Password field is required.',
|
||||||
'mariadbUser.required' => 'The MariaDB User field is required.',
|
'mariadbUser.required' => 'The MariaDB User field is required.',
|
||||||
'mariadbPassword.required' => 'The MariaDB Password field is required.',
|
'mariadbPassword.required' => 'The MariaDB Password field is required.',
|
||||||
|
|||||||
@@ -91,8 +91,6 @@ class General extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'mongoInitdbRootUsername.required' => 'The Root Username field is required.',
|
'mongoInitdbRootUsername.required' => 'The Root Username field is required.',
|
||||||
'mongoInitdbRootPassword.required' => 'The Root Password field is required.',
|
'mongoInitdbRootPassword.required' => 'The Root Password field is required.',
|
||||||
'mongoInitdbDatabase.required' => 'The MongoDB Database field is required.',
|
'mongoInitdbDatabase.required' => 'The MongoDB Database field is required.',
|
||||||
|
|||||||
@@ -94,8 +94,6 @@ class General extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'mysqlRootPassword.required' => 'The Root Password field is required.',
|
'mysqlRootPassword.required' => 'The Root Password field is required.',
|
||||||
'mysqlUser.required' => 'The MySQL User field is required.',
|
'mysqlUser.required' => 'The MySQL User field is required.',
|
||||||
'mysqlPassword.required' => 'The MySQL Password field is required.',
|
'mysqlPassword.required' => 'The MySQL Password field is required.',
|
||||||
|
|||||||
@@ -106,8 +106,6 @@ class General extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'postgresUser.required' => 'The Postgres User field is required.',
|
'postgresUser.required' => 'The Postgres User field is required.',
|
||||||
'postgresPassword.required' => 'The Postgres Password field is required.',
|
'postgresPassword.required' => 'The Postgres Password field is required.',
|
||||||
'postgresDb.required' => 'The Postgres Database field is required.',
|
'postgresDb.required' => 'The Postgres Database field is required.',
|
||||||
|
|||||||
@@ -88,8 +88,6 @@ class General extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'image.required' => 'The Docker Image field is required.',
|
'image.required' => 'The Docker Image field is required.',
|
||||||
'publicPort.integer' => 'The Public Port must be an integer.',
|
'publicPort.integer' => 'The Public Port must be an integer.',
|
||||||
'redisUsername.required' => 'The Redis Username field is required.',
|
'redisUsername.required' => 'The Redis Username field is required.',
|
||||||
|
|||||||
@@ -52,8 +52,6 @@ class StackForm extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'dockerComposeRaw.required' => 'The Docker Compose Raw field is required.',
|
'dockerComposeRaw.required' => 'The Docker Compose Raw field is required.',
|
||||||
'dockerCompose.required' => 'The Docker Compose field is required.',
|
'dockerCompose.required' => 'The Docker Compose field is required.',
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -40,8 +40,6 @@ class Show extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'privateKeyValue.required' => 'The Private Key field is required.',
|
'privateKeyValue.required' => 'The Private Key field is required.',
|
||||||
'privateKeyValue.string' => 'The Private Key must be a valid string.',
|
'privateKeyValue.string' => 'The Private Key must be a valid string.',
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -50,8 +50,6 @@ class Form extends Component
|
|||||||
return array_merge(
|
return array_merge(
|
||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
'region.required' => 'The Region field is required.',
|
'region.required' => 'The Region field is required.',
|
||||||
'region.max' => 'The Region may not be greater than 255 characters.',
|
'region.max' => 'The Region may not be greater than 255 characters.',
|
||||||
'key.required' => 'The Access Key field is required.',
|
'key.required' => 'The Access Key field is required.',
|
||||||
|
|||||||
@@ -37,8 +37,6 @@ class Index extends Component
|
|||||||
ValidationPatterns::combinedMessages(),
|
ValidationPatterns::combinedMessages(),
|
||||||
[
|
[
|
||||||
'name.required' => 'The Name field is required.',
|
'name.required' => 'The Name field is required.',
|
||||||
'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
|
|
||||||
'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
|
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user