Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Validation exception can be rendered only if a form field exists #1888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 6, 2022
Merged

Validation exception can be rendered only if a form field exists #1888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
745e01e
fix lookup.php demo
mvorisek Oct 5, 2022
897e398
Validation exception can be rendered only if a form field exists
mvorisek Oct 5, 2022
29e2902
add test
mvorisek Oct 6, 2022
994a297
improve test
mvorisek Oct 6, 2022
fb66b87
improve test ii
mvorisek Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions demos/form-control/lookup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,13 @@
]);

$form->onSubmit(function (Form $form) {
$str = $form->model->ref('country1')->get(Country::hinting()->fieldName()->name)
. '; '
. $form->model->ref('country2')->get(Country::hinting()->fieldName()->name)
. '; '
. (new Country($form->getApp()->db))->load($form->model->get('country3'))
->get(Country::hinting()->fieldName()->name);

$view = new Message('Select:'); // need in behat test.
$view->invokeInit();
$view->text->addParagraph($str);
$view->text->addParagraph($form->model->ref('country1')->get(Country::hinting()->fieldName()->name) ?? 'null');
$view->text->addParagraph($form->model->ref('country2')->get(Country::hinting()->fieldName()->name) ?? 'null');
$view->text->addParagraph($form->model->get('country3') !== '' // related with https://github.com/atk4/ui/pull/1805
? (new Country($form->getApp()->db))->load($form->model->get('country3'))->get(Country::hinting()->fieldName()->name)
: 'null');

return $view;
});
Expand Down
4 changes: 4 additions & 0 deletions src/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@ public function onSubmit(\Closure $callback)
} catch (ValidationException $e) {
$response = [];
foreach ($e->errors as $field => $error) {
if (!isset($this->controls[$field])) {
throw $e;
}

$response[] = $this->error($field, $error);
}

Expand Down
41 changes: 35 additions & 6 deletions tests/FormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@

use Atk4\Core\Phpunit\TestCase;
use Atk4\Data\Model;
use Atk4\Data\ValidationException;
use Atk4\Ui\App;
use Atk4\Ui\Callback;
use Atk4\Ui\Exception;
use Atk4\Ui\Exception\UnhandledCallbackExceptionError;
use Atk4\Ui\Form;
use Mvorisek\Atk4\Hintable\Phpstan\PhpstanUtil;

Expand Down Expand Up @@ -115,11 +117,6 @@ public function testTextarea(): void
});
}

public function assertSubmitError(array $post, \Closure $checkExpectedErrorsFx): void
{
$this->assertSubmit($post, null, $checkExpectedErrorsFx);
}

public function assertFormControlError(string $field, string $error): void
{
$n = preg_match_all('~form\("add prompt", "([^"]*)", "([^"]*)"\)~', $this->formError, $matchesAll, \PREG_SET_ORDER);
Expand Down Expand Up @@ -162,7 +159,7 @@ public function testSubmitError(): void
$m = $m->createEntity();
$this->form->setModel($m);

$this->assertSubmitError(['opt1' => '2', 'opt3_z' => '0', 'opt4' => '', 'opt4_z' => '0'], function (string $formError) {
$this->assertSubmit(['opt1' => '2', 'opt3_z' => '0', 'opt4' => '', 'opt4_z' => '0'], null, function (string $formError) {
// dropdown validates to make sure option is proper
$this->assertFormControlError('opt1', 'not one of the allowed values');

Expand All @@ -176,6 +173,38 @@ public function testSubmitError(): void
$this->assertFormControlError('opt4_z', 'Must not be empty');
});
}

public function testSubmitNonFormFieldError(): void
{
$m = new Model();
$m->addField('foo', ['nullable' => false]);
$m->addField('bar', ['nullable' => false]);

$m = $m->createEntity();
$this->form->setModel($m, ['foo']);

$submitReached = false;
$catchReached = false;
try {
try {
$this->assertSubmit(['foo' => 'x'], function (Model $model) use (&$submitReached) {
$submitReached = true;
$model->set('bar', null);
});
} catch (UnhandledCallbackExceptionError $e) {
$catchReached = true;
static::assertSame('bar', $e->getPrevious()->getParams()['field']->shortName); // @phpstan-ignore-line

$this->expectException(ValidationException::class);
$this->expectExceptionMessage('Must not be null');

throw $e->getPrevious();
}
} finally {
static::assertTrue($submitReached);
static::assertTrue($catchReached);
}
}
}

class AppFormTestMock extends App
Expand Down