Merge pull request #859 from topcoder-platform/dev

Member Profiles - BAU Sprint 6

Author: kkartunov

.environments/.env.prod

@@ -14,7 +14,7 @@ REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
 
 REACT_APP_MEMBER_VERIFY_LOOKER=3322
 
-REACT_APP_SPRIG_ENV_ID=bUcousVQ0-yF
+REACT_APP_SPRIG_ENV_ID=a-IZBZ6-r7bU
 
 # Filestack configuration for uploading Submissions
 REACT_APP_FILESTACK_API_KEY=

src/apps/accounts/src/settings/tabs/account/user-and-pass/UserAndPassword.tsx

@@ -11,7 +11,7 @@ import {
 } from '~/libs/ui'
 import {
     updateMemberPasswordAsync,
-    updateMemberTraitsAsync,
+    updateOrCreateMemberTraitsAsync,
     useMemberTraits,
     UserProfile,
     UserTrait,
@@ -69,7 +69,7 @@ const UserAndPassword: FC<UserAndPasswordProps> = (props: UserAndPasswordProps)
     }
 
     function handleUserConsentChange(): void {
-        updateMemberTraitsAsync(props.profile.handle, [{
+        updateOrCreateMemberTraitsAsync(props.profile.handle, [{
             categoryName: 'Personalization',
             traitId: 'personalization',
             traits: {

src/apps/accounts/src/settings/tabs/tcandyou/communities/Communities.tsx

@@ -3,7 +3,7 @@ import { bind } from 'lodash'
 import { KeyedMutator } from 'swr'
 import { toast } from 'react-toastify'
 
-import { updateMemberTraitsAsync, useMemberTraits, UserProfile, UserTraits } from '~/libs/core'
+import { updateOrCreateMemberTraitsAsync, useMemberTraits, UserProfile, UserTraits } from '~/libs/core'
 import { Button, Collapsible, FormToggleSwitch } from '~/libs/ui'
 import { triggerSprigSurvey } from '~/apps/accounts/src/lib'
 
@@ -38,7 +38,7 @@ const Communities: FC<CommunitiesProps> = (props: CommunitiesProps) => {
             [communityId]: !memberCommunities?.[communityId],
         }
 
-        updateMemberTraitsAsync(props.profile.handle, [{
+        updateOrCreateMemberTraitsAsync(props.profile.handle, [{
             categoryName: 'Communities',
             traitId: 'communities',
             traits: {

src/apps/accounts/src/settings/tabs/tools/devices/Devices.tsx

@@ -5,8 +5,8 @@ import { toast } from 'react-toastify'
 import classNames from 'classnames'
 
 import {
-    createMemberTraitsAsync,
     updateMemberTraitsAsync,
+    updateOrCreateMemberTraitsAsync,
     useMemberDevicesLookup,
     UserProfile,
     UserTrait,
@@ -31,11 +31,6 @@ interface DevicesProps {
     profile: UserProfile
 }
 
-const methodsMap: { [key: string]: any } = {
-    create: createMemberTraitsAsync,
-    update: updateMemberTraitsAsync,
-}
-
 const Devices: FC<DevicesProps> = (props: DevicesProps) => {
     const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()
 
@@ -293,7 +288,7 @@ const Devices: FC<DevicesProps> = (props: DevicesProps) => {
                         setIsEditMode(false)
                     })
             } else {
-                methodsMap[!deviceTypesData || !deviceTypesData.length ? 'create' : 'update'](
+                updateOrCreateMemberTraitsAsync(
                     props.profile.handle,
                     [{
                         categoryName: 'Device',

src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx

@@ -3,7 +3,7 @@ import { bind, isEmpty, reject, trim } from 'lodash'
 import { toast } from 'react-toastify'
 import classNames from 'classnames'
 
-import { createMemberTraitsAsync, updateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
+import { updateMemberTraitsAsync, updateOrCreateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
 import { Button, Collapsible, ConfirmModal, IconOutline, InputSelect, InputText } from '~/libs/ui'
 import {
     FinancialInstitutionIcon,
@@ -23,11 +23,6 @@ interface ServiceProviderProps {
     profile: UserProfile
 }
 
-const methodsMap: { [key: string]: any } = {
-    create: createMemberTraitsAsync,
-    update: updateMemberTraitsAsync,
-}
-
 const ServiceProvider: FC<ServiceProviderProps> = (props: ServiceProviderProps) => {
     const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()
 
@@ -166,7 +161,7 @@ const ServiceProvider: FC<ServiceProviderProps> = (props: ServiceProviderProps)
                         setIsEditMode(false)
                     })
             } else {
-                methodsMap[!serviceProviderTypesData || !serviceProviderTypesData.length ? 'create' : 'update'](
+                updateOrCreateMemberTraitsAsync(
                     props.profile.handle,
                     [{
                         categoryName: 'Service Provider',

src/apps/accounts/src/settings/tabs/tools/software/Software.tsx

@@ -3,7 +3,7 @@ import { bind, isEmpty, reject, trim } from 'lodash'
 import { toast } from 'react-toastify'
 import classNames from 'classnames'
 
-import { createMemberTraitsAsync, updateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
+import { updateMemberTraitsAsync, updateOrCreateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
 import { Button, Collapsible, ConfirmModal, IconOutline, InputSelect, InputText } from '~/libs/ui'
 import { SettingSection, SoftwareIcon, triggerSprigSurvey } from '~/apps/accounts/src/lib'
 
@@ -15,11 +15,6 @@ interface SoftwareProps {
     profile: UserProfile
 }
 
-const methodsMap: { [key: string]: any } = {
-    create: createMemberTraitsAsync,
-    update: updateMemberTraitsAsync,
-}
-
 const Software: FC<SoftwareProps> = (props: SoftwareProps) => {
     const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()
 
@@ -154,7 +149,7 @@ const Software: FC<SoftwareProps> = (props: SoftwareProps) => {
                         setIsEditMode(false)
                     })
             } else {
-                methodsMap[!softwareTypesData || !softwareTypesData.length ? 'create' : 'update'](
+                updateOrCreateMemberTraitsAsync(
                     props.profile.handle,
                     [{
                         categoryName: 'Software',

src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx

@@ -3,7 +3,7 @@ import { bind, isEmpty, reject, trim } from 'lodash'
 import { toast } from 'react-toastify'
 import classNames from 'classnames'
 
-import { createMemberTraitsAsync, updateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
+import { updateMemberTraitsAsync, updateOrCreateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
 import { Button, Collapsible, ConfirmModal, IconOutline, InputText } from '~/libs/ui'
 import { SettingSection, SubscriptionsIcon, triggerSprigSurvey } from '~/apps/accounts/src/lib'
 
@@ -14,11 +14,6 @@ interface SubscriptionsProps {
     profile: UserProfile
 }
 
-const methodsMap: { [key: string]: any } = {
-    create: createMemberTraitsAsync,
-    update: updateMemberTraitsAsync,
-}
-
 const Subscriptions: FC<SubscriptionsProps> = (props: SubscriptionsProps) => {
     const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()
 
@@ -139,7 +134,7 @@ const Subscriptions: FC<SubscriptionsProps> = (props: SubscriptionsProps) => {
                         setIsEditMode(false)
                     })
             } else {
-                methodsMap[!subscriptionsTypesData || !subscriptionsTypesData.length ? 'create' : 'update'](
+                updateOrCreateMemberTraitsAsync(
                     props.profile.handle,
                     [{
                         categoryName: 'Subscription',

src/apps/learn/src/tca-certificate/user-certification-view/UserCertificationViewBase.tsx

@@ -5,6 +5,7 @@ import {
     SetStateAction,
     useEffect,
     useLayoutEffect,
+    useMemo,
     useRef,
     useState,
 } from 'react'
@@ -44,6 +45,11 @@ const UserCertificationViewBase: FC<UserCertificationViewBaseProps> = (props: Us
     const isOwnProfile: boolean = !!props.profile?.email
 
     const isModalView: boolean = queryParams.get('view-style') === 'modal'
+    const userName = useMemo(() => (
+        !!(props.profile?.firstName || props.profile?.lastName)
+            ? `${props.profile.firstName} ${props.profile.lastName}`
+            : props.enrollment?.userName
+    ), [props.profile, props.enrollment])
 
     const [isMemberVerified, setIsMemberVerified]: [boolean, Dispatch<SetStateAction<boolean>>]
         = useState<boolean>(false)
@@ -95,7 +101,7 @@ const UserCertificationViewBase: FC<UserCertificationViewBaseProps> = (props: Us
                         completionUuid={props.enrollment.completionUuid ?? undefined}
                         isMemberVerified={isMemberVerified}
                         userProfile={props.profile}
-                        userName={props.enrollment.userName}
+                        userName={userName}
                         isOwner={isOwnProfile}
                         validationUrl={validationUrl}
                         isPreview={props.isPreview}

src/apps/profiles/src/lib/helpers.ts

@@ -71,6 +71,8 @@ export function subTrackLabelToHumanName(label: string): string {
             return 'Development'
         case 'ARCHITECTURE':
             return 'Architecture'
+        case 'UI_PROTOTYPE_COMPETITION':
+            return 'UI Prototype Competition'
 
         default: return label
     }

src/apps/profiles/src/member-profile/MemberProfilePage.tsx

@@ -31,7 +31,7 @@ const MemberProfilePage: FC<{}> = () => {
         if (routeParams.memberHandle) {
             profileGetPublicAsync(routeParams.memberHandle)
                 .then(userProfile => {
-                    setProfile(userProfile)
+                    setProfile({ ...userProfile } as UserProfile)
                     setProfileReady(true)
                 })
             // TODO: NOT FOUND PAGE redirect/dispaly
@@ -41,7 +41,7 @@ const MemberProfilePage: FC<{}> = () => {
     const refreshProfile = useCallback((handle: string) => (
         profileGetPublicAsync(handle)
             .then(userProfile => {
-                setProfile(userProfile)
+                setProfile({ ...userProfile } as UserProfile)
                 if (userProfile) {
                     notifyUniNavi(userProfile)
                     triggerSprigSurvey(userProfile)