From d9f1d16d238006eaddf36349fde37b504a6f492b Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 20 Jul 2023 19:43:16 +0300 Subject: [PATCH 1/2] MP-90 work status --- .../OpenForGigs/OpenForGigs.module.scss | 4 ++++ .../profile-header/OpenForGigs/OpenForGigs.tsx | 3 ++- .../member-profile/profile-header/ProfileHeader.tsx | 13 ++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.module.scss b/src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.module.scss index 3525fc84c..7f31ba279 100644 --- a/src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.module.scss +++ b/src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.module.scss @@ -11,4 +11,8 @@ color: $black-100; padding-right: $sp-2; } + + .notOopenToWork { + color: $red-100; + } } diff --git a/src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.tsx b/src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.tsx index e00887df0..1895b54c5 100644 --- a/src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.tsx +++ b/src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.tsx @@ -1,6 +1,7 @@ import { Dispatch, FC, SetStateAction, useEffect, useMemo, useState } from 'react' import { useSearchParams } from 'react-router-dom' import { KeyedMutator } from 'swr' +import classNames from 'classnames' import { useMemberTraits, UserProfile, UserTrait, UserTraitIds, UserTraits } from '~/libs/core' @@ -60,7 +61,7 @@ const OpenForGigs: FC = (props: OpenForGigsProps) => { return props.canEdit || openForWork ? (
-

+

{openForWork?.availableForGigs ? 'open to work' : 'not open to work'}

{ diff --git a/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx b/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx index 30bf3e287..548e2f290 100644 --- a/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx +++ b/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx @@ -53,11 +53,6 @@ const ProfileHeader: FC = (props: ProfileHeaderProps) => { } = useMemberTraits(props.profile.handle, { traitIds: UserTraitIds.personalization }) - const openForWork: UserTrait | undefined - = useMemo(() => memberPersonalizationTraits?.[0]?.traits?.data?.find( - (trait: UserTrait) => trait.availableForGigs, - ), [memberPersonalizationTraits]) - const namesAndHandleAppearanceData: UserTrait | undefined = useMemo(() => memberPersonalizationTraits?.[0]?.traits?.data?.find( (trait: UserTrait) => trait.namesAndHandleAppearance, @@ -113,9 +108,7 @@ const ProfileHeader: FC = (props: ProfileHeaderProps) => { function renderOpenForWork(): JSX.Element { return (
- - {canEdit ? 'I am' : `${props.profile.firstName} is`} - + My status: {/* Enable this with talent search app */} {/* { @@ -208,7 +201,9 @@ const ProfileHeader: FC = (props: ProfileHeaderProps) => { )} { - openForWork || canEdit ? renderOpenForWork() : undefined + // Showing only when they can edit until we have the talent search app + // and enough data to make this useful + canEdit ? renderOpenForWork() : undefined } { From 2cf099093030e7e99143e85f16ac981f625a3acd Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 20 Jul 2023 19:54:22 +0300 Subject: [PATCH 2/2] MP-258 modal fixes --- .../ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx b/src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx index b5f9bce56..f12b7d63f 100644 --- a/src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx +++ b/src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx @@ -229,7 +229,7 @@ const ModifyWorkExpirenceModal: FC = (props: Modi onClose={props.onClose} open size='lg' - title='Experience' + title={`${addingNewItem ? 'Add ' : (editedItemIndex !== undefined ? 'Edit ' : '')}Experience`} buttons={(