Merge pull request #517 from topcoder-platform/TCA-1033_progress-messages

TCA-1033 - update certification progress in course details page -> dev

Author: vas3a

src-ts/tools/learn/course-details/tca-certification-banner/TCACertificationBanner.tsx

@@ -58,7 +58,6 @@ const TCACertificationBanner: FC<TCACertificationBannerProps> = (props: TCACerti
     // Fetch Enrollment status & progress
     const {
         progress: certifProgress,
-        ready: certifProgressReady,
     }: TCACertificationProgressProviderData = useGetTCACertificationProgress(
         props.userId as unknown as string,
         certification?.dashedName as string,
@@ -69,9 +68,7 @@ const TCACertificationBanner: FC<TCACertificationBannerProps> = (props: TCACerti
     // so we can show their progress even before they enroll with the certification
     const {
         progresses: certsProgress,
-    }: UserCertificationsProviderData = useGetUserCertifications('freeCodeCamp', {
-        enabled: certifProgressReady && !certifProgress,
-    })
+    }: UserCertificationsProviderData = useGetUserCertifications('freeCodeCamp')
 
     const progressById: ProgressByIdCollection = useMemo(() => (
         certsProgress?.reduce((all, progress) => {
@@ -97,22 +94,21 @@ const TCACertificationBanner: FC<TCACertificationBannerProps> = (props: TCACerti
             : certification.certificationResources.filter(d => (
                 progressById[d.freeCodeCampCertification.fccId]?.status === UserCertificationProgressStatus.completed
             )).length
+        const inProgressCoursesCount: number = certification.certificationResources.filter(d => (
+            progressById[d.freeCodeCampCertification.fccId]?.status === UserCertificationProgressStatus.inProgress
+        )).length
 
         if (!completedCoursesCount) {
-            return certifProgress ? getStatusBox(
+            return inProgressCoursesCount ? getStatusBox(
+                <IconOutline.ClockIcon />,
+                `Good job! You are making progress with ${inProgressCoursesCount} of ${coursesCount} required courses.`,
+                'green',
+            ) : certifProgress ? getStatusBox(
                 <IconOutline.DotsCircleHorizontalIcon />,
                 'Begin working towards earning this Topcoder Certification by starting this course today!',
             ) : <></>
         }
 
-        if (completedCoursesCount === 1) {
-            return getStatusBox(
-                <IconOutline.ClockIcon />,
-                `Good job! You are making progress with 1 of ${coursesCount} required courses.`,
-                'green',
-            )
-        }
-
         return getStatusBox(
             <IconSolid.CheckCircleIcon />,
             `You have completed ${completedCoursesCount} of ${coursesCount} required courses.`,

src-ts/tools/learn/learn-lib/data-providers/tca-certifications-provider/tca-certification-progress/tca-certification-progress.model.ts

@@ -1,4 +1,5 @@
 import { LearnModelBase } from '../../../functions'
+import { UserCertificationProgressStatus } from '../../user-certifications-provider'
 import { TCACertification } from '../tca-certification.model'
 
 import { TCAFccCertificationProgress } from './tca-fcc-certification-progress.model'
@@ -17,6 +18,7 @@ export interface TCACertificationProgress extends LearnModelBase {
     completedAt: null | Date
     certificationProgress: number
     resourceProgresses: [{
+        status: UserCertificationProgressStatus,
         fccCertificationProgress: TCAFccCertificationProgress
     }]
     userHandle: string