Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix: fixing desktop layout for task edition

Andrej07ec9bf183db
diff --git a/apps/api/src/task/controllers/create-task.ts b/apps/api/src/task/controllers/create-task.ts
index dc8d62817..72d94c82f 100644
--- a/apps/api/src/task/controllers/create-task.ts
+++ b/apps/api/src/task/controllers/create-task.ts
@@ -14,17 +14,17 @@ async function getNextTaskNumber(projectId: string) {
async function createTask(body: {
projectId: string;
- userEmail: string;
- title: string;
- status: string;
+ userEmail: string | null;
+ title: string | null;
+ status: string | null;
dueDate: Date | null;
- description: string;
- priority: string;
+ description: string | null;
+ priority: string | null;
}) {
const [assignee] = await db
.select({ name: userTable.name })
.from(userTable)
- .where(eq(userTable.email, body.userEmail));
+ .where(eq(userTable.email, body.userEmail ?? ""));
const nextTaskNumber = await getNextTaskNumber(body.projectId);
@@ -32,6 +32,12 @@ async function createTask(body: {
.insert(taskTable)
.values({
...body,
+ userEmail: body.userEmail ?? "",
+ title: body.title ?? "",
+ status: body.status ?? "",
+ dueDate: body.dueDate ?? new Date(),
+ description: body.description ?? "",
+ priority: body.priority ?? "",
number: nextTaskNumber + 1,
})
.returning();
diff --git a/apps/api/src/task/controllers/update-task.ts b/apps/api/src/task/controllers/update-task.ts
index 9ee8a789b..d57a936c9 100644
--- a/apps/api/src/task/controllers/update-task.ts
+++ b/apps/api/src/task/controllers/update-task.ts
@@ -6,7 +6,7 @@ async function updateTask(
taskId: string,
body: {
projectId: string;
- assigneeId: string | null;
+ userEmail: string;
title: string;
status: string;
dueDate: Date | null;
@@ -33,6 +33,7 @@ async function updateTask(
status: body.status,
dueDate: new Date(body.dueDate ?? ""),
priority: body.priority,
+ userEmail: body.userEmail,
})
.where(eq(taskTable.id, taskId))
.returning();
diff --git a/apps/api/src/task/index.ts b/apps/api/src/task/index.ts
index 7be54fef2..5d8fefa83 100644
--- a/apps/api/src/task/index.ts
+++ b/apps/api/src/task/index.ts
@@ -40,23 +40,25 @@ const task = new Elysia({ prefix: "/task" })
}),
},
)
- .put("/:taskId/update", async ({ params, body }) => {
- const updatedTask = await updateTask(
- params.taskId,
- // TODO: Fix this casting
- body as {
- projectId: string;
- assigneeId: string | null;
- title: string;
- status: string;
- dueDate: Date | null;
- description: string;
- priority: string;
- },
- );
+ .put(
+ "/:taskId/update",
+ async ({ params, body }) => {
+ const updatedTask = await updateTask(params.taskId, body);
- return updatedTask;
- })
+ return updatedTask;
+ },
+ {
+ body: t.Object({
+ projectId: t.String(),
+ userEmail: t.String(),
+ title: t.String(),
+ status: t.String(),
+ dueDate: t.Date(),
+ description: t.String(),
+ priority: t.String(),
+ }),
+ },
+ )
.ws("/ws/:projectId", {
async open(ws) {
const projectId = ws.data.params.projectId;
diff --git a/apps/web/src/components/kanban-board/task-card.tsx b/apps/web/src/components/kanban-board/task-card.tsx
index d73eb7799..081c5ec06 100644
--- a/apps/web/src/components/kanban-board/task-card.tsx
+++ b/apps/web/src/components/kanban-board/task-card.tsx
@@ -73,13 +73,13 @@ function TaskCard({ task }: TaskCardProps) {
</div>
<div className="flex items-center gap-2 mt-auto">
- {task.assigneeName ? (
+ {task.userEmail ? (
<div
className="flex items-center gap-1.5 px-2 py-1 rounded-md bg-zinc-100/50 dark:bg-zinc-800/50 group-hover:bg-zinc-100 dark:group-hover:bg-zinc-800/80 transition-colors"
- title={task.assigneeName}
+ title={task.userEmail}
>
<span className="text-xs text-zinc-600 dark:text-zinc-400 truncate max-w-[100px]">
- {task.assigneeName}
+ {task.userEmail}
</span>
</div>
) : (
diff --git a/apps/web/src/components/task/create-task-modal.tsx b/apps/web/src/components/task/create-task-modal.tsx
index 1b0aa4be8..4873ee43f 100644
--- a/apps/web/src/components/task/create-task-modal.tsx
+++ b/apps/web/src/components/task/create-task-modal.tsx
@@ -77,7 +77,10 @@ export function CreateTaskModal({
(col) => col.id === newTask.status,
);
if (targetColumn) {
- targetColumn.tasks.push(newTask);
+ targetColumn.tasks.push({
+ ...newTask,
+ userEmail: data.email,
+ });
}
});
diff --git a/apps/web/src/components/task/task-description.tsx b/apps/web/src/components/task/task-description.tsx
index c7f86518e..fdac4844c 100644
--- a/apps/web/src/components/task/task-description.tsx
+++ b/apps/web/src/components/task/task-description.tsx
@@ -32,7 +32,11 @@ function TaskDescription({ setIsSaving }: TaskDescriptionProps) {
await updateTask({
...task,
description: value,
- assigneeName: task.userEmail || "",
+ userEmail: task.userEmail || "",
+ title: task.title || "",
+ status: task.status || "",
+ dueDate: task.dueDate || new Date(),
+ priority: task.priority || "",
});
setIsSaving(false);
}, 1000);
diff --git a/apps/web/src/components/task/task-info.tsx b/apps/web/src/components/task/task-info.tsx
index 54ffecfdb..aad4bdb8d 100644
--- a/apps/web/src/components/task/task-info.tsx
+++ b/apps/web/src/components/task/task-info.tsx
@@ -13,7 +13,7 @@ import TaskCalendar from "./task-calendar";
export const taskInfoSchema = z.object({
status: z.string(),
- assigneeName: z.string(),
+ userEmail: z.string(),
priority: z.string(),
dueDate: z.date(),
});
@@ -30,7 +30,7 @@ function TaskInfo({
const form = useForm<z.infer<typeof taskInfoSchema>>({
values: {
status: task?.status || "",
- assigneeName: task?.userEmail || "",
+ userEmail: task?.userEmail || "",
priority: task?.priority || "",
dueDate: task?.dueDate || new Date(),
},
@@ -44,7 +44,10 @@ function TaskInfo({
setIsSaving(true);
await updateTask({
...task,
- ...data,
+ userEmail: data.userEmail,
+ status: data.status || "",
+ priority: data.priority || "",
+ dueDate: data.dueDate || new Date(),
});
setIsSaving(false);
};
@@ -56,7 +59,7 @@ function TaskInfo({
}, [form]);
return (
- <div className="w-full md:w-80 flex-shrink-0 overflow-y-auto border-b border-zinc-200 dark:border-zinc-800 p-4 gap-4 flex flex-col">
+ <div className="w-full md:w-96 flex-shrink-0 overflow-y-auto border-b border-zinc-200 dark:border-zinc-800 p-4 gap-4 border-l flex flex-col">
<Form {...form}>
<FormField
control={form.control}
@@ -84,7 +87,7 @@ function TaskInfo({
<FormField
control={form.control}
- name="assigneeName"
+ name="userEmail"
render={({ field }) => (
<FormItem>
<FormLabel>Assign to</FormLabel>
@@ -93,7 +96,7 @@ function TaskInfo({
placeholder="Assign to"
onChange={(value) => {
field.onChange(value);
- handleChange({ ...form.getValues(), assigneeName: value });
+ handleChange({ ...form.getValues(), userEmail: value });
}}
options={[
{
diff --git a/apps/web/src/components/task/task-title.tsx b/apps/web/src/components/task/task-title.tsx
index ca42df9ab..eb10632a5 100644
--- a/apps/web/src/components/task/task-title.tsx
+++ b/apps/web/src/components/task/task-title.tsx
@@ -29,7 +29,10 @@ function TaskTitle({
await updateTask({
...task,
title: value,
- assigneeName: task.userEmail || "",
+ userEmail: task.userEmail || "",
+ status: task.status || "",
+ dueDate: task.dueDate || new Date(),
+ priority: task.priority || "",
});
setIsSaving(false);
}, 1000);
diff --git a/apps/web/src/fetchers/task/update-task.ts b/apps/web/src/fetchers/task/update-task.ts
index 7c31d5c53..953f30509 100644
--- a/apps/web/src/fetchers/task/update-task.ts
+++ b/apps/web/src/fetchers/task/update-task.ts
@@ -2,7 +2,15 @@ import type { Task } from "@/types/project";
import { api } from "@kaneo/libs";
async function updateTask(taskId: string, task: Task) {
- const response = await api.task({ taskId }).update.put(task);
+ const response = await api.task({ taskId }).update.put({
+ userEmail: task.userEmail,
+ title: task.title,
+ description: task.description || "",
+ status: task.status,
+ projectId: task.projectId,
+ priority: task.priority || "",
+ dueDate: task.dueDate || new Date(),
+ });
if (response.status !== 200) {
throw new Error("Failed to update task");
diff --git a/apps/web/src/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId.tsx b/apps/web/src/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId.tsx
index 87033efb9..2d62592c3 100644
--- a/apps/web/src/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId.tsx
+++ b/apps/web/src/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId.tsx
@@ -68,9 +68,9 @@ function TaskEditPage() {
</div>
</header>
- <div className="flex-1 min-h-0 md:flex-row">
+ <div className="flex-1 min-h-0 md:flex-row overflow-auto">
<div className="flex-1 min-w-0 overflow-y-auto border-r border-zinc-200 dark:border-zinc-800 flex flex-col-reverse md:flex-row">
- <div className="px-6 py-6 space-y-6">
+ <div className="px-6 py-6 space-y-6 flex-1">
<div className="space-y-8">
<TaskDescription setIsSaving={setIsSaving} />
diff --git a/apps/web/src/types/project/index.ts b/apps/web/src/types/project/index.ts
index fab031a6c..27a11b1f2 100644
--- a/apps/web/src/types/project/index.ts
+++ b/apps/web/src/types/project/index.ts
@@ -19,11 +19,10 @@ export type Task = {
number: number | null;
description: string | null;
projectId: string;
- userEmail: string | null;
+ userEmail: string;
title: string;
status: string;
dueDate: Date | null;
priority: string | null;
- assigneeName: string;
projectSlug?: string;
};