From 8b198d9719930cc4937831cee30b207816829c96 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Fri, 28 Mar 2025 09:32:34 +0000 Subject: [PATCH] fix: Fixed openingHours util function as tests were failing Approved-by: Anton Gunnarsson --- apps/scandic-web/components/OpeningHours/utils.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/scandic-web/components/OpeningHours/utils.ts b/apps/scandic-web/components/OpeningHours/utils.ts index ced787107..d0e8ce097 100644 --- a/apps/scandic-web/components/OpeningHours/utils.ts +++ b/apps/scandic-web/components/OpeningHours/utils.ts @@ -45,10 +45,12 @@ export function getGroupedOpeningHours( let rangeWeekdays: string[] = [] let rangeValue = "" + for (let i = 0, n = weekdayDefinitions.length; i < n; ++i) { const weekdayDefinition = weekdayDefinitions[i] const weekday = openingHours[weekdayDefinition.key] const label = weekdayDefinition.label + if (weekday) { let newValue = null @@ -77,11 +79,14 @@ export function getGroupedOpeningHours( rangeWeekdays = [label] } } - if (rangeValue && i === n - 1) { // Flush everything at the end groupedOpeningHours.push(`${rangeWeekdays.join("-")}: ${rangeValue}`) } + } else if (rangeValue) { + groupedOpeningHours.push(`${rangeWeekdays.join("-")}: ${rangeValue}`) + rangeValue = "" + rangeWeekdays = [] } } return groupedOpeningHours