Only show years with found events

ingef · May 28, 2024 · ef1dae0 · ef1dae0
1 parent c0eb3ab
commit ef1dae0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git 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
@@ -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 (
             <Quarter