Sync acceptance criteria toggle state to children
This commit is contained in:
@@ -35,14 +35,15 @@ class AcceptanceCriteriaChecklistMapper
|
||||
public static function normalize(mixed $value): array
|
||||
{
|
||||
if (is_array($value)) {
|
||||
return self::normalizeFromArray($value);
|
||||
return self::syncDescendantCheckedState(
|
||||
self::normalizeFromArray($value),
|
||||
);
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Ticket $ticket
|
||||
* @param array<int, array{id?: int, checked: bool, indent: int, text: string}> $items
|
||||
*/
|
||||
public static function syncTicket(Ticket $ticket, array $items): void
|
||||
@@ -167,6 +168,28 @@ class AcceptanceCriteriaChecklistMapper
|
||||
return max(0, min(self::MAX_INDENT_LEVEL, $indent));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int, array{id?: int, checked: bool, indent: int, text: string}> $items
|
||||
* @return array<int, array{id?: int, checked: bool, indent: int, text: string}>
|
||||
*/
|
||||
private static function syncDescendantCheckedState(array $items): array
|
||||
{
|
||||
$checkedStateByIndent = [];
|
||||
|
||||
foreach ($items as $index => $item) {
|
||||
$indent = $item['indent'];
|
||||
|
||||
if ($indent > 0 && array_key_exists($indent - 1, $checkedStateByIndent)) {
|
||||
$items[$index]['checked'] = $checkedStateByIndent[$indent - 1];
|
||||
}
|
||||
|
||||
$checkedStateByIndent[$indent] = $items[$index]['checked'];
|
||||
$checkedStateByIndent = array_slice($checkedStateByIndent, 0, $indent + 1, true);
|
||||
}
|
||||
|
||||
return $items;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param iterable<AcceptanceCriterion> $criteria
|
||||
* @return array<int, array{id?: int, checked: bool, indent: int, text: string}>
|
||||
|
||||
@@ -65,6 +65,34 @@ export const buildAcceptanceCriteria = (
|
||||
return normalizeAcceptanceCriteria(parseChecklistLines(checklistInput));
|
||||
};
|
||||
|
||||
export const syncAcceptanceCriteriaDescendantCheckedState = (
|
||||
items: AcceptanceCriteriaModel,
|
||||
index: number,
|
||||
checked: boolean,
|
||||
): AcceptanceCriteriaModel => {
|
||||
if (index < 0 || index >= items.length) {
|
||||
return items;
|
||||
}
|
||||
|
||||
const parentIndent = items[index]?.indent ?? 0;
|
||||
|
||||
return items.map((item, itemIndex) => {
|
||||
if (itemIndex === index) {
|
||||
return { ...item, checked };
|
||||
}
|
||||
|
||||
if (itemIndex < index) {
|
||||
return item;
|
||||
}
|
||||
|
||||
if (item.indent <= parentIndent) {
|
||||
return item;
|
||||
}
|
||||
|
||||
return { ...item, checked };
|
||||
});
|
||||
};
|
||||
|
||||
export const acceptanceCriteriaToEditorState = (
|
||||
value: AcceptanceCriteriaModel | null | undefined,
|
||||
): AcceptanceCriteriaEditorState => {
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
formatChecklistLines,
|
||||
normalizeAcceptanceCriteria,
|
||||
parseChecklistLines,
|
||||
syncAcceptanceCriteriaDescendantCheckedState,
|
||||
} from '@/lib/acceptance-criteria';
|
||||
import ProjectTicketBranchController from '@/actions/App/Http/Controllers/ProjectTicketBranchController';
|
||||
import ProjectTicketLinkController from '@/actions/App/Http/Controllers/ProjectTicketLinkController';
|
||||
@@ -392,8 +393,10 @@ const persistAcceptanceCriteriaToggle = async (
|
||||
return;
|
||||
}
|
||||
|
||||
const nextAcceptanceCriteria = savedAcceptanceCriteria.value.map((item, itemIndex) =>
|
||||
itemIndex === index ? { ...item, checked } : item,
|
||||
const nextAcceptanceCriteria = syncAcceptanceCriteriaDescendantCheckedState(
|
||||
savedAcceptanceCriteria.value,
|
||||
index,
|
||||
checked,
|
||||
);
|
||||
const previousChecklist = formatChecklistLines(savedAcceptanceCriteria.value);
|
||||
const nextChecklist = formatChecklistLines(nextAcceptanceCriteria);
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace Tests\Feature\Projects;
|
||||
|
||||
use App\Actions\ProjectTicketMetadata\InitializeProjectTicketMetadata;
|
||||
use App\Actions\Tickets\Support\AcceptanceCriteriaChecklistMapper;
|
||||
use App\Models\AcceptanceCriterion;
|
||||
use App\Models\BoardColumn;
|
||||
use App\Models\Project;
|
||||
@@ -495,7 +496,7 @@ class ProjectTicketControllerTest extends TestCase
|
||||
],
|
||||
[
|
||||
'text' => 'Includes nested confirmations',
|
||||
'checked' => true,
|
||||
'checked' => false,
|
||||
'indent' => 1,
|
||||
],
|
||||
];
|
||||
@@ -540,7 +541,7 @@ class ProjectTicketControllerTest extends TestCase
|
||||
|
||||
$this->assertEquals(
|
||||
$updatedAcceptanceCriteria,
|
||||
\App\Actions\Tickets\Support\AcceptanceCriteriaChecklistMapper::fromModels($ticket->acceptanceCriteria),
|
||||
AcceptanceCriteriaChecklistMapper::fromModels($ticket->acceptanceCriteria),
|
||||
);
|
||||
$this->assertDatabaseHas('acceptance_criteria', [
|
||||
'ticket_id' => $ticket->id,
|
||||
@@ -549,7 +550,7 @@ class ProjectTicketControllerTest extends TestCase
|
||||
'text' => 'Shows success banner',
|
||||
'is_checked' => false,
|
||||
]);
|
||||
$rootCriterionId = \App\Models\AcceptanceCriterion::query()
|
||||
$rootCriterionId = AcceptanceCriterion::query()
|
||||
->where('ticket_id', $ticket->id)
|
||||
->where('text', 'Shows success banner')
|
||||
->value('id');
|
||||
@@ -559,7 +560,7 @@ class ProjectTicketControllerTest extends TestCase
|
||||
'parent_acceptance_criterion_id' => $rootCriterionId,
|
||||
'position' => 0,
|
||||
'text' => 'Includes nested confirmations',
|
||||
'is_checked' => true,
|
||||
'is_checked' => false,
|
||||
]);
|
||||
$this->assertDatabaseHas('ticket_field_values', [
|
||||
'ticket_id' => $ticket->id,
|
||||
@@ -627,7 +628,7 @@ class ProjectTicketControllerTest extends TestCase
|
||||
[
|
||||
'id' => $childCriterion->id,
|
||||
'text' => 'Updated child item',
|
||||
'checked' => false,
|
||||
'checked' => true,
|
||||
'indent' => 1,
|
||||
],
|
||||
],
|
||||
@@ -657,7 +658,7 @@ class ProjectTicketControllerTest extends TestCase
|
||||
'parent_acceptance_criterion_id' => $rootCriterion->id,
|
||||
'position' => 0,
|
||||
'text' => 'Updated child item',
|
||||
'is_checked' => false,
|
||||
'is_checked' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -707,6 +708,141 @@ class ProjectTicketControllerTest extends TestCase
|
||||
]);
|
||||
}
|
||||
|
||||
public function test_ticket_update_syncs_child_acceptance_criteria_when_parent_is_toggled(): void
|
||||
{
|
||||
$editor = User::factory()->create();
|
||||
$project = Project::factory()->create([
|
||||
'key' => 'CORE',
|
||||
]);
|
||||
|
||||
app(InitializeProjectTicketMetadata::class)->handle($project);
|
||||
|
||||
$priority = $project->ticketPriorities()->firstOrFail();
|
||||
$ticketType = $this->nonParentType($project);
|
||||
$ticket = Ticket::factory()->create([
|
||||
'project_id' => $project->id,
|
||||
'sequence_number' => 1,
|
||||
'ticket_key' => 'CORE-1',
|
||||
'ticket_priority_id' => $priority->id,
|
||||
'ticket_type_id' => $ticketType->id,
|
||||
'title' => 'Acceptance criteria parent toggle test',
|
||||
]);
|
||||
$parentCriterion = AcceptanceCriterion::query()->create([
|
||||
'ticket_id' => $ticket->id,
|
||||
'parent_acceptance_criterion_id' => null,
|
||||
'position' => 0,
|
||||
'text' => 'Parent item',
|
||||
'is_checked' => false,
|
||||
]);
|
||||
$childCriterion = AcceptanceCriterion::query()->create([
|
||||
'ticket_id' => $ticket->id,
|
||||
'parent_acceptance_criterion_id' => $parentCriterion->id,
|
||||
'position' => 0,
|
||||
'text' => 'Child item',
|
||||
'is_checked' => false,
|
||||
]);
|
||||
$grandchildCriterion = AcceptanceCriterion::query()->create([
|
||||
'ticket_id' => $ticket->id,
|
||||
'parent_acceptance_criterion_id' => $childCriterion->id,
|
||||
'position' => 0,
|
||||
'text' => 'Grandchild item',
|
||||
'is_checked' => false,
|
||||
]);
|
||||
|
||||
$this->syncProjectPermissions($project, $editor, ['write', 'view']);
|
||||
|
||||
$headers = [
|
||||
'Accept' => 'application/json',
|
||||
'X-Requested-With' => 'XMLHttpRequest',
|
||||
];
|
||||
|
||||
$this->actingAs($editor)
|
||||
->withHeaders($headers)
|
||||
->patch(route('projects.tickets.update', [$project, $ticket]), $this->updatePayload($ticket, [
|
||||
'acceptance_criteria' => [
|
||||
[
|
||||
'id' => $parentCriterion->id,
|
||||
'text' => 'Parent item',
|
||||
'checked' => true,
|
||||
'indent' => 0,
|
||||
],
|
||||
[
|
||||
'id' => $childCriterion->id,
|
||||
'text' => 'Child item',
|
||||
'checked' => false,
|
||||
'indent' => 1,
|
||||
],
|
||||
[
|
||||
'id' => $grandchildCriterion->id,
|
||||
'text' => 'Grandchild item',
|
||||
'checked' => false,
|
||||
'indent' => 2,
|
||||
],
|
||||
],
|
||||
]))
|
||||
->assertOk()
|
||||
->assertJson([
|
||||
'message' => 'CORE-1 was updated.',
|
||||
'updated' => true,
|
||||
]);
|
||||
|
||||
$this->assertDatabaseHas('acceptance_criteria', [
|
||||
'id' => $parentCriterion->id,
|
||||
'is_checked' => true,
|
||||
]);
|
||||
$this->assertDatabaseHas('acceptance_criteria', [
|
||||
'id' => $childCriterion->id,
|
||||
'is_checked' => true,
|
||||
]);
|
||||
$this->assertDatabaseHas('acceptance_criteria', [
|
||||
'id' => $grandchildCriterion->id,
|
||||
'is_checked' => true,
|
||||
]);
|
||||
|
||||
$this->actingAs($editor)
|
||||
->withHeaders($headers)
|
||||
->patch(route('projects.tickets.update', [$project, $ticket]), $this->updatePayload($ticket->fresh(), [
|
||||
'acceptance_criteria' => [
|
||||
[
|
||||
'id' => $parentCriterion->id,
|
||||
'text' => 'Parent item',
|
||||
'checked' => false,
|
||||
'indent' => 0,
|
||||
],
|
||||
[
|
||||
'id' => $childCriterion->id,
|
||||
'text' => 'Child item',
|
||||
'checked' => true,
|
||||
'indent' => 1,
|
||||
],
|
||||
[
|
||||
'id' => $grandchildCriterion->id,
|
||||
'text' => 'Grandchild item',
|
||||
'checked' => true,
|
||||
'indent' => 2,
|
||||
],
|
||||
],
|
||||
]))
|
||||
->assertOk()
|
||||
->assertJson([
|
||||
'message' => 'CORE-1 was updated.',
|
||||
'updated' => true,
|
||||
]);
|
||||
|
||||
$this->assertDatabaseHas('acceptance_criteria', [
|
||||
'id' => $parentCriterion->id,
|
||||
'is_checked' => false,
|
||||
]);
|
||||
$this->assertDatabaseHas('acceptance_criteria', [
|
||||
'id' => $childCriterion->id,
|
||||
'is_checked' => false,
|
||||
]);
|
||||
$this->assertDatabaseHas('acceptance_criteria', [
|
||||
'id' => $grandchildCriterion->id,
|
||||
'is_checked' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensure non-parent tickets cannot be assigned as a parent target.
|
||||
*/
|
||||
@@ -1107,7 +1243,7 @@ class ProjectTicketControllerTest extends TestCase
|
||||
private function updatePayload(Ticket $ticket, array $overrides = []): array
|
||||
{
|
||||
return array_merge([
|
||||
'acceptance_criteria' => \App\Actions\Tickets\Support\AcceptanceCriteriaChecklistMapper::fromModels(
|
||||
'acceptance_criteria' => AcceptanceCriteriaChecklistMapper::fromModels(
|
||||
$ticket->acceptanceCriteria()->get(),
|
||||
),
|
||||
'assignee_user_id' => $ticket->assignee_user_id,
|
||||
|
||||
Reference in New Issue
Block a user