fix check

This commit is contained in:
rngsurrounded
2025-03-03 20:29:34 +09:00
parent 404ca1cc59
commit 46a1f43c49
2 changed files with 158 additions and 158 deletions
@@ -2,13 +2,14 @@ import React from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { Task } from '@/shared/types/task'; import { Task } from '@/shared/types/task';
import { ArrowLeft } from 'lucide-react'; import { ArrowLeft } from 'lucide-react';
import { useNavigate } from 'react-router-dom';
interface CompetitionHeaderProps { interface CompetitionHeaderProps {
title: string; title: string;
tasks: Task[]; tasks: Task[];
competitionId: string; competitionId: string;
setAnswer: (value: string) => void; setAnswer: (value: string) => void;
setSelectedFile: (file: File | null) => void; // заглушка setSelectedFile: (file: File | null) => void;
} }
const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
@@ -18,11 +19,15 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
setAnswer, setAnswer,
setSelectedFile setSelectedFile
}) => { }) => {
const navigate = useNavigate();
const handleTaskSelect = () => { const handleTaskSelect = (event: React.MouseEvent, taskId: string) => {
setAnswer("") event.preventDefault();
setSelectedFile(null) setAnswer("");
console.log("STOP IT") setSelectedFile(null);
console.log("link check");
navigate(`/competition/${competitionId}/tasks/${taskId}`);
} }
return ( return (
@@ -32,7 +37,6 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
<Link <Link
to={`/competition/${competitionId}`} to={`/competition/${competitionId}`}
className="flex items-center text-gray-600 hover:text-gray-900 transition-colors font-hse-sans text-sm" className="flex items-center text-gray-600 hover:text-gray-900 transition-colors font-hse-sans text-sm"
onClick={handleTaskSelect}
> >
<ArrowLeft className="h-4 w-4 mr-1" /> <ArrowLeft className="h-4 w-4 mr-1" />
</Link> </Link>
@@ -53,6 +57,7 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
rounded-lg px-3 py-1.5 font-medium text-sm font-hse-sans cursor-pointer rounded-lg px-3 py-1.5 font-medium text-sm font-hse-sans cursor-pointer
transition-all hover:brightness-95 flex-shrink-0 transition-all hover:brightness-95 flex-shrink-0
`} `}
onClick={(e) => handleTaskSelect(e, task.id)}
> >
{task.in_competition_position} {task.in_competition_position}
</Link> </Link>
@@ -1,32 +1,32 @@
import React, { useState, useRef, useEffect } from 'react'; import React, { useState, useRef, useEffect } from 'react';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
import { Task, TaskType, Solution } from '@/shared/types/task'; import { Task, TaskType, Solution } from '@/shared/types/task';
import { useQuery } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query';
import { getTaskSolutionHistory } from '@/shared/api/session'; import { getTaskSolutionHistory } from '@/shared/api/session';
import SolutionStatus from './components/SolutionStatus'; import SolutionStatus from './components/SolutionStatus';
import InputSolution from './components/InputSolution'; import InputSolution from './components/InputSolution';
import FileSolution from './components/FileSolution'; import FileSolution from './components/FileSolution';
import CodeSolution from './components/CodeSolution'; import CodeSolution from './components/CodeSolution';
import ActionButtons from './components/ActionButtons'; import ActionButtons from './components/ActionButtons';
import SolutionHistorySheet from './components/SolutionHistorySheet'; import SolutionHistorySheet from './components/SolutionHistorySheet';
interface TaskSolutionProps { interface TaskSolutionProps {
task: Task; task: Task;
answer: string; answer: string;
setAnswer: (value: string) => void; setAnswer: (value: string) => void;
selectedFile: File | null; selectedFile: File | null;
setSelectedFile: (file: File | null) => void; setSelectedFile: (file: File | null) => void;
onSubmit: () => void; onSubmit: () => void;
} }
const TaskSolution: React.FC<TaskSolutionProps> = ({ const TaskSolution: React.FC<TaskSolutionProps> = ({
task, task,
answer, answer,
setAnswer, setAnswer,
selectedFile, selectedFile,
setSelectedFile, setSelectedFile,
onSubmit, onSubmit,
}) => { }) => {
const fileInputRef = useRef<HTMLInputElement>(null); const fileInputRef = useRef<HTMLInputElement>(null);
const [isHistoryOpen, setIsHistoryOpen] = useState(false); const [isHistoryOpen, setIsHistoryOpen] = useState(false);
const [selectedSolutionUrl, setSelectedSolutionUrl] = useState<string | null>(null); const [selectedSolutionUrl, setSelectedSolutionUrl] = useState<string | null>(null);
@@ -54,7 +54,6 @@ const TaskSolution: React.FC<TaskSolutionProps> = ({
setDisplayedSolution(null); setDisplayedSolution(null);
setSelectedSolutionUrl(null); setSelectedSolutionUrl(null);
// If solutions are already loaded for the new task, set the latest one
if (solutionHistory.length > 0) { if (solutionHistory.length > 0) {
const latestSolution = solutionHistory[solutionHistory.length - 1]; const latestSolution = solutionHistory[solutionHistory.length - 1];
setDisplayedSolution(latestSolution); setDisplayedSolution(latestSolution);
@@ -64,13 +63,10 @@ const TaskSolution: React.FC<TaskSolutionProps> = ({
} }
}, [task.id, solutionHistory]); }, [task.id, solutionHistory]);
// Check if a new solution was submitted (latest solution ID changed)
useEffect(() => { useEffect(() => {
if (solutionHistory.length > 0 && displayedSolution) { if (solutionHistory.length > 0 && displayedSolution) {
const latestSolution = solutionHistory[solutionHistory.length - 1]; const latestSolution = solutionHistory[solutionHistory.length - 1];
// If the latest solution ID is different from the displayed one,
// a new solution was submitted - update to show the latest
if (latestSolution.id !== displayedSolution.id) { if (latestSolution.id !== displayedSolution.id) {
setDisplayedSolution(latestSolution); setDisplayedSolution(latestSolution);
} }
@@ -108,7 +104,6 @@ const TaskSolution: React.FC<TaskSolutionProps> = ({
const handleSolutionSelect = (solution: Solution) => { const handleSolutionSelect = (solution: Solution) => {
setDisplayedSolution(solution); setDisplayedSolution(solution);
console.log(displayedSolution)
}; };
const handleClearExistingFile = () => { const handleClearExistingFile = () => {
@@ -163,6 +158,6 @@ const TaskSolution: React.FC<TaskSolutionProps> = ({
/> />
</div> </div>
); );
}; };
export default TaskSolution; export default TaskSolution;