[7.x] Fix error when running resource actions (#638)

Co-authored-by: duncanmcclean <duncanmcclean@users.noreply.github.com>
statamic-rad-pack · Dec 4, 2024 · e3e2ddd · e3e2ddd
1 parent faece2f
commit e3e2ddd
Show file tree

Hide file tree

Showing 16 changed files with 147 additions and 80 deletions.
diff --git a/resources/views/edit.blade.php b/resources/views/edit.blade.php
@@ -24,7 +24,7 @@
         create-another-url="{{ cp_route('runway.create', ['resource' => $resource->handle()]) }}"
         initial-listing-url="{{ cp_route('runway.index', ['resource' => $resource->handle()]) }}"
         :initial-item-actions="{{ json_encode($itemActions) }}"
-        item-action-url="{{ cp_route('runway.actions.run', ['resource' => $resource->handle()]) }}"
+        item-action-url="{{ cp_route('runway.models.actions.run', ['resource' => $resource->handle()]) }}"
         :revisions-enabled="{{ $str::bool($revisionsEnabled) }}"
     ></runway-publish-form>
 

diff --git a/routes/cp.php b/routes/cp.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
+use StatamicRadPack\Runway\Http\Controllers\CP\ModelActionController;
 use StatamicRadPack\Runway\Http\Controllers\CP\ModelRevisionsController;
 use StatamicRadPack\Runway\Http\Controllers\CP\PublishedModelsController;
 use StatamicRadPack\Runway\Http\Controllers\CP\ResourceActionController;
@@ -10,10 +11,12 @@
 
 Route::name('runway.')->prefix('runway')->group(function () {
     Route::get('/{resource}', [ResourceController::class, 'index'])->name('index');
-
     Route::get('{resource}/listing-api', [ResourceListingController::class, 'index'])->name('listing-api');
-    Route::post('{resource}/actions', [ResourceActionController::class, 'runAction'])->name('actions.run');
-    Route::post('{resource}/actions/list', [ResourceActionController::class, 'bulkActionsList'])->name('actions.bulk');
+
+    Route::post('{resource}/actions', [ResourceActionController::class, 'run'])->name('actions.run');
+
+    Route::post('{resource}/models/actions', [ModelActionController::class, 'runAction'])->name('models.actions.run');
+    Route::post('{resource}/models/actions/list', [ModelActionController::class, 'bulkActionsList'])->name('models.actions.bulk');
 
     Route::get('{resource}/create', [ResourceController::class, 'create'])->name('create');
     Route::post('{resource}/create', [ResourceController::class, 'store'])->name('store');

diff --git a/src/Fieldtypes/HasManyFieldtype.php b/src/Fieldtypes/HasManyFieldtype.php
@@ -61,7 +61,7 @@ public function preProcess($data)
     public function preload()
     {
         return array_merge(parent::preload(), [
-            'actionUrl' => cp_route('runway.actions.run', [
+            'actionUrl' => cp_route('runway.models.actions.run', [
                 'resource' => $this->config('resource'),
             ]),
         ]);

diff --git a/src/Http/Controllers/CP/ModelActionController.php b/src/Http/Controllers/CP/ModelActionController.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace StatamicRadPack\Runway\Http\Controllers\CP;
+
+use Illuminate\Http\Request;
+use Statamic\Facades\Action;
+use Statamic\Http\Controllers\CP\ActionController;
+use StatamicRadPack\Runway\Resource;
+
+class ModelActionController extends ActionController
+{
+    use Traits\ExtractsFromModelFields;
+
+    protected $resource;
+
+    public function runAction(Request $request, Resource $resource)
+    {
+        $this->resource = $resource;
+
+        return parent::run($request);
+    }
+
+    public function bulkActionsList(Request $request, Resource $resource)
+    {
+        $this->resource = $resource;
+
+        return parent::bulkActions($request);
+    }
+
+    protected function getSelectedItems($items, $context)
+    {
+        return $this->resource->findMany($items);
+    }
+
+    protected function getItemData($model, $context): array
+    {
+        $blueprint = $this->resource->blueprint();
+
+        [$values] = $this->extractFromFields($model, $this->resource, $blueprint);
+
+        return [
+            'title' => $model->getAttribute($this->resource->titleField()),
+            'values' => array_merge($values, ['id' => $model->getKey()]),
+            'itemActions' => Action::for($model, $context),
+        ];
+    }
+}
diff --git a/src/Http/Controllers/CP/ResourceActionController.php b/src/Http/Controllers/CP/ResourceActionController.php
@@ -2,46 +2,13 @@
 
 namespace StatamicRadPack\Runway\Http\Controllers\CP;
 
-use Illuminate\Http\Request;
-use Statamic\Facades\Action;
 use Statamic\Http\Controllers\CP\ActionController;
-use StatamicRadPack\Runway\Resource;
+use StatamicRadPack\Runway\Runway;
 
 class ResourceActionController extends ActionController
 {
-    use Traits\ExtractsFromModelFields;
-
-    protected $resource;
-
-    public function runAction(Request $request, Resource $resource)
-    {
-        $this->resource = $resource;
-
-        return parent::run($request);
-    }
-
-    public function bulkActionsList(Request $request, Resource $resource)
-    {
-        $this->resource = $resource;
-
-        return parent::bulkActions($request);
-    }
-
     protected function getSelectedItems($items, $context)
     {
-        return $this->resource->findMany($items);
-    }
-
-    protected function getItemData($model, $context): array
-    {
-        $blueprint = $this->resource->blueprint();
-
-        [$values] = $this->extractFromFields($model, $this->resource, $blueprint);
-
-        return [
-            'title' => $model->getAttribute($this->resource->titleField()),
-            'values' => array_merge($values, ['id' => $model->getKey()]),
-            'itemActions' => Action::for($model, $context),
-        ];
+        return $items->map(fn ($item) => Runway::findResource($item));
     }
 }
diff --git a/src/Http/Controllers/CP/ResourceController.php b/src/Http/Controllers/CP/ResourceController.php
@@ -44,7 +44,7 @@ public function index(IndexRequest $request, Resource $resource)
                 ->rejectUnlisted()
                 ->values(),
             'filters' => Scope::filters('runway', ['resource' => $resource->handle()]),
-            'actionUrl' => cp_route('runway.actions.run', ['resource' => $resource->handle()]),
+            'actionUrl' => cp_route('runway.models.actions.run', ['resource' => $resource->handle()]),
             'primaryColumn' => $this->getPrimaryColumn($resource),
             'actions' => Action::for($resource, ['view' => 'form']),
         ]);

diff --git a/tests/Console/Commands/GenerateMigrationTest.php b/tests/Console/Commands/GenerateMigrationTest.php
@@ -19,7 +19,7 @@ class GenerateMigrationTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -37,7 +37,7 @@ public function setUp(): void
         });
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 

diff --git a/tests/Fieldtypes/BelongsToFieldtypeTest.php b/tests/Fieldtypes/BelongsToFieldtypeTest.php
@@ -21,7 +21,7 @@ class BelongsToFieldtypeTest extends TestCase
 
     protected BelongsToFieldtype $fieldtype;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Fieldtypes/HasManyFieldtypeTest.php b/tests/Fieldtypes/HasManyFieldtypeTest.php
@@ -25,7 +25,7 @@ class HasManyFieldtypeTest extends TestCase
 
     protected HasManyFieldtype $fieldtype;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Http/Controllers/ApiControllerTest.php b/tests/Http/Controllers/ApiControllerTest.php
@@ -9,7 +9,7 @@
 
 class ApiControllerTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Http/Controllers/CP/ModelActionControllerTest.php b/tests/Http/Controllers/CP/ModelActionControllerTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace StatamicRadPack\Runway\Tests\Http\Controllers\CP;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Actions\Action;
+use Statamic\Facades\User;
+use StatamicRadPack\Runway\Tests\Fixtures\Models\Post;
+use StatamicRadPack\Runway\Tests\TestCase;
+
+class ModelActionControllerTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        FooAction::register();
+    }
+
+    #[Test]
+    public function can_run_action()
+    {
+        $post = Post::factory()->create();
+
+        $this->assertFalse(FooAction::$hasRun);
+
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->post('/cp/runway/post/models/actions', [
+                'action' => 'foo',
+                'selections' => [$post->id],
+                'values' => [],
+            ])
+            ->assertOk()
+            ->assertJson(['message' => 'Foo action run!']);
+
+        $this->assertTrue(FooAction::$hasRun);
+    }
+
+    #[Test]
+    public function can_get_bulk_actions_list()
+    {
+        $post = Post::factory()->create();
+
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->post('/cp/runway/post/models/actions/list', [
+                'selections' => [$post->id],
+            ])
+            ->assertOk()
+            ->assertJsonPath('0.handle', 'unpublish');
+    }
+}
+
+class FooAction extends Action
+{
+    protected static $handle = 'foo';
+
+    public static bool $hasRun = false;
+
+    public function run($items, $values)
+    {
+        static::$hasRun = true;
+
+        return 'Foo action run!';
+    }
+}
diff --git a/tests/Http/Controllers/CP/ModelRevisionsControllerTest.php b/tests/Http/Controllers/CP/ModelRevisionsControllerTest.php
@@ -13,7 +13,7 @@ class ModelRevisionsControllerTest extends TestCase
 {
     private $dir;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -22,7 +22,7 @@ public function setUp(): void
         config(['statamic.revisions.path' => $this->dir]);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         Folder::delete($this->dir);
 

diff --git a/tests/Http/Controllers/CP/PublishedModelsControllerTest.php b/tests/Http/Controllers/CP/PublishedModelsControllerTest.php
@@ -12,7 +12,7 @@ class PublishedModelsControllerTest extends TestCase
 {
     private $dir;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -21,7 +21,7 @@ public function setUp(): void
         config(['statamic.revisions.path' => $this->dir]);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         Folder::delete($this->dir);
 

diff --git a/tests/Http/Controllers/CP/ResourceActionControllerTest.php b/tests/Http/Controllers/CP/ResourceActionControllerTest.php
@@ -5,63 +5,46 @@
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Actions\Action;
 use Statamic\Facades\User;
-use StatamicRadPack\Runway\Tests\Fixtures\Models\Post;
 use StatamicRadPack\Runway\Tests\TestCase;
 
 class ResourceActionControllerTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
-        FooAction::register();
+        BarAction::register();
     }
 
     #[Test]
     public function can_run_action()
     {
-        $post = Post::factory()->create();
-
-        $this->assertFalse(FooAction::$hasRun);
+        $this->assertFalse(BarAction::$hasRun);
 
         $this
             ->actingAs(User::make()->makeSuper()->save())
             ->post('/cp/runway/post/actions', [
-                'action' => 'foo',
-                'selections' => [$post->id],
+                'action' => 'bar',
+                'selections' => ['post'],
                 'values' => [],
             ])
             ->assertOk()
-            ->assertJson(['message' => 'Foo action run!']);
-
-        $this->assertTrue(FooAction::$hasRun);
-    }
-
-    #[Test]
-    public function can_get_bulk_actions_list()
-    {
-        $post = Post::factory()->create();
+            ->assertJson(['message' => 'Bar action run!']);
 
-        $this
-            ->actingAs(User::make()->makeSuper()->save())
-            ->post('/cp/runway/post/actions/list', [
-                'selections' => [$post->id],
-            ])
-            ->assertOk()
-            ->assertJsonPath('0.handle', 'unpublish');
+        $this->assertTrue(BarAction::$hasRun);
     }
 }
 
-class FooAction extends Action
+class BarAction extends Action
 {
-    protected static $handle = 'foo';
+    protected static $handle = 'bar';
 
     public static bool $hasRun = false;
 
     public function run($items, $values)
     {
         static::$hasRun = true;
 
-        return 'Foo action run!';
+        return 'Bar action run!';
     }
 }
diff --git a/tests/Http/Controllers/CP/RestoreModelRevisionController.php b/tests/Http/Controllers/CP/RestoreModelRevisionController.php
@@ -12,7 +12,7 @@ class RestoreModelRevisionController extends TestCase
 {
     private $dir;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -21,7 +21,7 @@ public function setUp(): void
         config(['statamic.revisions.path' => $this->dir]);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         Folder::delete($this->dir);
 

diff --git a/tests/Tags/RunwayTagTest.php b/tests/Tags/RunwayTagTest.php
@@ -17,7 +17,7 @@ class RunwayTagTest extends TestCase
 {
     public $tag;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();