Fix filters

Author: hasparus

src/app/conf/2025/schedule/_components/schedule-list.tsx

@@ -17,6 +17,11 @@ import {
   ResetFiltersButton,
 } from "./filters"
 
+export interface FiltersConfig
+  extends Partial<
+    Record<keyof ScheduleSession /* key */, string /* label */>
+  > {}
+
 function getSessionsByDay(
   scheduleData: ScheduleSession[],
   filterStates: FilterStates,
@@ -27,7 +32,8 @@ function getSessionsByDay(
 
   const states = Object.entries<FilterStates[keyof FilterStates]>(filterStates)
   const concurrentSessions: ConcurrentSessions = {}
-  for (const session of filteredSortedSchedule) {
+
+  filteredSortedSchedule.forEach(session => {
     for (const [property, filterState] of states) {
       if (
         filterState &&
@@ -36,11 +42,11 @@ function getSessionsByDay(
           session[property as keyof ScheduleSession] as string,
         )
       ) {
-        continue
+        return
       }
     }
     ;(concurrentSessions[session.event_start] ||= []).push(session)
-  }
+  })
 
   const sessionsByDay: ScheduleSessionsByDay = {}
   Object.entries(concurrentSessions).forEach(([date, sessions]) => {
@@ -59,23 +65,21 @@ function getSessionsByDay(
   return sessionsByDay
 }
 
-interface Props {
-  showEventType?: boolean
+export interface ScheduleListProps {
   showFilter?: boolean
   scheduleData: ScheduleSession[]
   year: `202${number}`
   eventsColors: Record<string, string>
-  filterFields: Partial<Record<keyof ScheduleSession, string /* label */>>
+  filterFields: FiltersConfig
 }
 
 export function ScheduleList({
-  showEventType,
   showFilter = true,
   scheduleData,
   year,
   eventsColors,
   filterFields,
-}: Props): ReactElement {
+}: ScheduleListProps): ReactElement {
   const [filtersState, setFiltersState] = useState<FilterStates>(() =>
     FilterStates.initial(
       Object.keys(filterFields) as (keyof ScheduleSession)[],
@@ -165,7 +169,6 @@ export function ScheduleList({
                             <ScheduleSessionCard
                               key={session.id}
                               session={session}
-                              showEventType={showEventType}
                               year={year}
                               eventsColors={eventsColors}
                             />

src/app/conf/2025/schedule/_components/schedule-session-card.tsx

@@ -14,16 +14,14 @@ function isString(x: unknown): x is string {
 
 export function ScheduleSessionCard({
   session,
-  showEventType,
   year,
   eventsColors,
 }: {
   session: ScheduleSession
-  showEventType: boolean | undefined
   year: `202${number}`
   eventsColors: Record<string, string>
 }) {
-  const eventType = session.event_type
+  let eventType = session.event_type
 
   const speakers = session.speakers
     ? isString(session.speakers)
@@ -38,11 +36,12 @@ export function ScheduleSessionCard({
     speakers.map(s => s.name),
   )
 
+  if (eventType === eventTitle) eventType = ""
+
   const eventColor = eventsColors[session.event_type]
 
   return session.event_type === "Breaks" ? (
     <div className="flex size-full items-center bg-neu-0 px-4 py-2 font-normal">
-      {showEventType ? eventType + " / " : ""}
       {eventTitle}
     </div>
   ) : (
@@ -63,7 +62,6 @@ export function ScheduleSessionCard({
           </Tag>
         )}
         <span className="flex h-full flex-col justify-between gap-y-2">
-          {showEventType ? eventType + " / " : ""}
           <span className="typography-body-md">{eventTitle}</span>
           <span className="flex flex-col">
             {(speakers?.length || 0) > 0 && (

src/app/conf/2025/schedule/page.tsx

@@ -1,8 +1,7 @@
 import { Metadata } from "next"
 
 import { schedule } from "../_data"
-import { ScheduleList } from "./_components/schedule-list"
-import { filterCategories2024 } from "./_components/filter-categories"
+import { ScheduleList, FiltersConfig } from "./_components/schedule-list"
 import { eventsColors, HERO_MARQUEE_ITEMS } from "../utils"
 import { Button } from "../../_design-system/button"
 import { GET_TICKETS_LINK } from "../links"
@@ -13,6 +12,12 @@ import { FAQ } from "../faq"
 
 const year = "2025"
 
+const FILTERS: FiltersConfig = {
+  event_type: "Session Format",
+  event_subtype: "Talk Category",
+  company: "Audience",
+}
+
 export const metadata: Metadata = {
   title: "Schedule",
 }
@@ -33,11 +38,7 @@ export default function SchedulePage() {
           eventsColors={eventsColors}
           year={year}
           scheduleData={schedule}
-          filterFields={{
-            event_subtype: "Talk Category",
-            event_type: "Session Format",
-            company: "Audience",
-          }}
+          filterFields={FILTERS}
         />
       </div>
       <div className="gql-conf-navbar-strip border-t border-neu-200 bg-neu-0 py-8 text-neu-900 before:bg-white/40 dark:border-neu-100 before:dark:bg-blk/30 xl:py-16">

src/app/conf/2025/utils.ts

@@ -36,6 +36,10 @@ export function getEventTitle(
     return name
   }
 
+  if (name.startsWith("Keynote: ")) {
+    name = name.slice(8)
+  }
+
   speakers?.forEach(speaker => {
     const speakerInTitle = name.indexOf(`- ${speaker.replace("ı", "i")}`)
     if (speakerInTitle > -1) {