[9.x] Fix validation on published field (#792)

Author: duncanmcclean

src/Http/Controllers/CP/ResourceController.php

@@ -95,8 +95,13 @@ public function create(CreateRequest $request, Resource $resource)
 
     public function store(StoreRequest $request, Resource $resource)
     {
-        $resource
-            ->blueprint()
+        $blueprint = $resource->blueprint();
+
+        if ($resource->hasPublishStates()) {
+            $blueprint->ensureField($resource->publishedColumn(), ['type' => 'toggle']);
+        }
+
+        $blueprint
             ->fields()
             ->addValues($request->all())
             ->validator()
@@ -178,7 +183,13 @@ public function update(UpdateRequest $request, Resource $resource, Model $model)
     {
         $model = $model->fromWorkingCopy();
 
-        $resource->blueprint()
+        $blueprint = $resource->blueprint();
+
+        if ($resource->hasPublishStates()) {
+            $blueprint->ensureField($resource->publishedColumn(), ['type' => 'toggle']);
+        }
+
+        $blueprint
             ->fields()
             ->setParent($model)
             ->addValues($request->except($resource->primaryKey()))

tests/Http/Controllers/CP/ResourceControllerTest.php

@@ -284,6 +284,77 @@ public function can_store_resource_and_ensure_date_comparison_validation_works()
         ]);
     }
 
+    #[Test]
+    public function can_store_resource_with_required_if_published_validation()
+    {
+        $postBlueprint = Blueprint::find('runway::post');
+
+        Blueprint::shouldReceive('find')->with('user')->andReturn(new \Statamic\Fields\Blueprint);
+        Blueprint::shouldReceive('find')->with('runway::author')->andReturn(new \Statamic\Fields\Blueprint);
+        Blueprint::shouldReceive('find')->with('runway::post')->andReturn($postBlueprint->ensureField('membership_status', [
+            'type' => 'select',
+            'options' => ['free' => 'Free', 'paid' => 'Paid'],
+            'validate' => ['required_if:published,true'],
+        ]));
+        Blueprint::shouldReceive('getAdditionalNamespaces')->andReturn(collect(['runway' => base_path('resources/blueprints/runway')]))->zeroOrMoreTimes();
+
+        $author = Author::factory()->create();
+        $user = User::make()->makeSuper()->save();
+
+        // Publishing without the required field should fail
+        $this
+            ->actingAs($user)
+            ->post(cp_route('runway.store', ['resource' => 'post']), [
+                'published' => true,
+                'title' => 'Test Post',
+                'slug' => 'test-post',
+                'body' => 'Test body',
+                'author_id' => [$author->id],
+                'membership_status' => null,
+            ])
+            ->assertSessionHasErrors('membership_status');
+
+        $this->assertDatabaseMissing('posts', [
+            'title' => 'Test Post',
+        ]);
+    }
+
+    #[Test]
+    public function can_store_resource_as_draft_without_required_if_published_field()
+    {
+        $postBlueprint = Blueprint::find('runway::post');
+
+        Blueprint::shouldReceive('find')->with('user')->andReturn(new \Statamic\Fields\Blueprint);
+        Blueprint::shouldReceive('find')->with('runway::author')->andReturn(new \Statamic\Fields\Blueprint);
+        Blueprint::shouldReceive('find')->with('runway::post')->andReturn($postBlueprint->ensureField('membership_status', [
+            'type' => 'select',
+            'options' => ['free' => 'Free', 'paid' => 'Paid'],
+            'validate' => ['required_if:published,true'],
+        ]));
+        Blueprint::shouldReceive('getAdditionalNamespaces')->andReturn(collect(['runway' => base_path('resources/blueprints/runway')]))->zeroOrMoreTimes();
+
+        $author = Author::factory()->create();
+        $user = User::make()->makeSuper()->save();
+
+        // Saving as draft without the required field should succeed
+        $this
+            ->actingAs($user)
+            ->post(cp_route('runway.store', ['resource' => 'post']), [
+                'published' => false,
+                'title' => 'Draft Post',
+                'slug' => 'draft-post',
+                'body' => 'Draft body',
+                'author_id' => [$author->id],
+                'membership_status' => null,
+            ])
+            ->assertOk();
+
+        $this->assertDatabaseHas('posts', [
+            'title' => 'Draft Post',
+            'published' => false,
+        ]);
+    }
+
     #[Test]
     public function can_edit_resource()
     {
@@ -692,4 +763,35 @@ public function can_update_resource_if_model_is_user_model()
             'group_id' => 'admins',
         ]);
     }
+
+    #[Test]
+    public function can_update_resource_with_required_if_published_validation()
+    {
+        $postBlueprint = Blueprint::find('runway::post');
+
+        Blueprint::shouldReceive('find')->with('user')->andReturn(new \Statamic\Fields\Blueprint);
+        Blueprint::shouldReceive('find')->with('runway::author')->andReturn(new \Statamic\Fields\Blueprint);
+        Blueprint::shouldReceive('find')->with('runway::post')->andReturn($postBlueprint->ensureField('membership_status', [
+            'type' => 'select',
+            'options' => ['free' => 'Free', 'paid' => 'Paid'],
+            'validate' => ['required_if:published,true'],
+        ]));
+        Blueprint::shouldReceive('getAdditionalNamespaces')->andReturn(collect(['runway' => base_path('resources/blueprints/runway')]))->zeroOrMoreTimes();
+
+        $post = Post::factory()->create(['published' => false]);
+        $user = User::make()->makeSuper()->save();
+
+        // Publishing without the required field should fail
+        $this
+            ->actingAs($user)
+            ->patch(cp_route('runway.update', ['resource' => 'post', 'model' => $post->id]), [
+                'published' => true,
+                'title' => $post->title,
+                'slug' => $post->slug,
+                'body' => $post->body,
+                'author_id' => [$post->author_id],
+                'membership_status' => null,
+            ])
+            ->assertSessionHasErrors('membership_status');
+    }
 }