From 9ccf4dd365eab567f8cfcad9ad5ee6b9e3ffe4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Veikko=20Lintuj=C3=A4rvi?= Date: Wed, 11 Mar 2026 20:21:01 +0200 Subject: [PATCH] Add contains of version onto version item on the list --- ui/src/components/OpenHoursForm.tsx | 39 ++++++++++++++++------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/ui/src/components/OpenHoursForm.tsx b/ui/src/components/OpenHoursForm.tsx index a2d2f84..16dc9b2 100644 --- a/ui/src/components/OpenHoursForm.tsx +++ b/ui/src/components/OpenHoursForm.tsx @@ -239,18 +239,6 @@ export default function OpenHoursForm() { } }; - const tooltipText = (version: LokOpenHours) => - [ - version.name, - version.paragraph1, - version.paragraph2, - version.paragraph3, - version.paragraph4, - version.kitchenNotice, - ] - .filter(Boolean) - .join("\n"); - const nameRequired = useMemo(() => form.name.trim().length === 0, [form.name]); return ( @@ -260,8 +248,8 @@ export default function OpenHoursForm() {
@@ -283,6 +271,13 @@ export default function OpenHoursForm() { const active = version.isActive; const deleting = deletingId === versionId; const settingActive = activatingId === versionId; + const contentLines = [ + version.paragraph1, + version.paragraph2, + version.paragraph3, + version.paragraph4, + version.kitchenNotice, + ].filter((line) => line.trim().length > 0); return (
-
+

{version.name || t("home.openHours.latest")}

@@ -306,6 +301,16 @@ export default function OpenHoursForm() { )}
+ {contentLines.length > 0 && ( +
+ {contentLines.map((line, index) => ( +

+ {line} +

+ ))} +
+ )} +