fix(nav): trim burger menu, fix MyClasses for teachers, fix NotFound crash
- Header: trim menu to My Work section (My Lessons, My Classes, Lesson Plans), School Admin (gated), Platform Admin (gated) - MyClassesPage: fix loading/error state destructure (classesLoading not myClassesLoading) - NotFound: fix ErrorOutline -> ErrorOutlineIcon to prevent 404 page crash - timetableService: getMyClasses now calls both /me/teacher and /me/student, merges with role annotation - timetableStore: myClasses type updated to ClassWithRole[] - timetable.types: add ClassWithRole interface and code/institute_id optional fields to Class Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
This commit is contained in:
@@ -2,6 +2,7 @@ import axios from 'axios';
|
||||
import { supabase } from '../supabaseClient';
|
||||
import {
|
||||
Class,
|
||||
ClassWithRole,
|
||||
ClassWithRelations,
|
||||
ClassFilters,
|
||||
Timetable,
|
||||
@@ -79,10 +80,30 @@ export const classService = {
|
||||
await axios.delete(`${API_BASE}/database/timetable/classes/${classId}`, { headers });
|
||||
},
|
||||
|
||||
async getMyClasses(): Promise<Class[]> {
|
||||
async getMyClasses(): Promise<ClassWithRole[]> {
|
||||
const headers = await getAuthHeaders();
|
||||
const response = await axios.get(`${API_BASE}/database/timetable/classes/me/student`, { headers });
|
||||
return response.data.classes;
|
||||
const [teacherRes, studentRes] = await Promise.allSettled([
|
||||
axios.get(`${API_BASE}/database/timetable/classes/me/teacher`, { headers }),
|
||||
axios.get(`${API_BASE}/database/timetable/classes/me/student`, { headers }),
|
||||
]);
|
||||
const teacherClasses: ClassWithRole[] = teacherRes.status === 'fulfilled'
|
||||
? (teacherRes.value.data.classes || []).map((c: Class) => ({
|
||||
...c,
|
||||
class_id: c.id,
|
||||
role: 'teacher' as const,
|
||||
status: 'active',
|
||||
}))
|
||||
: [];
|
||||
const studentClasses: ClassWithRole[] = studentRes.status === 'fulfilled'
|
||||
? (studentRes.value.data.classes || []).map((c: Class) => ({
|
||||
...c,
|
||||
class_id: c.id,
|
||||
role: 'student' as const,
|
||||
status: 'active',
|
||||
}))
|
||||
: [];
|
||||
const seen = new Set(teacherClasses.map(c => c.id));
|
||||
return [...teacherClasses, ...studentClasses.filter(c => !seen.has(c.id))];
|
||||
},
|
||||
|
||||
async getMyTeachingClasses(): Promise<Class[]> {
|
||||
|
||||
Reference in New Issue
Block a user