From 1c6895e441773f42fbefe4baaacc01c67fec0932 Mon Sep 17 00:00:00 2001
From: MartinBraquet <martin.braquet@gmail.com>
Date: Sat, 2 Aug 2025 02:37:39 +0200
Subject: [PATCH] Fix typing

---
 app/components/dropdown.tsx     | 12 +++++++-----
 app/profiles/ProfileFilters.tsx | 26 ++++++++++++++++----------
 app/profiles/page.tsx           | 10 ++++++++--
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/app/components/dropdown.tsx b/app/components/dropdown.tsx
index 18a70c4c..becae39c 100644
--- a/app/components/dropdown.tsx
+++ b/app/components/dropdown.tsx
@@ -1,13 +1,15 @@
 'use client';
 
+import {FilterKey} from "@/app/profiles/page";
+
 type DropdownProps = {
-  id: string
+  id: FilterKey
   options?: string[]
   value: string
-  onChange: (id: string, value: string) => void
-  onFocus?: (id: string) => void
-  onKeyDown?: (id: string, key: string) => void
-  onClick: (id: string) => void
+  onChange: (id: FilterKey, value: string) => void
+  onFocus?: (id: FilterKey) => void
+  onKeyDown?: (id: FilterKey, key: string) => void
+  onClick: (id: FilterKey) => void
 }
 
 export default function Dropdown(
diff --git a/app/profiles/ProfileFilters.tsx b/app/profiles/ProfileFilters.tsx
index 2b88c4da..86e3a499 100644
--- a/app/profiles/ProfileFilters.tsx
+++ b/app/profiles/ProfileFilters.tsx
@@ -3,6 +3,7 @@
 import {useEffect, useRef, useState} from 'react';
 import {Gender} from "@prisma/client";
 import Dropdown from "@/app/components/dropdown";
+import {FilterKey} from "@/app/profiles/page";
 
 interface FilterProps {
   filters: {
@@ -16,21 +17,26 @@ interface FilterProps {
   };
   onFilterChange: (key: string, value: any) => void;
   onShowFilters: (value: boolean) => void;
-  onToggleFilter: (key: string, value: string) => void;
+  onToggleFilter: (key: FilterKey, value: string) => void;
   onReset: () => void;
 }
 
-export const dropdownConfig = [
+export const dropdownConfig: { id: FilterKey, name: string }[] = [
   {id: "connections", name: "Desired Connections"},
   {id: "interests", name: "Core Interests"},
   {id: "causeAreas", name: "Cause Areas"},
 ]
 
 export function ProfileFilters({filters, onFilterChange, onShowFilters, onToggleFilter, onReset}: FilterProps) {
+  interface Item {
+    id: FilterKey;
+    name: string;
+  }
+
   const [showFilters, setShowFilters] = useState(true);
 
   const dropDownStates = Object.fromEntries(dropdownConfig.map(({id}) => {
-    const [all, setAll] = useState<{ id: string, name: string }[]>([]);
+    const [all, setAll] = useState<Item[]>([]);
     const [selected, setSelected] = useState<Set<string>>(new Set());
     const [newValue, setNewValue] = useState('');
     const ref = useRef<HTMLDivElement>(null);
@@ -51,7 +57,7 @@ export function ProfileFilters({filters, onFilterChange, onShowFilters, onToggle
       try {
         const res = await fetch('/api/interests');
         if (res.ok) {
-          const data = await res.json();
+          const data = await res.json() as Record<string, Item[]>;
           console.log(data);
           for (const [id, values] of Object.entries(data)) {
             dropDownStates[id].options.set(values);
@@ -86,7 +92,7 @@ export function ProfileFilters({filters, onFilterChange, onShowFilters, onToggle
   }, []);
 
 
-  const toggle = (id: string, optionId: string) => {
+  const toggle = (id: FilterKey, optionId: string) => {
     dropDownStates[id].selected.set(prev => {
       const newSet = new Set(prev);
       if (newSet.has(optionId)) {
@@ -98,24 +104,24 @@ export function ProfileFilters({filters, onFilterChange, onShowFilters, onToggle
     });
   };
 
-  const handleKeyDown = (id: string, key: string) => {
+  const handleKeyDown = (id: FilterKey, key: string) => {
     if (key === 'Escape') dropDownStates[id].show.set(false);
   };
 
-  const handleChange = (id: string, e: string) => {
+  const handleChange = (id: FilterKey, e: string) => {
     dropDownStates[id].new.set(e);
   }
 
-  const handleFocus = (id: string) => {
+  const handleFocus = (id: FilterKey) => {
     dropDownStates[id].show.set(true);
   }
 
-  const handleClick = (id: string) => {
+  const handleClick = (id: FilterKey) => {
     const shown = dropDownStates[id].show.value;
     dropDownStates[id].show.set(!shown);
   }
 
-  function getDrowDown(id: string, name: string) {
+  function getDrowDown(id: FilterKey, name: string) {
 
     return (
       <div key={id + '.div'}>
diff --git a/app/profiles/page.tsx b/app/profiles/page.tsx
index b5481e36..d81408ef 100644
--- a/app/profiles/page.tsx
+++ b/app/profiles/page.tsx
@@ -21,6 +21,9 @@ const initialState = {
   searchQuery: '',
 };
 
+export type FilterKey = 'interests' | 'causeAreas' | 'connections';
+type FilterKeyNonArray = 'gender' | 'minAge' | 'maxAge' | 'searchQuery';
+
 export default function ProfilePage() {
   const [profiles, setProfiles] = useState<ProfileData[]>([]);
   const [loading, setLoading] = useState(true);
@@ -53,7 +56,10 @@ export default function ProfilePage() {
 
           for (let i = 0; i < dropdownConfig.length; i++) {
             const v = dropdownConfig[i];
-            if (filters[v.id].length > 0) params.append(v.id, filters[v.id].join(','))
+            const filterKey = v.id as FilterKey;
+            if (filters[filterKey] && filters[filterKey].length > 0) {
+              params.append(v.id, filters[filterKey].join(','));
+            }
           }
 
           if (filters.searchQuery) params.append('search', filters.searchQuery);
@@ -113,7 +119,7 @@ export default function ProfilePage() {
     setShowFilters(value);
   };
 
-  const toggleFilter = (key: string, value: string) => {
+  const toggleFilter = (key: FilterKey, value: string) => {
     setFilters(prev => ({
       ...prev,
       [key]: prev[key].includes(value)