From 10ba050c4a027cf9d9b2f6eb42307b00ccfa39f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=2E=20Nagy=20Gerg=C5=91?= <hello@iamgergo.com>
Date: Tue, 3 Oct 2023 15:37:04 +0200
Subject: [PATCH] wip

---
 resources/views/actions/action.blade.php      | 11 ++++++++--
 resources/views/actions/form.blade.php        |  8 --------
 .../views/resources/table/actions.blade.php   |  4 ++--
 .../views/resources/table/table.blade.php     |  2 +-
 src/Actions/Action.php                        |  2 +-
 src/Fields/Boolean.php                        |  1 -
 src/Fields/Editor.php                         |  1 -
 src/Fields/Field.php                          |  4 +++-
 src/Fields/Range.php                          |  2 --
 stubs/Action.stub                             | 10 ++++++++++
 stubs/Resource.stub                           | 20 +++++++++----------
 11 files changed, 36 insertions(+), 29 deletions(-)
 delete mode 100644 resources/views/actions/form.blade.php

diff --git a/resources/views/actions/action.blade.php b/resources/views/actions/action.blade.php
index 4271ce1a..f74774e9 100644
--- a/resources/views/actions/action.blade.php
+++ b/resources/views/actions/action.blade.php
@@ -1,8 +1,15 @@
 <x-root::modal :title="$name" :key="$modalKey">
-    {!! $form !!}
+    <form method="POST" action="{{ $url }}">
+        @csrf
+        <div class="form-group-stack form-group-stack--bordered form-group-container">
+            @foreach($fields as $field)
+                {!! $field !!}
+            @endforeach
+        </div>
+    </form>
 
     <x-slot:footer>
-        <button form="{{ $form->getAttribute('id') }}" type="submit" class="btn btn-primary">
+        <button form="{{ $key }}" type="submit" class="btn btn--primary">
             {{ __('Run') }}
         </button>
         <button type="button" class="btn btn--outline-primary" x-on:click="open = false">
diff --git a/resources/views/actions/form.blade.php b/resources/views/actions/form.blade.php
deleted file mode 100644
index 3d3b9208..00000000
--- a/resources/views/actions/form.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<form method="POST" action="{{ $url }}">
-    @csrf
-    <div class="form-group-stack form-group-stack--bordered form-group-container">
-        @foreach($fields as $field)
-            {!! $field !!}
-        @endforeach
-    </div>
-</form>
diff --git a/resources/views/resources/table/actions.blade.php b/resources/views/resources/table/actions.blade.php
index c1bd66ab..54ec9336 100644
--- a/resources/views/resources/table/actions.blade.php
+++ b/resources/views/resources/table/actions.blade.php
@@ -5,9 +5,9 @@
             <button
                 type="button"
                 class="btn btn--primary btn--sm"
-                x-on:click="selection = {{ $items->pluck('id')->toJson() }}"
+                x-on:click="selection = {{ $data->pluck('id')->toJson() }}"
             >
-                {{ __('Select all') }} ({{ $items->total() }})
+                {{ __('Select all') }} ({{ $data->total() }})
             </button>
             <button
                 type="button"
diff --git a/resources/views/resources/table/table.blade.php b/resources/views/resources/table/table.blade.php
index 51e74bb6..7c2dbf19 100644
--- a/resources/views/resources/table/table.blade.php
+++ b/resources/views/resources/table/table.blade.php
@@ -5,7 +5,7 @@
     </div>
     <div class="app-card__body">
         <div class="data-table">
-            @includeWhen(! empty($actions), 'root::table.actions')
+            @includeWhen(! empty($actions), 'root::resources.table.actions')
             <div class="table-responsive">
                 <table class="table table--hover">
                     <thead>
diff --git a/src/Actions/Action.php b/src/Actions/Action.php
index 3d52b73a..a43dae3c 100644
--- a/src/Actions/Action.php
+++ b/src/Actions/Action.php
@@ -27,7 +27,7 @@ abstract class Action extends Element implements Form, Responsable
     /**
      * The Blade template.
      */
-    protected string $template = 'root::table.actions.action';
+    protected string $template = 'root::actions.action';
 
     /**
      * Indicates if the action is descrtuctive.
diff --git a/src/Fields/Boolean.php b/src/Fields/Boolean.php
index 6d3f857e..7c1a8c85 100644
--- a/src/Fields/Boolean.php
+++ b/src/Fields/Boolean.php
@@ -2,7 +2,6 @@
 
 namespace Cone\Root\Fields;
 
-
 use Illuminate\Http\Request;
 
 class Boolean extends Field
diff --git a/src/Fields/Editor.php b/src/Fields/Editor.php
index 14568015..883c1ff9 100644
--- a/src/Fields/Editor.php
+++ b/src/Fields/Editor.php
@@ -92,7 +92,6 @@ public function getConfig(): array
         return $this->config;
     }
 
-
     /**
      * Configure the media field.
      */
diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index c12ece94..509d2e2e 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -114,7 +114,9 @@ public function setForm(Form $form): static
      */
     public function getModel(): Model
     {
-        return $this->model ?: new class() extends Model {};
+        return $this->model ?: new class() extends Model
+        {
+        };
     }
 
     /**
diff --git a/src/Fields/Range.php b/src/Fields/Range.php
index 9baecbfe..e9c492a3 100644
--- a/src/Fields/Range.php
+++ b/src/Fields/Range.php
@@ -2,8 +2,6 @@
 
 namespace Cone\Root\Fields;
 
-use Cone\Root\Interfaces\Form;
-
 class Range extends Number
 {
     /**
diff --git a/stubs/Action.stub b/stubs/Action.stub
index 91ff7e66..d84042e3 100644
--- a/stubs/Action.stub
+++ b/stubs/Action.stub
@@ -15,4 +15,14 @@ class {{ class }} extends Action
     {
         //
     }
+
+    /**
+     * Define the fields.
+     */
+    public function fields(Request $request): array
+    {
+        return array_merge(parent::fields($request), [
+            //
+        ]);
+    }
 }
diff --git a/stubs/Resource.stub b/stubs/Resource.stub
index e7873625..db1122b2 100644
--- a/stubs/Resource.stub
+++ b/stubs/Resource.stub
@@ -23,9 +23,9 @@ class {{ class }} extends Resource
      */
     public function columns(Request $request): array
     {
-        return [
+        return array_merge(parent::columns($request), [
             //
-        ];
+        ]);
     }
 
     /**
@@ -33,9 +33,9 @@ class {{ class }} extends Resource
      */
     public function fields(Request $request): array
     {
-        return [
+        return array_merge(parent::fields($request), [
             //
-        ];
+        ]);
     }
 
     /**
@@ -43,9 +43,9 @@ class {{ class }} extends Resource
      */
     public function filters(Request $request): array
     {
-        return [
+        return array_merge(parent::filters($request), [
             //
-        ];
+        ]);
     }
 
     /**
@@ -53,9 +53,9 @@ class {{ class }} extends Resource
      */
     public function actions(Request $request): array
     {
-        return [
+        return array_merge(parent::actions($request), [
             //
-        ];
+        ]);
     }
 
     /**
@@ -63,8 +63,8 @@ class {{ class }} extends Resource
      */
     public function widgets(Request $request): array
     {
-        return [
+        return array_merge(parent::widgets($request), [
             //
-        ];
+        ]);
     }
 }