Merge pull request #294 from topcoder-platform/TCA-440_certificate-progress

TCA-440: call certification completion based on assessment completion

Author: vas3a

src-ts/tools/learn/free-code-camp/FreeCodeCamp.tsx

@@ -259,7 +259,7 @@ const FreeCodeCamp: FC<{}> = () => {
     useEffect(() => {
         if (
             certificateProgress &&
-            certificateProgress.courseProgressPercentage === 100 &&
+            certificateProgress.certificationProgressPercentage === 100 &&
             certificateProgress.status === UserCertificationProgressStatus.inProgress
         ) {
             userCertificationProgressUpdateAsync(

src-ts/tools/learn/learn-lib/course-outline/CourseOutline.tsx

@@ -54,6 +54,7 @@ const CourseOutline: FC<CourseOutlineProps> = (props: CourseOutlineProps) => {
                             shortDescription={module.meta.introCopy}
                             title={module.meta.name}
                             onItemClick={props.onItemNavigate}
+                            isAssessment={module.meta.isAssessment}
                         />
                     ))}
                 </div>

src-ts/tools/learn/learn-lib/course-outline/collapsible-item/CollapsibleItem.tsx

@@ -17,6 +17,7 @@ interface CollapsibleListItem {
 interface CollapsibleItemProps {
     active?: string
     duration: LearnModule['meta']['estimatedCompletionTime']
+    isAssessment: boolean
     itemId?: (item: any) => string
     items: Array<CollapsibleListItem>
     lessonsCount: number
@@ -31,8 +32,6 @@ interface CollapsibleItemProps {
 const CollapsibleItem: FC<CollapsibleItemProps> = (props: CollapsibleItemProps) => {
     const [isOpen, setIsOpen]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
 
-    const isAssessment: boolean = props.lessonsCount === 1
-
     const toggle: () => void = useCallback(() => {
         setIsOpen(open => !open)
     }, [])
@@ -89,7 +88,7 @@ const CollapsibleItem: FC<CollapsibleItemProps> = (props: CollapsibleItemProps)
             <div className={styles['title-row']} onClick={toggle}>
                 <StatusIcon completed={isCompleted} partial={isPartial} />
                 <span className={styles['title']}>
-                    {isAssessment && (
+                    {props.isAssessment && (
                         <div className={classNames(styles['title-tag'], 'label')}>
                             assessment
                         </div>

src-ts/tools/learn/learn-lib/lesson-provider/learn-module-meta.model.ts

@@ -5,6 +5,6 @@ export interface LearnModuleMeta {
         value: number
     }
     introCopy: Array<string>
-    lessonCount: number
+    isAssessment: boolean
     name: string
 }

src-ts/tools/learn/learn-lib/user-certifications-provider/user-certifications-functions/learn-user-certification-progress.model.ts

@@ -7,6 +7,8 @@ export interface LearnUserCertificationProgress extends LearnModelBase {
     academicHonestyPolicyAcceptedAt?: number,
     certification: string
     certificationId: string
+    certificationProgressPercentage: number
+    certType: 'certification'
     completedDate?: string
     courseId: string
     courseKey: string