From 70e3abdd8fb0617711c28eeb7c6d722916b56d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=2E=20Nagy=20Gerg=C5=91?= <hello@iamgergo.com>
Date: Sat, 14 Oct 2023 17:32:12 +0200
Subject: [PATCH] cleanup

---
 .../views/columns/cells/row-actions.blade.php |  4 +-
 .../views/fields/checkbox-option.blade.php    |  2 +-
 resources/views/fields/checkbox.blade.php     |  2 +-
 resources/views/fields/option.blade.php       |  1 -
 routes/api.php                                |  3 ++
 src/Fields/Checkbox.php                       | 16 ++++---
 src/Fields/Dropdown.php                       | 34 +++++++-------
 src/Fields/File.php                           |  1 -
 src/Fields/{Options => }/Option.php           | 13 +++++-
 src/Fields/Options/CheckboxOption.php         | 45 -------------------
 src/Fields/Options/DropdownOption.php         | 11 -----
 src/Fields/Options/RadioOption.php            | 16 -------
 src/Fields/Radio.php                          | 16 ++++---
 src/Fields/Relation.php                       |  1 -
 src/Fields/Select.php                         |  1 -
 15 files changed, 55 insertions(+), 111 deletions(-)
 delete mode 100644 resources/views/fields/option.blade.php
 rename src/Fields/{Options => }/Option.php (82%)
 delete mode 100644 src/Fields/Options/CheckboxOption.php
 delete mode 100644 src/Fields/Options/DropdownOption.php
 delete mode 100644 src/Fields/Options/RadioOption.php

diff --git a/resources/views/columns/cells/row-actions.blade.php b/resources/views/columns/cells/row-actions.blade.php
index 61cf1f9a4..4383598c8 100644
--- a/resources/views/columns/cells/row-actions.blade.php
+++ b/resources/views/columns/cells/row-actions.blade.php
@@ -1,12 +1,12 @@
 <td>
     <div class="data-table__actions">
         @can('update', $model)
-            <a href="{{ $url }}" class="btn btn--light btn--sm btn--icon" aria-label="{{ __('Edit') }}">
+            <a href="{{ $value }}" class="btn btn--light btn--sm btn--icon" aria-label="{{ __('Edit') }}">
                 <x-root::icon name="edit" class="btn__icon" />
             </a>
         @endcan
         @can('delete', $model)
-            <form action="{{ $url }}" method="POST" onsubmit="return window.confirm('{{ __('Are you sure?') }}');">
+            <form action="{{ $value }}" method="POST" onsubmit="return window.confirm('{{ __('Are you sure?') }}');">
                 @csrf
                 @method('DELETE')
                 <button type="submit" class="btn btn--delete btn--sm btn--icon" aria-label="{{ __('Delete') }}">
diff --git a/resources/views/fields/checkbox-option.blade.php b/resources/views/fields/checkbox-option.blade.php
index 3b959e356..c1b7bed2b 100644
--- a/resources/views/fields/checkbox-option.blade.php
+++ b/resources/views/fields/checkbox-option.blade.php
@@ -1,4 +1,4 @@
 <label class="form-check">
-    <input {{ $attrs->class(['form-check__control']) }}>
+    <input {{ $attrs }}>
     <span class="form-label form-check__label">{{ $label }}</span>
 </label>
diff --git a/resources/views/fields/checkbox.blade.php b/resources/views/fields/checkbox.blade.php
index 47b86b861..7598fc9a4 100644
--- a/resources/views/fields/checkbox.blade.php
+++ b/resources/views/fields/checkbox.blade.php
@@ -7,7 +7,7 @@
     </label>
     <div class="form-group form-group--vertical-check">
         @foreach($options as $option)
-            {!! $option !!}
+            @include('root::fields.checkbox-option', $option)
         @endforeach
     </div>
     @if($invalid)
diff --git a/resources/views/fields/option.blade.php b/resources/views/fields/option.blade.php
deleted file mode 100644
index aa626279f..000000000
--- a/resources/views/fields/option.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-<option {{ $attrs }}>{{ $label }}</option>
diff --git a/routes/api.php b/routes/api.php
index f24ac0c70..0861051be 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -9,3 +9,6 @@
 
 // Resource Fields
 Route::any('/{resource}/fields/{field}', ResourceFieldController::class)->where('field', '.*');
+
+// Actions
+// Action Fields
diff --git a/src/Fields/Checkbox.php b/src/Fields/Checkbox.php
index 1f23e81ed..076906e4a 100644
--- a/src/Fields/Checkbox.php
+++ b/src/Fields/Checkbox.php
@@ -2,8 +2,6 @@
 
 namespace Cone\Root\Fields;
 
-use Cone\Root\Fields\Options\CheckboxOption;
-
 class Checkbox extends Select
 {
     /**
@@ -12,10 +10,18 @@ class Checkbox extends Select
     protected string $template = 'root::fields.checkbox';
 
     /**
-     * Make a new option instance.
+     * {@inheritdoc}
      */
-    public function newOption(mixed $value, string $label): CheckboxOption
+    public function newOption(mixed $value, string $label): Option
     {
-        return CheckboxOption::make($value, $label)->name(sprintf('%s[]', $this->getModelAttribute()));
+        $option = parent::newOption($value, $label);
+
+        $option->setAttributes([
+            'type' => 'checkbox',
+            'class' => 'form-check__control',
+            'name' => sprintf('%s[]', $this->getModelAttribute()),
+        ]);
+
+        return $option;
     }
 }
diff --git a/src/Fields/Dropdown.php b/src/Fields/Dropdown.php
index 4ec1f1651..458fc1bcc 100644
--- a/src/Fields/Dropdown.php
+++ b/src/Fields/Dropdown.php
@@ -2,8 +2,10 @@
 
 namespace Cone\Root\Fields;
 
-use Cone\Root\Fields\Options\DropdownOption;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\View;
 
 class Dropdown extends Select
 {
@@ -22,34 +24,28 @@ public function __construct(string $label, string $modelAttribute = null)
         $this->setAttribute('class', 'form-control combobox__control');
     }
 
-    /**
-     * Make a new option instance.
-     */
-    public function newOption(mixed $value, string $label): DropdownOption
-    {
-        return new DropdownOption($value, $label);
-    }
-
     /**
      * {@inheritdoc}
      */
-    public function toArray(): array
+    public function toFormComponent(Request $request, Model $model): array
     {
-        $data = parent::toArray();
+        $data = parent::toFormComponent($request, $model);
 
         return array_merge($data, [
-            'options' => array_map(static function (DropdownOption $option): array {
-                return $option->toRenderedArray();
+            'options' => array_map(static function (array $option): array {
+                return array_merge($option, [
+                    'html' => View::make('root::fields.dropdown-option', $option)->render(),
+                ]);
             }, $data['options']),
             'selection' => Collection::make($data['options'])
-                ->filter(function (DropdownOption $option): bool {
-                    return $option->getAttribute('selected');
+                ->filter(fn (array $option): bool => $option['selected'] ?? false)
+                ->map(static function (array $option): array {
+                    return array_merge($option, [
+                        'html' => View::make('root::fields.dropdown-option', $option)->render(),
+                    ]);
                 })
                 ->values()
-                ->map(function (DropdownOption $option): array {
-                    return $option->toRenderedArray();
-                })
-                ->toArray(),
+                ->all(),
             'config' => [
                 'multiple' => $this->getAttribute('multiple'),
             ],
diff --git a/src/Fields/File.php b/src/Fields/File.php
index e8fb38555..c62fa5a86 100644
--- a/src/Fields/File.php
+++ b/src/Fields/File.php
@@ -3,7 +3,6 @@
 namespace Cone\Root\Fields;
 
 use Closure;
-use Cone\Root\Fields\Options\Option;
 use Cone\Root\Jobs\MoveFile;
 use Cone\Root\Jobs\PerformConversions;
 use Cone\Root\Models\Medium;
diff --git a/src/Fields/Options/Option.php b/src/Fields/Option.php
similarity index 82%
rename from src/Fields/Options/Option.php
rename to src/Fields/Option.php
index 75426eee9..1e4e987ca 100644
--- a/src/Fields/Options/Option.php
+++ b/src/Fields/Option.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Cone\Root\Fields\Options;
+namespace Cone\Root\Fields;
 
 use Cone\Root\Traits\HasAttributes;
 use Cone\Root\Traits\Makeable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Conditionable;
+use JsonSerializable;
 
-class Option implements Arrayable
+class Option implements Arrayable, JsonSerializable
 {
     use Conditionable;
     use HasAttributes;
@@ -44,6 +45,14 @@ public function selected(bool $value = true): static
         return $this->setAttribute('selected', $value);
     }
 
+    /**
+     * Convert the element to a JSON serializable format.
+     */
+    public function jsonSerialize(): mixed
+    {
+        return $this->toArray();
+    }
+
     /**
      * Get the array representation of the object.
      */
diff --git a/src/Fields/Options/CheckboxOption.php b/src/Fields/Options/CheckboxOption.php
deleted file mode 100644
index 9094a7d2d..000000000
--- a/src/Fields/Options/CheckboxOption.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Cone\Root\Fields\Options;
-
-class CheckboxOption extends Option
-{
-    /**
-     * The Blade template.
-     */
-    protected string $template = 'root::fields.checkbox-option';
-
-    /**
-     * Create a new option instance.
-     */
-    public function __construct(mixed $value, string $label)
-    {
-        parent::__construct($value, $label);
-
-        $this->setAttribute('type', 'checkbox');
-    }
-
-    /**
-     * Set the "name" HTML attribute.
-     */
-    public function name(string $value): static
-    {
-        return $this->setAttribute('name', $value);
-    }
-
-    /**
-     * Set the "selected" HTML attribute.
-     */
-    public function selected(bool $value = true): static
-    {
-        return $this->checked($value);
-    }
-
-    /**
-     * Set the "checked" HTML attribute.
-     */
-    public function checked(bool $value = true): static
-    {
-        return $this->setAttribute('checked', $value);
-    }
-}
diff --git a/src/Fields/Options/DropdownOption.php b/src/Fields/Options/DropdownOption.php
deleted file mode 100644
index b0914e39b..000000000
--- a/src/Fields/Options/DropdownOption.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Cone\Root\Fields\Options;
-
-class DropdownOption extends Option
-{
-    /**
-     * The Blade template.
-     */
-    protected string $template = 'root::fields.dropdown-option';
-}
diff --git a/src/Fields/Options/RadioOption.php b/src/Fields/Options/RadioOption.php
deleted file mode 100644
index 284bcd4e0..000000000
--- a/src/Fields/Options/RadioOption.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Cone\Root\Fields\Options;
-
-class RadioOption extends CheckboxOption
-{
-    /**
-     * Create a new option instance.
-     */
-    public function __construct(mixed $value, string $label)
-    {
-        parent::__construct($value, $label);
-
-        $this->setAttribute('type', 'radio');
-    }
-}
diff --git a/src/Fields/Radio.php b/src/Fields/Radio.php
index 99179efc8..61014f79e 100644
--- a/src/Fields/Radio.php
+++ b/src/Fields/Radio.php
@@ -2,15 +2,21 @@
 
 namespace Cone\Root\Fields;
 
-use Cone\Root\Fields\Options\RadioOption;
-
 class Radio extends Checkbox
 {
     /**
-     * Make a new option instance.
+     * {@inheritdoc}
      */
-    public function newOption(mixed $value, string $label): RadioOption
+    public function newOption(mixed $value, string $label): Option
     {
-        return RadioOption::make($value, $label)->name($this->getModelAttribute());
+        $option = parent::newOption($value, $label);
+
+        $option->setAttributes([
+            'type' => 'radio',
+            'class' => 'form-check__control',
+            'name' => $this->getModelAttribute(),
+        ]);
+
+        return $option;
     }
 }
diff --git a/src/Fields/Relation.php b/src/Fields/Relation.php
index 7eb1283e9..72445312a 100644
--- a/src/Fields/Relation.php
+++ b/src/Fields/Relation.php
@@ -3,7 +3,6 @@
 namespace Cone\Root\Fields;
 
 use Closure;
-use Cone\Root\Fields\Options\Option;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation as EloquentRelation;
diff --git a/src/Fields/Select.php b/src/Fields/Select.php
index 137aa686d..35e6f76bd 100644
--- a/src/Fields/Select.php
+++ b/src/Fields/Select.php
@@ -3,7 +3,6 @@
 namespace Cone\Root\Fields;
 
 use Closure;
-use Cone\Root\Fields\Options\Option;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;