From 54c0e8201b2e2cf92cc3bd299688747580486296 Mon Sep 17 00:00:00 2001 From: gameingame-eng <231358369+gameingame-eng@users.noreply.github.com> Date: Fri, 24 Apr 2026 23:15:58 -0500 Subject: [PATCH] remove student teacher links and fully replace with schedules --- src/App.jsx | 127 +++--------------- src/pages/AdminPage.jsx | 80 +---------- ...20000_drop_teacher_student_assignments.sql | 47 +++++++ 3 files changed, 70 insertions(+), 184 deletions(-) create mode 100644 supabase/migrations/20260424120000_drop_teacher_student_assignments.sql diff --git a/src/App.jsx b/src/App.jsx index 1c27533..ace3da5 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -20,7 +20,6 @@ function App() { const [studentSchedules, setStudentSchedules] = useState([]) const [teachers, setTeachers] = useState([]) const [students, setStudents] = useState([]) - const [studentAssignments, setStudentAssignments] = useState([]) const [teacherHomework, setTeacherHomework] = useState([]) const [studentHomework, setStudentHomework] = useState([]) const [assignmentFeedback, setAssignmentFeedback] = useState('') @@ -71,7 +70,6 @@ function App() { setStudentSchedules([]) setTeachers([]) setStudents([]) - setStudentAssignments([]) setTeacherHomework([]) setStudentHomework([]) setAdminSchedules([]) @@ -139,7 +137,7 @@ function App() { let isMounted = true async function loadTeacherData() { - const [{ data: teacherSchedules = [] }, { data: assignedStudents = [] }, { data: homeworkRows = [] }] = await Promise.all([ + const [{ data: teacherSchedules = [] }, { data: homeworkRows = [] }] = await Promise.all([ supabase .from('student_schedules') .select(` @@ -156,13 +154,6 @@ function App() { .eq('teacher_id', userId) .order('scheduled_for', { ascending: true }) .order('start_time', { ascending: true }), - supabase - .from('teacher_student_assignments') - .select(` - student_id, - student:profiles!teacher_student_assignments_student_id_fkey(username) - `) - .eq('teacher_id', userId), supabase .from('teacher_homework_assignments') .select(` @@ -182,11 +173,18 @@ function App() { return } + const uniqueStudents = new Map() + teacherSchedules.forEach((schedule) => { + if (schedule.student_id && !uniqueStudents.has(schedule.student_id)) { + uniqueStudents.set(schedule.student_id, schedule.student?.username ?? 'Unnamed student') + } + }) + setTeacherStudents( - assignedStudents - .map((assignment) => ({ - id: assignment.student_id, - username: assignment.student?.username ?? 'Unnamed student', + Array.from(uniqueStudents.entries()) + .map(([studentId, username]) => ({ + id: studentId, + username, })) .sort((a, b) => a.username.localeCompare(b.username)), ) @@ -214,7 +212,7 @@ function App() { ) setTeachers([]) setStudents([]) - setStudentAssignments([]) + setTeacherHomework([]) setStudentHomework([]) setAdminSchedules([]) } @@ -223,19 +221,10 @@ function App() { const [ { data: teacherProfiles = [] }, { data: studentProfiles = [] }, - { data: assignmentRows = [] }, { data: scheduleRows = [] }, ] = await Promise.all([ supabase.from('profiles').select('id, username').eq('role', 'teacher').order('username'), supabase.from('profiles').select('id, username').eq('role', 'student').order('username'), - supabase - .from('teacher_student_assignments') - .select(` - teacher_id, - student_id, - teacher:profiles!teacher_student_assignments_teacher_id_fkey(username), - student:profiles!teacher_student_assignments_student_id_fkey(username) - `), supabase .from('student_schedules') .select(` @@ -258,23 +247,7 @@ function App() { } setTeachers(teacherProfiles) - setStudentAssignments( - assignmentRows.map((assignment) => ({ - teacherId: assignment.teacher_id, - teacherName: assignment.teacher?.username ?? 'Unknown teacher', - studentId: assignment.student_id, - studentName: assignment.student?.username ?? 'Unknown student', - })), - ) - const assignedTeacherByStudentId = new Map( - assignmentRows.map((assignment) => [assignment.student_id, assignment.teacher?.username ?? 'Unknown teacher']), - ) - setStudents( - studentProfiles.map((student) => ({ - ...student, - assignedTeacherName: assignedTeacherByStudentId.get(student.id) ?? null, - })), - ) + setStudents(studentProfiles) setAdminSchedules( scheduleRows.map((schedule) => ({ id: schedule.id, @@ -297,7 +270,7 @@ function App() { } async function loadStudentData() { - const [{ data: schedules = [] }, { data: assignment }, { data: homeworkRows = [] }] = await Promise.all([ + const [{ data: schedules = [] }, { data: homeworkRows = [] }] = await Promise.all([ supabase .from('student_schedules') .select(` @@ -312,14 +285,6 @@ function App() { `) .eq('student_id', userId) .order('created_at', { ascending: false }), - supabase - .from('teacher_student_assignments') - .select(` - teacher_id, - teacher:profiles!teacher_student_assignments_teacher_id_fkey(username) - `) - .eq('student_id', userId) - .maybeSingle(), supabase .from('teacher_homework_assignments') .select(` @@ -339,11 +304,13 @@ function App() { return } + // Get the teacher from the latest schedule + const latestScheduleWithTeacher = schedules.find((schedule) => schedule.teacher_id) setAssignedTeacher( - assignment?.teacher_id + latestScheduleWithTeacher?.teacher_id ? { - id: assignment.teacher_id, - username: assignment.teacher?.username ?? 'Assigned teacher', + id: latestScheduleWithTeacher.teacher_id, + username: latestScheduleWithTeacher.teacher?.username ?? 'Your teacher', } : null, ) @@ -355,13 +322,12 @@ function App() { details: assignmentRow.details, dueDate: assignmentRow.due_date, createdAt: assignmentRow.created_at, - teacherName: assignmentRow.teacher?.username ?? 'Assigned teacher', + teacherName: assignmentRow.teacher?.username ?? 'Your teacher', })), ) setTeacherSchedules([]) setTeachers([]) setStudents([]) - setStudentAssignments([]) setTeacherHomework([]) setAdminSchedules([]) } @@ -530,55 +496,6 @@ function App() { setAssignmentFeedback('Schedule created successfully.') } - async function handleAssignTeacher() { - if (!supabase || !userId || !scheduleForm.studentId || !scheduleForm.teacherId) { - setAssignmentError('Choose both a student and teacher to save the class assignment.') - return - } - - setAssignmentLoading(true) - setAssignmentFeedback('') - setAssignmentError('') - - const { error } = await supabase - .from('teacher_student_assignments') - .upsert( - { - student_id: scheduleForm.studentId, - teacher_id: scheduleForm.teacherId, - assigned_by: userId, - }, - { onConflict: 'student_id' }, - ) - - setAssignmentLoading(false) - - if (error) { - setAssignmentError(error.message) - return - } - - const teacher = teachers.find((item) => item.id === scheduleForm.teacherId) - setStudents((current) => - current.map((student) => - student.id === scheduleForm.studentId - ? { ...student, assignedTeacherName: teacher?.username ?? 'Assigned teacher' } - : student, - ), - ) - setStudentAssignments((current) => { - const nextAssignment = { - teacherId: scheduleForm.teacherId, - teacherName: teacher?.username ?? 'Assigned teacher', - studentId: scheduleForm.studentId, - studentName: students.find((item) => item.id === scheduleForm.studentId)?.username ?? 'Unknown student', - } - const remaining = current.filter((assignment) => assignment.studentId !== scheduleForm.studentId) - return [nextAssignment, ...remaining] - }) - setAssignmentFeedback('Teacher assigned successfully.') - } - async function handleCreateHomework() { if (!supabase || !userId || !homeworkForm.studentId || !homeworkForm.title.trim()) { setAssignmentError('Choose a student and add a homework title.') @@ -691,12 +608,10 @@ function App() { assignmentLoading={assignmentLoading} schedules={adminSchedules} onCreateSchedule={handleCreateSchedule} - onAssignTeacher={handleAssignTeacher} onLogout={handleLogout} onScheduleFormChange={setScheduleForm} scheduleForm={scheduleForm} students={students} - studentAssignments={studentAssignments} teachers={teachers} username={username} /> diff --git a/src/pages/AdminPage.jsx b/src/pages/AdminPage.jsx index 17d0833..8fdc4a0 100644 --- a/src/pages/AdminPage.jsx +++ b/src/pages/AdminPage.jsx @@ -4,27 +4,18 @@ function AdminPage({ assignmentError, assignmentFeedback, assignmentLoading, - onAssignTeacher, onCreateSchedule, onLogout, onScheduleFormChange, scheduleForm, schedules, students, - studentAssignments, teachers, username, }) { const [selectedStudentId, setSelectedStudentId] = useState('') const [selectedTeacherId, setSelectedTeacherId] = useState('') - const progressTemplates = students.map((student) => ({ - id: student.id, - username: student.username, - status: 'Not started', - summary: 'Progress reports will appear here once the reporting model is added.', - })) - const selectedStudent = students.find((student) => student.id === selectedStudentId) ?? null const selectedTeacher = teachers.find((teacher) => teacher.id === selectedTeacherId) ?? null const visibleSchedules = schedules.filter((schedule) => { @@ -47,7 +38,7 @@ function AdminPage({

ProgCheck

{username ?

{username}

: null}

Admin

-

Assign students to teachers and create student schedules.

+

Create and manage student schedules with assigned teachers.

- - -

Create schedule

@@ -258,24 +199,7 @@ function AdminPage({
-
-

Class assignments

-
- {studentAssignments.length > 0 ? studentAssignments.map((assignment) => ( -
-

{assignment.studentName}

-

{assignment.teacherName}

-

Current teacher assignment

-
- )) : progressTemplates.map((report) => ( -
-

{report.username}

-

{report.status}

-

{report.summary}

-
- ))} -
-
+
diff --git a/supabase/migrations/20260424120000_drop_teacher_student_assignments.sql b/supabase/migrations/20260424120000_drop_teacher_student_assignments.sql new file mode 100644 index 0000000..e2f7177 --- /dev/null +++ b/supabase/migrations/20260424120000_drop_teacher_student_assignments.sql @@ -0,0 +1,47 @@ +-- Drop policies that depend on teacher_student_assignments table +drop policy if exists "Profiles are visible by role and relationship" on public.profiles; +drop policy if exists "Profiles are visible by relationship" on public.profiles; +drop policy if exists "Teachers create homework for their students" on public.teacher_homework_assignments; +drop policy if exists "Teachers can view assignments and students can view their own" on public.teacher_student_assignments; +drop policy if exists "Teachers can self assign students" on public.teacher_student_assignments; + +-- Drop the teacher_student_assignments table as teacher-student links are now managed through schedules +drop table if exists public.teacher_student_assignments; + +-- Recreate profiles policy to check schedules instead of teacher_student_assignments +create policy "Profiles are visible by role and relationship" +on public.profiles +for select +to authenticated +using ( + auth.uid() = id + or ( + public.has_role(auth.uid(), 'teacher') + and role = 'student' + ) + or ( + role = 'teacher' + and exists ( + select 1 + from public.student_schedules ss + where ss.student_id = auth.uid() + and ss.teacher_id = profiles.id + ) + ) +); + +-- Recreate homework policy to check schedules instead of teacher_student_assignments +create policy "Teachers create homework for their students" +on public.teacher_homework_assignments +for insert +to authenticated +with check ( + teacher_id = auth.uid() + and public.has_role(auth.uid(), 'teacher') + and exists ( + select 1 + from public.student_schedules ss + where ss.teacher_id = auth.uid() + and ss.student_id = teacher_homework_assignments.student_id + ) +);