Address code review: restore task.test.util.ts, simplify conditionals, enforce required DND data fields, remove docstring

Co-authored-by: tyler-dane <30163055+tyler-dane@users.noreply.github.com>

Author: Copilot

packages/web/src/__tests__/utils/tasks/task.test.util.ts

@@ -0,0 +1,48 @@
+import { act } from "react";
+import { screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+
+type User = ReturnType<typeof userEvent.setup>;
+
+export const addTasks = async (user: User, taskTitles: string[]) => {
+  for (const title of taskTitles) {
+    // Wait for the add button to be available
+    await clickCreateTaskButton(user);
+
+    // Wait for the input to appear
+    const input = await waitFor(() =>
+      screen.getByPlaceholderText("Enter task title..."),
+    );
+
+    await act(async () => {
+      await user.type(input, `${title}{Enter}`);
+    });
+
+    // Wait for the task to be created and appear in the DOM
+    await waitFor(
+      () => {
+        const elements = screen.getAllByDisplayValue(title);
+        expect(elements.length).toBeGreaterThan(0);
+      },
+      { timeout: 5000 },
+    );
+  }
+};
+
+export const clickCreateTaskButton = async (user: User) => {
+  const addButton = await waitFor(() =>
+    screen.getByRole("button", { name: "Create new task" }),
+  );
+  await act(async () => {
+    await user.click(addButton);
+  });
+};
+
+export const focusOnTaskCheckbox = async (user: User, title: string) => {
+  const checkbox = await waitFor(() =>
+    screen.getByRole("checkbox", { name: `Toggle ${title}` }),
+  );
+  await act(async () => {
+    checkbox.focus();
+  });
+};

packages/web/src/common/hooks/useEventDNDActions.ts

@@ -181,29 +181,24 @@ export function useEventDNDActions() {
 
       switch (switchCase) {
         case `day-task-to-${ID_GRID_MAIN}`:
-          if (task && deleteTask) {
-            convertTaskToEventOnAgenda(task, active, over, deleteTask, false);
-          }
+          if (!task || !deleteTask) break;
+          convertTaskToEventOnAgenda(task, active, over, deleteTask, false);
           break;
         case `day-task-to-${ID_GRID_ALLDAY_ROW}`:
-          if (task && deleteTask) {
-            convertTaskToEventOnAgenda(task, active, over, deleteTask, true);
-          }
+          if (!task || !deleteTask) break;
+          convertTaskToEventOnAgenda(task, active, over, deleteTask, true);
           break;
         case `day-${Categories_Event.ALLDAY}-to-${ID_GRID_MAIN}`:
-          if (event) {
-            moveAllDayToMainGridDayView(event, active, over);
-          }
+          if (!event) break;
+          moveAllDayToMainGridDayView(event, active, over);
           break;
         case `day-${Categories_Event.TIMED}-to-${ID_GRID_MAIN}`:
-          if (event) {
-            moveTimedAroundMainGridDayView(event, active, over);
-          }
+          if (!event) break;
+          moveTimedAroundMainGridDayView(event, active, over);
           break;
         case `day-${Categories_Event.TIMED}-to-${ID_GRID_ALLDAY_ROW}`:
-          if (event) {
-            moveTimedToAllDayGridDayView(event);
-          }
+          if (!event) break;
+          moveTimedToAllDayGridDayView(event);
           break;
       }
     },

packages/web/src/components/DND/Draggable.tsx

@@ -24,10 +24,10 @@ export type DraggableDataType = Categories_Event | "task";
 
 export interface DraggableDNDData {
   type: DraggableDataType;
-  event?: Schema_GridEvent | null;
-  task?: Task | null;
+  event: Schema_GridEvent | null;
+  task: Task | null;
   view: "day" | "week" | "now";
-  deleteTask?: () => void;
+  deleteTask: (() => void) | null;
 }
 
 export interface DNDChildProps

packages/web/src/views/Day/components/Agenda/Events/AllDayAgendaEvent/DraggableAllDayAgendaEvent.tsx

@@ -53,7 +53,9 @@ export const DraggableAllDayAgendaEvent = memo(
           data: {
             event,
             type: Categories_Event.ALLDAY,
+            task: null,
             view: "day",
+            deleteTask: null,
           },
           disabled: isDisabled,
         }}

packages/web/src/views/Day/components/Agenda/Events/TimedAgendaEvent/DraggableTimedAgendaEvent.tsx

@@ -92,7 +92,9 @@ export const DraggableTimedAgendaEvent = memo(
           data: {
             event: event,
             type: Categories_Event.TIMED,
+            task: null,
             view: "day",
+            deleteTask: null,
           },
           disabled: isDisabled,
         }}

packages/web/src/views/Day/components/Task/DraggableTask.tsx

@@ -49,6 +49,7 @@ export function DraggableTask({
         id: task.id,
         data: {
           type: "task",
+          event: null,
           task,
           view: "day",
           deleteTask: () => deleteTask(task.id),

packages/web/src/views/Day/util/task/convertTaskToEvent.ts

@@ -4,15 +4,6 @@ import { Schema_Event_Core } from "@core/types/event.types";
 import dayjs, { Dayjs } from "@core/util/date/dayjs";
 import { Task } from "@web/common/types/task.types";
 
-/**
- * Converts a task to an event
- * @param task - The task to convert
- * @param startTime - The start time for the event (should be snapped to the grid)
- * @param durationMinutes - The duration of the event in minutes (default: 30)
- * @param userId - The user ID
- * @param isAllDay - Whether the event is an all-day event (default: false)
- * @returns A new event schema
- */
 export function convertTaskToEvent(
   task: Task,
   startTime: Dayjs,