From ef1dae09858912fb489b52352312eb0892633077 Mon Sep 17 00:00:00 2001 From: Kai Rollmann Date: Tue, 28 May 2024 13:42:36 +0200 Subject: [PATCH] Only show years with found events --- frontend/src/js/entity-history/Timeline.tsx | 12 ++++++++---- frontend/src/js/entity-history/timeline/Year.tsx | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/frontend/src/js/entity-history/Timeline.tsx b/frontend/src/js/entity-history/Timeline.tsx index 6699a1a0ec..9c40408379 100644 --- a/frontend/src/js/entity-history/Timeline.tsx +++ b/frontend/src/js/entity-history/Timeline.tsx @@ -338,8 +338,8 @@ const groupByQuarter = ( } // Filter concepts by searchTerm - const filteredSortedEvents = sortedEvents.map( - ({ year, quarterwiseData }) => ({ + const filteredSortedEvents = sortedEvents + .map(({ year, quarterwiseData }) => ({ year, quarterwiseData: !searchTerm ? quarterwiseData @@ -367,8 +367,12 @@ const groupByQuarter = ( }); }), })), - }), - ); + })) + .filter((year) => + !searchTerm + ? year + : year.quarterwiseData.some(({ events }) => events.length > 0), + ); console.log(filteredSortedEvents); diff --git a/frontend/src/js/entity-history/timeline/Year.tsx b/frontend/src/js/entity-history/timeline/Year.tsx index 8e3b12a022..72aaf5359f 100644 --- a/frontend/src/js/entity-history/timeline/Year.tsx +++ b/frontend/src/js/entity-history/timeline/Year.tsx @@ -52,9 +52,9 @@ const Year = ({ sourceColumn: ColumnDescription; timeStratifiedInfos: TimeStratifiedInfo[]; }) => { - const { searchVisible } = useTimelineSearch(); + const { searchTerm } = useTimelineSearch(); - const isYearOpen = searchVisible || getIsOpen(year); + const isYearOpen = !!searchTerm || getIsOpen(year); const totalEvents = quarterwiseData.reduce( (all, data) => all + data.groupedEvents.reduce((s, evts) => s + evts.length, 0), @@ -76,7 +76,7 @@ const Year = ({ (s, evts) => s + evts.length, 0, ); - const isQuarterOpen = searchVisible || getIsOpen(year, quarter); + const isQuarterOpen = !!searchTerm || getIsOpen(year, quarter); return (