Skip to content

[6.x] Relax group/grid fieldtype check in ReplicatorController #14068

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
jasonvarga merged 6 commits into from
Sep 11, 2026
+148 −2
Merged

[6.x] Relax group/grid fieldtype check in ReplicatorController #14068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21676a2
Add failing test
duncanmcclean Feb 25, 2026
14c4927
Loosen Group/Grid check
duncanmcclean Feb 25, 2026
462f128
Merge branch '6.x' into replicator-inside-custom-fieldtypes
jasonvarga Sep 10, 2026
312f43c
send encrypted token payload in custom fieldtype test
duncanmcclean Sep 11, 2026
0c21e8d
guard nested field check against replicator sets maps
duncanmcclean Sep 11, 2026
e48cce5
rename `$isGroupOrGrid` to `$hasNestedFields`
duncanmcclean Sep 11, 2026
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
4 changes: 2 additions & 2 deletions src/Http/Controllers/CP/Fieldtypes/ReplicatorSetController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private function getReplicatorField(Blueprint $blueprint, string $field): Field

private function getConfig(array $config, array $remainingFieldPathComponents): array
{
$isGroupOrGrid = isset($config['type']) && in_array($config['type'], ['group', 'grid']);
$hasNestedFields = isset($config['type']) && isset($config['fields']);
$isReplicator = isset($config['type']) && in_array($config['type'], ['bard', 'replicator']);

if ($isReplicator) {
Expand All @@ -100,7 +100,7 @@ private function getConfig(array $config, array $remainingFieldPathComponents):
return $this->getConfig($flattenedSets, $remainingFieldPathComponents);
}

if ($isGroupOrGrid) {
if ($hasNestedFields) {
array_shift($remainingFieldPathComponents);

$fields = $this->resolveFields($config['fields'] ?? []);
Expand Down
146 changes: 146 additions & 0 deletions tests/Fieldtypes/ReplicatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,152 @@ public function it_can_return_set_defaults_for_replicator_inside_grid()
], $response->json('new'));
}

#[Test]
public function it_can_return_set_defaults_for_replicator_inside_custom_fieldtype()
{
$this->partialMock(RowId::class, function (MockInterface $mock) {
$mock->shouldReceive('generate')->andReturn('random-string-1', 'random-string-2');
});

$blueprint = Facades\Blueprint::make()->setHandle('default')->setNamespace('collections.pages');
$blueprint->setContents([
'sections' => [
'main' => [
'fields' => [
[
'handle' => 'stuff',
'field' => [
'type' => 'custom_fieldtype',
'fields' => [
[
'handle' => 'content_blocks',
'field' => [
'type' => 'replicator',
'sets' => [
'text' => [
'fields' => [
[
'handle' => 'body',
'field' => [
'type' => 'textarea',
'default' => 'the default',
],
],
],
],
],
],
],
],
],
],
],
],
],
]);

Facades\Blueprint::partialMock();
Facades\Blueprint::shouldReceive('find')->with('collections.pages.default')->andReturn($blueprint);

$user = tap(Facades\User::make()->makeSuper())->save();

$response = $this
->actingAs($user)
->postJson(cp_route('replicator-fieldtype.set'), [
'token' => encrypt([
'fqh' => 'collections.pages.default',
'user_id' => $user->id(),
]),
'field' => 'stuff.content_blocks',
'set' => 'text',
])
->assertOk();

$this->assertEquals([
'body' => 'the default',
], $response->json('defaults'));

$this->assertEquals([
'_' => '_',
'body' => null,
], $response->json('new'));
}

#[Test]
public function it_can_return_set_defaults_for_replicator_inside_a_set_handled_fields()
{
$this->partialMock(RowId::class, function (MockInterface $mock) {
$mock->shouldReceive('generate')->andReturn('random-string-1', 'random-string-2');
});

$blueprint = Facades\Blueprint::make()->setHandle('default')->setNamespace('collections.pages');
$blueprint->setContents([
'sections' => [
'main' => [
'fields' => [
[
'handle' => 'form_builder',
'field' => [
'type' => 'replicator',
'sets' => [
'fields' => [
'fields' => [
[
'handle' => 'options',
'field' => [
'type' => 'replicator',
'sets' => [
'option' => [
'fields' => [
[
'handle' => 'label',
'field' => [
'type' => 'text',
'default' => 'the default',
],
],
],
],
],
],
],
],
],
],
],
],
],
],
],
]);

Facades\Blueprint::partialMock();
Facades\Blueprint::shouldReceive('find')->with('collections.pages.default')->andReturn($blueprint);

$user = tap(Facades\User::make()->makeSuper())->save();

$response = $this
->actingAs($user)
->postJson(cp_route('replicator-fieldtype.set'), [
'token' => encrypt([
'fqh' => 'collections.pages.default',
'user_id' => $user->id(),
]),
'field' => 'form_builder.fields.options',
'set' => 'option',
])
->assertOk();

$this->assertEquals([
'label' => 'the default',
], $response->json('defaults'));

$this->assertEquals([
'_' => '_',
'label' => null,
], $response->json('new'));
}

#[Test]
public function it_can_return_set_defaults_when_sets_are_stored_in_legacy_format()
{
Expand Down
Loading