Skip to content
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

[5.x] Revert "Allow form fields view to be rendered with single tag" #11374

Merged
merged 1 commit into from
Jan 21, 2025
+10 −57
Merged

[5.x] Revert "Allow form fields view to be rendered with single tag" #11374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions resources/views/extend/forms/fields.antlers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@
<sup aria-label="{{ trans:Required }}">*</sup>
{{ /if }}
</label>
{{ if instructions && instructions_position == "above" }}
<p class="text-gray-500" id="{{ id }}-instructions">{{ instructions }}</p>
{{ /if }}
<div class="py-2">{{ field }}</div>
{{ if instructions && instructions_position == "below" }}
<div class="p-2">{{ field }}</div>
{{ if instructions }}
<p class="text-gray-500" id="{{ id }}-instructions">{{ instructions }}</p>
{{ /if }}
{{ if error }}
Expand Down
21 changes: 0 additions & 21 deletions src/Forms/FieldsVariable.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Forms/Tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function create()

$data['sections'] = $this->getSections($this->sessionHandle(), $jsDriver);

$data['fields'] = new FieldsVariable(collect($data['sections'])->flatMap->fields->all());
$data['fields'] = collect($data['sections'])->flatMap->fields->all();

$data['honeypot'] = $form->honeypot();

Expand Down
37 changes: 7 additions & 30 deletions tests/Tags/Form/FormCreateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Storage;
use Illuminate\Testing\Assert as PHPUnit;
use Illuminate\Testing\Constraints\SeeInOrder;
use Illuminate\Validation\ValidationException;
use PHPUnit\Framework\Attributes\Test;
use Statamic\Facades\AssetContainer;
use Statamic\Facades\Form;
use Statamic\Forms\FieldsVariable;
use Statamic\Statamic;

class FormCreateTest extends FormTestCase
Expand Down Expand Up @@ -77,26 +74,6 @@ public function it_dynamically_renders_fields_array()
$this->assertEquals(['Full Name', 'Email Address', 'Message'], $fieldOrder[1]);
}

#[Test]
public function it_dynamically_renders_fields_view_using_single_tag()
{
$output = $this->normalizeHtml($this->tag(<<<'EOT'
{{ form:contact }}
{{ fields }}
{{ /form:contact }}
EOT
));

PHPUnit::assertThat([
'<label for="contact-form-name-field">Full Name </label>',
'<input id="contact-form-name-field" type="text" name="name" value="">',
'<label for="contact-form-email-field">Email Address <sup aria-label="Required">*</sup></label>',
'<input id="contact-form-email-field" type="email" name="email" value="" required>',
'<label for="contact-form-message-field">Message<sup aria-label="Required">*</sup></label>',
'<textarea id="contact-form-message-field" name="message" rows="5" required></textarea>',
], new SeeInOrder($output));
}

#[Test]
public function it_dynamically_renders_with_form_handle()
{
Expand Down Expand Up @@ -527,20 +504,20 @@ public function it_dynamically_renders_sections_array()
$output = $this->normalizeHtml($this->tag(<<<'EOT'
{{ form:survey }}
{{ sections }}
<div class="section">{{ if display}}{{ display }} - {{ /if }}{{ if instructions }}{{ instructions }} - {{ /if }}{{ fields }}[{{ handle }}]{{ /fields }}</div>
<div class="section">{{ if display}}{{ display }} - {{ /if }}{{ if instructions }}{{ instructions }} - {{ /if }}{{ fields | pluck('handle') | join(',') }}</div>
{{ /sections }}
<div class="fields">{{ fields }}[{{ handle }}]{{ /fields }}</div>
<div class="fields">{{ fields | pluck('handle') | join(',') }}</div>
{{ /form:survey }}
EOT
));

$this->assertStringContainsString('<div class="section">One - One Instructions - [alpha][bravo]</div>', $output);
$this->assertStringContainsString('<div class="section">Two - Two Instructions - [charlie][delta]</div>', $output);
$this->assertStringContainsString('<div class="section">[echo][fox]</div>', $output);
$this->assertStringContainsString('<div class="section">One - One Instructions - alpha,bravo</div>', $output);
$this->assertStringContainsString('<div class="section">Two - Two Instructions - charlie,delta</div>', $output);
$this->assertStringContainsString('<div class="section">echo,fox</div>', $output);

// Even though the fields are all nested within sections,
// we should still be able to get them via `{{ fields }}` array at top level...
$this->assertStringContainsString('<div class="fields">[alpha][bravo][charlie][delta][echo][fox]</div>', $output);
$this->assertStringContainsString('<div class="fields">alpha,bravo,charlie,delta,echo,fox</div>', $output);
}

#[Test]
Expand Down Expand Up @@ -858,7 +835,7 @@ public function it_fetches_form_data()
$this->assertArrayHasKey('_token', $form['params']);

$this->assertIsArray($form['errors']);
$this->assertInstanceOf(FieldsVariable::class, $form['fields']);
$this->assertIsArray($form['fields']);

$this->assertEquals($form['honeypot'], 'winnie');
$this->assertEquals($form['js_driver'], 'alpine');
Expand Down
Loading