From 05545f6f886d45c198af23fd0e4a1d0ce693886b Mon Sep 17 00:00:00 2001 From: Davenludd Date: Fri, 29 Mar 2024 17:53:37 +0100 Subject: [PATCH 1/3] Minor fixes --- frontend/src/Components/DisplayUserProjects.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/Components/DisplayUserProjects.tsx b/frontend/src/Components/DisplayUserProjects.tsx index 29e4bcb..494e6b0 100644 --- a/frontend/src/Components/DisplayUserProjects.tsx +++ b/frontend/src/Components/DisplayUserProjects.tsx @@ -25,8 +25,9 @@ function DisplayUserProject(): JSX.Element { const handleProjectClick = async (projectName: string): Promise => { const token = localStorage.getItem("accessToken") ?? ""; const response = await api.checkIfProjectManager(projectName, token); + console.log(response.data); if (response.success) { - if (response.data) { + if (response.data === true) { navigate(`/PMProjectPage/${projectName}`); } else { navigate(`/project/${projectName}`); From c1f49915baff3271ded8d5b33bf8f57b52715db7 Mon Sep 17 00:00:00 2001 From: Davenludd Date: Fri, 29 Mar 2024 18:29:38 +0100 Subject: [PATCH 2/3] Refactor signReport method signature --- frontend/src/API/API.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts index 886c957..0a85e70 100644 --- a/frontend/src/API/API.ts +++ b/frontend/src/API/API.ts @@ -161,10 +161,7 @@ interface API { * @param {number} reportId The id of the report to sign * @param {string} token The authentication token */ - signReport( - reportId: number, - token: string, - ): Promise>; + signReport(reportId: number, token: string): Promise>; } /** An instance of the API */ @@ -615,5 +612,5 @@ export const api: API = { } catch (e) { return { success: false, message: "Failed to sign report" }; } - } + }, }; From 6dfa917cf0875347eefdad724e35c6f6d02af637 Mon Sep 17 00:00:00 2001 From: Davenludd Date: Tue, 2 Apr 2024 11:37:53 +0200 Subject: [PATCH 3/3] Fix in DisplayUserProjects component --- frontend/src/Components/DisplayUserProjects.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/Components/DisplayUserProjects.tsx b/frontend/src/Components/DisplayUserProjects.tsx index 494e6b0..9cc04fe 100644 --- a/frontend/src/Components/DisplayUserProjects.tsx +++ b/frontend/src/Components/DisplayUserProjects.tsx @@ -27,7 +27,10 @@ function DisplayUserProject(): JSX.Element { const response = await api.checkIfProjectManager(projectName, token); console.log(response.data); if (response.success) { - if (response.data === true) { + if ( + (response.data as unknown as { isProjectManager: boolean }) + .isProjectManager + ) { navigate(`/PMProjectPage/${projectName}`); } else { navigate(`/project/${projectName}`);