Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/pages/SpeakingSession.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { EventData } from 'react-joyride';
import { getSpeakingTourSteps } from '../data/TutorialSteps';
import { ArrowLeft, Play, Pause, Square, Save, Mic, X, Trash2 } from 'lucide-react';
import Topbar from '../components/Layout/Topbar';
import { useAssessment, useAuthoring, useSettings, useStudents } from '../context/AppContext';
import { useStoreActions, useStoreSelector } from '../context/useStore';
import { calcEntryPoints, calcGradeSummary, criterionMaxPoints } from '../utils/gradeCalc';
import { nanoid } from '../utils/nanoid';
import RecordingControls from '../components/Recordings/RecordingControls';
Expand All @@ -32,11 +32,23 @@ export default function SpeakingSession() {
const { rubricId, studentId } = useParams<{ rubricId: string; studentId: string }>();
const navigate = useNavigate();
const { t } = useTranslation();
const { students } = useStudents();

const { rubrics, gradeScales } = useAuthoring();
const { speakingSessions, saveSpeakingSession } = useAssessment();
const { settings } = useSettings();
const {
students: allStudents,
rubrics,
gradeScales,
speakingSessions,
settings,
} = useStoreSelector((s) => ({
students: s.students,
rubrics: s.rubrics,
gradeScales: s.gradeScales,
speakingSessions: s.speakingSessions,
settings: s.settings,
}));
// The roster domain hooks filtered soft-deleted rows; archived students must not
// be reachable from a speaking-session route.
const students = React.useMemo(() => allStudents.filter((s) => !s.archivedAt), [allStudents]);
const { saveSpeakingSession } = useStoreActions();

const rubric = rubrics.find((r) => r.id === rubricId);
const student = students.find((s) => s.id === studentId);
Expand Down
10 changes: 8 additions & 2 deletions src/pages/__tests__/SpeakingSession.extended.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { createMemoryRouter, RouterProvider } from 'react-router-dom';
import { DEFAULT_FORMAT } from '../../types';
import type { StoreData } from '../../store/storage';
import type {
AppSettings,
Class,
Expand Down Expand Up @@ -77,14 +78,13 @@ const mockClassesArr = [mockClass];
const mockGradeScalesArr = [mockGradeScale];
const emptyArr: never[] = [];

const mockAppValue: Record<string, unknown> = {
const mockAppValue: Partial<StoreData> = {
rubrics: mockRubricsArr,
students: mockStudentsArr,
classes: mockClassesArr,
gradeScales: mockGradeScalesArr,
settings: mockSettings,
speakingSessions: emptyArr,
saveSpeakingSession: mockSaveSpeakingSession,
studentRubrics: emptyArr,
};

Expand All @@ -102,6 +102,12 @@ vi.mock('../../context/AppContext', () => ({
usePlatform: () => mockAppValue,
}));

vi.mock('../../context/useStore', () => ({
useStoreSelector: <T,>(selector: (state: StoreData) => T): T => selector(mockAppValue as StoreData),
// SpeakingSession only triggers saveSpeakingSession; keep the action mock narrow.
useStoreActions: () => ({ saveSpeakingSession: mockSaveSpeakingSession }),
}));
Comment thread
NesiciCoding marked this conversation as resolved.

vi.mock('react-router-dom', async () => {
const actual = await vi.importActual('react-router-dom');
return { ...actual, useNavigate: () => mockNavigate };
Expand Down
10 changes: 8 additions & 2 deletions src/pages/__tests__/SpeakingSession.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
import { createMemoryRouter, RouterProvider } from 'react-router-dom';
import { DEFAULT_FORMAT } from '../../types';
import type { AppSettings, Class, GradeScale, Rubric, Student } from '../../types';
import type { StoreData } from '../../store/storage';

const mockGradeScale: GradeScale = {
id: 'gs1',
Expand Down Expand Up @@ -59,14 +60,13 @@ const mockClassesArr = [mockClass];
const mockGradeScalesArr = [mockGradeScale];
const emptyArr: never[] = [];

const mockAppValue = {
const mockAppValue: Partial<StoreData> = {
rubrics: mockRubricsArr,
students: mockStudentsArr,
classes: mockClassesArr,
gradeScales: mockGradeScalesArr,
settings: mockSettings,
speakingSessions: emptyArr,
saveSpeakingSession: mockSaveSpeakingSession,
studentRubrics: emptyArr,
};

Expand All @@ -83,6 +83,12 @@ vi.mock('../../context/AppContext', () => ({
usePlatform: () => mockAppValue,
}));

vi.mock('../../context/useStore', () => ({
useStoreSelector: <T,>(selector: (state: StoreData) => T): T => selector(mockAppValue as StoreData),
// SpeakingSession only triggers saveSpeakingSession; keep the action mock narrow.
useStoreActions: () => ({ saveSpeakingSession: mockSaveSpeakingSession }),
}));

vi.mock('react-router-dom', async () => {
const actual = await vi.importActual('react-router-dom');
return { ...actual, useNavigate: () => mockNavigate };
Expand Down
Loading