From 1742a3587a543555340e49086757abf1808a471f Mon Sep 17 00:00:00 2001 From: Ida Marie Andreassen Date: Tue, 30 Jul 2024 14:47:44 +0200 Subject: [PATCH 1/2] Fix: now you cant change project name if it is an internal project --- .../[organisation]/prosjekt/[project]/page.tsx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/[organisation]/prosjekt/[project]/page.tsx b/frontend/src/app/[organisation]/prosjekt/[project]/page.tsx index af8f4989..f3d5a823 100644 --- a/frontend/src/app/[organisation]/prosjekt/[project]/page.tsx +++ b/frontend/src/app/[organisation]/prosjekt/[project]/page.tsx @@ -39,6 +39,8 @@ export default async function Project({ }${weekSpan ? `${selectedWeek ? "&" : "?"}WeekSpan=${weekSpan}` : ""}`, )) ?? []; + const isInternalProject = project?.customerName === "Variant"; + if (project) { return (
- + {isInternalProject ? ( +

{project.projectName}

+ ) : ( + + )} +

{project.customerName}

From f97e3b5f22dab19482ce0e5d457624a387cf27b4 Mon Sep 17 00:00:00 2001 From: Ida Marie Andreassen Date: Tue, 30 Jul 2024 14:48:01 +0200 Subject: [PATCH 2/2] Fix: add styling for firefox --- frontend/src/components/EditEngagementName.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/EditEngagementName.tsx b/frontend/src/components/EditEngagementName.tsx index d9b6acf6..777f0e25 100644 --- a/frontend/src/components/EditEngagementName.tsx +++ b/frontend/src/components/EditEngagementName.tsx @@ -78,8 +78,10 @@ export default function EditEngagementName({ setNewEngagementName(e.target.value); setInputIsInvalid(false); }} - className={`h1 w-full px-2 ${ - inputIsInvalid ? " text-error focus:outline-error" : "" + className={`h1 w-full px-2 rounded ${ + inputIsInvalid + ? " text-error focus:outline-error focus:outline focus:outline-2" + : "" }`} autoFocus onBlur={() => {