Added input validation at Property Value assignment

Changelog.md

@@ -6,6 +6,7 @@
 - Added modal to display configuration JSON of order items
 - Added the Promotions & Coupons CRUD
 - Moved the Orders menu item to the top in the Shop section
+- Added input validation at Property Value assignment
 
 ## 4.1.1
 ##### 2024-07-23

src/Http/Requests/SyncModelPropertyValues.php

@@ -29,7 +29,8 @@ class SyncModelPropertyValues extends FormRequest implements SyncModelPropertyVa
     public function rules()
     {
         return array_merge($this->getForRules(), [
-            'propertyValues' => 'sometimes|array'
+            'propertyValues' => 'sometimes|array',
+            'propertyValues.*' => 'integer',
         ]);
     }
 
@@ -45,4 +46,11 @@ public function authorize()
     {
         return true;
     }
+
+    public function messages()
+    {
+        return [
+            'propertyValues.*.integer' => __('Each property value must be a valid entry.'),
+        ];
+    }
 }

src/resources/views/product/_show_properties.blade.php

@@ -20,9 +20,34 @@
     </table>
 </x-appshell::card>
 
+@if ($errors->any())
+    @php
+        $hasPropertyValuesError = false;
+        $propertyValuesErrorMessage = null;
+
+        foreach ($errors->keys() as $key) {
+            if (Str::startsWith($key, 'propertyValues')) {
+                $hasPropertyValuesError = true;
+                $propertyValuesErrorMessage = $errors->first($key);
+                break;
+            }
+        }
+    @endphp
+
+    @if($hasPropertyValuesError)
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                new bootstrap.Modal('#properties-assign-to-model-modal').show();
+            });
+        </script>
+    @endif
+@endif
+
 @include('vanilo::property-value.assign._form', [
     'for' => shorten(get_class($for)),
     'forId' => $for->id,
     'assignments' => $for->propertyValues,
-    'properties' => $properties
+    'properties' => $properties,
+    'hasPropertyValuesError' => $hasPropertyValuesError ?? null,
+    'propertyValuesErrorMessage' => $propertyValuesErrorMessage ?? null,
 ])

src/resources/views/property-value/assign/_form.blade.php

@@ -56,6 +56,17 @@
                                 </button>
                             </td>
                         </tr>
+
+                        @if ($hasPropertyValuesError)
+                            <tr>
+                                <td colspan="3">
+                                    <input type="hidden" class="form-control is-invalid">
+                                    <div class="invalid-feedback">
+                                        {{ $propertyValuesErrorMessage }}
+                                    </div>
+                                </td>
+                            </tr>
+                        @endif
                     </tfoot>
                 </table>