formatting values

conedevelopment · Dec 29, 2023 · b76787c · b76787c
1 parent 4162e53
commit b76787c
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 13 deletions.
diff --git a/resources/views/fields/boolean.blade.php b/resources/views/fields/boolean.blade.php
@@ -7,7 +7,7 @@
     </label>
     <div class="form-group">
         <label class="form-switch form-switch--sm">
-            <input {{ $attrs->class(['form-switch__control']) }} value="1">
+            <input {{ $attrs }} value="1">
         </label>
     </div>
     @if($invalid)

diff --git a/resources/views/fields/file.blade.php b/resources/views/fields/file.blade.php
@@ -5,7 +5,7 @@
             <span class="required-marker">*</span>
         @endif
     </label>
-    <input {{ $attrs->class(['form-file']) }}>
+    <input {{ $attrs }}>
     @if(! empty($options))
         <ul class="file-list__items">
             @foreach($options as $option)

diff --git a/resources/views/fields/range.blade.php b/resources/views/fields/range.blade.php
@@ -16,7 +16,7 @@ class="btn btn--primary btn--sm btn--icon"
             >
                 <x-root::icon name="minus" class="btn__icon" />
             </button>
-            <input {{ $attrs->class(['form-range', 'range-group__control']) }} value="{{ $value }}" x-model="value">
+            <input {{ $attrs }} value="{{ $value }}" x-model="value">
             <button
                 type="button"
                 class="btn btn--primary btn--sm btn--icon"

diff --git a/resources/views/fields/repeater-table.blade.php b/resources/views/fields/repeater-table.blade.php
@@ -0,0 +1,20 @@
+@if(! empty($values))
+    <table style="width: 100%;">
+        <thead>
+            <tr>
+                @foreach($values[0] as $field)
+                    <th>{!! $field['label'] !!}</th>
+                @endforeach
+            </tr>
+        </thead>
+        <thead>
+            @foreach($values as $value)
+                <tr>
+                    @foreach($value as $field)
+                        <td>{!! $field['formattedValue'] !!}</td>
+                    @endforeach
+                </tr>
+            @endforeach
+        </thead>
+    </table>
+@endif
diff --git a/resources/views/fields/textarea.blade.php b/resources/views/fields/textarea.blade.php
@@ -1,6 +1,6 @@
 <div class="form-group--row">
     <label class="form-label" for="{{ $attrs->get('id') }}">{{ $label }}</label>
-    <textarea {{ $attrs->class(['form-control', 'form-control--invalid' => $invalid]) }}>{{ $value }}</textarea>
+    <textarea {{ $attrs }}>{{ $value }}</textarea>
     @if($invalid)
         <span class="field-feedback field-feedback--invalid">{!! $error !!}</span>
     @endif

diff --git a/resources/views/filters/search.blade.php b/resources/views/filters/search.blade.php
@@ -1,5 +1,5 @@
 <div class="search-form">
-    <input {{ $attrs->class(['form-control search-form__control']) }} value="{{ $value }}">
+    <input {{ $attrs }} value="{{ $value }}">
     <button type="submit" class="search-form__submit">
         <span class="sr-only">{{ $label }}</span>
         <x-root::icon name="search" class="search-form__icon" />

diff --git a/src/Fields/Boolean.php b/src/Fields/Boolean.php
@@ -21,6 +21,7 @@ public function __construct(string $label, Closure|string|null $modelAttribute =
         parent::__construct($label, $modelAttribute);
 
         $this->type('checkbox');
+        $this->class(['form-switch__control']);
     }
 
     /**
@@ -52,4 +53,22 @@ public function resolveValue(Request $request, Model $model): mixed
 
         return $value;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveFormat(Request $request, Model $model): ?string
+    {
+        if (is_null($this->formatResolver)) {
+            $this->formatResolver = static function (Request $request, Model $model, ?bool $value): string {
+                return sprintf(
+                    '<span class="status %s">%s</span>',
+                    $value ? 'status--success' : 'status--danger',
+                    $value ? __('Yes') : __('No')
+                );
+            };
+        }
+
+        return parent::resolveFormat($request, $model);
+    }
 }
diff --git a/src/Fields/Field.php b/src/Fields/Field.php
@@ -406,7 +406,7 @@ public function resolveFormat(Request $request, Model $model): ?string
         $value = $this->resolveValue($request, $model);
 
         if (is_null($this->formatResolver)) {
-            return $value;
+            return is_array($value) ? json_encode($value) : $value;
         }
 
         return call_user_func_array($this->formatResolver, [$request, $model, $value]);

diff --git a/src/Fields/File.php b/src/Fields/File.php
@@ -48,8 +48,9 @@ public function __construct(string $label, Closure|string|null $modelAttribute =
     {
         parent::__construct($label, $modelAttribute, $relation);
 
-        $this->type('file')->multiple(false);
-
+        $this->type('file');
+        $this->multiple(false);
+        $this->class(['form-file']);
         $this->disk(Config::get('root.media.disk', 'public'));
     }
 

diff --git a/src/Fields/Range.php b/src/Fields/Range.php
@@ -18,6 +18,10 @@ public function __construct(string $label, Closure|string|null $modelAttribute =
     {
         parent::__construct($label, $modelAttribute);
 
-        $this->type('range')->step(1)->min(0)->max(100);
+        $this->type('range');
+        $this->step(1);
+        $this->min(0);
+        $this->max(100);
+        $this->class(['form-range', 'range-group__control']);
     }
 }
diff --git a/src/Fields/Repeater.php b/src/Fields/Repeater.php
@@ -36,6 +36,16 @@ class Repeater extends Field
      */
     protected ?int $max = null;
 
+    /**
+     * Create a new repeater field instance.
+     */
+    public function __construct(string $label, Closure|string|null $modelAttribute = null)
+    {
+        parent::__construct($label, $modelAttribute);
+
+        $this->hiddenOn(['index']);
+    }
+
     /**
      * Get the URI key.
      */
@@ -127,7 +137,7 @@ public function withFields(Closure $callback): static
                 $field->setModelAttribute($attribute)
                     ->name($attribute)
                     ->id($attribute)
-                    ->value(function () use ($tmpModel, $key): mixed {
+                    ->value(static function () use ($tmpModel, $key): mixed {
                         return $tmpModel->getAttribute($key);
                     });
             });
@@ -138,6 +148,16 @@ public function withFields(Closure $callback): static
         return $this->__withFields($callback);
     }
 
+    /**
+     * Resolve the option fields.
+     */
+    public function resolveOptionFields(Request $request, Model $model, Model $tmpModel): Fields
+    {
+        return is_null($this->optionFieldsResolver)
+            ? new Fields()
+            : call_user_func_array($this->optionFieldsResolver, [$request, $model, $tmpModel]);
+    }
+
     /**
      * Make a new temporary model for the option.
      */
@@ -188,6 +208,27 @@ public function modelUrl(Model $model): string
         return str_replace('{resourceModel}', $model->exists ? $model->getKey() : 'create', $this->getUri());
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveFormat(Request $request, Model $model): ?string
+    {
+        if (is_null($this->formatResolver)) {
+            $this->formatResolver = function (Request $request, Model $model, array $value): string {
+                $values = array_map(function (array $value) use ($request, $model): array {
+                    return $this->resolveOptionFields($request, $model, $this->newTemporaryModel($value))
+                        ->authorized($request, $model)
+                        ->visible('show')
+                        ->mapToDisplay($request, $model);
+                }, $value);
+
+                return View::make('root::fields.repeater-table', ['values' => $values])->render();
+            };
+        }
+
+        return parent::resolveFormat($request, $model);
+    }
+
     /**
      * Register the routes using the given router.
      */
@@ -217,9 +258,7 @@ public function toOption(Request $request, Model $model, Model $tmpModel): array
             'open' => true,
             'value' => $tmpModel->getAttribute('_key'),
             'label' => $this->getOptionName(),
-            'fields' => is_null($this->optionFieldsResolver)
-                ? new Fields()
-                : call_user_func_array($this->optionFieldsResolver, [$request, $model, $tmpModel]),
+            'fields' => $this->resolveOptionFields($request, $model, $tmpModel),
         ];
     }
 

diff --git a/src/Fields/Textarea.php b/src/Fields/Textarea.php
@@ -11,6 +11,16 @@ class Textarea extends Field
      */
     protected string $template = 'root::fields.textarea';
 
+    /**
+     * Create a new field instance.
+     */
+    public function __construct(string $label, Closure|string|null $modelAttribute = null)
+    {
+        parent::__construct($label, $modelAttribute);
+
+        $this->class(['form-control']);
+    }
+
     /**
      * Set the rows attribute.
      */

diff --git a/src/Filters/SearchField.php b/src/Filters/SearchField.php
@@ -2,6 +2,7 @@
 
 namespace Cone\Root\Filters;
 
+use Closure;
 use Cone\Root\Fields\Text;
 
 class SearchField extends Text
@@ -10,4 +11,14 @@ class SearchField extends Text
      * The Blade template.
      */
     protected string $template = 'root::filters.search';
+
+    /**
+     * Create a new field instance.
+     */
+    public function __construct(string $label, Closure|string|null $modelAttribute = null)
+    {
+        parent::__construct($label, $modelAttribute);
+
+        $this->class(['search-form__control']);
+    }
 }