Page create dialog: add form validation

config/areas/site/dialogs.php

@@ -3,6 +3,7 @@
 use Kirby\Cms\App;
 use Kirby\Cms\Find;
 use Kirby\Cms\Page;
+use Kirby\Cms\PageRules;
 use Kirby\Cms\Response;
 use Kirby\Exception\Exception;
 use Kirby\Exception\InvalidArgumentException;
@@ -236,17 +237,8 @@
 			$slug  = trim($request->get('slug', ''));
 
 			// basic input validation before we move on
-			if (Str::length($title) === 0) {
-				throw new InvalidArgumentException([
-					'key' => 'page.changeTitle.empty'
-				]);
-			}
-
-			if (Str::length($slug) === 0) {
-				throw new InvalidArgumentException([
-					'key' => 'page.slug.invalid'
-				]);
-			}
+			PageRules::validateTitleLength($title);
+			PageRules::validateSlugLength($slug);
 
 			// nothing changed
 			if ($page->title()->value() === $title && $page->slug() === $slug) {

src/Cms/PageRules.php

@@ -221,11 +221,7 @@ public static function changeTitle(Page $page, string $title): bool
 			]);
 		}
 
-		if (Str::length($title) === 0) {
-			throw new InvalidArgumentException([
-				'key' => 'page.changeTitle.empty',
-			]);
-		}
+		static::validateTitleLength($title);
 
 		return true;
 	}
@@ -452,7 +448,7 @@ public static function update(Page $page, array $content = []): bool
 	 *
 	 * @throws \Kirby\Exception\InvalidArgumentException If the slug is empty or too long
 	 */
-	protected static function validateSlugLength(string $slug): void
+	public static function validateSlugLength(string $slug): void
 	{
 		$slugLength = Str::length($slug);
 
@@ -505,4 +501,18 @@ protected static function validateSlugProtectedPaths(
 			}
 		}
 	}
+
+	/**
+	 * Ensures that the page title is not empty
+	 *
+	 * @throws \Kirby\Exception\InvalidArgumentException If the title is empty
+	 */
+	public static function validateTitleLength(string $title): void
+	{
+		if (Str::length($title) === 0) {
+			throw new InvalidArgumentException([
+				'key' => 'page.changeTitle.empty',
+			]);
+		}
+	}
 }

src/Panel/PageCreateDialog.php

@@ -5,12 +5,12 @@
 use Kirby\Cms\Find;
 use Kirby\Cms\Page;
 use Kirby\Cms\PageBlueprint;
+use Kirby\Cms\PageRules;
 use Kirby\Cms\Site;
 use Kirby\Exception\InvalidArgumentException;
 use Kirby\Form\Form;
 use Kirby\Toolkit\A;
 use Kirby\Toolkit\I18n;
-use Kirby\Toolkit\Str;
 
 /**
  * Manages the Panel dialog to create new pages
@@ -248,12 +248,13 @@ public function sanitize(array $input): array
 	 */
 	public function submit(array $input): array
 	{
-		$input = $this->sanitize($input);
+		$input  = $this->sanitize($input);
+		$status = $this->blueprint()->create()['status'] ?? 'draft';
 
-		$this->validate($input);
+		// validate the input before creating the page
+		$this->validate($input, $status);
 
-		$page   = $this->parent->createChild($input);
-		$status = $this->blueprint()->create()['status'] ?? 'draft';
+		$page = $this->parent->createChild($input);
 
 		if ($status !== 'draft') {
 			// grant all permissions as the status is set in the blueprint and
@@ -276,12 +277,23 @@ public function submit(array $input): array
 		return $payload;
 	}
 
-	public function validate(array $input): bool
+	public function validate(array $input, string $status = 'draft'): bool
 	{
-		if (Str::length($input['content']['title']) === 0) {
-			throw new InvalidArgumentException([
-				'key' => 'page.changeTitle.empty'
-			]);
+		// basic validation
+		PageRules::validateTitleLength($input['content']['title']);
+		PageRules::validateSlugLength($input['slug']);
+
+		// if the page is supposed to be published directly,
+		// ensure that all field validations are met
+		if ($status !== 'draft') {
+			// create temporary form to validate the input
+			$form = Form::for($this->model(), ['values' => $input['content']]);
+
+			if ($form->isInvalid() === true) {
+				throw new InvalidArgumentException([
+					'key' => 'page.changeStatus.incomplete'
+				]);
+			}
 		}
 
 		return true;

tests/Panel/Areas/PageCreateDialogTest.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace Kirby\Panel\Areas;
+
+use Kirby\Exception\InvalidArgumentException;
+use Kirby\Panel\PageCreateDialog;
+
+/**
+ * @coversDefaultClass \Kirby\Panel\Areas\PageCreateDialog
+ */
+class PageCreateDialogTest extends AreaTestCase
+{
+	public function setUp(): void
+	{
+		parent::setUp();
+		$this->install();
+		$this->login();
+	}
+
+	/**
+	 * @covers ::coreFields
+	 */
+	public function testCoreFields(): void
+	{
+		$dialog = new PageCreateDialog(
+			null,
+			null,
+			'test',
+			null
+		);
+
+		$fields = $dialog->coreFields();
+
+		$this->assertSame('Title', $fields['title']['label']);
+		$this->assertSame('/', $fields['slug']['path']);
+	}
+
+	/**
+	 * @covers ::validate
+	 */
+	public function testValidateInvalidTitle(): void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionCode('error.page.changeTitle.empty');
+
+		$dialog = new PageCreateDialog(
+			null,
+			null,
+			'test',
+			null
+		);
+
+		$dialog->validate(['content' => ['title' => '']]);
+	}
+
+	/**
+	 * @covers ::validate
+	 */
+	public function testValidateInvalidSlug(): void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionCode('error.page.slug.invalid');
+
+		$dialog = new PageCreateDialog(
+			null,
+			null,
+			'test',
+			null
+		);
+
+		$dialog->validate([
+			'slug'    => '',
+			'content' => ['title' => 'Foo']
+		]);
+	}
+
+	/**
+	 * @covers ::validate
+	 */
+	public function testValidateInvalidFields(): void
+	{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionCode('error.page.changeStatus.incomplete');
+
+		$this->app([
+			'blueprints' => [
+				'pages/test' => [
+					'fields' => [
+						'foo' => [
+							'type' => 'text',
+							'required' => true
+						]
+					]
+				]
+			]
+		]);
+
+
+		$dialog = new PageCreateDialog(
+			null,
+			null,
+			'test',
+			null
+		);
+
+		$dialog->validate([
+			'slug'    => 'foo',
+			'content' => ['title' => 'Foo']
+		], 'listed');
+	}
+
+	/**
+	 * @covers ::validate
+	 */
+	public function testValidateValidFields(): void
+	{
+		$this->app([
+			'blueprints' => [
+				'pages/test' => [
+					'fields' => [
+						'foo' => [
+							'type' => 'text',
+							'required' => true
+						]
+					]
+				]
+			]
+		]);
+
+
+		$dialog = new PageCreateDialog(
+			null,
+			null,
+			'test',
+			null
+		);
+
+		$valid = $dialog->validate([
+			'slug'    => 'foo',
+			'content' => ['title' => 'Foo', 'foo' => 'bar']
+		], 'listed');
+
+		$this->assertTrue($valid);
+	}
+}