Merge pull request #260 from topcoder-platform/TCA-105_rename-cert

TCA-105 Learn Config -> dev

Author: testflyjets

src-ts/config/environments/environment.default.config.ts

@@ -16,7 +16,6 @@ export const EnvironmentConfigDefault: GlobalConfig = {
         V5: 'https://api.topcoder-dev.com/v5',
     },
     ENV: AppHostEnvironment.default,
-    LEARN_SRC: 'https://fcc.topcoder-dev.com:4431',
     LOGGING: {
         PUBLIC_TOKEN: 'puba0825671e469d16f940c5a30dc738f11',
         SERVICE: 'platform-ui',

src-ts/config/environments/environment.dev.config.ts

@@ -12,7 +12,6 @@ export const EnvironmentConfigDev: GlobalConfig = {
     },
     DISABLED_TOOLS: [],
     ENV: AppHostEnvironment.dev,
-    LEARN_SRC: 'https://freecodecamp.topcoder-dev.com',
     // TODO: Move stripe creds to .env file
     STRIPE: {
         ADMIN_TOKEN:

src-ts/config/environments/environment.prod.config.ts

@@ -19,7 +19,6 @@ export const EnvironmentConfigProd: GlobalConfig = {
     },
     DISABLED_TOOLS: [ ],
     ENV: AppHostEnvironment.prod,
-    LEARN_SRC: 'https://freecodecamp.topcoder.com',
     // TODO: Move stripe creds to .env file
     STRIPE: {
         ADMIN_TOKEN:

src-ts/config/environments/index.ts

@@ -1 +1,2 @@
+export * from './app-host-environment.enum'
 export { default as EnvironmentConfig } from './environment.config'

src-ts/lib/global-config.model.ts

@@ -11,7 +11,6 @@ export interface GlobalConfig {
     }
     DISABLED_TOOLS?: Array<string>
     ENV: string
-    LEARN_SRC: string,
     LOGGING: {
         PUBLIC_TOKEN: string
         SERVICE: string

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

@@ -45,15 +45,15 @@ import { TitleNav } from './title-nav'
 const FreeCodeCamp: FC<{}> = () => {
 
     const {
-        profile,
         initialized: profileReady,
+        isLoggedIn,
+        profile,
     }: ProfileContextData = useContext(profileContext)
-    const isLoggedIn: boolean = !!profile
 
     const navigate: NavigateFunction = useNavigate()
     const routeParams: Params<string> = useParams()
-
     const providerParam: string = routeParams.provider ?? ''
+
     const [certificationParam, setCourseParam]: [string, Dispatch<SetStateAction<string>>] = useState(routeParams.certification ?? '')
     const [moduleParam, setModuleParam]: [string, Dispatch<SetStateAction<string>>] = useState(routeParams.module ?? '')
     const [lessonParam, setLessonParam]: [string, Dispatch<SetStateAction<string>>] = useState(routeParams.lesson ?? '')
@@ -178,7 +178,8 @@ const FreeCodeCamp: FC<{}> = () => {
                 lesson.course.certificationId,
                 lesson.course.id,
                 currentLesson
-            ).then(setCertificateProgress)
+            )
+                .then(setCertificateProgress)
         } else {
             // TODO: remove this delay!!
             // TEMP_FIX: delay this api call to allow for previous "completeLesson" call to write in the api
@@ -297,7 +298,7 @@ const FreeCodeCamp: FC<{}> = () => {
         if (lessonPath !== lessonParam) {
             setLessonParam(lessonPath)
         }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         // DO NOT UPDATE THIS DEPS ARRAY!!
         // we do not care about changes to the other deps

src-ts/tools/learn/free-code-camp/fcc-frame/FccFrame.tsx

@@ -1,6 +1,6 @@
 import { FC, memo, MutableRefObject, useEffect, useRef } from 'react'
 
-import { EnvironmentConfig } from '../../../../config'
+import { LearnConfig } from '../../learn-config'
 import { LearnLessonMeta } from '../../learn-lib'
 
 import styles from './FccFrame.module.scss'
@@ -33,14 +33,14 @@ const FccFrame: FC<FccFrameProps> = (props: FccFrameProps) => {
         }
 
         if (!frameIsReady.current) {
-            Object.assign(frameRef.current, { src: `${EnvironmentConfig.LEARN_SRC}/${props.lesson.lessonUrl}` })
+            Object.assign(frameRef.current, { src: `${LearnConfig.CLIENT}/${props.lesson.lessonUrl}` })
         } else {
             frameRef.current.contentWindow.postMessage(JSON.stringify({
                 data: { path: `/${lessonUrl}` },
                 event: 'fcc:url:update',
             }), '*')
         }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         lessonUrl,
     ])
@@ -52,7 +52,7 @@ const FccFrame: FC<FccFrameProps> = (props: FccFrameProps) => {
         const handleEvent: (event: any) => void = (event: any) => {
             const { data: jsonData, origin }: { data: string, origin: string } = event
 
-            if (origin.indexOf(EnvironmentConfig.LEARN_SRC) === -1) {
+            if (origin.indexOf(LearnConfig.CLIENT) === -1) {
                 return
             }
 

src-ts/tools/learn/learn-config/index.ts

@@ -0,0 +1 @@
+export { default as LearnConfig } from './learn.config'

src-ts/tools/learn/learn-config/learn-config.model.ts

@@ -0,0 +1,4 @@
+export interface LearnConfigModel {
+    API: string
+    CLIENT: string
+}

src-ts/tools/learn/learn-config/learn.bsouza.config.ts

@@ -0,0 +1,6 @@
+import { LearnConfigModel } from './learn-config.model'
+import { LearnConfigDefault } from './learn.default.config'
+
+export const LearnConfigBsouza: LearnConfigModel = {
+    ...LearnConfigDefault,
+}