diff --git a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx index 0f8eab24122165a99e1652cdc2f9f35846ca7e53..3c5b333ab0af3c513fdd7c5d10d6c6c86ad70946 100644 --- a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx +++ b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx @@ -26,7 +26,7 @@ const TimelineCard = ({ }: TimelineCardProps): JSX.Element => { const timelineUrl = Urls.timelineInCollection(timeline, collection); const menuItems = getMenuItems(timeline, collection, onUnarchive); - const eventCount = timeline.events?.length; + const eventCount = getEventCount(timeline); const hasDescription = Boolean(timeline.description); const hasMenuItems = menuItems.length > 0; const hasEventCount = !hasMenuItems && eventCount != null; @@ -58,6 +58,10 @@ const TimelineCard = ({ ); }; +const getEventCount = (timeline: Timeline) => { + return timeline.events ? timeline.events.filter(e => !e.archived).length : 0; +}; + const getMenuItems = ( timeline: Timeline, collection: Collection, diff --git a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.unit.spec.tsx b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.unit.spec.tsx index 50901b8be6c2dcc85f7bcbd60be107d9864c9e0a..c05a1292459deac69d9d808d0a6ce98d250ff92c 100644 --- a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.unit.spec.tsx +++ b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.unit.spec.tsx @@ -11,7 +11,11 @@ describe("TimelineCard", () => { it("should render timeline", () => { const props = getProps({ timeline: createMockTimeline({ - events: [createMockTimelineEvent(), createMockTimelineEvent()], + events: [ + createMockTimelineEvent(), + createMockTimelineEvent(), + createMockTimelineEvent({ archived: true }), + ], }), });