Skip to content

Optimize upcoming events list grouping #16499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Optimize upcoming events list grouping #16499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 46 additions & 26 deletions src/components/UpcomingEventsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"use client"

import { useEffect, useState } from "react"
import { groupBy } from "lodash"
import { useLocale } from "next-intl"

import type { CommunityConference, Lang } from "@/lib/types"
Expand All @@ -23,7 +22,15 @@ const UpcomingEventsList = () => {
const { t } = useTranslation("page-community")
const monthsPerLoad = 2

const [monthGroupedEvents, setMonthGroupedEvents] = useState({})
type FormattedCommunityEvent = CommunityConference & {
date: string
formattedDetails: string
}

type MonthGroupedEvents = Record<string, Array<FormattedCommunityEvent>>

const [monthGroupedEvents, setMonthGroupedEvents] =
useState<MonthGroupedEvents>({})
const [maxRange, setMaxRange] = useState<number>(monthsPerLoad)

// Create Date object from each YYYY-MM-DD JSON date string
Expand Down Expand Up @@ -53,31 +60,44 @@ const UpcomingEventsList = () => {
)

// Add formatted string to display
const formattedEvents = orderedEvents.map((event) => {
const getDate = (date) =>
getLocaleTimestamp(locale! as Lang, dateParse(date).toString(), {})

const dateRange =
event.startDate === event.endDate
? getDate(event.startDate)
: `${getDate(event.startDate)} - ${getDate(event.endDate)}`

const details = `${event.description}`

return {
...event,
date: dateRange,
formattedDetails: details,
const formattedEvents: Array<FormattedCommunityEvent> = orderedEvents.map(
(event) => {
const getDate = (date) =>
getLocaleTimestamp(locale! as Lang, dateParse(date).toString(), {})

const dateRange =
event.startDate === event.endDate
? getDate(event.startDate)
: `${getDate(event.startDate)} - ${getDate(event.endDate)}`

const details = `${event.description}`

return {
...event,
date: dateRange,
formattedDetails: details,
}
}
})
const groupedEvents = groupBy(formattedEvents, ({ startDate }) => {
const start = new Date(startDate.replace(/-/g, "/"))
const formatYearMonth = new Intl.DateTimeFormat(locale, {
month: "short",
year: "numeric",
}).format(start)
return `${formatYearMonth}`
})
)

const groupedEvents = formattedEvents.reduce<MonthGroupedEvents>(
(acc, event) => {
const start = new Date(event.startDate.replace(/-/g, "/"))
const formatYearMonth = new Intl.DateTimeFormat(locale, {
month: "short",
year: "numeric",
}).format(start)
const key = `${formatYearMonth}`

if (!acc[key]) {
acc[key] = []
}

acc[key].push(event)
return acc
Comment on lines +90 to +97
Copy link
Member

@wackerow wackerow Oct 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree with comment..

`${}`

^ Redundant pattern, but we then don't need to assign to const key either

Suggested change
const key = `${formatYearMonth}`
if (!acc[key]) {
acc[key] = []
}
acc[key].push(event)
return acc
if (!acc[formatYearMonth]) {
acc[formatYearMonth] = []
}
acc[formatYearMonth].push(event)
return acc

or, just name formatYearMonth key instead

},
{}
)

setMonthGroupedEvents(groupedEvents)
}, [locale])
Expand Down