saulteafarmer/plebdevs
1
0
Fork 0
mirror of https://github.com/AustinKelsay/plebdevs.git synced 2025-05-29 21:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from AustinKelsay/bugfix/user-progress-flow

Browse Source 
Fix user progress flow success state
This commit is contained in:
Austin Kelsay 2025-05-23 10:59:03 -05:00 committed by GitHub
commit 5d808669dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/profile/progress/UserProgress.js
View File

@ -6,7 +6,6 @@ import { useRouter } from 'next/router';
import { useBadge } from '@/hooks/badges/useBadge';
import GenericButton from '@/components/buttons/GenericButton';
import UserProgressFlow from './UserProgressFlow';
import { Tooltip } from 'primereact/tooltip';
import RepoSelector from '@/components/profile/RepoSelector';
import MoreInfo from '@/components/MoreInfo';
@ -89,31 +88,40 @@ const UserProgress = () => {
const generateTasks = completedCourseIds => {
const updatedTasks = allTasks.map(task => {
if (task.status === 'Connect GitHub') {
const isGithubConnected = session?.account?.provider === 'github';
return {
...task,
completed: session?.account?.provider === 'github' ? true : false,
completed: isGithubConnected,
subTasks: task.subTasks.map(subTask => ({
...subTask,
completed: session?.account?.provider === 'github' ? true : false,
completed: isGithubConnected,
})),
};
}
// For course tasks
const userCourse = session?.user?.userCourses?.find(uc => uc.courseId === task.courseId);
const courseCompleted = completedCourseIds.includes(task.courseId);
const repoSubmitted = userCourse?.submittedRepoLink ? true : false;
const updatedSubTasks = task.subTasks.map(subTask => {
let isSubTaskActuallyCompleted = false;
if (subTask.status.includes('Complete the course')) {
isSubTaskActuallyCompleted = courseCompleted;
} else if (subTask.status.includes('Submit your project repository')) {
isSubTaskActuallyCompleted = repoSubmitted;
}
// Add more conditions here if other types of subtasks exist in the future
return { ...subTask, completed: isSubTaskActuallyCompleted };
});
// A task is considered complete if all of its subtasks are complete.
const taskOverallCompleted = updatedSubTasks.every(st => st.completed);
return {
...task,
completed: courseCompleted && (task.courseId === null || repoSubmitted),
subTasks: task.subTasks.map(subTask => ({
...subTask,
completed: subTask.status.includes('Complete')
? courseCompleted
: subTask.status.includes('repository')
? repoSubmitted
: false,
})),
completed: taskOverallCompleted,
subTasks: updatedSubTasks,
};
});