Add form translation handling

francoism90 · Oct 11, 2024 · 81c5dbe · 81c5dbe
1 parent d25623e
commit 81c5dbe
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 21 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/App/Web/Shared/Concerns/WithFormTranslations.php b/src/App/Web/Shared/Concerns/WithFormTranslations.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Web\Shared\Concerns;
+
+use Illuminate\Database\Eloquent\Model;
+
+trait WithFormTranslations
+{
+    protected function setTranslations(): void
+    {
+        collect($this->all())
+            ->filter(fn (mixed $value) => is_string($value) && filled($value))
+            ->each(fn (?string $value, string $key) => data_set($this, $key, str($value ?: '')->squish()->value()));
+    }
+
+    protected function getModelTranslations(Model $model, ?string $locale = null): array
+    {
+        $locale ??= app()->getLocale();
+
+        return collect($model->getTranslations())
+            ->map(fn (?array $item) => data_get($item, $locale))
+            ->toArray();
+    }
+}
diff --git a/src/App/Web/Tags/Controllers/TagEditController.php b/src/App/Web/Tags/Controllers/TagEditController.php
@@ -37,6 +37,11 @@ protected function authorizeAccess(): void
         $this->canUpdate($this->tag);
     }
 
+    public function updatedForm(): void
+    {
+        $this->form->validate();
+    }
+
     public function submit(): void
     {
         $this->authorize('update', $model = $this->tag);

diff --git a/src/App/Web/Tags/Forms/GeneralForm.php b/src/App/Web/Tags/Forms/GeneralForm.php
@@ -2,6 +2,7 @@
 
 namespace App\Web\Tags\Forms;
 
+use App\Web\Shared\Concerns\WithFormTranslations;
 use Domain\Tags\Enums\TagType;
 use Domain\Tags\Models\Tag;
 use Foxws\WireUse\Forms\Support\Form;
@@ -10,6 +11,8 @@
 
 class GeneralForm extends Form
 {
+    use WithFormTranslations;
+
     #[Validate]
     public string $name = '';
 
@@ -22,13 +25,6 @@ class GeneralForm extends Form
     #[Validate(['related' => 'nullable|array', 'related.*.id' => 'exists:tags,prefixed_id'])]
     public array $related = [];
 
-    protected function beforeValidate(): void
-    {
-        collect($this->all())
-            ->filter(fn (mixed $value) => filled($value) && is_string($value))
-            ->each(fn (mixed $value, string $key) => data_set($this, $key, str($value)->squish()->value()));
-    }
-
     public function rules(): array
     {
         return [
@@ -38,11 +34,14 @@ public function rules(): array
         ];
     }
 
+    protected function beforeValidate(): void
+    {
+        $this->setTranslations();
+    }
+
     protected function beforeFill(Tag $model): array
     {
-        $translations = collect($model->getTranslations())
-            ->map(fn (?array $item) => data_get($item, app()->getLocale(), ''))
-            ->toArray();
+        $translations = $this->getModelTranslations($model);
 
         $values = [...$model->toArray(), ...$translations];
 

diff --git a/src/App/Web/Videos/Controllers/VideoEditController.php b/src/App/Web/Videos/Controllers/VideoEditController.php
@@ -34,6 +34,11 @@ protected function authorizeAccess(): void
         $this->canUpdate($this->video);
     }
 
+    public function updatedForm(): void
+    {
+        $this->form->validate();
+    }
+
     public function submit(): void
     {
         $this->authorize('update', $model = $this->video);

diff --git a/src/App/Web/Videos/Forms/GeneralForm.php b/src/App/Web/Videos/Forms/GeneralForm.php
@@ -2,14 +2,17 @@
 
 namespace App\Web\Videos\Forms;
 
+use App\Web\Shared\Concerns\WithFormTranslations;
 use Domain\Videos\Models\Video;
 use Foxws\WireUse\Forms\Support\Form;
 use Livewire\Attributes\Validate;
 
 class GeneralForm extends Form
 {
+    use WithFormTranslations;
+
     #[Validate('required|string|min:1|max:255')]
-    public string $name = '';
+    public ?string $name = null;
 
     #[Validate('nullable|string|min:1|max:255')]
     public ?string $episode = null;
@@ -30,24 +33,19 @@ class GeneralForm extends Form
     public ?string $released_at = null;
 
     #[Validate(['tags' => 'nullable|array', 'tags.*.id' => 'exists:tags,prefixed_id'])]
-    public array $tags = [];
+    public ?array $tags = [];
 
     protected function beforeValidate(): void
     {
-        collect($this->all())
-            ->filter(fn (mixed $value) => is_string($value) && filled($value))
-            ->each(fn (mixed $value, string $key) => data_set($this, $key, str($value)->squish()->value()));
+        $this->setTranslations();
     }
 
     protected function beforeFill(Video $model): array
     {
-        $translations = collect($model->getTranslations())
-            ->map(fn (?array $item) => data_get($item, app()->getLocale(), ''))
-            ->toArray();
+        $translations = $this->getModelTranslations($model);
 
         $values = [...$model->toArray(), ...$translations];
 
-        // Convert tags to options
         $values['tags'] = $model->tags->options()->toArray();
 
         return $values;