Fix #59 - Add asset validation

spatie · Mar 11, 2022 · 6938e4c · 6938e4c
1 parent 9ecef00
commit 6938e4c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/dist/js/responsive.js b/dist/js/responsive.js
diff --git a/resources/js/ResponsiveFieldtype.vue b/resources/js/ResponsiveFieldtype.vue
@@ -9,6 +9,7 @@
         :read-only="isReadOnly"
         class="form-group bg-white border-t border-b"
         :class="field.type === 'section' ? 'mt-px -mb-px' : ''"
+        :errors="errors(field.handle)"
         @meta-updated="metaUpdated(field.handle, $event)"
         @focus="$emit('focus')"
         @blur="$emit('blur')"
@@ -33,10 +34,18 @@ export default {
           })
           .values()
           .value();
-    }
+    },
+
+    storeState() {
+      return this.$store.state.publish['base'] || {};
+    },
   },
 
   methods: {
+    errors(handle) {
+      return this.storeState.errors[this.handle + '.' + handle] || [];
+    },
+
     updateKey(handle, value) {
       let responsiveValue = this.value;
       Vue.set(responsiveValue, handle, value);

diff --git a/src/Fieldtypes/ResponsiveFields.php b/src/Fieldtypes/ResponsiveFields.php
@@ -3,6 +3,7 @@
 namespace Spatie\ResponsiveImages\Fieldtypes;
 
 use Statamic\Facades\AssetContainer;
+use Statamic\Fieldtypes\Assets\ImageRule;
 
 class ResponsiveFields
 {
@@ -74,6 +75,7 @@ public function getConfig(): array
                         ? ($this->config['allow_ratio'] ? ($this->config['allow_fit'] ? 25 : 33) : 66)
                         : ($this->config['allow_ratio'] ? ($this->config['allow_fit'] ? 50 : 66) : 100),
                     'required' => in_array('required', $this->validate ?? []) && $index === 0,
+                    'validate' => [new ImageRule()],
                 ],
             ];
 

diff --git a/src/Fieldtypes/ResponsiveFieldtype.php b/src/Fieldtypes/ResponsiveFieldtype.php
@@ -6,10 +6,14 @@
 use Spatie\ResponsiveImages\Fieldtypes\ResponsiveFields as ResponsiveFields;
 use Spatie\ResponsiveImages\GraphQL\ResponsiveFieldType as GraphQLResponsiveFieldtype;
 use Spatie\ResponsiveImages\Responsive;
+use Spatie\ResponsiveImages\Tags\ResponsiveTag;
+use Statamic\Assets\Asset;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\GraphQL;
 use Statamic\Fields\Fields as BlueprintFields;
 use Statamic\Fields\Fieldtype;
+use Statamic\Fieldtypes\Assets\Assets;
+use Statamic\Fieldtypes\Assets\ImageRule;
 use Statamic\Support\Arr;
 use Statamic\Tags\Context;
 use Statamic\Tags\Parameters;
@@ -114,6 +118,25 @@ protected function fieldConfig()
         return ResponsiveFields::new($this->config())->getConfig();
     }
 
+    public function extraRules(): array
+    {
+        $rules = collect($this->fieldConfig())->mapWithKeys(function ($field) {
+            if ($field['field']['required'] ?? false) {
+                $rules = ['required'];
+            } else {
+                $rules = ['nullable'];
+            }
+
+            $prefixedHandle = $this->field()->handle() . '.' . $field['handle'];
+
+            return [
+                $prefixedHandle => array_merge($rules, $field['field']['validate'] ?? [])
+            ];
+        });
+
+        return $rules->toArray();
+    }
+
     public function preProcess($data)
     {
         return $this->fields()->addValues($data ?? [])->preProcess()->values()->all();
@@ -123,7 +146,7 @@ public function preProcessIndex($data)
     {
         $data = $this->augment($data);
 
-        if (! isset($data['src'])) {
+        if (!isset($data['src'])) {
             return [];
         }