diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index d3cd9a300e5..ce0db4f73f1 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -135,6 +135,7 @@
v-for="asset in assets"
:key="asset.id"
:asset="asset"
+ :errors="errorsForAsset(asset.id)"
:siblings="assets"
:read-only="isReadOnly"
:show-filename="config.show_filename"
@@ -176,6 +177,7 @@
v-for="asset in assets"
:key="asset.id"
:asset="asset"
+ :errors="errorsForAsset(asset.id)"
:siblings="assets"
:read-only="isReadOnly"
:show-filename="config.show_filename"
@@ -275,6 +277,7 @@ export default {
innerDragging: false,
displayMode: 'grid',
lockedDynamicFolder: this.meta.dynamicFolder,
+ errorsById: {},
};
},
@@ -661,6 +664,14 @@ export default {
this.loadAssets([...this.value, id]);
}
},
+
+ errorsForAsset(id) {
+ if (Object.keys(this.errorsById).length === 0 || !this.errorsById.hasOwnProperty(id)) {
+ return [];
+ }
+
+ return this.errorsById[id];
+ },
},
watch: {
@@ -682,6 +693,29 @@ export default {
}
},
+ 'publishContainer.errors': {
+ immediate: true,
+ handler(errors) {
+ this.errorsById = Object.entries(errors).reduce((acc, [key, value]) => {
+ const prefix = this.fieldPathKeys || this.handle;
+
+ if (!key.startsWith(prefix)) {
+ return acc;
+ }
+
+ const subKey = key.replace(`${prefix}.`, '');
+ const assetIndex = subKey.split('.').shift();
+ const assetId = this.assetIds[assetIndex];
+
+ if (assetId) {
+ acc[assetId] = value;
+ }
+
+ return acc;
+ }, {});
+ },
+ },
+
loading(loading) {
this.$progress.loading(`assets-fieldtype-${this.$.uid}`, loading);
},
diff --git a/resources/js/tests/components/fieldtypes/AssetsFieldtype.test.js b/resources/js/tests/components/fieldtypes/AssetsFieldtype.test.js
index ff68cff46fa..3674b906880 100644
--- a/resources/js/tests/components/fieldtypes/AssetsFieldtype.test.js
+++ b/resources/js/tests/components/fieldtypes/AssetsFieldtype.test.js
@@ -3,6 +3,7 @@ import { expect, test, vi } from 'vitest';
import * as Globals from '@/bootstrap/globals';
import { preferences } from '@api';
import AssetsFieldtype from '@/components/fieldtypes/assets/AssetsFieldtype.vue';
+import { publishContextKey } from '@/components/ui';
// Register the global helper functions (data_get, clone, etc.) onto the window
// like the control panel bootstrap does, so the component can use them.
@@ -25,6 +26,9 @@ const makeField = ({ axiosPost = vi.fn(() => Promise.resolve({ data: [] })), pro
...props,
},
global: {
+ provide: {
+ [publishContextKey]: { errors: {} },
+ },
mocks: {
$axios: { post: axiosPost },
$progress: { loading: () => {} },
diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index 9b89e9832fa..2bc000f300a 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -146,11 +146,29 @@ public function reserveSpaceWhenHidden()
public function rules()
{
- $rules = [$this->handle => $this->addNullableRule(array_merge(
+ $temp_rules = collect($this->addNullableRule(array_merge(
$this->get('required') ? ['required'] : [],
Validator::explodeRules($this->fieldtype()->fieldRules()),
Validator::explodeRules($this->fieldtype()->rules())
- ))];
+ )));
+
+ $rules = [];
+ if ($this->type() === 'assets') {
+ $rules = $temp_rules->reduce(function ($result, $rule) {
+ // These rules need to be applied to the field as a whole vs each asset in the field
+ if (Str::of($rule)->before(':')->is(['array', 'required', 'nullable', 'max', 'min'])) {
+ $result[$this->handle] ??= [];
+ $result[$this->handle][] = $rule;
+ } else {
+ $result["{$this->handle}.*"] ??= [];
+ $result["{$this->handle}.*"][] = $rule;
+ }
+
+ return $result;
+ }, []);
+ } else {
+ $rules = [$this->handle => $temp_rules->all()];
+ }
$extra = collect($this->fieldtype()->extraRules())->map(function ($rules) {
return $this->addNullableRule(Validator::explodeRules($rules));
diff --git a/src/Fieldtypes/Assets/DimensionsRule.php b/src/Fieldtypes/Assets/DimensionsRule.php
index e6d9512c5d6..3e612871ea0 100644
--- a/src/Fieldtypes/Assets/DimensionsRule.php
+++ b/src/Fieldtypes/Assets/DimensionsRule.php
@@ -2,91 +2,62 @@
namespace Statamic\Fieldtypes\Assets;
-use Illuminate\Contracts\Validation\Rule;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
use Statamic\Contracts\GraphQL\CastableToValidationString;
use Statamic\Facades\Asset;
use Statamic\Statamic;
+use Stringable;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use function Statamic\trans as __;
-class DimensionsRule implements CastableToValidationString, Rule
+class DimensionsRule implements CastableToValidationString, Stringable, ValidationRule
{
- protected $parameters;
+ protected array $raw_parameters;
- public function __construct($parameters = null)
+ public function __construct(protected $parameters)
{
- $this->parameters = $parameters;
+ $this->raw_parameters = $parameters;
+ $this->parameters = array_reduce($parameters, function ($acc, $item) {
+ [$key, $value] = array_pad(explode('=', $item, 2), 2, null);
+ $acc[$key] = $value;
+
+ return $acc;
+ }, []);
}
- /**
- * Determine if the validation rule passes.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- public function passes($attribute, $value)
+ public function validate(string $attribute, mixed $value, Closure $fail): void
{
- return collect($value)->every(function ($id) {
- if ($id instanceof UploadedFile) {
- if (in_array($id->getMimeType(), ['image/svg+xml', 'image/svg'])) {
- return true;
- }
-
- $size = getimagesize($id->getPathname());
- } else {
- if (! $asset = Asset::find($id)) {
- return false;
- }
-
- if ($asset->isSvg()) {
- return true;
- }
-
- $size = $asset->dimensions();
+ $size = [0, 0];
+
+ if ($value instanceof UploadedFile) {
+ if (in_array($value->getMimeType(), ['image/svg+xml', 'image/svg'])) {
+ return;
}
- [$width, $height] = $size;
+ $size = getimagesize($value->getPathname());
+ } elseif ($asset = Asset::find($value)) {
+ if ($asset->isSvg()) {
+ return;
+ }
- $parameters = $this->parseNamedParameters($this->parameters);
+ $size = $asset->dimensions();
+ }
- if ($this->failsBasicDimensionChecks($parameters, $width, $height) ||
- $this->failsRatioCheck($parameters, $width, $height)) {
- return false;
- }
+ [$width, $height] = $size;
- return true;
- });
+ if ($this->failsBasicDimensionChecks($this->parameters, $width, $height) ||
+ $this->failsRatioCheck($this->parameters, $width, $height)) {
+ $fail($this->message());
+ }
}
- /**
- * Get the validation error message.
- *
- * @return string
- */
- public function message()
+ public function message(): string
{
return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.dimensions');
}
- /**
- * Parse named parameters to $key => $value items.
- *
- * @param array $parameters
- * @return array
- */
- protected function parseNamedParameters($parameters)
- {
- return array_reduce($parameters, function ($result, $item) {
- [$key, $value] = array_pad(explode('=', $item, 2), 2, null);
-
- $result[$key] = $value;
-
- return $result;
- });
- }
-
/**
* Test if the given width and height fail any conditions.
*
@@ -128,8 +99,13 @@ protected function failsRatioCheck($parameters, $width, $height)
return abs($numerator / $denominator - $width / $height) > $precision;
}
+ public function __toString()
+ {
+ return 'dimensions:'.implode(',', $this->raw_parameters);
+ }
+
public function toGqlValidationString(): string
{
- return 'dimensions:'.implode(',', $this->parameters);
+ return $this->__toString();
}
}
diff --git a/src/Fieldtypes/Assets/ImageRule.php b/src/Fieldtypes/Assets/ImageRule.php
index 3cfe2eeb892..57f0ad702a5 100644
--- a/src/Fieldtypes/Assets/ImageRule.php
+++ b/src/Fieldtypes/Assets/ImageRule.php
@@ -2,59 +2,54 @@
namespace Statamic\Fieldtypes\Assets;
-use Illuminate\Contracts\Validation\Rule;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
use Statamic\Contracts\GraphQL\CastableToValidationString;
use Statamic\Facades\Asset;
use Statamic\Statamic;
+use Stringable;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use function Statamic\trans as __;
-class ImageRule implements CastableToValidationString, Rule
+class ImageRule implements CastableToValidationString, Stringable, ValidationRule
{
- protected $parameters;
+ public $extensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp', 'avif'];
- public function __construct($parameters = null)
+ public function __construct(protected $parameters)
{
- $this->parameters = $parameters;
+ if ($this->parameters !== ['image']) {
+ $this->extensions = array_map(strtolower(...), $this->parameters);
+ }
}
- /**
- * Determine if the validation rule passes.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- public function passes($attribute, $value)
+ public function validate(string $attribute, mixed $value, Closure $fail): void
{
- $extensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp', 'avif'];
+ $extension = '';
- return collect($value)->every(function ($id) use ($extensions) {
- if ($id instanceof UploadedFile) {
- return in_array($id->guessExtension(), $extensions);
- }
+ if ($value instanceof UploadedFile) {
+ $extension = $value->guessExtension();
+ } elseif ($asset = Asset::find($value)) {
+ $extension = $asset->extension();
+ }
- if (! $asset = Asset::find($id)) {
- return false;
- }
+ if (! in_array($extension, $this->extensions)) {
+ $fail($this->message());
+ }
+ }
- return $asset->guessedExtensionIsOneOf($extensions);
- });
+ public function message(): string
+ {
+ return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.image', ['extensions' => implode(', ', $this->extensions)]);
}
- /**
- * Get the validation error message.
- *
- * @return string
- */
- public function message()
+ public function __toString()
{
- return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.image');
+ return 'image:'.implode(',', $this->extensions);
}
public function toGqlValidationString(): string
{
- return 'image:'.implode(',', $this->parameters);
+ return $this->__toString();
}
}
diff --git a/src/Fieldtypes/Assets/MaxRule.php b/src/Fieldtypes/Assets/MaxRule.php
index 801d335ac55..94c09990ab8 100644
--- a/src/Fieldtypes/Assets/MaxRule.php
+++ b/src/Fieldtypes/Assets/MaxRule.php
@@ -2,30 +2,49 @@
namespace Statamic\Fieldtypes\Assets;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Contracts\GraphQL\CastableToValidationString;
+use Statamic\Facades\Asset;
use Statamic\Statamic;
+use Stringable;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
use function Statamic\trans as __;
-class MaxRule extends SizeBasedRule
+class MaxRule implements CastableToValidationString, Stringable, ValidationRule
{
- /**
- * Determine if the the rule passes for the given size.
- *
- * @param int $size
- * @return bool
- */
- public function sizePasses($size)
+ public function __construct(protected $parameters)
{
- return $size <= $this->parameters[0];
}
- /**
- * Get the validation error message.
- *
- * @return string
- */
- public function message()
+ public function validate(string $attribute, mixed $value, Closure $fail): void
{
- return str_replace(':max', $this->parameters[0], __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.max.file'));
+ $size = 0;
+
+ if ($value instanceof UploadedFile) {
+ $size = $value->getSize() / 1024;
+ } elseif ($asset = Asset::find($value)) {
+ $size = $asset->size() / 1024;
+ }
+
+ if ($size > $this->parameters[0]) {
+ $fail($this->message());
+ }
+ }
+
+ public function message(): string
+ {
+ return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.max.file', ['max' => $this->parameters[0]]);
+ }
+
+ public function __toString(): string
+ {
+ return 'max_filesize:'.$this->parameters[0];
+ }
+
+ public function toGqlValidationString(): string
+ {
+ return $this->__toString();
}
}
diff --git a/src/Fieldtypes/Assets/MimesRule.php b/src/Fieldtypes/Assets/MimesRule.php
index 5d74c342774..237d19a2823 100644
--- a/src/Fieldtypes/Assets/MimesRule.php
+++ b/src/Fieldtypes/Assets/MimesRule.php
@@ -2,61 +2,54 @@
namespace Statamic\Fieldtypes\Assets;
-use Illuminate\Contracts\Validation\Rule;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
use Statamic\Contracts\GraphQL\CastableToValidationString;
use Statamic\Facades\Asset;
use Statamic\Statamic;
+use Stringable;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use function Statamic\trans as __;
-class MimesRule implements CastableToValidationString, Rule
+class MimesRule implements CastableToValidationString, Stringable, ValidationRule
{
- protected $parameters;
-
- public function __construct($parameters)
+ public function __construct(protected $parameters)
{
if (in_array('jpg', $parameters) || in_array('jpeg', $parameters)) {
$parameters = array_unique(array_merge($parameters, ['jpg', 'jpeg']));
}
- $this->parameters = $parameters;
+ $this->parameters = array_map(strtolower(...), $parameters);
}
- /**
- * Determine if the validation rule passes.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- public function passes($attribute, $value)
+ public function validate(string $attribute, mixed $value, Closure $fail): void
{
- return collect($value)->every(function ($id) {
- if ($id instanceof UploadedFile) {
- return in_array($id->guessExtension(), $this->parameters);
- }
+ $mime = '';
- if (! $asset = Asset::find($id)) {
- return false;
- }
+ if ($value instanceof UploadedFile) {
+ $mime = $value->guessExtension();
+ } elseif ($asset = Asset::find($value)) {
+ $mime = $asset->extension();
+ }
- return $asset->guessedExtensionIsOneOf($this->parameters);
- });
+ if (! in_array($mime, $this->parameters)) {
+ $fail($this->message());
+ }
}
- /**
- * Get the validation error message.
- *
- * @return string
- */
- public function message()
+ public function message(): string
{
- return str_replace(':values', implode(', ', $this->parameters), __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimes'));
+ return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimes', ['values' => implode(', ', $this->parameters)]);
}
- public function toGqlValidationString(): string
+ public function __toString()
{
return 'mimes:'.implode(',', $this->parameters);
}
+
+ public function toGqlValidationString(): string
+ {
+ return $this->__toString();
+ }
}
diff --git a/src/Fieldtypes/Assets/MimetypesRule.php b/src/Fieldtypes/Assets/MimetypesRule.php
index 6f815686fde..41507c6cf5e 100644
--- a/src/Fieldtypes/Assets/MimetypesRule.php
+++ b/src/Fieldtypes/Assets/MimetypesRule.php
@@ -2,56 +2,49 @@
namespace Statamic\Fieldtypes\Assets;
-use Illuminate\Contracts\Validation\Rule;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
use Statamic\Contracts\GraphQL\CastableToValidationString;
use Statamic\Facades\Asset;
use Statamic\Statamic;
+use Stringable;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use function Statamic\trans as __;
-class MimetypesRule implements CastableToValidationString, Rule
+class MimetypesRule implements CastableToValidationString, Stringable, ValidationRule
{
- protected $parameters;
-
- public function __construct($parameters)
+ public function __construct(protected $parameters)
{
- $this->parameters = $parameters;
}
- /**
- * Determine if the validation rule passes.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- public function passes($attribute, $value)
+ public function validate(string $attribute, mixed $value, Closure $fail): void
{
- return collect($value)->every(function ($id) {
- if ($id instanceof UploadedFile) {
- $mimeType = $id->getMimeType();
- } elseif (! ($mimeType = optional(Asset::find($id))->mimeType())) {
- return false;
- }
-
- return in_array($mimeType, $this->parameters) ||
- in_array(explode('/', $mimeType)[0].'/*', $this->parameters);
- });
+ $mime_type = '';
+
+ if ($value instanceof UploadedFile) {
+ $mime_type = $value->getMimeType();
+ } elseif ($asset = Asset::find($value)) {
+ $mime_type = $asset->mimeType();
+ }
+
+ if (! in_array($mime_type, $this->parameters) && ! in_array(explode('/', $mime_type)[0].'/*', $this->parameters)) {
+ $fail($this->message());
+ }
}
- /**
- * Get the validation error message.
- *
- * @return string
- */
public function message()
{
- return str_replace(':values', implode(', ', $this->parameters), __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimetypes'));
+ return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimetypes', ['values' => implode(', ', $this->parameters)]);
}
- public function toGqlValidationString(): string
+ public function __toString()
{
return 'mimetypes:'.implode(',', $this->parameters);
}
+
+ public function toGqlValidationString(): string
+ {
+ return $this->__toString();
+ }
}
diff --git a/src/Fieldtypes/Assets/MinRule.php b/src/Fieldtypes/Assets/MinRule.php
index 071d87d3df3..33a7ae78568 100644
--- a/src/Fieldtypes/Assets/MinRule.php
+++ b/src/Fieldtypes/Assets/MinRule.php
@@ -2,30 +2,49 @@
namespace Statamic\Fieldtypes\Assets;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Contracts\GraphQL\CastableToValidationString;
+use Statamic\Facades\Asset;
use Statamic\Statamic;
+use Stringable;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
use function Statamic\trans as __;
-class MinRule extends SizeBasedRule
+class MinRule implements CastableToValidationString, Stringable, ValidationRule
{
- /**
- * Determine if the the rule passes for the given size.
- *
- * @param int $size
- * @return bool
- */
- public function sizePasses($size)
+ public function __construct(protected $parameters)
{
- return $size >= $this->parameters[0];
}
- /**
- * Get the validation error message.
- *
- * @return string
- */
- public function message()
+ public function validate(string $attribute, mixed $value, Closure $fail): void
{
- return str_replace(':min', $this->parameters[0], __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.min.file'));
+ $size = 0;
+
+ if ($value instanceof UploadedFile) {
+ $size = $value->getSize() / 1024;
+ } elseif ($asset = Asset::find($value)) {
+ $size = $asset->size() / 1024;
+ }
+
+ if ($size < $this->parameters[0]) {
+ $fail($this->message());
+ }
+ }
+
+ public function message(): string
+ {
+ return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.min.file', ['min' => $this->parameters[0]]);
+ }
+
+ public function __toString(): string
+ {
+ return 'min_filesize:'.$this->parameters[0];
+ }
+
+ public function toGqlValidationString(): string
+ {
+ return $this->__toString();
}
}
diff --git a/src/Fieldtypes/Assets/SizeBasedRule.php b/src/Fieldtypes/Assets/SizeBasedRule.php
deleted file mode 100644
index 875c3c612d0..00000000000
--- a/src/Fieldtypes/Assets/SizeBasedRule.php
+++ /dev/null
@@ -1,75 +0,0 @@
-parameters = $parameters;
- }
-
- /**
- * Determine if the validation rule passes.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- public function passes($attribute, $value)
- {
- return collect($value)->every(function ($id) {
- if (($size = $this->getFileSize($id)) === false) {
- return false;
- }
-
- return $this->sizePasses($size);
- });
- }
-
- /**
- * Determine if the the rule passes for the given size.
- *
- * @param int $size
- * @return bool
- */
- abstract public function sizePasses($size);
-
- /**
- * Get the validation error message.
- *
- * @return string
- */
- abstract public function message();
-
- /**
- * Get the file size.
- *
- * @param string|UploadedFile $id
- * @return int|false
- */
- protected function getFileSize($id)
- {
- if ($id instanceof UploadedFile) {
- return $id->getSize() / 1024;
- }
-
- if ($asset = Asset::find($id)) {
- return $asset->size() / 1024;
- }
-
- return false;
- }
-
- public function toGqlValidationString(): string
- {
- return 'size:'.implode(',', $this->parameters);
- }
-}
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index c5fde7bc263..776b0f57c79 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -12,6 +12,7 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Validator;
use League\Flysystem\PathTraversalDetected;
use Mockery;
use PHPUnit\Framework\Attributes\DataProvider;
@@ -1699,7 +1700,10 @@ public function it_gets_dimensions()
public function it_passes_the_dimensions_validation()
{
$file = UploadedFile::fake()->image('image.jpg', 30, 60);
- $validDimensions = (new DimensionsRule(['max_width=10']))->passes('Image', [$file]);
+ $validDimensions = Validator::make(
+ ['Image' => $file],
+ ['Image' => [new DimensionsRule(['max_width=10'])]],
+ )->passes();
$this->assertFalse($validDimensions);
}
diff --git a/tests/Feature/GraphQL/FormTest.php b/tests/Feature/GraphQL/FormTest.php
index 05324284be0..6d2e529e7b1 100644
--- a/tests/Feature/GraphQL/FormTest.php
+++ b/tests/Feature/GraphQL/FormTest.php
@@ -359,13 +359,15 @@ public function it_returns_string_based_validation_rules_for_mimes_mimetypes_dim
'form' => [
'rules' => [
'name' => [
- 'mimes:image/jpeg,image/png',
- 'mimetypes:image/jpeg,image/png',
- 'dimensions:1024',
- 'size:1000',
- 'image:jpeg',
- 'thevalidationrule:foo,bar',
- 'Tests\\Feature\\GraphQL\\TestValidationRuleWithoutToString::class',
+ '*' => [
+ 'mimes:image/jpeg,image/png',
+ 'mimetypes:image/jpeg,image/png',
+ 'dimensions:1024',
+ 'size:1000',
+ 'image:jpeg',
+ 'thevalidationrule:foo,bar',
+ 'Tests\\Feature\\GraphQL\\TestValidationRuleWithoutToString::class',
+ ],
'array',
'nullable',
],