@@ -194,6 +194,60 @@ new #[Title('Folders')] class extends Component
|
|||||||
$todo->update(['folder_id' => $folder->id]);
|
$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
|
public function todosForFolder(int $folderId): Collection
|
||||||
{
|
{
|
||||||
return Todo::query()
|
return Todo::query()
|
||||||
@@ -345,8 +399,41 @@ new #[Title('Folders')] class extends Component
|
|||||||
</form>
|
</form>
|
||||||
</flux:card>
|
</flux:card>
|
||||||
|
|
||||||
<div class="flex flex-col divide-y divide-zinc-200 rounded-xl border border-zinc-200 bg-white dark:divide-zinc-700 dark:border-zinc-700 dark:bg-zinc-900" data-test="folder-list">
|
<div
|
||||||
|
x-data="{
|
||||||
|
draggingFolder: false,
|
||||||
|
droppingTopLevel: false,
|
||||||
|
dropFolder(folderId) {
|
||||||
|
if (window.__mtFolderDrag) {
|
||||||
|
if (window.__mtFolderDrag.folderId !== folderId) $wire.moveFolderToFolder(window.__mtFolderDrag.folderId, folderId);
|
||||||
|
window.__mtFolderDrag = null;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
dropTodo(folderId) {
|
||||||
|
if (window.__mtTodoDrag && window.__mtTodoDrag.folderId !== folderId) $wire.moveTodoToFolder(window.__mtTodoDrag.todoId, folderId);
|
||||||
|
window.__mtTodoDrag = null;
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
@folder-drag-start="draggingFolder = true; droppingTopLevel = false"
|
||||||
|
@folder-drag-end="draggingFolder = false; droppingTopLevel = false"
|
||||||
|
class="flex flex-col divide-y divide-zinc-200 rounded-xl border border-zinc-200 bg-white dark:divide-zinc-700 dark:border-zinc-700 dark:bg-zinc-900"
|
||||||
|
data-test="folder-list"
|
||||||
|
>
|
||||||
@forelse ($this->folderTree as $node)
|
@forelse ($this->folderTree as $node)
|
||||||
|
<div
|
||||||
|
x-show="draggingFolder"
|
||||||
|
class="p-4"
|
||||||
|
:class="droppingTopLevel && 'rounded-lg bg-blue-50 ring-2 ring-inset ring-blue-400 dark:bg-blue-500/10'"
|
||||||
|
@dragover.prevent="droppingTopLevel = true"
|
||||||
|
@dragleave="!$el.contains($event.relatedTarget) && (droppingTopLevel = false)"
|
||||||
|
@drop.prevent="droppingTopLevel = false; if (window.__mtFolderDrag) { $wire.moveFolderToTopLevel(window.__mtFolderDrag.folderId); window.__mtFolderDrag = null; }"
|
||||||
|
data-test="top-level-drop-zone"
|
||||||
|
>
|
||||||
|
<div class="flex items-center justify-center gap-2 border-2 border-dashed border-zinc-300 p-3 text-sm text-zinc-500 dark:border-zinc-600 dark:text-zinc-400">
|
||||||
|
<flux:icon.arrow-up-on-square variant="micro" class="size-4" />
|
||||||
|
{{ __('Drop here to make it a top-level folder') }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="p-4" :style="'margin-left: {{ $node['depth'] * 1.5 }}rem'">
|
<div class="p-4" :style="'margin-left: {{ $node['depth'] * 1.5 }}rem'">
|
||||||
<div
|
<div
|
||||||
x-data="{ drop: false }"
|
x-data="{ drop: false }"
|
||||||
@@ -354,7 +441,7 @@ new #[Title('Folders')] class extends Component
|
|||||||
:class="drop && 'rounded-lg bg-blue-50 ring-2 ring-inset ring-blue-400 dark:bg-blue-500/10'"
|
:class="drop && 'rounded-lg bg-blue-50 ring-2 ring-inset ring-blue-400 dark:bg-blue-500/10'"
|
||||||
@dragover.prevent="drop = true"
|
@dragover.prevent="drop = true"
|
||||||
@dragleave="!$el.contains($event.relatedTarget) && (drop = false)"
|
@dragleave="!$el.contains($event.relatedTarget) && (drop = false)"
|
||||||
@drop.prevent="drop = false; if (window.__mtTodoDrag && window.__mtTodoDrag.folderId !== {{ $node['folder']->id }}) $wire.moveTodoToFolder(window.__mtTodoDrag.todoId, {{ $node['folder']->id }}); window.__mtTodoDrag = null"
|
@drop.prevent="drop = false; window.__mtFolderDrag ? dropFolder({{ $node['folder']->id }}) : dropTodo({{ $node['folder']->id }})"
|
||||||
data-test="folder-row-{{ $node['folder']->id }}"
|
data-test="folder-row-{{ $node['folder']->id }}"
|
||||||
>
|
>
|
||||||
@if ($renamingFolderId === $node['folder']->id)
|
@if ($renamingFolderId === $node['folder']->id)
|
||||||
@@ -378,6 +465,18 @@ new #[Title('Folders')] class extends Component
|
|||||||
</form>
|
</form>
|
||||||
@else
|
@else
|
||||||
<div class="flex min-w-0 items-center gap-2">
|
<div class="flex min-w-0 items-center gap-2">
|
||||||
|
<div
|
||||||
|
x-data="{ dragging: false }"
|
||||||
|
draggable="true"
|
||||||
|
class="inline-flex shrink-0 cursor-grab text-zinc-400 dark:text-zinc-500"
|
||||||
|
:class="dragging && 'opacity-40'"
|
||||||
|
@dragstart="dragging = true; window.__mtFolderDrag = { folderId: {{ $node['folder']->id }} }; $dispatch('folder-drag-start')"
|
||||||
|
@dragend="dragging = false; window.__mtFolderDrag = null; $dispatch('folder-drag-end')"
|
||||||
|
:title="__('Drag to move this folder')"
|
||||||
|
data-test="drag-folder-{{ $node['folder']->id }}"
|
||||||
|
>
|
||||||
|
<flux:icon.chevrons-up-down variant="micro" />
|
||||||
|
</div>
|
||||||
<x-folder-dot :color="$node['folder']->color" data-test="folder-dot-{{ $node['folder']->id }}" />
|
<x-folder-dot :color="$node['folder']->color" data-test="folder-dot-{{ $node['folder']->id }}" />
|
||||||
<flux:heading size="sm" class="truncate" data-test="folder-name-{{ $node['folder']->id }}">
|
<flux:heading size="sm" class="truncate" data-test="folder-name-{{ $node['folder']->id }}">
|
||||||
{{ $node['folder']->name }}
|
{{ $node['folder']->name }}
|
||||||
|
|||||||
@@ -453,3 +453,110 @@ test('an invalid color is rejected when editing a folder', function () {
|
|||||||
|
|
||||||
expect($work->fresh()->color)->toBeNull();
|
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);
|
||||||
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user