Merge pull request #5 from kirschbaum-development/feature/update-error-messages

updated error messages

Author: kirschbaum

dist/js/field.js

@@ -800,6 +800,7 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
 //
 //
 //
+//
 
 
 
@@ -17265,7 +17266,7 @@ var render = function() {
   var _c = _vm._self._c || _h
   return _c(
     "default-field",
-    { attrs: { field: _vm.field, errors: _vm.errors } },
+    { attrs: { field: _vm.field, errors: _vm.errors, "show-errors": false } },
     [
       _c(
         "template",

resources/js/components/FormField.vue

@@ -2,6 +2,7 @@
   <default-field
     :field="field"
     :errors="errors"
+    :show-errors="false"
   >
     <template slot="field">
       <draggable

src/NovaInlineRelationship.php

@@ -72,14 +72,29 @@ protected function fillAttributeFromRequest(NovaRequest $request, $requestAttrib
      */
     protected function getRelationshipRule($attribute, $properties): RelationshipRule
     {
+        /** @var array $ruleArray */
         $ruleArray = [];
 
+        /** @var array $messageArray */
+        $messageArray = [];
+
+        /** @var array $attribArray */
+        $attribArray = [];
+
         foreach ($properties as $attrib => $prop) {
             if (! empty($prop['rules'])) {
-                $ruleArray[sprintf('%s.*.%s', $attribute, $attrib)] = $prop['rules'];
+                $name = sprintf('%s.*.%s', $attribute, $attrib);
+                $ruleArray[$name] = $prop['rules'];
+                $attribArray[$name] = $prop['label'] ?? $attrib;
+
+                if (! empty($prop['messages']) && is_array($prop['messages'])) {
+                    foreach ($prop['messages'] as $rule => $message) {
+                        $messageArray[sprintf('%s.%s', $name, $rule)] = $message;
+                    }
+                }
             }
         }
 
-        return new RelationshipRule($ruleArray);
+        return new RelationshipRule($ruleArray, $messageArray, $attribArray);
     }
 }

src/Rules/RelationshipRule.php

@@ -2,37 +2,59 @@
 
 namespace KirschbaumDevelopment\NovaInlineRelationship\Rules;
 
+use Illuminate\Support\MessageBag;
 use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Support\Facades\Validator;
 
 class RelationshipRule implements Rule
 {
     public $rules = [];
 
+    /**
+     * @var array
+     */
+    protected $messages;
+
+    /**
+     * @var array
+     */
+    protected $attributes;
+
+    /**
+     * @var MessageBag
+     */
+    protected $response;
+
     /**
      * Create a new rule instance.
      *
-     * @return void
+     * @param array $rules
+     * @param null|mixed $messages
+     * @param null|mixed $attributes
+     *
      */
-    public function __construct(array $rules)
+    public function __construct(array $rules, $messages = null, $attributes = null)
     {
         $this->rules = $rules;
+        $this->messages = $messages;
+        $this->attributes = $attributes;
     }
 
     /**
      * Determine if the validation rule passes.
      *
      * @param  string  $attribute
      * @param  mixed  $value
+     *
      * @return bool
      */
     public function passes($attribute, $value)
     {
         $input = [$attribute => json_decode($value, true)];
 
-        $validator = Validator::make($input, $this->rules);
+        $validator = Validator::make($input, $this->rules, $this->messages, $this->attributes);
 
-        $this->message = $validator->errors();
+        $this->response = $validator->errors();
 
         return $validator->passes();
     }
@@ -44,6 +66,6 @@ public function passes($attribute, $value)
      */
     public function message()
     {
-        return $this->message;
+        return $this->response;
     }
 }