update plans; assign lifetime;kanban; column sort;
tests / ci (push) Canceled after 0s

This commit is contained in:
2026-11-04 11:10:05 -08:00
parent 177f122c10
commit 31a80ec4d1
26 changed files with 2984 additions and 672 deletions
+60 -36
View File
@@ -1,5 +1,6 @@
<?php
use App\Concerns\SortsTodos;
use App\Models\Folder;
use App\Models\Todo;
use App\TodoStatus;
@@ -14,6 +15,8 @@ use Livewire\Component;
new #[Title('Todos')] class extends Component
{
use SortsTodos;
private const PER_PAGE = 50;
#[Locked]
@@ -74,6 +77,11 @@ new #[Title('Todos')] class extends Component
$this->limit = self::PER_PAGE;
}
protected function sortChanged(): void
{
$this->limit = self::PER_PAGE;
}
public function openCreateForm(?int $folderId = null): void
{
$this->reset('editingTodoId', 'description', 'todoStatus', 'dueDate', 'notes', 'formFolderId');
@@ -243,15 +251,19 @@ new #[Title('Todos')] class extends Component
#[Computed]
public function todos(): Collection
{
return $this->filteredTodoQuery()
->with('folder.parent')
->priority()
return $this->applyTodoSort(
$this->filteredTodoQuery()->with('folder.parent')
)
->limit($this->limit)
->get();
}
public function moveTodo(int $todoId, string $direction): void
{
if ($this->hasActiveSort()) {
return;
}
$this->todoForAction($todoId, 'update');
$ids = $this->orderedTodoIds;
@@ -272,6 +284,10 @@ new #[Title('Todos')] class extends Component
public function handleSort(int $todoId, int $position): void
{
if ($this->hasActiveSort()) {
return;
}
$this->todoForAction($todoId, 'update');
$this->reorderTodo($todoId, $position);
@@ -380,13 +396,19 @@ new #[Title('Todos')] class extends Component
<flux:text class="mt-1">Browse and reorder every todo.</flux:text>
</div>
<flux:button
variant="primary"
wire:click="openCreateForm"
data-test="add-todo-button"
>
{{ __('New Todo') }}
</flux:button>
<div class="flex flex-wrap items-center gap-2">
<flux:button variant="ghost" icon="view-columns" :href="route('kanban')" wire:navigate>
{{ __('Board view') }}
</flux:button>
<flux:button
variant="primary"
wire:click="openCreateForm"
data-test="add-todo-button"
>
{{ __('New Todo') }}
</flux:button>
</div>
</div>
<div class="flex flex-wrap items-center gap-2">
@@ -432,12 +454,12 @@ new #[Title('Todos')] class extends Component
<flux:table.columns>
<flux:table.column width="3rem"></flux:table.column>
<flux:table.column width="3rem">{{ __('Done') }}</flux:table.column>
<flux:table.column>{{ __('Description') }}</flux:table.column>
<flux:table.column>{{ __('Status') }}</flux:table.column>
<flux:table.column>{{ __('Folder') }}</flux:table.column>
<flux:table.column>{{ __('Due') }}</flux:table.column>
<flux:table.column>{{ __('Created') }}</flux:table.column>
<flux:table.column>{{ __('Completed') }}</flux:table.column>
<flux:table.column sortable :sorted="$sortBy === 'description'" :direction="$sortDirection" wire:click="sort('description')">{{ __('Description') }}</flux:table.column>
<flux:table.column sortable :sorted="$sortBy === 'status'" :direction="$sortDirection" wire:click="sort('status')">{{ __('Status') }}</flux:table.column>
<flux:table.column sortable :sorted="$sortBy === 'folder'" :direction="$sortDirection" wire:click="sort('folder')">{{ __('Folder') }}</flux:table.column>
<flux:table.column sortable :sorted="$sortBy === 'due_date'" :direction="$sortDirection" wire:click="sort('due_date')">{{ __('Due') }}</flux:table.column>
<flux:table.column sortable :sorted="$sortBy === 'created_at'" :direction="$sortDirection" wire:click="sort('created_at')">{{ __('Created') }}</flux:table.column>
<flux:table.column sortable :sorted="$sortBy === 'completed_at'" :direction="$sortDirection" wire:click="sort('completed_at')">{{ __('Completed') }}</flux:table.column>
<flux:table.column align="end" width="10rem">{{ __('Actions') }}</flux:table.column>
</flux:table.columns>
@@ -446,7 +468,7 @@ new #[Title('Todos')] class extends Component
<flux:table.row :key="$todo->id" wire:sort:item="{{ $todo->id }}" data-test="todo-row">
<flux:table.cell class="py-0 text-zinc-300 dark:text-zinc-600">
@can('update', $todo)
<div wire:sort:handle class="inline-flex cursor-grab" title="{{ __('Reorder') }}">
<div wire:sort:handle class="{{ $sortBy === null ? 'inline-flex cursor-grab' : 'hidden' }}" title="{{ __('Reorder') }}">
<flux:icon.chevrons-up-down variant="micro" />
</div>
@endcan
@@ -517,26 +539,28 @@ new #[Title('Todos')] class extends Component
<flux:table.cell class="py-0">
<div class="flex justify-end gap-1">
@can('update', $todo)
@if ($todo->id !== ($this->orderedTodoIds[0] ?? null))
<flux:button
size="sm"
variant="ghost"
icon="chevron-up"
:title="__('Move up')"
wire:click="moveTodo({{ $todo->id }}, 'up')"
data-test="move-todo-up-{{ $todo->id }}"
/>
@endif
@if ($sortBy === null)
@if ($todo->id !== ($this->orderedTodoIds[0] ?? null))
<flux:button
size="sm"
variant="ghost"
icon="chevron-up"
:title="__('Move up')"
wire:click="moveTodo({{ $todo->id }}, 'up')"
data-test="move-todo-up-{{ $todo->id }}"
/>
@endif
@if ($todo->id !== ($this->orderedTodoIds[array_key_last($this->orderedTodoIds)] ?? null))
<flux:button
size="sm"
variant="ghost"
icon="chevron-down"
:title="__('Move down')"
wire:click="moveTodo({{ $todo->id }}, 'down')"
data-test="move-todo-down-{{ $todo->id }}"
/>
@if ($todo->id !== ($this->orderedTodoIds[array_key_last($this->orderedTodoIds)] ?? null))
<flux:button
size="sm"
variant="ghost"
icon="chevron-down"
:title="__('Move down')"
wire:click="moveTodo({{ $todo->id }}, 'down')"
data-test="move-todo-down-{{ $todo->id }}"
/>
@endif
@endif
<flux:button