feat(5.21): Tasks Plugin — activities with status, priority, due dates, ARQ reminders
- New builtin plugin app/plugins/builtins/tasks/ with full CRUD
- Task model with TenantMixin (title, description, status, priority, due_date, assigned_to, contact_id)
- Routes: GET/POST /tasks, GET/PATCH/DELETE /tasks/{id}, POST /tasks/{id}/assign, POST /tasks/{id}/status
- All routes RBAC-protected (tasks:read, tasks:write, tasks:delete)
- ARQ cron job tasks_due_reminder (daily 8:00) sends notifications for due tasks
- Migration 0001_initial.sql creates tasks table with indexes
- Frontend: Tasks.tsx page with list, filter, create/edit modal, detail modal
- Frontend: api/tasks.ts with React Query hooks
- Route /tasks in routes/index.tsx, sidebar entry via plugin manifest
- i18n keys for nav.tasks and tasks.* in de.json and en.json
- Tests: test_tasks.py (11 tests) + Tasks.test.tsx (3 tests)
- Registered TasksPlugin in conftest.py and worker.py
This commit is contained in:
@@ -53,6 +53,7 @@ from app.plugins.builtins.automation.scheduler import scheduler_tick
|
|||||||
from app.plugins.builtins.automation.workflow_timeout import check_workflow_timeouts
|
from app.plugins.builtins.automation.workflow_timeout import check_workflow_timeouts
|
||||||
from app.plugins.builtins.automation.agent_runner import run_agent
|
from app.plugins.builtins.automation.agent_runner import run_agent
|
||||||
from app.plugins.builtins.automation.execution_engine import run_automation
|
from app.plugins.builtins.automation.execution_engine import run_automation
|
||||||
|
from app.plugins.builtins.tasks.jobs import tasks_due_reminder
|
||||||
|
|
||||||
|
|
||||||
class WorkerSettings:
|
class WorkerSettings:
|
||||||
@@ -69,6 +70,7 @@ class WorkerSettings:
|
|||||||
check_workflow_timeouts,
|
check_workflow_timeouts,
|
||||||
run_agent,
|
run_agent,
|
||||||
run_automation,
|
run_automation,
|
||||||
|
tasks_due_reminder,
|
||||||
]
|
]
|
||||||
redis_settings = _get_redis_settings()
|
redis_settings = _get_redis_settings()
|
||||||
on_startup = on_startup
|
on_startup = on_startup
|
||||||
@@ -79,4 +81,5 @@ class WorkerSettings:
|
|||||||
cron_jobs = [
|
cron_jobs = [
|
||||||
cron(scheduler_tick, second={0, 30}),
|
cron(scheduler_tick, second={0, 30}),
|
||||||
cron(check_workflow_timeouts, minute={0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55}),
|
cron(check_workflow_timeouts, minute={0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55}),
|
||||||
|
cron(tasks_due_reminder, hour=8, minute=0),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
"""Tasks builtin plugin."""
|
||||||
|
|
||||||
|
from app.plugins.builtins.tasks.plugin import TasksPlugin
|
||||||
|
|
||||||
|
__all__ = ["TasksPlugin"]
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
"""ARQ reminder job for due tasks — sends notifications for overdue/due tasks."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
|
||||||
|
from app.core.db import get_session_factory
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
async def tasks_due_reminder(ctx: dict) -> None:
|
||||||
|
"""Check for due tasks and send notifications to assigned users.
|
||||||
|
|
||||||
|
Runs daily at 8:00 via cron. Finds all non-done tasks with due_date <= now
|
||||||
|
and creates a notification for the assigned user.
|
||||||
|
"""
|
||||||
|
from app.plugins.builtins.tasks.services import get_due_tasks
|
||||||
|
from app.models.tenant import Tenant
|
||||||
|
from app.core.notifications import create_notification
|
||||||
|
from sqlalchemy import select
|
||||||
|
|
||||||
|
factory = get_session_factory()
|
||||||
|
async with factory() as db:
|
||||||
|
result = await db.execute(select(Tenant))
|
||||||
|
tenants = result.scalars().all()
|
||||||
|
|
||||||
|
total_notified = 0
|
||||||
|
for tenant in tenants:
|
||||||
|
try:
|
||||||
|
due_tasks = await get_due_tasks(db, tenant.id)
|
||||||
|
for task in due_tasks:
|
||||||
|
if not task.get("assigned_to"):
|
||||||
|
continue
|
||||||
|
await create_notification(
|
||||||
|
db,
|
||||||
|
user_id=task["assigned_to"],
|
||||||
|
tenant_id=str(tenant.id),
|
||||||
|
type="task_due",
|
||||||
|
title=f"Task due: {task['title']}",
|
||||||
|
body=f"Task '{task['title']}' is due. Priority: {task['priority']}",
|
||||||
|
data={"task_id": task["id"], "due_date": task.get("due_date")},
|
||||||
|
)
|
||||||
|
total_notified += 1
|
||||||
|
except Exception:
|
||||||
|
logger.warning(f"Failed to process due tasks for tenant {tenant.id}", exc_info=True)
|
||||||
|
|
||||||
|
if total_notified > 0:
|
||||||
|
logger.info(f"Tasks reminder: sent {total_notified} notifications")
|
||||||
|
await db.commit()
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
-- Tasks plugin initial migration: creates tasks table
|
||||||
|
CREATE TABLE IF NOT EXISTS tasks (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
tenant_id UUID NOT NULL,
|
||||||
|
title VARCHAR(255) NOT NULL,
|
||||||
|
description TEXT,
|
||||||
|
status VARCHAR(20) NOT NULL DEFAULT 'open',
|
||||||
|
priority VARCHAR(10) NOT NULL DEFAULT 'medium',
|
||||||
|
due_date TIMESTAMPTZ,
|
||||||
|
assigned_to UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||||
|
contact_id UUID REFERENCES contacts(id) ON DELETE SET NULL,
|
||||||
|
created_by UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
deleted_at TIMESTAMPTZ
|
||||||
|
);
|
||||||
|
CREATE INDEX IF NOT EXISTS ix_tasks_tenant_deleted ON tasks(tenant_id, deleted_at);
|
||||||
|
CREATE INDEX IF NOT EXISTS ix_tasks_tenant_status ON tasks(tenant_id, status);
|
||||||
|
CREATE INDEX IF NOT EXISTS ix_tasks_tenant_assigned ON tasks(tenant_id, assigned_to);
|
||||||
|
CREATE INDEX IF NOT EXISTS ix_tasks_tenant_due ON tasks(tenant_id, due_date);
|
||||||
|
CREATE INDEX IF NOT EXISTS ix_tasks_contact ON tasks(contact_id);
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
"""Task model for the Tasks plugin."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import DateTime, ForeignKey, Index, String, Text
|
||||||
|
from sqlalchemy.dialects.postgresql import UUID as PGUUID
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
|
|
||||||
|
from app.core.db import Base, TenantMixin
|
||||||
|
|
||||||
|
|
||||||
|
class Task(Base, TenantMixin):
|
||||||
|
"""Task entity — free activities (calls, notes, visits) linked to contacts."""
|
||||||
|
|
||||||
|
__tablename__ = "tasks"
|
||||||
|
__table_args__ = (
|
||||||
|
Index("ix_tasks_tenant_deleted", "tenant_id", "deleted_at"),
|
||||||
|
Index("ix_tasks_tenant_status", "tenant_id", "status"),
|
||||||
|
Index("ix_tasks_tenant_assigned", "tenant_id", "assigned_to"),
|
||||||
|
Index("ix_tasks_tenant_due", "tenant_id", "due_date"),
|
||||||
|
Index("ix_tasks_contact", "contact_id"),
|
||||||
|
)
|
||||||
|
|
||||||
|
id: Mapped[uuid.UUID] = mapped_column(
|
||||||
|
PGUUID(as_uuid=True), primary_key=True, default=uuid.uuid4
|
||||||
|
)
|
||||||
|
title: Mapped[str] = mapped_column(String(255), nullable=False)
|
||||||
|
description: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||||
|
status: Mapped[str] = mapped_column(
|
||||||
|
String(20), nullable=False, default="open"
|
||||||
|
) # open, in_progress, done
|
||||||
|
priority: Mapped[str] = mapped_column(
|
||||||
|
String(10), nullable=False, default="medium"
|
||||||
|
) # low, medium, high, urgent
|
||||||
|
due_date: Mapped[datetime | None] = mapped_column(
|
||||||
|
DateTime(timezone=True), nullable=True
|
||||||
|
)
|
||||||
|
assigned_to: Mapped[uuid.UUID | None] = mapped_column(
|
||||||
|
PGUUID(as_uuid=True), ForeignKey("users.id", ondelete="SET NULL"), nullable=True
|
||||||
|
)
|
||||||
|
contact_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||||
|
PGUUID(as_uuid=True), ForeignKey("contacts.id", ondelete="SET NULL"), nullable=True
|
||||||
|
)
|
||||||
|
created_by: Mapped[uuid.UUID | None] = mapped_column(
|
||||||
|
PGUUID(as_uuid=True), ForeignKey("users.id", ondelete="SET NULL"), nullable=True
|
||||||
|
)
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
"""Tasks plugin — manage free tasks/activities linked to contacts."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from app.plugins.base import BasePlugin
|
||||||
|
from app.plugins.manifest import (
|
||||||
|
PluginManifest,
|
||||||
|
PluginRouteDef,
|
||||||
|
FrontendMenuItem,
|
||||||
|
FrontendPageRoute,
|
||||||
|
CronJobContribution,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TasksPlugin(BasePlugin):
|
||||||
|
"""Tasks plugin for managing activities (calls, notes, visits) linked to contacts."""
|
||||||
|
|
||||||
|
manifest = PluginManifest(
|
||||||
|
name="tasks",
|
||||||
|
version="1.0.0",
|
||||||
|
display_name="Tasks",
|
||||||
|
description="Manage free tasks/activities with status, priority, due dates, and contact links.",
|
||||||
|
dependencies=["permissions"],
|
||||||
|
routes=[
|
||||||
|
PluginRouteDef(
|
||||||
|
path="/api/v1/tasks",
|
||||||
|
module="app.plugins.builtins.tasks.routes",
|
||||||
|
router_attr="router",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
events=[],
|
||||||
|
migrations=["0001_initial.sql"],
|
||||||
|
permissions=[
|
||||||
|
"tasks:read",
|
||||||
|
"tasks:write",
|
||||||
|
"tasks:delete",
|
||||||
|
],
|
||||||
|
is_core=True,
|
||||||
|
menu_items=[
|
||||||
|
FrontendMenuItem(
|
||||||
|
label_key="nav.tasks",
|
||||||
|
label="Tasks",
|
||||||
|
path="/tasks",
|
||||||
|
icon="CheckSquare",
|
||||||
|
order=30,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
page_routes=[
|
||||||
|
FrontendPageRoute(
|
||||||
|
path="/tasks",
|
||||||
|
component="@/pages/Tasks",
|
||||||
|
protected=True,
|
||||||
|
order=30,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
cron_jobs=[
|
||||||
|
CronJobContribution(
|
||||||
|
name="tasks_due_reminder",
|
||||||
|
cron_expression="0 8 * * *",
|
||||||
|
job_type="custom",
|
||||||
|
target_name="tasks_due_reminder",
|
||||||
|
plugin_name="tasks",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
"""Tasks plugin routes — CRUD, assign, status update."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
|
||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
|
from app.core.db import get_db
|
||||||
|
from app.deps import get_current_user, require_permission
|
||||||
|
from app.plugins.builtins.tasks import services
|
||||||
|
from app.plugins.builtins.tasks.schemas import (
|
||||||
|
TaskAssignRequest,
|
||||||
|
TaskCreate,
|
||||||
|
TaskStatusRequest,
|
||||||
|
TaskUpdate,
|
||||||
|
)
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/v1/tasks", tags=["tasks"])
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_uuid(val: str, field: str) -> uuid.UUID:
|
||||||
|
try:
|
||||||
|
return uuid.UUID(val)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
raise HTTPException(
|
||||||
|
400, detail={"detail": f"Invalid {field}", "code": "invalid_id"}
|
||||||
|
) from None
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("", dependencies=[Depends(require_permission("tasks:read"))])
|
||||||
|
async def list_tasks(
|
||||||
|
page: int = Query(1, ge=1),
|
||||||
|
page_size: int = Query(25, ge=1, le=100),
|
||||||
|
status: str | None = Query(None, pattern="^(open|in_progress|done)$"),
|
||||||
|
priority: str | None = Query(None, pattern="^(low|medium|high|urgent)$"),
|
||||||
|
assigned_to: str | None = Query(None),
|
||||||
|
contact_id: str | None = Query(None),
|
||||||
|
search: str | None = Query(None),
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: dict = Depends(get_current_user),
|
||||||
|
):
|
||||||
|
"""List tasks with filtering and pagination."""
|
||||||
|
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||||
|
return await services.list_tasks(
|
||||||
|
db, tenant_id,
|
||||||
|
page=page, page_size=page_size,
|
||||||
|
status=status, priority=priority,
|
||||||
|
assigned_to=assigned_to, contact_id=contact_id,
|
||||||
|
search=search,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("", status_code=status.HTTP_201_CREATED, dependencies=[Depends(require_permission("tasks:write"))])
|
||||||
|
async def create_task(
|
||||||
|
body: TaskCreate,
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: dict = Depends(get_current_user),
|
||||||
|
):
|
||||||
|
"""Create a new task."""
|
||||||
|
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||||
|
user_id = uuid.UUID(current_user["user_id"])
|
||||||
|
data = body.model_dump()
|
||||||
|
return await services.create_task(db, tenant_id, user_id, data)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/{task_id}", dependencies=[Depends(require_permission("tasks:read"))])
|
||||||
|
async def get_task(
|
||||||
|
task_id: str,
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: dict = Depends(get_current_user),
|
||||||
|
):
|
||||||
|
"""Get a single task by ID."""
|
||||||
|
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||||
|
tid = _parse_uuid(task_id, "task_id")
|
||||||
|
result = await services.get_task(db, tenant_id, tid)
|
||||||
|
if result is None:
|
||||||
|
raise HTTPException(404, detail={"detail": "Task not found", "code": "not_found"})
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
@router.patch("/{task_id}", dependencies=[Depends(require_permission("tasks:write"))])
|
||||||
|
async def update_task(
|
||||||
|
task_id: str,
|
||||||
|
body: TaskUpdate,
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: dict = Depends(get_current_user),
|
||||||
|
):
|
||||||
|
"""Update a task."""
|
||||||
|
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||||
|
tid = _parse_uuid(task_id, "task_id")
|
||||||
|
data = body.model_dump(exclude_unset=True)
|
||||||
|
result = await services.update_task(db, tenant_id, tid, data)
|
||||||
|
if result is None:
|
||||||
|
raise HTTPException(404, detail={"detail": "Task not found", "code": "not_found"})
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/{task_id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_permission("tasks:delete"))])
|
||||||
|
async def delete_task(
|
||||||
|
task_id: str,
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: dict = Depends(get_current_user),
|
||||||
|
):
|
||||||
|
"""Delete a task (soft-delete)."""
|
||||||
|
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||||
|
tid = _parse_uuid(task_id, "task_id")
|
||||||
|
deleted = await services.delete_task(db, tenant_id, tid)
|
||||||
|
if not deleted:
|
||||||
|
raise HTTPException(404, detail={"detail": "Task not found", "code": "not_found"})
|
||||||
|
return Response(status_code=status.HTTP_204_NO_CONTENT)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{task_id}/assign", dependencies=[Depends(require_permission("tasks:write"))])
|
||||||
|
async def assign_task(
|
||||||
|
task_id: str,
|
||||||
|
body: TaskAssignRequest,
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: dict = Depends(get_current_user),
|
||||||
|
):
|
||||||
|
"""Assign a task to a user."""
|
||||||
|
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||||
|
tid = _parse_uuid(task_id, "task_id")
|
||||||
|
assigned_to = _parse_uuid(body.assigned_to, "assigned_to")
|
||||||
|
result = await services.assign_task(db, tenant_id, tid, assigned_to)
|
||||||
|
if result is None:
|
||||||
|
raise HTTPException(404, detail={"detail": "Task not found", "code": "not_found"})
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{task_id}/status", dependencies=[Depends(require_permission("tasks:write"))])
|
||||||
|
async def update_task_status(
|
||||||
|
task_id: str,
|
||||||
|
body: TaskStatusRequest,
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
current_user: dict = Depends(get_current_user),
|
||||||
|
):
|
||||||
|
"""Update task status."""
|
||||||
|
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||||
|
tid = _parse_uuid(task_id, "task_id")
|
||||||
|
result = await services.update_task_status(db, tenant_id, tid, body.status)
|
||||||
|
if result is None:
|
||||||
|
raise HTTPException(404, detail={"detail": "Task not found", "code": "not_found"})
|
||||||
|
return result
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
"""Pydantic schemas for the Tasks plugin."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
|
|
||||||
|
class TaskCreate(BaseModel):
|
||||||
|
"""Schema for creating a task."""
|
||||||
|
title: str = Field(..., min_length=1, max_length=255)
|
||||||
|
description: str | None = None
|
||||||
|
status: str = Field(default="open", pattern="^(open|in_progress|done)$")
|
||||||
|
priority: str = Field(default="medium", pattern="^(low|medium|high|urgent)$")
|
||||||
|
due_date: datetime | None = None
|
||||||
|
assigned_to: str | None = None
|
||||||
|
contact_id: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class TaskUpdate(BaseModel):
|
||||||
|
"""Schema for updating a task."""
|
||||||
|
title: str | None = Field(default=None, min_length=1, max_length=255)
|
||||||
|
description: str | None = None
|
||||||
|
status: str | None = Field(default=None, pattern="^(open|in_progress|done)$")
|
||||||
|
priority: str | None = Field(default=None, pattern="^(low|medium|high|urgent)$")
|
||||||
|
due_date: datetime | None = None
|
||||||
|
assigned_to: str | None = None
|
||||||
|
contact_id: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class TaskAssignRequest(BaseModel):
|
||||||
|
"""Schema for assigning a task."""
|
||||||
|
assigned_to: str = Field(..., description="User ID to assign the task to")
|
||||||
|
|
||||||
|
|
||||||
|
class TaskStatusRequest(BaseModel):
|
||||||
|
"""Schema for updating task status."""
|
||||||
|
status: str = Field(..., pattern="^(open|in_progress|done)$")
|
||||||
|
|
||||||
|
|
||||||
|
class TaskResponse(BaseModel):
|
||||||
|
"""Schema for task response."""
|
||||||
|
id: str
|
||||||
|
title: str
|
||||||
|
description: str | None = None
|
||||||
|
status: str
|
||||||
|
priority: str
|
||||||
|
due_date: datetime | None = None
|
||||||
|
assigned_to: str | None = None
|
||||||
|
contact_id: str | None = None
|
||||||
|
created_by: str | None = None
|
||||||
|
created_at: datetime
|
||||||
|
updated_at: datetime
|
||||||
|
|
||||||
|
|
||||||
|
class TaskListResponse(BaseModel):
|
||||||
|
"""Paginated task list response."""
|
||||||
|
items: list[TaskResponse]
|
||||||
|
total: int
|
||||||
|
page: int
|
||||||
|
page_size: int
|
||||||
@@ -0,0 +1,212 @@
|
|||||||
|
"""Business logic for the Tasks plugin."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import uuid
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from sqlalchemy import func, select
|
||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
|
from app.plugins.builtins.tasks.models import Task
|
||||||
|
|
||||||
|
|
||||||
|
def _task_to_dict(task: Task) -> dict[str, Any]:
|
||||||
|
"""Serialize a Task model to a dict."""
|
||||||
|
return {
|
||||||
|
"id": str(task.id),
|
||||||
|
"title": task.title,
|
||||||
|
"description": task.description,
|
||||||
|
"status": task.status,
|
||||||
|
"priority": task.priority,
|
||||||
|
"due_date": task.due_date.isoformat() if task.due_date else None,
|
||||||
|
"assigned_to": str(task.assigned_to) if task.assigned_to else None,
|
||||||
|
"contact_id": str(task.contact_id) if task.contact_id else None,
|
||||||
|
"created_by": str(task.created_by) if task.created_by else None,
|
||||||
|
"created_at": task.created_at.isoformat() if task.created_at else None,
|
||||||
|
"updated_at": task.updated_at.isoformat() if task.updated_at else None,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async def list_tasks(
|
||||||
|
db: AsyncSession,
|
||||||
|
tenant_id: uuid.UUID,
|
||||||
|
*,
|
||||||
|
page: int = 1,
|
||||||
|
page_size: int = 25,
|
||||||
|
status: str | None = None,
|
||||||
|
priority: str | None = None,
|
||||||
|
assigned_to: str | None = None,
|
||||||
|
contact_id: str | None = None,
|
||||||
|
search: str | None = None,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""List tasks with filtering and pagination."""
|
||||||
|
query = select(Task).where(Task.tenant_id == tenant_id, Task.deleted_at.is_(None))
|
||||||
|
|
||||||
|
if status:
|
||||||
|
query = query.where(Task.status == status)
|
||||||
|
if priority:
|
||||||
|
query = query.where(Task.priority == priority)
|
||||||
|
if assigned_to:
|
||||||
|
query = query.where(Task.assigned_to == uuid.UUID(assigned_to))
|
||||||
|
if contact_id:
|
||||||
|
query = query.where(Task.contact_id == uuid.UUID(contact_id))
|
||||||
|
if search:
|
||||||
|
query = query.where(Task.title.ilike(f"%{search}%"))
|
||||||
|
|
||||||
|
# Count total
|
||||||
|
count_query = select(func.count()).select_from(query.subquery())
|
||||||
|
total_result = await db.execute(count_query)
|
||||||
|
total = total_result.scalar() or 0
|
||||||
|
|
||||||
|
# Paginate
|
||||||
|
query = query.order_by(Task.due_date.asc().nulls_last(), Task.created_at.desc())
|
||||||
|
query = query.offset((page - 1) * page_size).limit(page_size)
|
||||||
|
|
||||||
|
result = await db.execute(query)
|
||||||
|
tasks = result.scalars().all()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"items": [_task_to_dict(t) for t in tasks],
|
||||||
|
"total": total,
|
||||||
|
"page": page,
|
||||||
|
"page_size": page_size,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async def get_task(db: AsyncSession, tenant_id: uuid.UUID, task_id: uuid.UUID) -> dict[str, Any] | None:
|
||||||
|
"""Get a single task by ID."""
|
||||||
|
result = await db.execute(
|
||||||
|
select(Task).where(Task.id == task_id, Task.tenant_id == tenant_id, Task.deleted_at.is_(None))
|
||||||
|
)
|
||||||
|
task = result.scalar_one_or_none()
|
||||||
|
if task is None:
|
||||||
|
return None
|
||||||
|
return _task_to_dict(task)
|
||||||
|
|
||||||
|
|
||||||
|
async def create_task(
|
||||||
|
db: AsyncSession,
|
||||||
|
tenant_id: uuid.UUID,
|
||||||
|
user_id: uuid.UUID,
|
||||||
|
data: dict[str, Any],
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Create a new task."""
|
||||||
|
task = Task(
|
||||||
|
tenant_id=tenant_id,
|
||||||
|
title=data["title"],
|
||||||
|
description=data.get("description"),
|
||||||
|
status=data.get("status", "open"),
|
||||||
|
priority=data.get("priority", "medium"),
|
||||||
|
due_date=data.get("due_date"),
|
||||||
|
assigned_to=uuid.UUID(data["assigned_to"]) if data.get("assigned_to") else None,
|
||||||
|
contact_id=uuid.UUID(data["contact_id"]) if data.get("contact_id") else None,
|
||||||
|
created_by=user_id,
|
||||||
|
)
|
||||||
|
db.add(task)
|
||||||
|
await db.flush()
|
||||||
|
return _task_to_dict(task)
|
||||||
|
|
||||||
|
|
||||||
|
async def update_task(
|
||||||
|
db: AsyncSession,
|
||||||
|
tenant_id: uuid.UUID,
|
||||||
|
task_id: uuid.UUID,
|
||||||
|
data: dict[str, Any],
|
||||||
|
) -> dict[str, Any] | None:
|
||||||
|
"""Update a task."""
|
||||||
|
result = await db.execute(
|
||||||
|
select(Task).where(Task.id == task_id, Task.tenant_id == tenant_id, Task.deleted_at.is_(None))
|
||||||
|
)
|
||||||
|
task = result.scalar_one_or_none()
|
||||||
|
if task is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
if "title" in data and data["title"] is not None:
|
||||||
|
task.title = data["title"]
|
||||||
|
if "description" in data:
|
||||||
|
task.description = data["description"]
|
||||||
|
if "status" in data and data["status"] is not None:
|
||||||
|
task.status = data["status"]
|
||||||
|
if "priority" in data and data["priority"] is not None:
|
||||||
|
task.priority = data["priority"]
|
||||||
|
if "due_date" in data:
|
||||||
|
task.due_date = data["due_date"]
|
||||||
|
if "assigned_to" in data:
|
||||||
|
task.assigned_to = uuid.UUID(data["assigned_to"]) if data["assigned_to"] else None
|
||||||
|
if "contact_id" in data:
|
||||||
|
task.contact_id = uuid.UUID(data["contact_id"]) if data["contact_id"] else None
|
||||||
|
|
||||||
|
await db.flush()
|
||||||
|
return _task_to_dict(task)
|
||||||
|
|
||||||
|
|
||||||
|
async def delete_task(db: AsyncSession, tenant_id: uuid.UUID, task_id: uuid.UUID) -> bool:
|
||||||
|
"""Soft-delete a task."""
|
||||||
|
result = await db.execute(
|
||||||
|
select(Task).where(Task.id == task_id, Task.tenant_id == tenant_id, Task.deleted_at.is_(None))
|
||||||
|
)
|
||||||
|
task = result.scalar_one_or_none()
|
||||||
|
if task is None:
|
||||||
|
return False
|
||||||
|
task.deleted_at = datetime.now(timezone.utc)
|
||||||
|
await db.flush()
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
async def assign_task(
|
||||||
|
db: AsyncSession,
|
||||||
|
tenant_id: uuid.UUID,
|
||||||
|
task_id: uuid.UUID,
|
||||||
|
assigned_to: uuid.UUID,
|
||||||
|
) -> dict[str, Any] | None:
|
||||||
|
"""Assign a task to a user."""
|
||||||
|
result = await db.execute(
|
||||||
|
select(Task).where(Task.id == task_id, Task.tenant_id == tenant_id, Task.deleted_at.is_(None))
|
||||||
|
)
|
||||||
|
task = result.scalar_one_or_none()
|
||||||
|
if task is None:
|
||||||
|
return None
|
||||||
|
task.assigned_to = assigned_to
|
||||||
|
await db.flush()
|
||||||
|
return _task_to_dict(task)
|
||||||
|
|
||||||
|
|
||||||
|
async def update_task_status(
|
||||||
|
db: AsyncSession,
|
||||||
|
tenant_id: uuid.UUID,
|
||||||
|
task_id: uuid.UUID,
|
||||||
|
new_status: str,
|
||||||
|
) -> dict[str, Any] | None:
|
||||||
|
"""Update task status."""
|
||||||
|
result = await db.execute(
|
||||||
|
select(Task).where(Task.id == task_id, Task.tenant_id == tenant_id, Task.deleted_at.is_(None))
|
||||||
|
)
|
||||||
|
task = result.scalar_one_or_none()
|
||||||
|
if task is None:
|
||||||
|
return None
|
||||||
|
task.status = new_status
|
||||||
|
await db.flush()
|
||||||
|
return _task_to_dict(task)
|
||||||
|
|
||||||
|
|
||||||
|
async def get_due_tasks(
|
||||||
|
db: AsyncSession,
|
||||||
|
tenant_id: uuid.UUID,
|
||||||
|
*,
|
||||||
|
before: datetime | None = None,
|
||||||
|
) -> list[dict[str, Any]]:
|
||||||
|
"""Get tasks that are due (for ARQ reminder job)."""
|
||||||
|
now = before or datetime.now(timezone.utc)
|
||||||
|
result = await db.execute(
|
||||||
|
select(Task).where(
|
||||||
|
Task.tenant_id == tenant_id,
|
||||||
|
Task.deleted_at.is_(None),
|
||||||
|
Task.status != "done",
|
||||||
|
Task.due_date.is_not(None),
|
||||||
|
Task.due_date <= now,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
tasks = result.scalars().all()
|
||||||
|
return [_task_to_dict(t) for t in tasks]
|
||||||
@@ -0,0 +1,134 @@
|
|||||||
|
/**
|
||||||
|
* Tasks page tests — basic rendering and interaction.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { describe, it, expect, vi } from 'vitest';
|
||||||
|
import { render, screen, fireEvent, waitFor } from '@testing-library/react';
|
||||||
|
import { TasksPage } from '@/pages/Tasks';
|
||||||
|
import * as tasksApi from '@/api/tasks';
|
||||||
|
|
||||||
|
// Mock i18n
|
||||||
|
vi.mock('react-i18next', () => ({
|
||||||
|
useTranslation: () => ({ t: (key: string) => key }),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Mock toast
|
||||||
|
vi.mock('@/components/ui/Toast', () => ({
|
||||||
|
useToast: () => ({
|
||||||
|
success: vi.fn(),
|
||||||
|
error: vi.fn(),
|
||||||
|
warning: vi.fn(),
|
||||||
|
info: vi.fn(),
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Mock UI components
|
||||||
|
vi.mock('@/components/ui/Input', () => ({
|
||||||
|
Input: ({ value, onChange, type, label, ...props }: any) => (
|
||||||
|
<div>
|
||||||
|
{label && <label>{label}</label>}
|
||||||
|
<input
|
||||||
|
data-testid={props['data-testid'] || 'input'}
|
||||||
|
type={type || 'text'}
|
||||||
|
value={value || ''}
|
||||||
|
onChange={onChange}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('@/components/ui/Select', () => ({
|
||||||
|
Select: ({ value, onChange, options, label, ...props }: any) => (
|
||||||
|
<div>
|
||||||
|
{label && <label>{label}</label>}
|
||||||
|
<select data-testid={props['data-testid'] || 'select'} value={value || ''} onChange={onChange}>
|
||||||
|
{options?.map((o: any) => <option key={o.value} value={o.value}>{o.label}</option>)}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('@/components/ui/Modal', () => ({
|
||||||
|
Modal: ({ open, onClose, title, children }: any) =>
|
||||||
|
open ? (
|
||||||
|
<div data-testid="modal" role="dialog">
|
||||||
|
<h2>{title}</h2>
|
||||||
|
<button onClick={onClose}>Close</button>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
) : null,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('@/components/ui/Button', () => ({
|
||||||
|
Button: ({ children, onClick, disabled, ...props }: any) => (
|
||||||
|
<button onClick={onClick} disabled={disabled} data-testid={props['data-testid'] || 'button'}>
|
||||||
|
{children}
|
||||||
|
</button>
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('@/components/ui/Badge', () => ({
|
||||||
|
Badge: ({ children, variant }: any) => <span data-testid="badge" data-variant={variant}>{children}</span>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('@/components/ui/EmptyState', () => ({
|
||||||
|
EmptyState: ({ title, description }: any) => (
|
||||||
|
<div data-testid="empty-state">
|
||||||
|
<h3>{title}</h3>
|
||||||
|
<p>{description}</p>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Mock tasks API
|
||||||
|
vi.mock('@/api/tasks', () => ({
|
||||||
|
useTasks: vi.fn(() => ({
|
||||||
|
data: {
|
||||||
|
items: [
|
||||||
|
{
|
||||||
|
id: 'task-1',
|
||||||
|
title: 'Test Task',
|
||||||
|
description: 'Test description',
|
||||||
|
status: 'open',
|
||||||
|
priority: 'high',
|
||||||
|
due_date: '2025-12-31T10:00:00Z',
|
||||||
|
assigned_to: null,
|
||||||
|
contact_id: null,
|
||||||
|
created_by: null,
|
||||||
|
created_at: '2025-01-01T00:00:00Z',
|
||||||
|
updated_at: '2025-01-01T00:00:00Z',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
total: 1,
|
||||||
|
page: 1,
|
||||||
|
page_size: 25,
|
||||||
|
},
|
||||||
|
isLoading: false,
|
||||||
|
})),
|
||||||
|
useCreateTask: vi.fn(() => ({ mutateAsync: vi.fn() })),
|
||||||
|
useUpdateTask: vi.fn(() => ({ mutateAsync: vi.fn() })),
|
||||||
|
useDeleteTask: vi.fn(() => ({ mutateAsync: vi.fn() })),
|
||||||
|
useUpdateTaskStatus: vi.fn(() => ({ mutateAsync: vi.fn() })),
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe('TasksPage', () => {
|
||||||
|
it('renders the tasks page with header', () => {
|
||||||
|
render(<TasksPage />);
|
||||||
|
expect(screen.getByTestId('tasks-page')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('tasks.title')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders task items from API', () => {
|
||||||
|
render(<TasksPage />);
|
||||||
|
expect(screen.getByText('Test Task')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Test description')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens create modal when create button is clicked', () => {
|
||||||
|
render(<TasksPage />);
|
||||||
|
const createBtn = screen.getByText('tasks.create');
|
||||||
|
fireEvent.click(createBtn);
|
||||||
|
expect(screen.getByTestId('modal')).toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId('task-title-input')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
/**
|
||||||
|
* Tasks API hooks — CRUD, assign, status update.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
|
||||||
|
import { apiGet, apiPost, apiPatch, apiDelete } from './client';
|
||||||
|
|
||||||
|
export interface Task {
|
||||||
|
id: string;
|
||||||
|
title: string;
|
||||||
|
description: string | null;
|
||||||
|
status: 'open' | 'in_progress' | 'done';
|
||||||
|
priority: 'low' | 'medium' | 'high' | 'urgent';
|
||||||
|
due_date: string | null;
|
||||||
|
assigned_to: string | null;
|
||||||
|
contact_id: string | null;
|
||||||
|
created_by: string | null;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TaskListResponse {
|
||||||
|
items: Task[];
|
||||||
|
total: number;
|
||||||
|
page: number;
|
||||||
|
page_size: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TaskCreateInput {
|
||||||
|
title: string;
|
||||||
|
description?: string | null;
|
||||||
|
status?: string;
|
||||||
|
priority?: string;
|
||||||
|
due_date?: string | null;
|
||||||
|
assigned_to?: string | null;
|
||||||
|
contact_id?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TaskUpdateInput {
|
||||||
|
title?: string;
|
||||||
|
description?: string | null;
|
||||||
|
status?: string;
|
||||||
|
priority?: string;
|
||||||
|
due_date?: string | null;
|
||||||
|
assigned_to?: string | null;
|
||||||
|
contact_id?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TaskFilter {
|
||||||
|
status?: string;
|
||||||
|
priority?: string;
|
||||||
|
assigned_to?: string;
|
||||||
|
contact_id?: string;
|
||||||
|
search?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useTasks(page = 1, pageSize = 25, filter?: TaskFilter) {
|
||||||
|
const params = new URLSearchParams({ page: String(page), page_size: String(pageSize) });
|
||||||
|
if (filter?.status) params.set('status', filter.status);
|
||||||
|
if (filter?.priority) params.set('priority', filter.priority);
|
||||||
|
if (filter?.assigned_to) params.set('assigned_to', filter.assigned_to);
|
||||||
|
if (filter?.contact_id) params.set('contact_id', filter.contact_id);
|
||||||
|
if (filter?.search) params.set('search', filter.search);
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ['tasks', page, pageSize, filter],
|
||||||
|
queryFn: () => apiGet<TaskListResponse>(`/tasks?${params.toString()}`),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useTask(id?: string) {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ['tasks', id],
|
||||||
|
queryFn: () => apiGet<Task>(`/tasks/${id}`),
|
||||||
|
enabled: !!id,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useCreateTask() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: (data: TaskCreateInput) => apiPost<Task>('/tasks', data),
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['tasks'] });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useUpdateTask() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: ({ id, data }: { id: string; data: TaskUpdateInput }) =>
|
||||||
|
apiPatch<Task>(`/tasks/${id}`, data),
|
||||||
|
onSuccess: (_data, variables) => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['tasks'] });
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['tasks', variables.id] });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useDeleteTask() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: (id: string) => apiDelete(`/tasks/${id}`),
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['tasks'] });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useAssignTask() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: ({ id, assignedTo }: { id: string; assignedTo: string }) =>
|
||||||
|
apiPost<Task>(`/tasks/${id}/assign`, { assigned_to: assignedTo }),
|
||||||
|
onSuccess: (_data, variables) => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['tasks'] });
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['tasks', variables.id] });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useUpdateTaskStatus() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: ({ id, status }: { id: string; status: string }) =>
|
||||||
|
apiPost<Task>(`/tasks/${id}/status`, { status }),
|
||||||
|
onSuccess: (_data, variables) => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['tasks'] });
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['tasks', variables.id] });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -18,7 +18,8 @@
|
|||||||
"settings": "Einstellungen",
|
"settings": "Einstellungen",
|
||||||
"aiAssistant": "KI Assistent",
|
"aiAssistant": "KI Assistent",
|
||||||
"mcpSettings": "MCP Einstellungen",
|
"mcpSettings": "MCP Einstellungen",
|
||||||
"reports": "Reports"
|
"reports": "Reports",
|
||||||
|
"tasks": "Aufgaben"
|
||||||
},
|
},
|
||||||
"auth": {
|
"auth": {
|
||||||
"login": "Anmelden",
|
"login": "Anmelden",
|
||||||
@@ -996,5 +997,30 @@
|
|||||||
"selectTemplateHint": "Wählen Sie eine Vorlage aus der Liste",
|
"selectTemplateHint": "Wählen Sie eine Vorlage aus der Liste",
|
||||||
"downloadHistory": "Download-Verlauf",
|
"downloadHistory": "Download-Verlauf",
|
||||||
"noDownloads": "Noch keine Downloads"
|
"noDownloads": "Noch keine Downloads"
|
||||||
|
},
|
||||||
|
"tasks": {
|
||||||
|
"title": "Aufgaben",
|
||||||
|
"create": "Neue Aufgabe",
|
||||||
|
"edit": "Aufgabe bearbeiten",
|
||||||
|
"deleteConfirm": "Diese Aufgabe löschen?",
|
||||||
|
"created": "Aufgabe erstellt",
|
||||||
|
"updated": "Aufgabe aktualisiert",
|
||||||
|
"deleted": "Aufgabe gelöscht",
|
||||||
|
"statusUpdated": "Status aktualisiert",
|
||||||
|
"noTasks": "Keine Aufgaben",
|
||||||
|
"noTasksDesc": "Es wurden noch keine Aufgaben erstellt.",
|
||||||
|
"markDone": "Erledigt",
|
||||||
|
"dueDate": "Fälligkeitsdatum",
|
||||||
|
"title_field": "Titel",
|
||||||
|
"description": "Beschreibung",
|
||||||
|
"status_field": "Status",
|
||||||
|
"priority_field": "Priorität",
|
||||||
|
"statusOpen": "Offen",
|
||||||
|
"statusInProgress": "In Bearbeitung",
|
||||||
|
"statusDone": "Erledigt",
|
||||||
|
"priorityLow": "Niedrig",
|
||||||
|
"priorityMedium": "Mittel",
|
||||||
|
"priorityHigh": "Hoch",
|
||||||
|
"priorityUrgent": "Dringend"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,8 @@
|
|||||||
"settings": "Settings",
|
"settings": "Settings",
|
||||||
"aiAssistant": "AI Assistant",
|
"aiAssistant": "AI Assistant",
|
||||||
"mcpSettings": "MCP Settings",
|
"mcpSettings": "MCP Settings",
|
||||||
"reports": "Reports"
|
"reports": "Reports",
|
||||||
|
"tasks": "Tasks"
|
||||||
},
|
},
|
||||||
"auth": {
|
"auth": {
|
||||||
"login": "Sign In",
|
"login": "Sign In",
|
||||||
@@ -996,5 +997,30 @@
|
|||||||
"selectTemplateHint": "Select a template from the list",
|
"selectTemplateHint": "Select a template from the list",
|
||||||
"downloadHistory": "Download History",
|
"downloadHistory": "Download History",
|
||||||
"noDownloads": "No downloads yet"
|
"noDownloads": "No downloads yet"
|
||||||
|
},
|
||||||
|
"tasks": {
|
||||||
|
"title": "Tasks",
|
||||||
|
"create": "New Task",
|
||||||
|
"edit": "Edit Task",
|
||||||
|
"deleteConfirm": "Delete this task?",
|
||||||
|
"created": "Task created",
|
||||||
|
"updated": "Task updated",
|
||||||
|
"deleted": "Task deleted",
|
||||||
|
"statusUpdated": "Status updated",
|
||||||
|
"noTasks": "No tasks",
|
||||||
|
"noTasksDesc": "No tasks have been created yet.",
|
||||||
|
"markDone": "Mark Done",
|
||||||
|
"dueDate": "Due Date",
|
||||||
|
"title_field": "Title",
|
||||||
|
"description": "Description",
|
||||||
|
"status_field": "Status",
|
||||||
|
"priority_field": "Priority",
|
||||||
|
"statusOpen": "Open",
|
||||||
|
"statusInProgress": "In Progress",
|
||||||
|
"statusDone": "Done",
|
||||||
|
"priorityLow": "Low",
|
||||||
|
"priorityMedium": "Medium",
|
||||||
|
"priorityHigh": "High",
|
||||||
|
"priorityUrgent": "Urgent"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,417 @@
|
|||||||
|
/**
|
||||||
|
* Tasks page — list with filter, create modal, detail.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React, { useState, useMemo } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Button } from '@/components/ui/Button';
|
||||||
|
import { Input } from '@/components/ui/Input';
|
||||||
|
import { Select } from '@/components/ui/Select';
|
||||||
|
import { Modal } from '@/components/ui/Modal';
|
||||||
|
import { Badge } from '@/components/ui/Badge';
|
||||||
|
import { EmptyState } from '@/components/ui/EmptyState';
|
||||||
|
import { useToast } from '@/components/ui/Toast';
|
||||||
|
import { Loader2, Plus, CheckSquare, Clock, AlertCircle } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
useTasks,
|
||||||
|
useCreateTask,
|
||||||
|
useUpdateTask,
|
||||||
|
useDeleteTask,
|
||||||
|
useUpdateTaskStatus,
|
||||||
|
type Task,
|
||||||
|
type TaskFilter,
|
||||||
|
} from '@/api/tasks';
|
||||||
|
|
||||||
|
const STATUS_COLORS: Record<string, 'secondary' | 'info' | 'success'> = {
|
||||||
|
open: 'secondary',
|
||||||
|
in_progress: 'info',
|
||||||
|
done: 'success',
|
||||||
|
};
|
||||||
|
|
||||||
|
const PRIORITY_COLORS: Record<string, 'secondary' | 'info' | 'warning' | 'danger'> = {
|
||||||
|
low: 'secondary',
|
||||||
|
medium: 'info',
|
||||||
|
high: 'warning',
|
||||||
|
urgent: 'danger',
|
||||||
|
};
|
||||||
|
|
||||||
|
function formatDate(dateStr: string | null): string {
|
||||||
|
if (!dateStr) return '—';
|
||||||
|
try {
|
||||||
|
return new Date(dateStr).toLocaleDateString();
|
||||||
|
} catch {
|
||||||
|
return dateStr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isOverdue(dateStr: string | null, status: string): boolean {
|
||||||
|
if (!dateStr || status === 'done') return false;
|
||||||
|
try {
|
||||||
|
return new Date(dateStr) < new Date();
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function TasksPage() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const toast = useToast();
|
||||||
|
|
||||||
|
const [page, setPage] = useState(1);
|
||||||
|
const [filter, setFilter] = useState<TaskFilter>({});
|
||||||
|
const [search, setSearch] = useState('');
|
||||||
|
const [debouncedSearch, setDebouncedSearch] = useState('');
|
||||||
|
const [createModalOpen, setCreateModalOpen] = useState(false);
|
||||||
|
const [editingTask, setEditingTask] = useState<Task | null>(null);
|
||||||
|
const [selectedTask, setSelectedTask] = useState<Task | null>(null);
|
||||||
|
|
||||||
|
// Debounce search
|
||||||
|
React.useEffect(() => {
|
||||||
|
const timer = setTimeout(() => setDebouncedSearch(search), 300);
|
||||||
|
return () => clearTimeout(timer);
|
||||||
|
}, [search]);
|
||||||
|
|
||||||
|
const effectiveFilter = useMemo(
|
||||||
|
() => ({ ...filter, search: debouncedSearch || undefined }),
|
||||||
|
[filter, debouncedSearch],
|
||||||
|
);
|
||||||
|
|
||||||
|
const { data, isLoading } = useTasks(page, 25, effectiveFilter);
|
||||||
|
const createMutation = useCreateTask();
|
||||||
|
const updateMutation = useUpdateTask();
|
||||||
|
const deleteMutation = useDeleteTask();
|
||||||
|
const statusMutation = useUpdateTaskStatus();
|
||||||
|
|
||||||
|
const tasks = data?.items || [];
|
||||||
|
|
||||||
|
const handleCreate = async (formData: Partial<Task>) => {
|
||||||
|
try {
|
||||||
|
await createMutation.mutateAsync({
|
||||||
|
title: formData.title || '',
|
||||||
|
description: formData.description || null,
|
||||||
|
priority: formData.priority || 'medium',
|
||||||
|
status: formData.status || 'open',
|
||||||
|
due_date: formData.due_date || null,
|
||||||
|
contact_id: formData.contact_id || null,
|
||||||
|
});
|
||||||
|
toast.success(t('tasks.created'));
|
||||||
|
setCreateModalOpen(false);
|
||||||
|
} catch (err: any) {
|
||||||
|
toast.error(err.message || t('common.error'));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleUpdate = async (formData: Partial<Task>) => {
|
||||||
|
if (!editingTask) return;
|
||||||
|
try {
|
||||||
|
await updateMutation.mutateAsync({ id: editingTask.id, data: formData });
|
||||||
|
toast.success(t('tasks.updated'));
|
||||||
|
setEditingTask(null);
|
||||||
|
} catch (err: any) {
|
||||||
|
toast.error(err.message || t('common.error'));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDelete = async (task: Task) => {
|
||||||
|
if (!window.confirm(t('tasks.deleteConfirm'))) return;
|
||||||
|
try {
|
||||||
|
await deleteMutation.mutateAsync(task.id);
|
||||||
|
toast.success(t('tasks.deleted'));
|
||||||
|
setSelectedTask(null);
|
||||||
|
} catch (err: any) {
|
||||||
|
toast.error(err.message || t('common.error'));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleStatusChange = async (task: Task, newStatus: string) => {
|
||||||
|
try {
|
||||||
|
await statusMutation.mutateAsync({ id: task.id, status: newStatus });
|
||||||
|
toast.success(t('tasks.statusUpdated'));
|
||||||
|
} catch (err: any) {
|
||||||
|
toast.error(err.message || t('common.error'));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col h-full" data-testid="tasks-page">
|
||||||
|
{/* Header */}
|
||||||
|
<div className="flex items-center justify-between px-4 py-3 border-b border-secondary-200 bg-white">
|
||||||
|
<h1 className="text-lg font-semibold text-secondary-900 flex items-center gap-2">
|
||||||
|
<CheckSquare className="w-5 h-5" />
|
||||||
|
{t('tasks.title')}
|
||||||
|
</h1>
|
||||||
|
<Button size="sm" onClick={() => { setEditingTask(null); setCreateModalOpen(true); }}>
|
||||||
|
<Plus className="w-4 h-4 mr-1" />
|
||||||
|
{t('tasks.create')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Filters */}
|
||||||
|
<div className="flex items-center gap-2 px-4 py-2 border-b border-secondary-200 bg-white flex-wrap">
|
||||||
|
<Input
|
||||||
|
type="text"
|
||||||
|
placeholder={t('common.search')}
|
||||||
|
value={search}
|
||||||
|
onChange={(e) => setSearch(e.target.value)}
|
||||||
|
className="w-48"
|
||||||
|
/>
|
||||||
|
<Select
|
||||||
|
options={[
|
||||||
|
{ value: '', label: t('common.all') },
|
||||||
|
{ value: 'open', label: t('tasks.statusOpen') },
|
||||||
|
{ value: 'in_progress', label: t('tasks.statusInProgress') },
|
||||||
|
{ value: 'done', label: t('tasks.statusDone') },
|
||||||
|
]}
|
||||||
|
value={filter.status || ''}
|
||||||
|
onChange={(e) => { setFilter(f => ({ ...f, status: e.target.value || undefined })); setPage(1); }}
|
||||||
|
className="w-40"
|
||||||
|
/>
|
||||||
|
<Select
|
||||||
|
options={[
|
||||||
|
{ value: '', label: t('common.all') },
|
||||||
|
{ value: 'low', label: t('tasks.priorityLow') },
|
||||||
|
{ value: 'medium', label: t('tasks.priorityMedium') },
|
||||||
|
{ value: 'high', label: t('tasks.priorityHigh') },
|
||||||
|
{ value: 'urgent', label: t('tasks.priorityUrgent') },
|
||||||
|
]}
|
||||||
|
value={filter.priority || ''}
|
||||||
|
onChange={(e) => { setFilter(f => ({ ...f, priority: e.target.value || undefined })); setPage(1); }}
|
||||||
|
className="w-40"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* List */}
|
||||||
|
<div className="flex-1 overflow-y-auto">
|
||||||
|
{isLoading ? (
|
||||||
|
<div className="flex items-center justify-center py-12">
|
||||||
|
<Loader2 className="animate-spin h-5 w-5 text-secondary-400" />
|
||||||
|
</div>
|
||||||
|
) : tasks.length === 0 ? (
|
||||||
|
<EmptyState title={t('tasks.noTasks')} description={t('tasks.noTasksDesc')} />
|
||||||
|
) : (
|
||||||
|
<ul className="divide-y divide-secondary-100" role="list">
|
||||||
|
{tasks.map((task) => {
|
||||||
|
const overdue = isOverdue(task.due_date, task.status);
|
||||||
|
return (
|
||||||
|
<li
|
||||||
|
key={task.id}
|
||||||
|
className="px-4 py-3 hover:bg-secondary-50 cursor-pointer"
|
||||||
|
onClick={() => setSelectedTask(task)}
|
||||||
|
data-testid={`task-item-${task.id}`}
|
||||||
|
>
|
||||||
|
<div className="flex items-start gap-3">
|
||||||
|
<div className="flex-1 min-w-0">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="text-sm font-medium text-secondary-900">{task.title}</span>
|
||||||
|
{overdue && (
|
||||||
|
<AlertCircle className="w-4 h-4 text-danger-500" />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{task.description && (
|
||||||
|
<p className="text-xs text-secondary-500 truncate mt-0.5">{task.description}</p>
|
||||||
|
)}
|
||||||
|
<div className="flex items-center gap-2 mt-1">
|
||||||
|
<Badge variant={STATUS_COLORS[task.status] || 'secondary'}>
|
||||||
|
{t(`tasks.status${task.status.charAt(0).toUpperCase() + task.status.slice(1).replace('_', '')}`)}
|
||||||
|
</Badge>
|
||||||
|
<Badge variant={PRIORITY_COLORS[task.priority] || 'secondary'}>
|
||||||
|
{t(`tasks.priority${task.priority.charAt(0).toUpperCase() + task.priority.slice(1)}`)}
|
||||||
|
</Badge>
|
||||||
|
{task.due_date && (
|
||||||
|
<span className={`text-xs flex items-center gap-1 ${overdue ? 'text-danger-600' : 'text-secondary-500'}`}>
|
||||||
|
<Clock className="w-3 h-3" />
|
||||||
|
{formatDate(task.due_date)}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-1 flex-shrink-0">
|
||||||
|
{task.status !== 'done' && (
|
||||||
|
<button
|
||||||
|
onClick={(e) => { e.stopPropagation(); handleStatusChange(task, 'done'); }}
|
||||||
|
className="text-xs text-success-600 hover:text-success-700 px-2 py-1 min-h-touch"
|
||||||
|
>
|
||||||
|
{t('tasks.markDone')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button
|
||||||
|
onClick={(e) => { e.stopPropagation(); setEditingTask(task); }}
|
||||||
|
className="text-xs text-primary-600 hover:text-primary-700 px-2 py-1 min-h-touch"
|
||||||
|
>
|
||||||
|
{t('common.edit')}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={(e) => { e.stopPropagation(); handleDelete(task); }}
|
||||||
|
className="text-xs text-danger-600 hover:text-danger-700 px-2 py-1 min-h-touch"
|
||||||
|
>
|
||||||
|
{t('common.delete')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Pagination */}
|
||||||
|
{data && data.total > 25 && (
|
||||||
|
<div className="flex items-center justify-between px-4 py-2 border-t border-secondary-200">
|
||||||
|
<span className="text-xs text-secondary-500">
|
||||||
|
{((page - 1) * 25) + 1}–{Math.min(page * 25, data.total)} / {data.total}
|
||||||
|
</span>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Button size="sm" variant="secondary" disabled={page <= 1} onClick={() => setPage(p => p - 1)}>
|
||||||
|
{t('common.back')}
|
||||||
|
</Button>
|
||||||
|
<Button size="sm" variant="secondary" disabled={page * 25 >= data.total} onClick={() => setPage(p => p + 1)}>
|
||||||
|
{t('common.next')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Create/Edit Modal */}
|
||||||
|
<TaskModal
|
||||||
|
open={createModalOpen || !!editingTask}
|
||||||
|
onClose={() => { setCreateModalOpen(false); setEditingTask(null); }}
|
||||||
|
task={editingTask}
|
||||||
|
onSubmit={editingTask ? handleUpdate : handleCreate}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{/* Detail Modal */}
|
||||||
|
{selectedTask && (
|
||||||
|
<Modal open={!!selectedTask} onClose={() => setSelectedTask(null)} title={selectedTask.title} size="lg">
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Badge variant={STATUS_COLORS[selectedTask.status] || 'secondary'}>
|
||||||
|
{t(`tasks.status${selectedTask.status.charAt(0).toUpperCase() + selectedTask.status.slice(1).replace('_', '')}`)}
|
||||||
|
</Badge>
|
||||||
|
<Badge variant={PRIORITY_COLORS[selectedTask.priority] || 'secondary'}>
|
||||||
|
{t(`tasks.priority${selectedTask.priority.charAt(0).toUpperCase() + selectedTask.priority.slice(1)}`)}
|
||||||
|
</Badge>
|
||||||
|
</div>
|
||||||
|
{selectedTask.description && (
|
||||||
|
<p className="text-sm text-secondary-700">{selectedTask.description}</p>
|
||||||
|
)}
|
||||||
|
<div className="text-xs text-secondary-500">
|
||||||
|
<span className="font-medium">{t('tasks.dueDate')}:</span> {formatDate(selectedTask.due_date)}
|
||||||
|
</div>
|
||||||
|
<div className="flex gap-2 pt-2">
|
||||||
|
{selectedTask.status !== 'done' && (
|
||||||
|
<Button size="sm" onClick={() => { handleStatusChange(selectedTask, 'done'); setSelectedTask(null); }}>
|
||||||
|
{t('tasks.markDone')}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button size="sm" variant="secondary" onClick={() => { setEditingTask(selectedTask); setSelectedTask(null); }}>
|
||||||
|
{t('common.edit')}
|
||||||
|
</Button>
|
||||||
|
<Button size="sm" variant="danger" onClick={() => handleDelete(selectedTask)}>
|
||||||
|
{t('common.delete')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Task Create/Edit Modal ──
|
||||||
|
|
||||||
|
function TaskModal({
|
||||||
|
open,
|
||||||
|
onClose,
|
||||||
|
task,
|
||||||
|
onSubmit,
|
||||||
|
}: {
|
||||||
|
open: boolean;
|
||||||
|
onClose: () => void;
|
||||||
|
task?: Task | null;
|
||||||
|
onSubmit: (data: Partial<Task>) => void;
|
||||||
|
}) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const [title, setTitle] = useState(task?.title || '');
|
||||||
|
const [description, setDescription] = useState(task?.description || '');
|
||||||
|
const [priority, setPriority] = useState<string>(task?.priority || 'medium');
|
||||||
|
const [status, setStatus] = useState<string>(task?.status || 'open');
|
||||||
|
const [dueDate, setDueDate] = useState(task?.due_date ? task.due_date.slice(0, 10) : '');
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (open) {
|
||||||
|
setTitle(task?.title || '');
|
||||||
|
setDescription(task?.description || '');
|
||||||
|
setPriority(task?.priority || 'medium');
|
||||||
|
setStatus(task?.status || 'open');
|
||||||
|
setDueDate(task?.due_date ? task.due_date.slice(0, 10) : '');
|
||||||
|
}
|
||||||
|
}, [open, task]);
|
||||||
|
|
||||||
|
const handleSubmit = (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (!title.trim()) return;
|
||||||
|
onSubmit({
|
||||||
|
title: title.trim(),
|
||||||
|
description: description || null,
|
||||||
|
priority: priority as any,
|
||||||
|
status: status as any,
|
||||||
|
due_date: dueDate ? new Date(dueDate).toISOString() : null,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Modal open={open} onClose={onClose} title={task ? t('tasks.edit') : t('tasks.create')} size="md">
|
||||||
|
<form onSubmit={handleSubmit} className="space-y-4">
|
||||||
|
<Input
|
||||||
|
label={t('tasks.title_field')}
|
||||||
|
value={title}
|
||||||
|
onChange={(e) => setTitle(e.target.value)}
|
||||||
|
required
|
||||||
|
data-testid="task-title-input"
|
||||||
|
/>
|
||||||
|
<div>
|
||||||
|
<label className="block text-sm font-medium text-secondary-700 mb-1">{t('tasks.description')}</label>
|
||||||
|
<textarea
|
||||||
|
value={description}
|
||||||
|
onChange={(e) => setDescription(e.target.value)}
|
||||||
|
className="w-full px-3 py-2 text-sm rounded-md border border-secondary-300 focus:outline-none focus:ring-2 focus:ring-primary-500 min-h-20"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<Select
|
||||||
|
label={t('tasks.status_field')}
|
||||||
|
options={[
|
||||||
|
{ value: 'open', label: t('tasks.statusOpen') },
|
||||||
|
{ value: 'in_progress', label: t('tasks.statusInProgress') },
|
||||||
|
{ value: 'done', label: t('tasks.statusDone') },
|
||||||
|
]}
|
||||||
|
value={status}
|
||||||
|
onChange={(e) => setStatus(e.target.value)}
|
||||||
|
/>
|
||||||
|
<Select
|
||||||
|
label={t('tasks.priority_field')}
|
||||||
|
options={[
|
||||||
|
{ value: 'low', label: t('tasks.priorityLow') },
|
||||||
|
{ value: 'medium', label: t('tasks.priorityMedium') },
|
||||||
|
{ value: 'high', label: t('tasks.priorityHigh') },
|
||||||
|
{ value: 'urgent', label: t('tasks.priorityUrgent') },
|
||||||
|
]}
|
||||||
|
value={priority}
|
||||||
|
onChange={(e) => setPriority(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<Input
|
||||||
|
label={t('tasks.dueDate')}
|
||||||
|
type="date"
|
||||||
|
value={dueDate}
|
||||||
|
onChange={(e) => setDueDate(e.target.value)}
|
||||||
|
/>
|
||||||
|
<div className="flex justify-end gap-2 pt-2">
|
||||||
|
<Button variant="secondary" onClick={onClose}>{t('common.cancel')}</Button>
|
||||||
|
<Button type="submit" data-testid="task-submit-btn">{t('common.save')}</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -40,6 +40,7 @@ const AutomationDashboardPage = React.lazy(() => import('@/pages/AutomationDashb
|
|||||||
const AgentDashboardPage = React.lazy(() => import('@/pages/AgentDashboard').then(m => ({ default: m.AgentDashboardPage })));
|
const AgentDashboardPage = React.lazy(() => import('@/pages/AgentDashboard').then(m => ({ default: m.AgentDashboardPage })));
|
||||||
const AutomationSettingsPage = React.lazy(() => import('@/pages/AutomationSettings').then(m => ({ default: m.AutomationSettingsPage })));
|
const AutomationSettingsPage = React.lazy(() => import('@/pages/AutomationSettings').then(m => ({ default: m.AutomationSettingsPage })));
|
||||||
const ReportsPage = React.lazy(() => import('@/pages/Reports').then(m => ({ default: m.ReportsPage })));
|
const ReportsPage = React.lazy(() => import('@/pages/Reports').then(m => ({ default: m.ReportsPage })));
|
||||||
|
const TasksPage = React.lazy(() => import('@/pages/Tasks').then(m => ({ default: m.TasksPage })));
|
||||||
|
|
||||||
/** Centered spinner fallback for lazy-loaded routes */
|
/** Centered spinner fallback for lazy-loaded routes */
|
||||||
function PageLoader() {
|
function PageLoader() {
|
||||||
@@ -91,6 +92,7 @@ const router = createBrowserRouter([
|
|||||||
{ path: '/automation', element: withSuspense(<AutomationDashboardPage />) },
|
{ path: '/automation', element: withSuspense(<AutomationDashboardPage />) },
|
||||||
{ path: '/agents', element: withSuspense(<AgentDashboardPage />) },
|
{ path: '/agents', element: withSuspense(<AgentDashboardPage />) },
|
||||||
{ path: '/reports', element: withSuspense(<ReportsPage />) },
|
{ path: '/reports', element: withSuspense(<ReportsPage />) },
|
||||||
|
{ path: '/tasks', element: withSuspense(<TasksPage />) },
|
||||||
{ path: '/profile', element: withSuspense(<SettingsProfilePage />) },
|
{ path: '/profile', element: withSuspense(<SettingsProfilePage />) },
|
||||||
{
|
{
|
||||||
path: '/settings',
|
path: '/settings',
|
||||||
|
|||||||
@@ -80,6 +80,8 @@ from app.plugins.builtins.report_generator.models import ( # noqa: F401
|
|||||||
ReportTemplate,
|
ReportTemplate,
|
||||||
)
|
)
|
||||||
from app.plugins.builtins.tags.models import Tag, TagAssignment # noqa: F401
|
from app.plugins.builtins.tags.models import Tag, TagAssignment # noqa: F401
|
||||||
|
from app.plugins.builtins.tasks import TasksPlugin # noqa: F401
|
||||||
|
from app.plugins.builtins.tasks.models import Task # noqa: F401
|
||||||
from app.plugins.registry import reset_registry_for_testing # noqa: F401
|
from app.plugins.registry import reset_registry_for_testing # noqa: F401
|
||||||
from app.services.plugin_service import reset_plugin_service_for_testing # noqa: F401
|
from app.services.plugin_service import reset_plugin_service_for_testing # noqa: F401
|
||||||
|
|
||||||
@@ -351,6 +353,7 @@ async def dms_app(engine: AsyncEngine, redis_client):
|
|||||||
|
|
||||||
registry.register_plugin(PermissionsPlugin())
|
registry.register_plugin(PermissionsPlugin())
|
||||||
registry.register_plugin(DmsPlugin())
|
registry.register_plugin(DmsPlugin())
|
||||||
|
registry.register_plugin(TasksPlugin())
|
||||||
reset_plugin_service_for_testing(registry)
|
reset_plugin_service_for_testing(registry)
|
||||||
|
|
||||||
yield app
|
yield app
|
||||||
|
|||||||
@@ -0,0 +1,180 @@
|
|||||||
|
"""Tasks plugin tests — CRUD, assign, status update, filtering."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from httpx import AsyncClient
|
||||||
|
|
||||||
|
from tests.conftest import ORIGIN_HEADER, login_client, seed_tenant_and_users
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
class TestTaskList:
|
||||||
|
"""GET /api/v1/tasks"""
|
||||||
|
|
||||||
|
async def test_list_tasks_returns_200(self, client: AsyncClient, db_session):
|
||||||
|
"""GET /tasks returns 200 with paginated list."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
resp = await client.get("/api/v1/tasks", headers=ORIGIN_HEADER)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
data = resp.json()
|
||||||
|
assert "items" in data
|
||||||
|
assert "total" in data
|
||||||
|
assert "page" in data
|
||||||
|
assert "page_size" in data
|
||||||
|
|
||||||
|
async def test_list_tasks_with_status_filter(self, client: AsyncClient, db_session):
|
||||||
|
"""GET /tasks?status=open filters by status."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
resp = await client.get("/api/v1/tasks?status=open", headers=ORIGIN_HEADER)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
for item in resp.json()["items"]:
|
||||||
|
assert item["status"] == "open"
|
||||||
|
|
||||||
|
async def test_list_tasks_requires_auth(self, client: AsyncClient, db_session):
|
||||||
|
"""GET /tasks without auth returns 401."""
|
||||||
|
resp = await client.get("/api/v1/tasks", headers=ORIGIN_HEADER)
|
||||||
|
assert resp.status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
class TestTaskCreate:
|
||||||
|
"""POST /api/v1/tasks"""
|
||||||
|
|
||||||
|
async def test_create_task_returns_201(self, client: AsyncClient, db_session):
|
||||||
|
"""POST /tasks creates a task and returns 201."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
resp = await client.post(
|
||||||
|
"/api/v1/tasks",
|
||||||
|
json={"title": "Call customer", "priority": "high"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 201
|
||||||
|
data = resp.json()
|
||||||
|
assert data["title"] == "Call customer"
|
||||||
|
assert data["priority"] == "high"
|
||||||
|
assert data["status"] == "open"
|
||||||
|
|
||||||
|
async def test_create_task_with_due_date(self, client: AsyncClient, db_session):
|
||||||
|
"""POST /tasks with due_date stores it correctly."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
resp = await client.post(
|
||||||
|
"/api/v1/tasks",
|
||||||
|
json={"title": "Follow up", "due_date": "2025-12-31T10:00:00Z"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 201
|
||||||
|
assert resp.json()["due_date"] is not None
|
||||||
|
|
||||||
|
async def test_create_task_empty_title_returns_422(self, client: AsyncClient, db_session):
|
||||||
|
"""POST /tasks with empty title returns 422."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
resp = await client.post(
|
||||||
|
"/api/v1/tasks",
|
||||||
|
json={"title": ""},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 422
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
class TestTaskUpdate:
|
||||||
|
"""PATCH /api/v1/tasks/{id}"""
|
||||||
|
|
||||||
|
async def test_update_task_returns_200(self, client: AsyncClient, db_session):
|
||||||
|
"""PATCH /tasks/{id} updates the task."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
# Create
|
||||||
|
create_resp = await client.post(
|
||||||
|
"/api/v1/tasks",
|
||||||
|
json={"title": "Original"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
task_id = create_resp.json()["id"]
|
||||||
|
# Update
|
||||||
|
resp = await client.patch(
|
||||||
|
f"/api/v1/tasks/{task_id}",
|
||||||
|
json={"title": "Updated", "status": "in_progress"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
assert resp.json()["title"] == "Updated"
|
||||||
|
assert resp.json()["status"] == "in_progress"
|
||||||
|
|
||||||
|
async def test_update_task_not_found_returns_404(self, client: AsyncClient, db_session):
|
||||||
|
"""PATCH non-existent task returns 404."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
resp = await client.patch(
|
||||||
|
"/api/v1/tasks/00000000-0000-0000-0000-000000000000",
|
||||||
|
json={"title": "Updated"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 404
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
class TestTaskStatus:
|
||||||
|
"""POST /api/v1/tasks/{id}/status"""
|
||||||
|
|
||||||
|
async def test_update_status_returns_200(self, client: AsyncClient, db_session):
|
||||||
|
"""POST /tasks/{id}/status updates status."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
create_resp = await client.post(
|
||||||
|
"/api/v1/tasks",
|
||||||
|
json={"title": "Task to complete"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
task_id = create_resp.json()["id"]
|
||||||
|
resp = await client.post(
|
||||||
|
f"/api/v1/tasks/{task_id}/status",
|
||||||
|
json={"status": "done"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
assert resp.json()["status"] == "done"
|
||||||
|
|
||||||
|
async def test_update_status_invalid_returns_422(self, client: AsyncClient, db_session):
|
||||||
|
"""POST /tasks/{id}/status with invalid status returns 422."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
create_resp = await client.post(
|
||||||
|
"/api/v1/tasks",
|
||||||
|
json={"title": "Task"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
task_id = create_resp.json()["id"]
|
||||||
|
resp = await client.post(
|
||||||
|
f"/api/v1/tasks/{task_id}/status",
|
||||||
|
json={"status": "invalid"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
assert resp.status_code == 422
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
class TestTaskDelete:
|
||||||
|
"""DELETE /api/v1/tasks/{id}"""
|
||||||
|
|
||||||
|
async def test_delete_task_returns_204(self, client: AsyncClient, db_session):
|
||||||
|
"""DELETE /tasks/{id} soft-deletes the task."""
|
||||||
|
await seed_tenant_and_users(db_session)
|
||||||
|
await login_client(client, "admin@tenanta.com")
|
||||||
|
create_resp = await client.post(
|
||||||
|
"/api/v1/tasks",
|
||||||
|
json={"title": "To delete"},
|
||||||
|
headers=ORIGIN_HEADER,
|
||||||
|
)
|
||||||
|
task_id = create_resp.json()["id"]
|
||||||
|
resp = await client.delete(f"/api/v1/tasks/{task_id}", headers=ORIGIN_HEADER)
|
||||||
|
assert resp.status_code == 204
|
||||||
|
# Verify it's gone from list
|
||||||
|
list_resp = await client.get("/api/v1/tasks", headers=ORIGIN_HEADER)
|
||||||
|
assert not any(t["id"] == task_id for t in list_resp.json()["items"])
|
||||||
Reference in New Issue
Block a user