Skip to content

Fixed a bug where past events don't show if the current year does not have events #166

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

Open
SithuSoe04 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixed a bug where past events don't show if the current year does not have events #166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ed57e5
remove filter buttons when no events
May 30, 2024
f23a8a8
Fixed bug where past events don't show if the current year does not h…
SithuSoe04 May 31, 2024
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
10 changes: 5 additions & 5 deletions frontend/src/components/Events/Events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ const Events = () => {
if (type === 'past' && selectedYear !== null) {
// If a year filter is applied, use the filtered past events
filteredEvents = pastEvents.filter(event => new Date(event.end_time).getFullYear() === selectedYear);

}

if (type === 'upcoming') {
Expand Down Expand Up @@ -135,8 +134,6 @@ const Events = () => {
const years = Array.from(new Set(data.map((event: EventData) => new Date(event.end_time).getFullYear())))
.sort((a, b) => (b as number) - (a as number)); // Explicit type casting for 'a' and 'b'
setPastEventYears(years as number[]);


paginate(data, 1, totalPagesPast, 'past');
} catch (error) {
console.error('Error fetching past events:', error);
Expand All @@ -156,7 +153,7 @@ const Events = () => {
fetchData();
}, [selectedYear, selectedMonth, totalPagesUpcoming, totalPagesPast, setTotalPagesUpcoming, setTotalPagesPast]);


const handleThisWeekClick = () => {
if (isThisWeekClicked) {
setDisplayedFutureEvents(upcomingEvents);
Expand Down Expand Up @@ -216,6 +213,9 @@ const Events = () => {

if (selectedYear !== null) {
const filteredPastEvents = filterEventsByYear(selectedYear, pastEvents);
if (filteredPastEvents.length === 0 && pastEventYears.length > 0) {
setSelectedYear((currentYear) => currentYear === null ? null : currentYear = currentYear - 1);
}
setDisplayedPastEvents(filteredPastEvents);
setFilteredTotalPagesPast(Math.ceil(filteredPastEvents.length / eventsPerPage));
paginate(filteredPastEvents, 1, totalPagesPast, 'past');
Expand Down Expand Up @@ -314,7 +314,7 @@ const Events = () => {
)}

{/* Buttons for filtering events */}
{displayedFutureEvents.length >= 0 && (
{displayedFutureEvents.length > 0 && (
<Grid item container mb={3} ml={4} justifyContent="flex-start">
<Button
size="medium"
Expand Down