Merge branch 'feature/standardized-skills' into TSJR-111

Author: kkartunov

.circleci/config.yml

@@ -234,15 +234,13 @@ workflows:
                           ignore:
                               - master
                               - qa
-                              - profiles-app
 
             - build-qa:
                   context: org-global
                   filters:
                       branches:
                           only:
                               - qa
-                              - profiles-app
 
             - build-prod:
                   context: org-global
@@ -261,8 +259,7 @@ workflows:
                               - dev
                               - justin_fixes
                               - talent_search_fixes
-                              - PROD-4398_integrate-userflow-remove-sprig
-                              - TSJR-111
+                              - feature/standardized-skills
 
             - deployQa:
                   context: org-global

src/apps/learn/src/lib/components/skill-tags/SkillTags.tsx

@@ -5,7 +5,7 @@ import { Tooltip } from '~/libs/ui'
 import { EnvironmentConfig } from '~/config'
 
 import { SkillLabel } from '..'
-import { TCAEMSISkillType } from '../../data-providers'
+import { TCASkillType } from '../../data-providers'
 
 import styles from './SkillTags.module.scss'
 
@@ -15,7 +15,7 @@ interface SkillTagsProps {
     label?: string
     theme?: 'white' | 'gray' | undefined
     skills?: Array<string> | null | undefined
-    emsiSkills?: TCAEMSISkillType[]
+    emsiSkills?: TCASkillType[]
 }
 
 const SkillTags: FC<SkillTagsProps> = (props: SkillTagsProps) => {
@@ -24,15 +24,15 @@ const SkillTags: FC<SkillTagsProps> = (props: SkillTagsProps) => {
     const label: string = props.label ?? 'skills taught'
     const tcaEMSIEnabled: boolean = EnvironmentConfig.ENABLE_EMSI_SKILLS || false
 
-    const skills: string[] | TCAEMSISkillType[] = tcaEMSIEnabled ? (props.emsiSkills || []) : (props.skills || [])
+    const skills: string[] | TCASkillType[] = tcaEMSIEnabled ? (props.emsiSkills || []) : (props.skills || [])
 
     return (
         <div className={styles.skills}>
             {label && (
                 <span className={classNames('body-small', styles.infoText)}>{label}</span>
             )}
             {skills?.slice(0, expandCount)
-                .map((skill: string | TCAEMSISkillType) => (
+                .map((skill: string | TCASkillType) => (
                     <SkillLabel
                         skill={skill}
                         theme={theme}

src/apps/learn/src/lib/components/skill/SkillLabel.tsx

@@ -1,11 +1,11 @@
 import { FC } from 'react'
 
-import { TCAEMSISkillType } from '../../data-providers'
+import { TCASkillType } from '../../data-providers'
 
 import styles from './SkillLabel.module.scss'
 
 interface SkillLabelProps {
-    skill: string | TCAEMSISkillType
+    skill: string | TCASkillType
     theme: 'white' | 'gray' | undefined
 }
 

src/apps/learn/src/lib/data-providers/courses-provider/learn-course.model.ts

@@ -2,12 +2,12 @@ import { LearnModelBase } from '../../functions'
 import { CertificationLearnLevel, LearnCertification } from '../all-certifications-provider'
 import { LearnModule } from '../lesson-provider'
 import { ResourceProvider } from '../resource-provider-provider'
-import { TCAEMSISkillType } from '../tca-certifications-provider/tca-emsi-skill-type'
+import { TCASkillType } from '../tca-certifications-provider/tca-skill-type'
 
 export interface LearnCourse extends LearnModelBase {
     certificationId: string
     completionSuggestions: Array<string>
-    emsiSkills: Array<TCAEMSISkillType>
+    emsiSkills: Array<TCASkillType>
     estimatedCompletionTimeValue: number
     estimatedCompletionTimeUnits: string
     fccCourseUuid: string

src/apps/learn/src/lib/data-providers/tca-certifications-provider/index.ts

@@ -17,4 +17,4 @@ export * from './tca-certification-progress'
 export * from './tca-certification-enrollment-base.model'
 export * from './tca-certification-validation'
 export * from './tca-certification-enrollment'
-export * from './tca-emsi-skill-type'
+export * from './tca-skill-type'

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

@@ -5,7 +5,7 @@ import { TCACertificationCompletionTimeRange } from './tca-certification-complet
 import { TCACertificationProvider } from './tca-certification-provider.model'
 import { TCACertificationProviderBase } from './tca-certification-provider.model-base'
 import { TCACertificationResource } from './tca-certification-resource.model'
-import { TCAEMSISkillType } from './tca-emsi-skill-type'
+import { TCASkillType } from './tca-skill-type'
 
 export interface TCACertification {
     certificationCategory: TCACertificationCategory
@@ -16,7 +16,7 @@ export interface TCACertification {
     createdAt: Date
     dashedName: string
     description: string
-    emsiSkills: Array<TCAEMSISkillType>
+    emsiSkills: Array<TCASkillType>
     id: number
     introText: string
     learnerLevel: TCACertificationLearnLevel

src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-emsi-skill-type.ts renamed to src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-skill-type.ts

@@ -1,4 +1,4 @@
-export type TCAEMSISkillType = {
+export type TCASkillType = {
     assessed: boolean
     confidence: number
     emsiId: string

src/apps/learn/src/welcome/tc-certifications/cert-card/TCCertCard.tsx

@@ -19,7 +19,7 @@ import {
     TCACertification,
     TCACertificationProgress,
     TCACertificationProviderBase,
-    TCAEMSISkillType,
+    TCASkillType,
 } from '../../../lib'
 
 import styles from './TCCertCard.module.scss'
@@ -43,7 +43,7 @@ const TCCertCard: FC<TCCertCardProps> = (props: TCCertCardProps) => {
         skills: string[],
         providers: Array<TCACertificationProviderBase>,
         dashedName: string
-        emsiSkills: TCAEMSISkillType[]
+        emsiSkills: TCASkillType[]
     } = props.certification
 
     const isEnrolled: boolean = props.progress?.status === 'enrolled'

src/apps/onboarding/src/models/MemberInfo.ts

@@ -1,5 +1,6 @@
-import { MemberEmsiSkill, MemberMaxRating } from '~/apps/talent-search/src/lib/models'
+import { MemberMaxRating } from '~/apps/talent-search/src/lib/models'
 import { MemberStats } from '~/libs/core'
+import { Skill } from '~/libs/shared'
 
 import MemberAddress from './MemberAddress'
 
@@ -13,7 +14,7 @@ export default interface MemberInfo {
     email: string
     accountAge: number
     maxRating: MemberMaxRating
-    emsiSkills: Array<MemberEmsiSkill>
+    emsiSkills: Array<Skill>
     stats: Array<MemberStats>
     addresses?: MemberAddress[]
     country: string

src/apps/onboarding/src/pages/skills/index.tsx

@@ -16,12 +16,12 @@ export const PageSkillsContent: FC<{
 }> = props => {
     const navigate: any = useNavigate()
     const [loading, setLoading] = useState(false)
-    const { formInput: emsiFormInput, saveSkills: saveEmsiSkills }: MemberSkillEditor = useMemberSkillEditor()
+    const editor: MemberSkillEditor = useMemberSkillEditor()
 
     async function saveSkills(): Promise<void> {
         setLoading(true)
         try {
-            await saveEmsiSkills()
+            await editor.saveSkills()
         } catch (error) {
         }
 
@@ -46,7 +46,7 @@ export const PageSkillsContent: FC<{
                         Understanding your skills will allow us to connect you to the right opportunities.
                     </span>
                     <div className='mt-16 full-width color-black-80'>
-                        {emsiFormInput}
+                        {editor.formInput}
                     </div>
                 </div>
             </div>