wip

conedevelopment · Nov 13, 2023 · 8801a1a · 8801a1a
1 parent cbe165f
commit 8801a1a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 48 deletions.
diff --git a/src/Console/Commands/ResourceMake.php b/src/Console/Commands/ResourceMake.php
@@ -63,7 +63,8 @@ protected function buildClass($name): string
      */
     public function replaceModel(string $class): string
     {
-        $model = $this->option('model');
+        $model = $this->option('model')
+            ?: sprintf('%sModels\\%s', $this->laravel->getNamespace(), str_replace('Resource', '', $this->argument('name')));
 
         $model = str_replace('/', '\\', $model);
 

diff --git a/stubs/Action.stub b/stubs/Action.stub
@@ -21,8 +21,8 @@ class {{ class }} extends Action
      */
     public function fields(Request $request): array
     {
-        return array_merge(parent::fields($request), [
+        return [
             //
-        ]);
+        ];
     }
 }
diff --git a/stubs/Resource.stub b/stubs/Resource.stub
@@ -2,12 +2,7 @@
 
 namespace {{ namespace }};
 
-use Cone\Root\Fields\Fields;
-use Cone\Root\Interfaces\Form;
 use Cone\Root\Resources\Resource;
-use Cone\Root\Table\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 
 class {{ class }} extends Resource
@@ -22,38 +17,38 @@ class {{ class }} extends Resource
      */
     public function fields(Request $request): array
     {
-        return array_merge(parent::fields($request), [
+        return [
             //
-        ]);
+        ];
     }
 
     /**
      * Define the filters.
      */
     public function filters(Request $request): array
     {
-        return array_merge(parent::filters($request), [
+        return [
             //
-        ]);
+        ];
     }
 
     /**
      * Define the actions.
      */
     public function actions(Request $request): array
     {
-        return array_merge(parent::actions($request), [
+        return [
             //
-        ]);
+        ];
     }
 
     /**
      * Define the widgets for the resource.
      */
     public function widgets(Request $request): array
     {
-        return array_merge(parent::widgets($request), [
+        return [
             //
-        ]);
+        ];
     }
 }
diff --git a/stubs/UserResource.stub b/stubs/UserResource.stub
@@ -22,48 +22,22 @@ class UserResource extends Resource
      */
     public function fields(Request $request): array
     {
-        return array_merge(parent::fields($request), [
+        return [
             ID::make(),
 
             Text::make(__('Name'), 'name')
+                ->searchable()
+                ->sortable()
                 ->rules(['required', 'string', 'max:256']),
 
             Email::make(__('Email'), 'email')
+                ->searchable()
+                ->sortable()
                 ->rules(['required', 'string', 'email', 'max:256'])
                 ->createRules(['unique:users'])
                 ->updateRules(static function (Request $request, Model $model): array {
                     return [Rule::unique('users')->ignoreModel($model)];
                 }),
-        ]);
-    }
-
-    /**
-     * Define the filters.
-     */
-    public function filters(Request $request): array
-    {
-        return array_merge(parent::filters($request), [
-            //
-        ]);
-    }
-
-    /**
-     * Define the actions.
-     */
-    public function actions(Request $request): array
-    {
-        return array_merge(parent::actions($request), [
-            //
-        ]);
-    }
-
-    /**
-     * Define the widgets for the resource.
-     */
-    public function widgets(Request $request): array
-    {
-        return array_merge(parent::widgets($request), [
-            //
-        ]);
+        ];
     }
 }