Skip to content

feat: speaker filter and sessiontype filter for agenda component #595

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.

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
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
102 changes: 92 additions & 10 deletions components/Agenda/agenda.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,103 @@
import React from "react";
import React, { useState, useEffect } from 'react';
import Heading from "../Typography/heading";
import Paragraph from "../Typography/paragraph";
import Image from "next/image";

function Agenda({ city }) {
return (
<div className="" data-test="agenda-com">
<div className="flex flex-col justify-center items-center">
{!city.agenda ? (
const [selectedSpeaker, setSelectedSpeaker] = useState(null);
const [selectedType, setSelectedType] = useState('');
const [filteredSpeakers, setFilteredSpeakers] = useState([]);
const [filteredTypes, setFilteredTypes] = useState([]);

useEffect(() => {
if (!city.agenda) return;

if (selectedType) {
const speakersForType = city.agenda
.filter((talk) =>
talk.type === selectedType && talk.speaker !== undefined
)
.flatMap((talk) => (Array.isArray(talk.speaker) ? talk.speaker : [talk.speaker]));
const uniqueSpeakers = [...new Set(speakersForType)];
setFilteredSpeakers(uniqueSpeakers);
} else {
setFilteredSpeakers(city.speakers.map((s, index) => index + 1));
}

if (selectedSpeaker) {
const typesForSpeaker = city.agenda
.filter((talk) =>
Array.isArray(talk.speaker) ? talk.speaker.includes(selectedSpeaker) : talk.speaker === selectedSpeaker
)
.map((talk) => talk.type);

setFilteredTypes([...new Set(typesForSpeaker)]);
} else {
setFilteredTypes([...new Set(city.agenda.map((talk) => talk.type))]);
}
}, [selectedSpeaker, selectedType, city.agenda, city.speakers]);

if (!city.agenda) {
return (
<div className="" data-test="agenda-com">
<div className="flex flex-col justify-center items-center">
<div className="w-[720px] lg:w-full mt-[10px] text-center">
<Heading typeStyle="lg" className="text-white text-[30px]">
Agenda Coming Soon - Stay Tuned!
</Heading>
</div>
) : (
<Heading className="text-[30px] text-white">Agenda</Heading>
)}
</div>
</div>
);
}

const filteredAgenda = city.agenda.filter((talk) => {
const matchesSpeaker = selectedSpeaker
? Array.isArray(talk.speaker) ? talk.speaker.includes(selectedSpeaker) : talk.speaker === selectedSpeaker : true;
const matchesType = selectedType ? talk.type === selectedType : true;
return matchesSpeaker && matchesType;
});

return (
<div className="" data-test="agenda-com">
<div className="flex flex-col justify-center items-center">
<Heading className="text-[30px] text-white">Agenda</Heading>
</div>

{/* filters */}
<div className="flex justify-center mt-6 gap-4">
{/* Speaker Filter Dropdown */}
<select
data-test="speaker-dropdown"
className="p-2 rounded-md bg-transparent border border-white text-white"
onChange={(e) => setSelectedSpeaker(e.target.value ? parseInt(e.target.value) : null)}
value={selectedSpeaker || ""}
>
<option value="" className='bg-[#1B1130]'>All Speakers</option>
{filteredSpeakers.map((speakerId) => (
<option key={speakerId} value={speakerId} className='bg-[#1B1130]'>
{city.speakers[speakerId - 1].name}
</option>
))}
</select>

{/* Session Type Filter Dropdown */}
<select
data-test="type-dropdown"
className="p-2 rounded-md bg-transparent border border-white text-white"
onChange={(e) => setSelectedType(e.target.value)}
value={selectedType}
>
<option value="" className='bg-[#1B1130]'>All Session Types</option>
{filteredTypes.map((type, index) => (
<option key={index} value={type} className='bg-[#1B1130]'>
{type}
</option>
))}
</select>
</div>

{city.agenda && (
{filteredAgenda.length > 0 ? (
<div className="mt-[40px]">
<Heading
typeStyle="heading-md"
Expand All @@ -29,7 +108,7 @@ function Agenda({ city }) {
</Heading>

<div className="mt-[40px]">
{city.agenda.map((talk) => {
{filteredAgenda.map((talk) => {
return (
<div
key={talk.time}
Expand Down Expand Up @@ -111,6 +190,9 @@ function Agenda({ city }) {
})}
</div>
</div>
)
: (
<div className="text-center text-white mt-10">No agenda items found for the selected criteria.</div>
)}
</div>
);
Expand Down
20 changes: 20 additions & 0 deletions cypress/e2e/Venue.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,33 @@ it("should render guideline if cfp is open, and agenda otherwise",()=>{
}
else{
cy.getTestData("agenda-com").should("be.visible");
it('should display and allow interaction with the speaker and type dropdowns', () => {
// Check if the Speaker dropdown is visible and clickable
cy.get('[data-test="speaker-dropdown"]')
.should('be.visible')
.click();

// Close the dropdown after clicking
cy.get('[data-test="speaker-dropdown"]').blur();

// Check if the Type dropdown is visible and clickable
cy.get('[data-test="type-dropdown"]')
.should('be.visible')
.click();

// Close the dropdown after clicking
cy.get('[data-test="type-dropdown"]').blur();
});

}
});

})

});



// disbale this test file for now

// it("Should contain logos in Sponsor component", () => {
Expand Down