diff --git a/resources/views/pages/⚡folders.blade.php b/resources/views/pages/⚡folders.blade.php index 655067f..6e99927 100644 --- a/resources/views/pages/⚡folders.blade.php +++ b/resources/views/pages/⚡folders.blade.php @@ -194,6 +194,60 @@ new #[Title('Folders')] class extends Component $todo->update(['folder_id' => $folder->id]); } + public function moveFolderToTopLevel(int $folderId): void + { + $folder = $this->folderForUser($folderId); + + $hasSiblingConflict = Folder::query() + ->forUser(auth()->id()) + ->whereNull('parent_id') + ->whereKeyNot($folder->id) + ->where('name', $folder->name) + ->exists(); + + if ($hasSiblingConflict) { + return; + } + + $folder->update(['parent_id' => null]); + } + + public function moveFolderToFolder(int $folderId, int $targetFolderId): void + { + $folder = $this->folderForUser($folderId); + $target = $this->folderForUser($targetFolderId); + + if ($folder->id === $target->id || $this->isDescendantOf($target, $folder)) { + return; + } + + $hasSiblingConflict = $target->children() + ->whereKeyNot($folder->id) + ->where('name', $folder->name) + ->exists(); + + if ($hasSiblingConflict) { + return; + } + + $folder->update(['parent_id' => $target->id]); + } + + private function isDescendantOf(Folder $folder, Folder $ancestor): bool + { + $cursor = $folder->parent; + + while ($cursor !== null) { + if ($cursor->id === $ancestor->id) { + return true; + } + + $cursor = $cursor->parent; + } + + return false; + } + public function todosForFolder(int $folderId): Collection { return Todo::query() @@ -345,8 +399,41 @@ new #[Title('Folders')] class extends Component -
+
@forelse ($this->folderTree as $node) +
+
+ + {{ __('Drop here to make it a top-level folder') }} +
+
@if ($renamingFolderId === $node['folder']->id) @@ -378,6 +465,18 @@ new #[Title('Folders')] class extends Component @else
+
+ +
{{ $node['folder']->name }} diff --git a/tests/Feature/FoldersTest.php b/tests/Feature/FoldersTest.php index b166fc4..5f1cd6a 100644 --- a/tests/Feature/FoldersTest.php +++ b/tests/Feature/FoldersTest.php @@ -453,3 +453,110 @@ test('an invalid color is rejected when editing a folder', function () { expect($work->fresh()->color)->toBeNull(); }); + +test('the folder drag handle and top-level drop zone render', function () { + $user = User::factory()->create(); + $this->actingAs($user); + + $work = Folder::factory()->for($user)->create(['name' => 'Work']); + + Livewire::test('pages::folders') + ->assertSeeHtml('data-test="drag-folder-'.$work->id.'"') + ->assertSeeHtml('data-test="top-level-drop-zone"'); +}); + +test('users can drag a folder under another folder', function () { + $user = User::factory()->create(); + $this->actingAs($user); + + $work = Folder::factory()->for($user)->create(['name' => 'Work']); + $personal = Folder::factory()->for($user)->create(['name' => 'Personal']); + + Livewire::test('pages::folders') + ->call('moveFolderToFolder', $personal->id, $work->id); + + expect($personal->fresh()->parent_id)->toBe($work->id); +}); + +test('users can drag a nested folder back to the top level', function () { + $user = User::factory()->create(); + $this->actingAs($user); + + $work = Folder::factory()->for($user)->create(['name' => 'Work']); + $acme = Folder::factory()->childOf($work)->create(['name' => 'Acme Corp']); + + Livewire::test('pages::folders') + ->call('moveFolderToTopLevel', $acme->id); + + expect($acme->fresh()->parent_id)->toBeNull(); +}); + +test('a folder cannot be moved into itself', function () { + $user = User::factory()->create(); + $this->actingAs($user); + + $work = Folder::factory()->for($user)->create(['name' => 'Work']); + + Livewire::test('pages::folders') + ->call('moveFolderToFolder', $work->id, $work->id); + + expect($work->fresh()->parent_id)->toBeNull(); +}); + +test('a folder cannot be moved into its own descendant', function () { + $user = User::factory()->create(); + $this->actingAs($user); + + $work = Folder::factory()->for($user)->create(['name' => 'Work']); + $acme = Folder::factory()->childOf($work)->create(['name' => 'Acme Corp']); + $deep = Folder::factory()->childOf($acme)->create(['name' => 'Deep']); + + Livewire::test('pages::folders') + ->call('moveFolderToFolder', $work->id, $deep->id); + + expect($work->fresh()->parent_id)->toBeNull(); + expect($acme->fresh()->parent_id)->toBe($work->id); +}); + +test('a folder cannot be moved under a sibling with the same name', function () { + $user = User::factory()->create(); + $this->actingAs($user); + + $work = Folder::factory()->for($user)->create(['name' => 'Work']); + $client = Folder::factory()->childOf($work)->create(['name' => 'Client']); + $projects = Folder::factory()->for($user)->create(['name' => 'Projects']); + Folder::factory()->childOf($projects)->create(['name' => 'Client']); + + Livewire::test('pages::folders') + ->call('moveFolderToFolder', $client->id, $projects->id); + + expect($client->fresh()->parent_id)->toBe($work->id); +}); + +test('a folder cannot be moved to the top level when a same-named folder already exists there', function () { + $user = User::factory()->create(); + $this->actingAs($user); + + $work = Folder::factory()->for($user)->create(['name' => 'Work']); + $acme = Folder::factory()->childOf($work)->create(['name' => 'Acme Corp']); + Folder::factory()->for($user)->create(['name' => 'Acme Corp']); + + Livewire::test('pages::folders') + ->call('moveFolderToTopLevel', $acme->id); + + expect($acme->fresh()->parent_id)->toBe($work->id); +}); + +test('users cannot move a folder under another user folder', function () { + $owner = User::factory()->create(); + $foreign = Folder::factory()->for($owner)->create(['name' => 'Foreign']); + + $user = User::factory()->create(); + $this->actingAs($user); + $work = Folder::factory()->for($user)->create(['name' => 'Work']); + + $this->expectException(ModelNotFoundException::class); + + Livewire::test('pages::folders') + ->call('moveFolderToFolder', $work->id, $foreign->id); +});