From 7eb50c8a8dcb8598dcd805699043e69a70c94b5b Mon Sep 17 00:00:00 2001 From: Lars Date: Mon, 16 Nov 2026 14:25:05 +0100 Subject: [PATCH] =?UTF-8?q?Halte=20die=20Rolle=20an=20dem=20Bestandteil,?= =?UTF-8?q?=20der=20gerade=20ausgew=C3=A4hlt=20ist.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- .../Compositions/Pages/EditComposition.php | 34 +++++++++++++++++++ .../views/filament/editorial/editor.blade.php | 2 +- tests/Feature/EditorialEditorTest.php | 34 +++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/app/Filament/Resources/Compositions/Pages/EditComposition.php b/app/Filament/Resources/Compositions/Pages/EditComposition.php index a87d278..d6c504d 100644 --- a/app/Filament/Resources/Compositions/Pages/EditComposition.php +++ b/app/Filament/Resources/Compositions/Pages/EditComposition.php @@ -57,6 +57,8 @@ abstract class EditComposition extends EditRecord public ?int $selected = null; + public string $roleDraft = ''; + public string $panel = 'angaben'; public string $returnUrl = ''; @@ -355,8 +357,10 @@ public function selectPart(int $index): void return; } + $this->commitRoleDraft(); $this->selected = $index; $this->panel = 'bestandteil'; + $this->syncRoleDraft(); } public function addPart(string $target): void @@ -390,6 +394,7 @@ public function addPart(string $target): void $this->members = array_values($this->members); $this->selected = array_key_last($this->members); $this->panel = 'bestandteil'; + $this->syncRoleDraft(); $this->search = ''; $this->feedback = $row['title'].' ist in den Aufbau übernommen. Die neue Fassung entsteht erst mit „Neue Fassung übernehmen“.'; } @@ -403,12 +408,14 @@ public function removePart(int $index): void unset($this->members[$index]); $this->members = array_values($this->members); $this->selected = null; + $this->roleDraft = ''; $this->panel = 'angaben'; $this->feedback = 'Der Bestandteil ist aus dem Arbeitsstand genommen. Gespeichert ist das erst mit einer neuen Fassung.'; } public function movePart(int $index, int $direction): void { + $this->commitRoleDraft(); $target = $index + $direction; if (! isset($this->members[$index], $this->members[$target])) { @@ -420,6 +427,7 @@ public function movePart(int $index, int $direction): void $this->members[$target] = $current; $this->members = array_values($this->members); $this->selected = $target; + $this->syncRoleDraft(); } public function useVersion(int $index, string $target): void @@ -436,8 +444,10 @@ public function useVersion(int $index, string $target): void return; } + $this->commitRoleDraft(); $row['role'] = $this->members[$index]['role'] ?? $row['kind']; $this->members[$index] = $row; + $this->syncRoleDraft(); $this->feedback = $row['version_label'].' ist für diese Stelle ausgewählt. Übernehmen legt dafür eine neue Fassung an.'; } @@ -560,6 +570,8 @@ public function savePreviewImage(string $storedPath): void public function publishRevision(): bool { + $this->commitRoleDraft(); + if ($this->members === []) { $this->feedback = 'Eine Fassung braucht mindestens einen Bestandteil. Anzeige und Kurzbeschreibung kannst du schon speichern.'; @@ -716,9 +728,31 @@ protected function applyVersion(CompositionVersion $version): void $this->durationMinutes = $version->duration_minutes === null ? '' : (string) $version->duration_minutes; $this->materialNote = (string) ($version->material_note ?? ''); $this->selected = null; + $this->roleDraft = ''; $this->panel = 'angaben'; } + public function updatedRoleDraft(string $value): void + { + $this->commitRoleDraft($value); + } + + protected function commitRoleDraft(?string $value = null): void + { + if ($this->selected === null || ! isset($this->members[$this->selected])) { + return; + } + + $this->members[$this->selected]['role'] = trim($value ?? $this->roleDraft); + } + + protected function syncRoleDraft(): void + { + $this->roleDraft = $this->selected !== null && isset($this->members[$this->selected]) + ? (string) ($this->members[$this->selected]['role'] ?? '') + : ''; + } + public function releaseDisplay(): void { $this->releaseCurrent(); diff --git a/resources/views/filament/editorial/editor.blade.php b/resources/views/filament/editorial/editor.blade.php index 826bf78..cbd79c3 100644 --- a/resources/views/filament/editorial/editor.blade.php +++ b/resources/views/filament/editorial/editor.blade.php @@ -116,7 +116,7 @@

{{ $member['kind'] }} · {{ $member['version_label'] }}

- +

Die Rolle gilt nur hier. Dasselbe Medium kann woanders eine andere Rolle haben.

@if (count($this->selectedAlternatives()) > 1) diff --git a/tests/Feature/EditorialEditorTest.php b/tests/Feature/EditorialEditorTest.php index 999b9f4..c8aa1c3 100644 --- a/tests/Feature/EditorialEditorTest.php +++ b/tests/Feature/EditorialEditorTest.php @@ -198,6 +198,40 @@ public function test_a_new_module_returns_into_the_program(): void $this->assertSame($sheet->id, $program->fresh()->members()->first()->content_element_version_id); } + public function test_a_role_change_stays_on_the_selected_part_when_the_order_changes(): void + { + $content = app(ContentService::class); + $sheet = $content->publishElementVersion($content->createElement('text', 'text', 'Blatt'), 'Hinweis'); + $film = $content->publishElementVersion($content->createElement('film', 'film', 'Lara im Park'), 'Film'); + $program = $content->publishComposition( + $content->createComposition('Programm Abstand', CompositionKind::Kurs), + [ + ['role' => 'Unterlage', 'target' => $sheet], + ['role' => 'Film', 'target' => $film], + ], + ); + + Livewire::actingAs($this->editor(), 'staff') + ->test(EditCourse::class, ['record' => $program->composition_id]) + ->call('selectPart', 1) + ->set('roleDraft', 'Film zum Einstieg') + ->assertSet('members.0.role', 'Unterlage') + ->assertSet('members.1.role', 'Film zum Einstieg') + ->call('movePart', 1, -1) + ->call('publishRevision') + ->assertSet('feedback', 'Die neue Fassung ist übernommen. Die bisherige Fassung bleibt erhalten.'); + + $versions = $program->composition->versions()->with('members')->orderBy('number')->get(); + + $this->assertCount(2, $versions); + $this->assertSame('Unterlage', $versions[0]->members[0]->role); + $this->assertSame('Film', $versions[0]->members[1]->role); + $this->assertSame('Film zum Einstieg', $versions[1]->members[0]->role); + $this->assertSame($film->id, $versions[1]->members[0]->content_element_version_id); + $this->assertSame('Unterlage', $versions[1]->members[1]->role); + $this->assertSame($sheet->id, $versions[1]->members[1]->content_element_version_id); + } + public function test_guests_cannot_open_the_trainer_preview(): void { $content = app(ContentService::class);