Merge branch 'feat/v6' of github.com:topcoder-platform/platform-ui into feat/v6

Author: jmgasper

src/apps/onboarding/src/components/modal-add-work/index.tsx

@@ -4,7 +4,7 @@ import classNames from 'classnames'
 import moment from 'moment'
 
 import { Button, IconSolid, InputDatePicker, InputSelect, InputText, Tooltip } from '~/libs/ui'
-import { INDUSTRIES_OPTIONS } from '~/libs/shared'
+import { getIndustryOptionLabel, getIndustryOptionValue, INDUSTRIES_OPTIONS } from '~/libs/shared'
 
 import FormInputCheckbox from '../form-input-checkbox'
 import OnboardingBaseModal from '../onboarding-base-modal'
@@ -23,8 +23,8 @@ interface ModalAddWorkProps {
 
 const industryOptions: any = _.sortBy(INDUSTRIES_OPTIONS)
     .map(v => ({
-        label: v,
-        value: v,
+        label: getIndustryOptionLabel(v),
+        value: getIndustryOptionValue(v),
     }))
 
 const ModalAddWork: FC<ModalAddWorkProps> = (props: ModalAddWorkProps) => {

src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx

@@ -11,7 +11,7 @@ import {
     UserTraitCategoryNames,
     UserTraitIds,
 } from '~/libs/core'
-import { INDUSTRIES_OPTIONS } from '~/libs/shared'
+import { getIndustryOptionLabel, getIndustryOptionValue, INDUSTRIES_OPTIONS } from '~/libs/shared'
 
 import { WorkExpirenceCard } from '../WorkExpirenceCard'
 
@@ -58,8 +58,8 @@ const ModifyWorkExpirenceModal: FC<ModifyWorkExpirenceModalProps> = (props: Modi
 
     const industryOptions: any = sortBy(INDUSTRIES_OPTIONS)
         .map(v => ({
-            label: v,
-            value: v,
+            label: getIndustryOptionLabel(v),
+            value: getIndustryOptionValue(v),
         }))
 
     function handleModifyWorkExpirenceSave(): void {

src/apps/profiles/src/member-profile/work-expirence/WorkExpirenceCard/WorkExpirenceCard.tsx

@@ -3,6 +3,7 @@ import classNames from 'classnames'
 import moment from 'moment'
 
 import { UserTrait } from '~/libs/core'
+import { getIndustryOptionLabel } from '~/libs/shared'
 
 import styles from './WorkExpirenceCard.module.scss'
 
@@ -17,7 +18,7 @@ const WorkExpirenceCard: FC<WorkExpirenceCardProps> = (props: WorkExpirenceCardP
             <div className={styles.workExpirenceCardHeaderLeft}>
                 <p className='body-main-bold'>
                     {props.work.position}
-                    {props.work.industry ? `, ${props.work.industry}` : undefined}
+                    {props.work.industry ? `, ${getIndustryOptionLabel(props.work.industry)}` : undefined}
                 </p>
                 <p>
                     {props.work.company}

src/libs/shared/lib/utils/index.ts

@@ -2,5 +2,6 @@ export * from './copy-text-to-clipboard'
 export * from './files'
 export * from './generic-data-object.type'
 export * from './handle-error'
+export * from './industry'
 export * from './string'
 export * from './text-format'

src/libs/shared/lib/utils/industry.ts

@@ -0,0 +1,40 @@
+export const IndustryEnumToLabel: {
+  [key: string]: string
+} = {
+    ConsumerGoods: 'Consumer goods',
+    PublicSector: 'Public sector',
+    TechAndTechnologyService: 'Tech & technology services',
+    TravelAndHospitality: 'Travel & hospitality',
+}
+
+export const IndustryLabelToEnum: {
+  [key: string]: string
+} = {
+    'Consumer goods': 'ConsumerGoods',
+    'Public sector': 'PublicSector',
+    'Tech & technology services': 'TechAndTechnologyService',
+    'Travel & hospitality': 'TravelAndHospitality',
+}
+
+export const getIndustryOptionValue = (v: string): string => {
+    const values = Object.values(IndustryEnumToLabel)
+    const keys = Object.keys(IndustryEnumToLabel)
+    if (values.includes(v)) {
+        return IndustryLabelToEnum[v]
+    }
+
+    if (keys.includes(v)) {
+        return IndustryEnumToLabel[v]
+    }
+
+    return v
+}
+
+export const getIndustryOptionLabel = (v: string): string => {
+    const keys = Object.keys(IndustryEnumToLabel)
+    if (keys.includes(v)) {
+        return IndustryEnumToLabel[v]
+    }
+
+    return v
+}