From fd85056711950e15ddcf7c990f16d362ae70cc4c Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Mon, 15 Jan 2024 08:03:14 -0300 Subject: [PATCH] frontend: fix Task component --- twenty-frontend/src/js/components/Task.tsx | 7 +++++-- twenty-frontend/src/js/main/task/edit.tsx | 6 ++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/twenty-frontend/src/js/components/Task.tsx b/twenty-frontend/src/js/components/Task.tsx index e76b394..7ab08ab 100644 --- a/twenty-frontend/src/js/components/Task.tsx +++ b/twenty-frontend/src/js/components/Task.tsx @@ -1,4 +1,5 @@ -import React, { useEffect, useState } from "react"; +import React, { useEffect, useState, useContext } from "react"; +import { ParamContext } from "/Context"; import { useForm } from "react-hook-form"; import { useCreateTask } from "/hooks/mutations/useCreateTask"; import { useUpdateTask } from "/hooks/mutations/useUpdateTask"; @@ -21,7 +22,9 @@ const DEFAULT_TASK_CONTENT = [ "Add a description here....", ].join("\n"); -export function Task({ taskId }: { taskId?: number }) { +export function Task() { + const params = useContext(ParamContext); + const taskId = params.id ? parseInt(params.id) : null; const { register, handleSubmit, diff --git a/twenty-frontend/src/js/main/task/edit.tsx b/twenty-frontend/src/js/main/task/edit.tsx index f5b6a88..e8301b7 100644 --- a/twenty-frontend/src/js/main/task/edit.tsx +++ b/twenty-frontend/src/js/main/task/edit.tsx @@ -1,15 +1,13 @@ -import React, { useContext } from "react"; -import { ParamContext } from "/Context"; +import React from "react"; import ReactDOM from "react-dom/client"; import { App } from "/components/App"; import { Task } from "/components/Task"; (function () { const root = document.querySelector(".react-root")!; - const params = useContext(ParamContext); ReactDOM.createRoot(root).render( - + , ); })();