Merge branch 'dev' into PROD-3115_uni-nav

Author: brooketopcoder

.circleci/config.yml

@@ -28,7 +28,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
     name: Installation of install_deploysuite.
     command: |
-      git clone --branch v1.4.12 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+      git clone --branch v1.4.13 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
       cp ./../buildscript/master_deploy.sh .
       cp ./../buildscript/buildenv.sh .
       cp ./../buildscript/awsconfiguration.sh .
@@ -184,7 +184,7 @@ jobs:
     environment:
       DEPLOY_ENV: "PROD"
       LOGICAL_ENV: "prod"
-      ENABLE_CACHE: false
+      ENABLE_CACHE: true
       APPNAME: "platform-ui-mvp"
     steps: *deploy_steps
 

src-ts/lib/functions/survey-functions/survey.functions.tsx renamed to src-ts/lib/functions/survey-functions/survey.functions.ts

@@ -48,6 +48,7 @@ const CourseDetailsPage: FC<{}> = () => {
     const {
         certificationProgress: progress,
         ready: progressReady,
+        setCertificateProgress,
     }: UserCertificationProgressProviderData = useGetUserCertificationProgress(
         profile?.userId,
         routeParams.provider,
@@ -214,6 +215,7 @@ const CourseDetailsPage: FC<{}> = () => {
                                 progress={progress}
                                 progressReady={progressReady}
                                 profile={profile}
+                                setCertificateProgress={setCertificateProgress}
                             />
                         </div>
                     </div>

src-ts/tools/learn/course-details/CourseDetailsPage.tsx

@@ -31,6 +31,7 @@ interface CourseCurriculumProps {
     profile?: UserProfile
     progress?: LearnUserCertificationProgress
     progressReady?: boolean
+    setCertificateProgress: (d: LearnUserCertificationProgress) => void
 }
 
 const CourseCurriculum: FC<CourseCurriculumProps> = (props: CourseCurriculumProps) => {
@@ -108,7 +109,7 @@ const CourseCurriculum: FC<CourseCurriculumProps> = (props: CourseCurriculumProp
         }
 
         if (!props.progress?.id) {
-            await userCertificationProgressStartAsync(
+            const progress: LearnUserCertificationProgress = await userCertificationProgressStartAsync(
                 props.profile.userId,
                 props.course.certificationId,
                 props.course.id,
@@ -117,6 +118,9 @@ const CourseCurriculum: FC<CourseCurriculumProps> = (props: CourseCurriculumProp
                     module: props.course.modules[0].meta.dashedName,
                 },
             )
+
+            // update progress with data returned from calling the start progress endpoint
+            props.setCertificateProgress(progress)
         } else {
             await userCertificationProgressUpdateAsync(
                 props.progress.id,

src-ts/tools/learn/course-details/course-curriculum/CourseCurriculum.tsx

@@ -45,6 +45,7 @@ import { FccFrame } from './fcc-frame'
 import { FccSidebar } from './fcc-sidebar'
 import { TitleNav } from './title-nav'
 import styles from './FreeCodeCamp.module.scss'
+import { debounce } from 'lodash'
 
 const FreeCodeCamp: FC<{}> = () => {
 
@@ -211,7 +212,7 @@ const FreeCodeCamp: FC<{}> = () => {
         profile?.userId,
     ])
 
-    const handleFccLessonComplete: (challengeUuid: string) => void = useCallback((challengeUuid: string) => {
+    const handleFccLessonComplete: (challengeUuid: string) => void = useCallback(debounce((challengeUuid: string) => {
 
         const currentLesson: { [key: string]: string } = {
             lesson: lessonParam,
@@ -239,7 +240,7 @@ const FreeCodeCamp: FC<{}> = () => {
 
             })
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [
+    }, 30), [
         certificateProgress,
         lessonParam,
         moduleParam,
@@ -271,23 +272,40 @@ const FreeCodeCamp: FC<{}> = () => {
             return
         }
 
-        // this is the last lesson to be completed in the first module completed,
-        // so it's good to show the trigger
-        surveyTriggerForUser('TCA First Module Completed', profile?.userId)
+        // This is the last lesson to be completed in the first module completed,
+        // so it's time to trigger the survey
+        const surveyTrigger: string = 'TCA First Module Completed'
+
+        // If there is only one assessment in a cert (e.g. Data Analysis w/Python),
+        // the cert is also completed, which redirects the user to the cert page.
+        // So the survey needs to be delayed so that it appears on the completed
+        // cert page instead of the current lesson.
+
+        // NOTE: we can't use the cert's status here bc it doesn't get set to
+        // completed until the UI notices the cert is complete and initiates
+        // the completion. And we have to use >= instead of === because it's
+        // possible TCA data isn't in sync w/the latest FCC curriculum.
+        if (progress.certificationProgressPercentage >= 100) {
+            setTimeout(async () => {
+                surveyTriggerForUser(surveyTrigger, profile?.userId)
+            }, 1000)
+        } else {
+            surveyTriggerForUser(surveyTrigger, profile?.userId)
+        }
     }
 
     /**
      * Handle the navigation away from the last step of the course in the FCC frame
      * @returns
      */
-    const handleFccLastLessonNavigation: () => void = useCallback(() => {
+    const handleFccLastLessonNavigation: () => void = useCallback(debounce(() => {
 
         if (!certificateProgress) {
             return
         }
 
         // course is completed, return user to course completed screen
-        if (certificateProgress.courseProgressPercentage === 100) {
+        if (certificateProgress.status === UserCertificationProgressStatus.completed) {
             const completedPath: string = getCertificationCompletedPath(
                 providerParam,
                 certificationParam,
@@ -326,7 +344,7 @@ const FreeCodeCamp: FC<{}> = () => {
 
         navigate(nextLessonPath)
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [
+    }, 30), [
         certificateProgress,
         certificationParam,
         courseData?.modules,

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

@@ -27,10 +27,12 @@ export function useGetUserCertificationProgress(
         isPaused: () => !userId || !certification,
     })
 
+    const certificationProgress: LearnUserCertificationProgress | undefined = find(data, { certification })
+
     return {
-        certificationProgress: find(data, { certification }),
+        certificationProgress,
         loading: !!userId && !data && !error,
-        ready: !userId || data || error,
+        ready: !userId || !!data || !!error,
         refetch: () => mutate(),
         setCertificateProgress: progress => mutate([progress]),
     }