mirror of
https://github.com/bulwarkmail/native.git
synced 2026-11-01 08:06:13 +00:00
Saving in the tasks sheet ran `onCreate`/`onUpdate` in a `try/finally` without a `catch`, so a refused create or update became an unhandled rejection: the spinner stopped, nothing was shown, and the user could not tell whether the task was saved. The editor state and the save logic move to `src/lib/task-editor.ts`. `submitTaskEditor` returns the server's reason instead of throwing; the sheet shows it in an alert and leaves the editor untouched so the input can be fixed or saved again. It is cleared only after a successful save.
123 lines
4.1 KiB
TypeScript
123 lines
4.1 KiB
TypeScript
import { format } from 'date-fns';
|
|
import type { CalendarEvent } from '../api/types';
|
|
import { getTaskDueDate } from './calendar-utils';
|
|
import { getEffectiveTimeZone } from './calendar-timezone';
|
|
|
|
export type PriorityLevel = 'none' | 'high' | 'medium' | 'low';
|
|
|
|
// RFC 8984 priority 0-9 <-> the three levels the editor offers (webmail's
|
|
// task-modal mapping).
|
|
export function priorityToLevel(p: number | undefined): PriorityLevel {
|
|
if (p === undefined) return 'none';
|
|
if (p >= 1 && p <= 4) return 'high';
|
|
if (p === 5) return 'medium';
|
|
if (p >= 6 && p <= 9) return 'low';
|
|
return 'none';
|
|
}
|
|
|
|
export function levelToPriority(l: PriorityLevel): number {
|
|
switch (l) {
|
|
case 'high': return 1;
|
|
case 'medium': return 5;
|
|
case 'low': return 9;
|
|
default: return 0;
|
|
}
|
|
}
|
|
|
|
/** What the tasks sheet's inline editor holds while the user types. */
|
|
export interface TaskEditorState {
|
|
id: string | null;
|
|
title: string;
|
|
description: string;
|
|
due: Date | null;
|
|
withTime: boolean;
|
|
priority: PriorityLevel;
|
|
calendarId: string;
|
|
}
|
|
|
|
export function emptyTaskEditor(calendarId: string): TaskEditorState {
|
|
return { id: null, title: '', description: '', due: null, withTime: false, priority: 'none', calendarId };
|
|
}
|
|
|
|
export function taskEditorFromTask(task: CalendarEvent, fallbackCalendarId: string): TaskEditorState {
|
|
return {
|
|
id: task.id,
|
|
title: task.title || '',
|
|
description: task.description || '',
|
|
due: getTaskDueDate(task),
|
|
withTime: !!task.due && !task.showWithoutTime && !/^\d{4}-\d{2}-\d{2}$/.test(task.due),
|
|
priority: priorityToLevel(task.priority),
|
|
calendarId: Object.keys(task.calendarIds || {})[0] || fallbackCalendarId,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* The task properties the editor writes. `existing` is the task being
|
|
* edited (undefined for a new one); a changed calendar is only sent when it
|
|
* differs from the one the task is in.
|
|
*/
|
|
export function buildTaskEditorChanges(
|
|
editor: TaskEditorState,
|
|
existing?: Pick<CalendarEvent, 'calendarIds'>,
|
|
): Partial<CalendarEvent> {
|
|
const data: Partial<CalendarEvent> = {
|
|
title: editor.title.trim(),
|
|
description: editor.description.trim(),
|
|
priority: levelToPriority(editor.priority),
|
|
};
|
|
if (editor.due) {
|
|
if (editor.withTime) {
|
|
data.due = format(editor.due, "yyyy-MM-dd'T'HH:mm:ss");
|
|
data.showWithoutTime = false;
|
|
// The editor shows the due in local time; label it with the zone
|
|
// it was entered in, like the event editor, or the task's old zone
|
|
// would shift it.
|
|
data.timeZone = getEffectiveTimeZone();
|
|
} else {
|
|
data.due = format(editor.due, "yyyy-MM-dd'T'00:00:00");
|
|
data.showWithoutTime = true;
|
|
data.timeZone = null;
|
|
}
|
|
} else if (editor.id) {
|
|
data.due = null;
|
|
}
|
|
if (editor.id) {
|
|
const currentCalendar = existing ? Object.keys(existing.calendarIds || {})[0] : undefined;
|
|
if (editor.calendarId && currentCalendar && editor.calendarId !== currentCalendar) {
|
|
data.calendarIds = { [editor.calendarId]: true };
|
|
}
|
|
}
|
|
return data;
|
|
}
|
|
|
|
export type TaskSaveResult = { ok: true } | { ok: false; message?: string };
|
|
|
|
/**
|
|
* Create or update the task in the editor. Never throws: a refusal comes
|
|
* back as `{ ok: false }` with the server's reason, so the sheet can say so
|
|
* and keep what the user typed instead of clearing the editor.
|
|
*/
|
|
export async function submitTaskEditor(
|
|
editor: TaskEditorState,
|
|
tasks: CalendarEvent[],
|
|
handlers: {
|
|
onCreate: (task: Partial<CalendarEvent>, calendarId: string) => Promise<void> | void;
|
|
onUpdate?: (id: string, changes: Partial<CalendarEvent>) => Promise<void> | void;
|
|
},
|
|
): Promise<TaskSaveResult> {
|
|
try {
|
|
if (editor.id) {
|
|
const existing = tasks.find((task) => task.id === editor.id);
|
|
await handlers.onUpdate?.(editor.id, buildTaskEditorChanges(editor, existing));
|
|
} else {
|
|
await handlers.onCreate(
|
|
{ ...buildTaskEditorChanges(editor), progress: 'needs-action' },
|
|
editor.calendarId,
|
|
);
|
|
}
|
|
return { ok: true };
|
|
} catch (err) {
|
|
return { ok: false, message: err instanceof Error && err.message ? err.message : undefined };
|
|
}
|
|
}
|