diff --git a/apps/redi-connect/src/components/organisms/MentorProfileCard.tsx b/apps/redi-connect/src/components/organisms/MentorProfileCard.tsx index edf6e806a..fb4abbaba 100644 --- a/apps/redi-connect/src/components/organisms/MentorProfileCard.tsx +++ b/apps/redi-connect/src/components/organisms/MentorProfileCard.tsx @@ -29,7 +29,7 @@ export function MentorProfileCard({ categories, } = mentorProfile const tags = categories.map((category) => CATEGORIES_MAP[category]) - const location = `ReDI ${REDI_LOCATION_NAMES[rediLocation]}` + const location = REDI_LOCATION_NAMES[rediLocation] const avatar = profileAvatarImageS3Key || placeholderImage return ( diff --git a/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.generated.ts b/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.generated.ts index e8eb9b132..3b522ff44 100644 --- a/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.generated.ts +++ b/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.generated.ts @@ -1,7 +1,7 @@ // THIS FILE IS GENERATED, DO NOT EDIT! import * as Types from '@talent-connect/data-access'; -export type JobseekerProfileCardJobseekerProfilePropFragment = { __typename?: 'TpJobseekerDirectoryEntry', id: string, fullName: string, desiredPositions?: Array | null, topSkills?: Array | null, profileAvatarImageS3Key?: string | null, federalState?: Types.FederalState | null, workingLanguages?: Array<{ __typename?: 'TpJobseekerProfileLanguageRecord', language: Types.Language }> | null }; +export type JobseekerProfileCardJobseekerProfilePropFragment = { __typename?: 'TpJobseekerDirectoryEntry', id: string, fullName: string, desiredPositions?: Array | null, topSkills?: Array | null, profileAvatarImageS3Key?: string | null, location?: string | null, workingLanguages?: Array<{ __typename?: 'TpJobseekerProfileLanguageRecord', language: Types.Language }> | null }; export const JobseekerProfileCardJobseekerProfilePropFragmentDoc = ` fragment JobseekerProfileCardJobseekerProfileProp on TpJobseekerDirectoryEntry { @@ -10,7 +10,7 @@ export const JobseekerProfileCardJobseekerProfilePropFragmentDoc = ` desiredPositions topSkills profileAvatarImageS3Key - federalState + location workingLanguages { language } diff --git a/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.graphql b/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.graphql index 0c1de6274..52c8dc61b 100644 --- a/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.graphql +++ b/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.graphql @@ -4,7 +4,7 @@ fragment JobseekerProfileCardJobseekerProfileProp on TpJobseekerDirectoryEntry { desiredPositions topSkills profileAvatarImageS3Key - federalState + location workingLanguages { language } diff --git a/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.tsx b/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.tsx index 7f27dcae1..b50c16859 100644 --- a/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.tsx +++ b/apps/redi-talent-pool/src/components/organisms/JobseekerProfileCard.tsx @@ -6,7 +6,6 @@ import { NewProfileCard } from '../../../../../libs/shared-atomic-design-compone import placeholderImage from '../../assets/img-placeholder.png' import { JobseekerProfileCardJobseekerProfilePropFragment } from './JobseekerProfileCard.generated' import './JobseekerProfileCard.scss' -import { germanFederalStates } from '@talent-connect/talent-pool/config' interface JobseekerProfileCardProps { jobseekerProfile: JobseekerProfileCardJobseekerProfilePropFragment @@ -26,7 +25,7 @@ export function JobseekerProfileCard({ profileAvatarImageS3Key, fullName, desiredPositions, - federalState, + location, workingLanguages, topSkills, } = jobseekerProfile @@ -38,7 +37,6 @@ export function JobseekerProfileCard({ const languages = workingLanguages?.map(({ language }) => language) const tags = topSkills?.map((skill) => topSkillsIdToLabelMap[skill]) const avatar = profileAvatarImageS3Key || placeholderImage - const location = `Based in ${germanFederalStates[federalState]}` return (
diff --git a/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableNamePhotoLocation.tsx b/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableNamePhotoLocation.tsx index ac0b61b49..57a1ac067 100644 --- a/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableNamePhotoLocation.tsx +++ b/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableNamePhotoLocation.tsx @@ -132,8 +132,8 @@ const validationSchema = Yup.object({ lastName: Yup.string() .transform(toPascalCaseAndTrim) .required('Your last name is required'), - location: Yup.string().ensure().required('Your location is required'), - federalState: Yup.mixed().required('Please select the state you live in'), + location: Yup.string().required('Your location is required'), + federalState: Yup.string().required('Please select the state you live in'), }) function ModalForm({ diff --git a/libs/shared-atomic-design-components/src/lib/molecules/NewProfileCard.tsx b/libs/shared-atomic-design-components/src/lib/molecules/NewProfileCard.tsx index b0d400557..dd5351745 100644 --- a/libs/shared-atomic-design-components/src/lib/molecules/NewProfileCard.tsx +++ b/libs/shared-atomic-design-components/src/lib/molecules/NewProfileCard.tsx @@ -33,7 +33,7 @@ const UserLocation = ({ location }) => { alt="Location" className="new-profile-card__location-icon" /> -

{location}

+

ReDI {location}

) }