topcoder-platform · brooketopcoder · Dec 14, 2022 · Dec 6, 2022 · Dec 6, 2022 · Dec 7, 2022
diff --git a/.circleci/config.yml b/.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
 
@@ -227,7 +227,9 @@ workflows:
           filters: 
             branches:
               only:
-                - dev
+                # - dev
+                # temp only deploy the release branch to dev
+                - TCA-832_release
 
       - deployProd:
           context : org-global

diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "dependencies": {
         "@datadog/browser-logs": "^4.21.2",
         "@heroicons/react": "^1.0.6",
+        "@sprig-technologies/sprig-browser": "^2.20.1",
         "@stripe/react-stripe-js": "1.13.0",
         "@stripe/stripe-js": "1.41.0",
         "apexcharts": "^3.36.0",

diff --git a/public/index.html b/public/index.html
@@ -2,24 +2,26 @@
 <html lang="en">
 
 <head>
-  <meta charset="utf-8" />
-  <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="theme-color" content="#000000" />
-  <meta name="description"
-    content="Topcoder is home to the world’s largest community of designers, developers, and data scientists. Allowing you the freedom to start and execute faster." />
-  <link rel="preconnect" href="https://fonts.googleapis.com" />
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-  <link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Barlow:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Barlow+Condensed:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" />
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Barlow:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Barlow+Condensed:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" />
-  <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo_512x512.png" />
-  <link rel="stylesheet" href="%PUBLIC_URL%/global.css">
-  <!--
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta name="description"
+        content="Topcoder is home to the world’s largest community of designers, developers, and data scientists. Allowing you the freedom to start and execute faster." />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link rel="preload" as="style"
+        href="https://fonts.googleapis.com/css2?family=Barlow:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Barlow+Condensed:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" />
+    <link rel="stylesheet"
+        href="https://fonts.googleapis.com/css2?family=Barlow:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Barlow+Condensed:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,600;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo_512x512.png" />
+    <link rel="stylesheet" href="%PUBLIC_URL%/global.css">
+    <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-  <!--
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -28,13 +30,13 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-  <title>Topcoder Top Technology Talent On-Demand</title>
+    <title>Topcoder Top Technology Talent On-Demand</title>
 </head>
 
 <body>
-  <noscript>You need to enable JavaScript to run this app.</noscript>
-  <div id="root" data-id="root"></div>
-  <!--
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root" data-id="root"></div>
+    <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
 

diff --git a/src-ts/App.tsx b/src-ts/App.tsx
@@ -7,7 +7,7 @@ import { routeContext, RouteContextData } from './lib'
 
 const App: FC<{}> = () => {
 
-    const [ready, setReady]: [boolean, Dispatch<SetStateAction<boolean>>] = useState(false)
+    const [ready, setReady]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
     const { allRoutes, getRouteElement }: RouteContextData = useContext(routeContext)
 
     const routeElements: Array<ReactElement> = allRoutes
@@ -19,9 +19,9 @@ const App: FC<{}> = () => {
 
     useEffect(() => {
         if (ready) {
-            document.getElementById('root')?.classList.add('app-ready');
+            document.getElementById('root')?.classList.add('app-ready')
         }
-    }, [ready]);
+    }, [ready])
 
     return (
         <>

diff --git a/src-ts/config/environments/environment.default.config.ts b/src-ts/config/environments/environment.default.config.ts
@@ -20,6 +20,9 @@ export const EnvironmentConfigDefault: EnvironmentConfigModel = {
         SERVICE: 'platform-ui',
     },
     REAUTH_OFFSET: 55,
+    SPRIG: {
+        ENVIRONMENT_ID: 'bUcousVQ0-yF',
+    },
     // TODO: Move stripe creds to .env file
     STRIPE: {
         ADMIN_TOKEN:

diff --git a/src-ts/config/environments/environment.prod.config.ts b/src-ts/config/environments/environment.prod.config.ts
@@ -18,6 +18,9 @@ export const EnvironmentConfigProd: EnvironmentConfigModel = {
     },
     DISABLED_TOOLS: [],
     ENV: 'prod',
+    SPRIG: {
+        ENVIRONMENT_ID: 'a-IZBZ6-r7bU',
+    },
     // TODO: Move stripe creds to .env file
     STRIPE: {
         ADMIN_TOKEN:

diff --git a/src-ts/lib/functions/index.ts b/src-ts/lib/functions/index.ts
@@ -10,5 +10,6 @@ export * from './error-functions'
 export * from './file-functions'
 export * from './logging-functions'
 export * from './text-format-functions'
+export * from './survey-functions'
 export * from './user-functions'
 export * from './xhr-functions'
diff --git a/src-ts/lib/functions/survey-functions/index.ts b/src-ts/lib/functions/survey-functions/index.ts
@@ -0,0 +1 @@
+export { triggerForUser as surveyTriggerForUser } from './survey.functions'
diff --git a/src-ts/lib/functions/survey-functions/survey.functions.ts b/src-ts/lib/functions/survey-functions/survey.functions.ts
@@ -0,0 +1,22 @@
+import { sprig, SprigAPI } from '@sprig-technologies/sprig-browser'
+
+import { EnvironmentConfig } from '../../../config'
+
+const Sprig: SprigAPI = sprig.configure({
+    environmentId: EnvironmentConfig.SPRIG.ENVIRONMENT_ID,
+})
+
+export function triggerForUser(surveyName: string, userId?: number): void {
+
+    if (!userId) {
+        Sprig.track(surveyName)
+        return
+    }
+
+    Sprig.identifyAndTrack({
+        anonymousId: '',
+        eventName: surveyName,
+        metadata: undefined,
+        userId: `${userId}`,
+    })
+}
diff --git a/src-ts/lib/global-config.model.ts b/src-ts/lib/global-config.model.ts
@@ -16,6 +16,9 @@ export interface GlobalConfig {
         SERVICE: string
     }
     REAUTH_OFFSET: number
+    SPRIG: {
+        ENVIRONMENT_ID: string
+    }
     STRIPE: {
         ADMIN_TOKEN: string
         API_KEY: string

diff --git a/src-ts/lib/index.ts b/src-ts/lib/index.ts
@@ -18,6 +18,7 @@ export {
     logError,
     logInfo,
     logInitialize,
+    surveyTriggerForUser,
     textFormatDateLocaleShortString,
     textFormatGetSafeString,
     textFormatMoneyLocaleString,

diff --git a/src-ts/tools/learn/course-details/CourseDetailsPage.tsx b/src-ts/tools/learn/course-details/CourseDetailsPage.tsx
@@ -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>

diff --git a/src-ts/tools/learn/course-details/course-curriculum/CourseCurriculum.tsx b/src-ts/tools/learn/course-details/course-curriculum/CourseCurriculum.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,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { triggerForUser as surveyTriggerForUser } from './survey.functions'