Merge tasks into notes: a task is just a note with task attributes

A task is now a note with status/priority/due_date columns set (status IS NOT NULL).
This eliminates the separate tasks table, companion note system, cascade deletes,
bidirectional title sync, and _skip_cascade flags.

Migration (0004):
- Add status, priority, due_date columns to notes table
- Migrate task data from companion notes and orphan tasks
- Drop tasks table and old enum types

Backend:
- models/note.py: Add TaskStatus/TaskPriority enums, task columns, is_task property
- models/task.py: Deleted (merged into note.py)
- models/__init__.py: Re-export enums from note.py, remove Task import
- services/notes.py: Remove companion/cascade logic, add is_task filter,
  convert_note_to_task, convert_task_to_note, simplified backlinks
- services/tasks.py: Rewritten as thin wrappers around notes service
- routes/notes.py: Add is_task filter (default false), task fields in CRUD,
  convert-to-note endpoint
- routes/tasks.py: description→body (with fallback), remove note_id filter

Frontend:
- types/note.ts: Add TaskStatus, TaskPriority, task fields to Note interface
- types/task.ts: Task is now a re-export alias for Note
- stores/notes.ts: Simplify convertToTask, add convertToNote
- stores/tasks.ts: description→body in createTask/updateTask
- TaskEditorView: description→body, remove companion note UI
- TaskViewerView: description→body, remove companion note link, add Convert to Note
- NoteViewerView: Remove companion task UI, simplify convert-to-task
- TaskCard: description→body, non-null assertions for status/priority

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-02-10 17:56:12 -05:00
parent e2338918b0
commit 807cde30be
17 changed files with 439 additions and 532 deletions
+4 -4
View File
@@ -19,7 +19,7 @@ const statusCycle: Record<TaskStatus, TaskStatus> = {
};
function cycleStatus() {
emit("status-toggle", props.task.id, statusCycle[props.task.status]);
emit("status-toggle", props.task.id, statusCycle[props.task.status!]);
}
function isOverdue(): boolean {
@@ -32,14 +32,14 @@ function isOverdue(): boolean {
<router-link :to="`/tasks/${task.id}`" class="task-card">
<div class="task-top">
<StatusBadge
:status="task.status"
:status="task.status!"
clickable
@click.prevent.stop="cycleStatus"
/>
<PriorityBadge :priority="task.priority" />
<PriorityBadge :priority="task.priority!" />
<h3 class="task-title">{{ task.title || "Untitled" }}</h3>
</div>
<div v-if="task.description" class="task-preview prose" v-html="renderPreview(task.description)"></div>
<div v-if="task.body" class="task-preview prose" v-html="renderPreview(task.body)"></div>
<div class="task-meta">
<span v-if="task.due_date" :class="['due-date', { overdue: isOverdue() }]">
Due: {{ task.due_date }}
+17 -6
View File
@@ -142,17 +142,27 @@ export const useNotesStore = defineStore("notes", () => {
return await apiPost<Note>("/api/notes/resolve-title", { title });
}
async function convertToTask(noteId: number) {
const task = await apiPost<Record<string, unknown>>(
async function convertToTask(noteId: number): Promise<Note> {
const note = await apiPost<Note>(
`/api/notes/${noteId}/convert-to-task`,
{}
);
// Remove the note from local state since it was converted
notes.value = notes.value.filter((n) => n.id !== noteId);
// Update local state — the note is now a task
if (currentNote.value?.id === noteId) {
currentNote.value = null;
currentNote.value = note;
}
return task;
return note;
}
async function convertToNote(noteId: number): Promise<Note> {
const note = await apiPost<Note>(
`/api/notes/${noteId}/convert-to-note`,
{}
);
if (currentNote.value?.id === noteId) {
currentNote.value = note;
}
return note;
}
async function fetchBacklinks(
@@ -196,6 +206,7 @@ export const useNotesStore = defineStore("notes", () => {
refresh,
resolveTitle,
convertToTask,
convertToNote,
fetchBacklinks,
fetchAllTags,
};
+2 -2
View File
@@ -57,7 +57,7 @@ export const useTasksStore = defineStore("tasks", () => {
async function createTask(data: {
title: string;
description: string;
body: string;
status?: TaskStatus;
priority?: TaskPriority;
due_date?: string | null;
@@ -68,7 +68,7 @@ export const useTasksStore = defineStore("tasks", () => {
async function updateTask(
id: number,
data: Partial<
Pick<Task, "title" | "description" | "status" | "priority" | "due_date">
Pick<Task, "title" | "body" | "status" | "priority" | "due_date">
>
): Promise<Task> {
const task = await apiPut<Task>(`/api/tasks/${id}`, data);
+7
View File
@@ -1,9 +1,16 @@
export type TaskStatus = "todo" | "in_progress" | "done";
export type TaskPriority = "none" | "low" | "medium" | "high";
export interface Note {
id: number;
title: string;
body: string;
tags: string[];
parent_id: number | null;
status: TaskStatus | null;
priority: TaskPriority | null;
due_date: string | null;
is_task: boolean;
created_at: string;
updated_at: string;
}
+2 -16
View File
@@ -1,20 +1,6 @@
export type TaskStatus = "todo" | "in_progress" | "done";
export type TaskPriority = "none" | "low" | "medium" | "high";
export interface Task {
id: number;
title: string;
description: string;
status: TaskStatus;
priority: TaskPriority;
due_date: string | null;
note_id: number | null;
tags: string[];
created_at: string;
updated_at: string;
}
export type { TaskStatus, TaskPriority, Note as Task } from "./note";
export interface TaskListResponse {
tasks: Task[];
tasks: import("./note").Note[];
total: number;
}
+8 -64
View File
@@ -4,25 +4,20 @@ import { useRoute, useRouter } from "vue-router";
import { useNotesStore } from "@/stores/notes";
import { renderMarkdown } from "@/utils/markdown";
import { relativeTime } from "@/composables/useRelativeTime";
import { apiGet, apiPost } from "@/api/client";
import type { Task, TaskListResponse, TaskStatus } from "@/types/task";
import { apiPost } from "@/api/client";
import type { Note } from "@/types/note";
import TagPill from "@/components/TagPill.vue";
import StatusBadge from "@/components/StatusBadge.vue";
const route = useRoute();
const router = useRouter();
const store = useNotesStore();
const bodyEl = ref<HTMLElement | null>(null);
const linkedTasks = ref<Task[]>([]);
const backlinks = ref<{ type: string; id: number; title: string }[]>([]);
const converting = ref(false);
const noteId = computed(() => Number(route.params.id));
const hasCompanionTask = computed(() => linkedTasks.value.length > 0);
async function loadNote(id: number) {
linkedTasks.value = [];
backlinks.value = [];
await store.fetchNote(id);
@@ -32,16 +27,10 @@ async function loadNote(id: number) {
return;
}
// Fetch tasks linked to this note & backlinks in parallel
const [taskData, backlinkData] = await Promise.allSettled([
apiGet<TaskListResponse>(`/api/tasks?note_id=${id}`),
store.fetchBacklinks(id),
]);
if (taskData.status === "fulfilled") {
linkedTasks.value = taskData.value.tasks;
}
if (backlinkData.status === "fulfilled") {
backlinks.value = backlinkData.value;
try {
backlinks.value = await store.fetchBacklinks(id);
} catch {
backlinks.value = [];
}
}
@@ -93,37 +82,14 @@ function onTagClick(tag: string) {
router.push({ path: "/notes", query: { tag } });
}
const statusCycle: Record<TaskStatus, TaskStatus> = {
todo: "in_progress",
in_progress: "done",
done: "todo",
};
async function toggleTaskStatus(task: Task) {
const newStatus = statusCycle[task.status];
try {
const { apiPatch } = await import("@/api/client");
const updated = await apiPatch<Task>(
`/api/tasks/${task.id}/status`,
{ status: newStatus }
);
const idx = linkedTasks.value.findIndex((t) => t.id === task.id);
if (idx !== -1) {
linkedTasks.value[idx] = updated;
}
} catch {
// silently fail
}
}
async function convertToTask() {
if (converting.value) return;
converting.value = true;
try {
const task = await store.convertToTask(noteId.value);
await store.convertToTask(noteId.value);
const { useToastStore } = await import("@/stores/toast");
useToastStore().show("Converted to task");
router.push(`/tasks/${task.id}`);
router.push(`/tasks/${noteId.value}`);
} catch {
const { useToastStore } = await import("@/stores/toast");
useToastStore().show("Failed to convert note", "error");
@@ -146,7 +112,7 @@ async function convertToTask() {
Edit
</router-link>
<button
v-if="!hasCompanionTask"
v-if="!store.currentNote.is_task"
class="btn-convert"
@click="convertToTask"
:disabled="converting"
@@ -175,22 +141,6 @@ async function convertToTask() {
@click="onBodyClick"
></div>
<div v-if="linkedTasks.length" class="linked-tasks">
<h2>Companion Task</h2>
<ul class="linked-tasks-list">
<li v-for="task in linkedTasks" :key="task.id" class="linked-task-item">
<StatusBadge
:status="task.status"
clickable
@click="toggleTaskStatus(task)"
/>
<router-link :to="`/tasks/${task.id}`" class="linked-task-link">
{{ task.title || "Untitled" }}
</router-link>
</li>
</ul>
</div>
<div v-if="backlinks.length" class="backlinks">
<h2>Backlinks</h2>
<ul class="backlinks-list">
@@ -256,18 +206,15 @@ async function convertToTask() {
margin-bottom: 1rem;
flex-wrap: wrap;
}
.linked-tasks,
.backlinks {
margin-top: 2rem;
border-top: 1px solid var(--color-border);
padding-top: 1rem;
}
.linked-tasks h2,
.backlinks h2 {
font-size: 1.1rem;
margin: 0 0 0.75rem;
}
.linked-tasks-list,
.backlinks-list {
list-style: none;
margin: 0;
@@ -276,19 +223,16 @@ async function convertToTask() {
flex-direction: column;
gap: 0.5rem;
}
.linked-task-item,
.backlink-item {
display: flex;
align-items: center;
gap: 0.5rem;
}
.linked-task-link,
.backlink-link {
color: var(--color-text);
text-decoration: none;
font-size: 0.95rem;
}
.linked-task-link:hover,
.backlink-link:hover {
color: var(--color-primary);
}
+17 -50
View File
@@ -6,9 +6,7 @@ import { useNotesStore } from "@/stores/notes";
import { useToastStore } from "@/stores/toast";
import { renderMarkdown } from "@/utils/markdown";
import { useAutocomplete } from "@/composables/useAutocomplete";
import { apiGet } from "@/api/client";
import type { TaskStatus, TaskPriority } from "@/types/task";
import type { Note } from "@/types/note";
import MarkdownToolbar from "@/components/MarkdownToolbar.vue";
const route = useRoute();
@@ -18,12 +16,10 @@ const notesStore = useNotesStore();
const toast = useToastStore();
const title = ref("");
const description = ref("");
const body = ref("");
const status = ref<TaskStatus>("todo");
const priority = ref<TaskPriority>("none");
const dueDate = ref("");
const noteId = ref<number | null>(null);
const companionNote = ref<Note | null>(null);
const dirty = ref(false);
const saving = ref(false);
const showPreview = ref(false);
@@ -34,7 +30,7 @@ const taskId = computed(() =>
);
const isEditing = computed(() => taskId.value !== null);
const renderedPreview = computed(() => renderMarkdown(description.value));
const renderedPreview = computed(() => renderMarkdown(body.value));
// Autocomplete
const {
@@ -47,10 +43,10 @@ const {
accept: acAccept,
dismiss: acDismiss,
onKeydown: acOnKeydown,
} = useAutocomplete(textareaRef, description, (q) => notesStore.fetchAllTags(q));
} = useAutocomplete(textareaRef, body, (q) => notesStore.fetchAllTags(q));
let savedTitle = "";
let savedDescription = "";
let savedBody = "";
let savedStatus: TaskStatus = "todo";
let savedPriority: TaskPriority = "none";
let savedDueDate = "";
@@ -58,7 +54,7 @@ let savedDueDate = "";
function markDirty() {
dirty.value =
title.value !== savedTitle ||
description.value !== savedDescription ||
body.value !== savedBody ||
status.value !== savedStatus ||
priority.value !== savedPriority ||
dueDate.value !== savedDueDate;
@@ -71,7 +67,7 @@ function autoGrow() {
el.style.height = Math.max(el.scrollHeight, 200) + "px";
}
function onDescriptionInput() {
function onBodyInput() {
markDirty();
autoGrow();
detectTrigger();
@@ -93,10 +89,10 @@ function insertAtCursor(before: string, after: string, placeholder: string) {
el.focus();
const start = el.selectionStart;
const end = el.selectionEnd;
const selected = description.value.slice(start, end);
const selected = body.value.slice(start, end);
const insert = selected || placeholder;
description.value =
description.value.slice(0, start) + before + insert + after + description.value.slice(end);
body.value =
body.value.slice(0, start) + before + insert + after + body.value.slice(end);
markDirty();
nextTick(() => {
const newStart = start + before.length;
@@ -113,24 +109,15 @@ onMounted(async () => {
await store.fetchTask(taskId.value);
if (store.currentTask) {
title.value = store.currentTask.title;
description.value = store.currentTask.description;
status.value = store.currentTask.status;
priority.value = store.currentTask.priority;
body.value = store.currentTask.body;
status.value = store.currentTask.status as TaskStatus;
priority.value = store.currentTask.priority as TaskPriority;
dueDate.value = store.currentTask.due_date || "";
noteId.value = store.currentTask.note_id;
savedTitle = title.value;
savedDescription = description.value;
savedBody = body.value;
savedStatus = status.value;
savedPriority = priority.value;
savedDueDate = dueDate.value;
if (noteId.value) {
try {
companionNote.value = await apiGet<Note>(`/api/notes/${noteId.value}`);
} catch {
companionNote.value = null;
}
}
}
}
nextTick(autoGrow);
@@ -142,7 +129,7 @@ async function save() {
try {
const data = {
title: title.value,
description: description.value,
body: body.value,
status: status.value,
priority: priority.value,
due_date: dueDate.value || null,
@@ -150,7 +137,7 @@ async function save() {
if (isEditing.value) {
await store.updateTask(taskId.value!, data);
savedTitle = title.value;
savedDescription = description.value;
savedBody = body.value;
savedStatus = status.value;
savedPriority = priority.value;
savedDueDate = dueDate.value;
@@ -254,10 +241,10 @@ onUnmounted(() => window.removeEventListener("beforeunload", onBeforeUnload));
<div class="textarea-wrapper" v-show="!showPreview">
<textarea
ref="textareaRef"
v-model="description"
v-model="body"
placeholder="Describe this task... Use #tags inline"
class="body-input"
@input="onDescriptionInput"
@input="onBodyInput"
@keydown="onTextareaKeydown"
@blur="onTextareaBlur"
></textarea>
@@ -314,13 +301,6 @@ onUnmounted(() => window.removeEventListener("beforeunload", onBeforeUnload));
</div>
</div>
<div v-if="companionNote" class="field companion-note">
<label>Companion Note</label>
<router-link :to="`/notes/${companionNote.id}`" class="note-link">
{{ companionNote.title || "Untitled" }}
</router-link>
</div>
<!-- Delete confirmation -->
<teleport to="body">
<div v-if="showDeleteConfirm" class="modal-overlay" @click="showDeleteConfirm = false">
@@ -476,19 +456,6 @@ onUnmounted(() => window.removeEventListener("beforeunload", onBeforeUnload));
color: var(--color-text);
font-size: 0.9rem;
}
.companion-note {
flex-direction: row;
align-items: center;
gap: 0.5rem;
}
.note-link {
color: var(--color-primary);
text-decoration: none;
font-size: 0.9rem;
}
.note-link:hover {
text-decoration: underline;
}
.modal-overlay {
position: fixed;
inset: 0;
+54 -42
View File
@@ -5,7 +5,7 @@ import { useTasksStore } from "@/stores/tasks";
import { useNotesStore } from "@/stores/notes";
import { renderMarkdown } from "@/utils/markdown";
import { relativeTime } from "@/composables/useRelativeTime";
import { apiGet, apiPost } from "@/api/client";
import { apiPost } from "@/api/client";
import type { Note } from "@/types/note";
import type { TaskStatus } from "@/types/task";
import StatusBadge from "@/components/StatusBadge.vue";
@@ -16,28 +16,18 @@ const route = useRoute();
const router = useRouter();
const store = useTasksStore();
const notesStore = useNotesStore();
const linkedNote = ref<Note | null>(null);
const backlinks = ref<{ type: string; id: number; title: string }[]>([]);
const converting = ref(false);
const taskId = computed(() => Number(route.params.id));
async function loadTask(id: number) {
linkedNote.value = null;
backlinks.value = [];
await store.fetchTask(id);
if (store.currentTask?.note_id) {
try {
linkedNote.value = await apiGet<Note>(
`/api/notes/${store.currentTask.note_id}`
);
} catch {
linkedNote.value = null;
}
try {
backlinks.value = await notesStore.fetchBacklinks(store.currentTask.note_id);
} catch {
backlinks.value = [];
}
try {
backlinks.value = await notesStore.fetchBacklinks(id);
} catch {
backlinks.value = [];
}
}
@@ -47,9 +37,9 @@ watch(() => route.params.id, (newId) => {
if (newId) loadTask(Number(newId));
});
const renderedDescription = computed(() => {
const renderedBody = computed(() => {
if (!store.currentTask) return "";
return renderMarkdown(store.currentTask.description);
return renderMarkdown(store.currentTask.body);
});
const statusCycle: Record<TaskStatus, TaskStatus> = {
@@ -62,7 +52,7 @@ function cycleStatus() {
if (!store.currentTask) return;
store.patchStatus(
store.currentTask.id,
statusCycle[store.currentTask.status]
statusCycle[store.currentTask.status as TaskStatus]
);
}
@@ -74,6 +64,22 @@ function isOverdue(): boolean {
);
}
async function convertToNote() {
if (converting.value) return;
converting.value = true;
try {
await notesStore.convertToNote(taskId.value);
const { useToastStore } = await import("@/stores/toast");
useToastStore().show("Converted to note");
router.push(`/notes/${taskId.value}`);
} catch {
const { useToastStore } = await import("@/stores/toast");
useToastStore().show("Failed to convert task", "error");
} finally {
converting.value = false;
}
}
async function onBodyClick(e: MouseEvent) {
const target = e.target as HTMLElement;
@@ -123,6 +129,13 @@ function onTagClick(tag: string) {
>
Edit
</router-link>
<button
class="btn-convert"
@click="convertToNote"
:disabled="converting"
>
{{ converting ? "Converting..." : "Convert to Note" }}
</button>
</div>
<h1>{{ store.currentTask.title || "Untitled" }}</h1>
<p class="meta">
@@ -132,11 +145,11 @@ function onTagClick(tag: string) {
</p>
<div class="badges">
<StatusBadge
:status="store.currentTask.status"
:status="store.currentTask.status!"
clickable
@click="cycleStatus"
/>
<PriorityBadge :priority="store.currentTask.priority" />
<PriorityBadge :priority="store.currentTask.priority!" />
<span
v-if="store.currentTask.due_date"
:class="['due-date', { overdue: isOverdue() }]"
@@ -144,14 +157,6 @@ function onTagClick(tag: string) {
Due: {{ store.currentTask.due_date }}
</span>
</div>
<div
v-if="linkedNote"
class="linked-note"
>
<router-link :to="`/notes/${linkedNote.id}`" class="note-link">
View Note
</router-link>
</div>
<div class="tags" v-if="store.currentTask.tags.length">
<TagPill
v-for="tag in store.currentTask.tags"
@@ -162,7 +167,7 @@ function onTagClick(tag: string) {
</div>
<div
class="body prose"
v-html="renderedDescription"
v-html="renderedBody"
@click="onBodyClick"
></div>
@@ -201,6 +206,25 @@ function onTagClick(tag: string) {
text-decoration: none;
color: var(--color-primary);
}
.btn-convert {
margin-left: auto;
padding: 0.3rem 0.75rem;
background: var(--color-bg-secondary);
color: var(--color-text);
border: 1px solid var(--color-border);
border-radius: 4px;
cursor: pointer;
font-size: 0.85rem;
}
.btn-convert:hover {
background: var(--color-primary);
color: #fff;
border-color: var(--color-primary);
}
.btn-convert:disabled {
opacity: 0.6;
cursor: default;
}
.meta {
font-size: 0.85rem;
color: var(--color-text-muted);
@@ -220,18 +244,6 @@ function onTagClick(tag: string) {
color: var(--color-overdue);
font-weight: 600;
}
.linked-note {
font-size: 0.9rem;
color: var(--color-text-secondary);
margin-bottom: 0.75rem;
}
.note-link {
color: var(--color-primary);
text-decoration: none;
}
.note-link:hover {
text-decoration: underline;
}
.tags {
display: flex;
gap: 0.5rem;