app/components/home/index.tsx

@@ -67,19 +67,12 @@ export default function Home({ user }: { user: User }) {
     isLoading,
   } = useColles(startDate);
 
-  // Fetch upcoming colles from API
-  const {
-    classColles: upcomingClassColles,
-    error: upcomingError,
-    isLoading: upcomingIsLoading,
-  } = useColles(DateTime.now());
-
   // Error handling (after all hooks)
-  if (error || upcomingError)
+  if (error)
     return (
       <Error
         title="Impossible de charger les colles"
-        message={error?.toString() || upcomingError?.toString()}
+        message={error?.toString()}
         code={500}
         description="Une erreur s'est produite lors du chargement de la liste des colles."
       />
@@ -105,14 +98,6 @@ export default function Home({ user }: { user: User }) {
     updateQuery("examiner", examiner);
     setExaminerFilter(examiner == "all" ? "" : examiner);
   };
-  const rawStudent = query.get("student");
-  const [studentFilter, setStudentFilter] = useState<string>(
-    rawStudent === "all" ? "" : rawStudent || ""
-  );
-  const setStudent = (student: string) => {
-    updateQuery("student", student);
-    setStudentFilter(student == "all" ? "" : student);
-  };
   const [sorted, setSort] = useState<string>(query.get("sort") || "desc");
   const toggleSort = () => {
     const newSort = sorted === "asc" ? "desc" : "asc";
@@ -121,29 +106,21 @@ export default function Home({ user }: { user: User }) {
   };
 
   const generateFilter = (arr: string[], value: string) => {
-    const unique = [...new Set(arr.filter(Boolean))];
+    const unique = [...new Set(arr)];
     if (value && !unique.includes(value)) {
       unique.push(value);
     }
     unique.sort((a, b) => a.localeCompare(b));
     return unique;
   };
-
-  const currentClassColles =
-    activeTab === "upcoming" ? upcomingClassColles : classColles;
-
   const subjects = generateFilter(
-    currentClassColles.map((colle) => colle.subject?.name),
+    classColles.map((colle) => colle.subject?.name),
     subjectFilter
   );
   const examiners = generateFilter(
-    currentClassColles.map((colle) => colle.examiner?.name),
+    classColles.map((colle) => colle.examiner?.name),
     examinerFilter
   );
-  const students = generateFilter(
-    upcomingClassColles.map((colle) => colle.student?.fullName),
-    studentFilter
-  );
 
   const applyFilters = (colles: any[]) => {
     return colles
@@ -156,11 +133,7 @@ export default function Home({ user }: { user: User }) {
           examinerFilter === "all" || !examinerFilter
             ? true
             : colle.examiner?.name === examinerFilter;
-        const studentMatch =
+        return subjectMatch && examinerMatch;
-          activeTab !== "upcoming" || studentFilter === "all" || !studentFilter
-            ? true
-            : colle.student?.fullName === studentFilter;
-        return subjectMatch && examinerMatch && studentMatch;
       })
       .sort((a, b) => {
         if (sorted === "asc") {
@@ -245,22 +218,6 @@ export default function Home({ user }: { user: User }) {
             </SelectContent>
           </Select>
 
-          {activeTab === "upcoming" && (
-            <Select value={studentFilter} onValueChange={setStudent}>
-              <SelectTrigger className="rounded-full data-[placeholder]:text-primary">
-                <SelectValue placeholder="Élève" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="all">Tous</SelectItem>
-                {students.map((student) => (
-                  <SelectItem key={student} value={student}>
-                    {student}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          )}
-
           <Button
             variant="outline"
             size="sm"
@@ -314,10 +271,10 @@ export default function Home({ user }: { user: User }) {
         {activeTab === "upcoming" && (
           <TabContent
             tabTitle="Toutes les colles à venir"
-            emptyCollesText="Aucune colle à venir n'a été trouvée."
+            emptyCollesText="Cette fonctionnalité est en cours de développement. Bientôt, vous verrez ici toutes les colles à venir pour votre classe."
-            isLoading={upcomingIsLoading}
+            isLoading={false}
             isSorted={sorted === "desc"}
-            colles={applyFilters(upcomingClassColles)}
+            colles={[]}
             preferences={user.preferences}
           />
         )}

app/components/settings/match-student.tsx

@@ -74,7 +74,6 @@ export function MatchStudent({
           <p>
             Correspondance trouvée: {matchedStudent.fullName}
           </p>
-          {/* TODO: Improve UI */}
           <button onClick={handleValidate}>Valider</button>
         </div>
       )}

app/lib/api.ts

@@ -203,7 +203,6 @@ interface CollePayload {
   classColles: Colle[];
   studentColles: Colle[];
   favoriteColles: Colle[];
-  upcomingClassColles: Colle[];
   healthyUntil: Date;
   lastSync: Date;
 }
@@ -239,7 +238,6 @@ export const useColles = (startDate: DateTime) => {
       classColles: [],
       studentColles: [],
       favoriteColles: [],
-      upcomingClassColles: [],
       healthyUntil: new Date(0),
       lastSync: new Date(0),
     },