From 9bda120b61b4a6b7749c928103113eb17c08c517 Mon Sep 17 00:00:00 2001 From: kate Date: Wed, 1 Mar 2023 12:12:05 +0100 Subject: [PATCH 01/15] Display job postings in chronological order --- apps/redi-talent-pool/src/services/api/api.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/redi-talent-pool/src/services/api/api.tsx b/apps/redi-talent-pool/src/services/api/api.tsx index 9a35cf319..eb67c267c 100644 --- a/apps/redi-talent-pool/src/services/api/api.tsx +++ b/apps/redi-talent-pool/src/services/api/api.tsx @@ -358,13 +358,12 @@ export async function fetchAllTpJobListingsUsingFilters({ export async function fetchAllTpJobListings(): Promise> { const userId = getAccessTokenFromLocalStorage().userId - const resp = await http(`${API_URL}/redUsers/${userId}/tpJobListings`) - - // TODO: remove the `.filter()`. It - // was inserted temporarily for the "dummy" job listings we created for HR Summit - // 2021. Once the event is over, they can be removed from database completely. - // Reason for filter here is so companies don't see these dummy job listings. - return resp.data.filter((listing) => !listing.dummy) + return http( + `${API_URL}/redUsers/${userId}/tpJobListings?filter=${JSON.stringify({ + order: 'createdAt DESC', + limit: 0, + })}` + ).then((resp) => resp.data) } export async function fetchOneTpJobListingOfCurrentUser( From 5fadd46114a9a951dca219bff230275d05ae8bae Mon Sep 17 00:00:00 2001 From: kate Date: Wed, 1 Mar 2023 12:25:48 +0100 Subject: [PATCH 02/15] Display CVs in chronological order --- apps/redi-talent-pool/src/services/api/api.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/redi-talent-pool/src/services/api/api.tsx b/apps/redi-talent-pool/src/services/api/api.tsx index eb67c267c..2386e411a 100644 --- a/apps/redi-talent-pool/src/services/api/api.tsx +++ b/apps/redi-talent-pool/src/services/api/api.tsx @@ -222,10 +222,14 @@ export async function updateCurrentUserTpJobseekerProfile( export async function fetchAllCurrentUserTpJobseekerCv(): Promise< Array> -> { + > { const userId = getAccessTokenFromLocalStorage().userId - const resp = await http(`${API_URL}/redUsers/${userId}/tpJobseekerCv`) - return resp.data + return http( + `${API_URL}/redUsers/${userId}/tpJobseekerCv?filter=${JSON.stringify({ + order: 'createdAt DESC', + limit: 0, + })}`) + .then((resp) => resp.data) } export async function fetchCurrentUserTpJobseekerCvById( From 3d4ab058bb736681f6b12c927fb66d197ca6883c Mon Sep 17 00:00:00 2001 From: kate Date: Mon, 6 Mar 2023 10:33:21 +0100 Subject: [PATCH 03/15] Fix colors for FormSelect, add typed props --- .../organisms/DeclineMentorshipButton.tsx | 2 +- .../organisms/EditableEducation.tsx | 2 +- .../organisms/EditableLanguages.tsx | 2 +- .../organisms/EditableMenteeCount.tsx | 2 +- .../organisms/EditableOccupation.tsx | 2 +- .../organisms/EditablePersonalDetail.tsx | 4 +-- .../organisms/EditableRediClass.tsx | 2 +- .../organisms/modules/MSessions.tsx | 2 +- .../src/pages/front/signup/SignUp.tsx | 2 +- .../EditableJobPostings.tsx | 8 ++--- .../EditableEducation.tsx | 6 ++-- .../EditableImportantDetails.tsx | 6 ++-- .../EditableLanguages.tsx | 4 +-- .../EditableNamePhotoLocation.tsx | 2 +- .../EditableOverview.tsx | 4 +-- .../EditableProfessionalExperience.tsx | 4 +-- .../EditableSummary.tsx | 2 +- .../src/pages/front/signup/SignUp.tsx | 6 ++-- .../src/lib/atoms/FormSelect.styles.ts | 4 +-- .../src/lib/atoms/FormSelect.tsx | 30 ++++++++++++------- 20 files changed, 52 insertions(+), 44 deletions(-) diff --git a/apps/redi-connect/src/components/organisms/DeclineMentorshipButton.tsx b/apps/redi-connect/src/components/organisms/DeclineMentorshipButton.tsx index ceda55426..c873758cd 100644 --- a/apps/redi-connect/src/components/organisms/DeclineMentorshipButton.tsx +++ b/apps/redi-connect/src/components/organisms/DeclineMentorshipButton.tsx @@ -97,7 +97,7 @@ const DeclineMentorshipButton = ({ name="ifDeclinedByMentor_chosenReasonForDecline" label="" items={formDeclineOptions} - {...formik} + formik={formik} /> {formik.values.ifDeclinedByMentor_chosenReasonForDecline === 'other' ? ( diff --git a/apps/redi-connect/src/components/organisms/EditableEducation.tsx b/apps/redi-connect/src/components/organisms/EditableEducation.tsx index 13a231294..b0f9c0441 100644 --- a/apps/redi-connect/src/components/organisms/EditableEducation.tsx +++ b/apps/redi-connect/src/components/organisms/EditableEducation.tsx @@ -72,7 +72,7 @@ const EditableEducation = ({ profile, profileSaveStart }: any) => { name="mentee_highestEducationLevel" placeholder="Education Level" items={formEducationLevels} - {...formik} + formik={formik} /> ) diff --git a/apps/redi-connect/src/components/organisms/EditableLanguages.tsx b/apps/redi-connect/src/components/organisms/EditableLanguages.tsx index 19a4f831b..90ee9c63b 100644 --- a/apps/redi-connect/src/components/organisms/EditableLanguages.tsx +++ b/apps/redi-connect/src/components/organisms/EditableLanguages.tsx @@ -60,7 +60,7 @@ const EditableLanguages = ({ profile, profileSaveStart }: any) => { items={formLanguages} multiselect placeholder="Start typing and select languages" - {...formik} + formik={formik} /> ) diff --git a/apps/redi-connect/src/components/organisms/EditableMenteeCount.tsx b/apps/redi-connect/src/components/organisms/EditableMenteeCount.tsx index 13be2968a..4ba01ada8 100644 --- a/apps/redi-connect/src/components/organisms/EditableMenteeCount.tsx +++ b/apps/redi-connect/src/components/organisms/EditableMenteeCount.tsx @@ -91,7 +91,7 @@ const EditableMenteeCount = ({ profile, profileSaveStart }: any) => { name="menteeCountCapacity" placeholder="Mentee count" items={formMenteeCountCapacityOptions} - {...formik} + formik={formik} /> { name="mentee_occupationCategoryId" placeholder="Current Occupation" items={formMenteeOccupationCategories} - {...formik} + formik={formik} /> {occupation === 'job' && ( <> diff --git a/apps/redi-connect/src/components/organisms/EditablePersonalDetail.tsx b/apps/redi-connect/src/components/organisms/EditablePersonalDetail.tsx index cf03480f9..bdd918b1a 100644 --- a/apps/redi-connect/src/components/organisms/EditablePersonalDetail.tsx +++ b/apps/redi-connect/src/components/organisms/EditablePersonalDetail.tsx @@ -1,9 +1,7 @@ -import React from 'react' import { subYears } from 'date-fns' import { FormDatePicker, - FormInput, FormSelect, } from '@talent-connect/shared-atomic-design-components' import { Editable } from '@talent-connect/shared-atomic-design-components' @@ -68,7 +66,7 @@ const EditablePersonalDetail = ({ profile, profileSaveStart }: any) => { name="gender" placeholder="Prefer not to answer" items={formGenders} - {...formik} + formik={formik} /> { label="Which course are you taking at ReDI?" name="mentee_currentlyEnrolledInCourse" items={formCourses} - {...formik} + formik={formik} /> ) diff --git a/apps/redi-connect/src/components/organisms/modules/MSessions.tsx b/apps/redi-connect/src/components/organisms/modules/MSessions.tsx index 07b6c8e0d..292c35a3e 100644 --- a/apps/redi-connect/src/components/organisms/modules/MSessions.tsx +++ b/apps/redi-connect/src/components/organisms/modules/MSessions.tsx @@ -163,7 +163,7 @@ const MSessions = ({ name="minuteDuration" placeholder="Add the duration of the session" items={formMentoringSessionDurationOptions} - {...formik} + formik={formik} /> diff --git a/apps/redi-connect/src/pages/front/signup/SignUp.tsx b/apps/redi-connect/src/pages/front/signup/SignUp.tsx index b403af740..47190e791 100644 --- a/apps/redi-connect/src/pages/front/signup/SignUp.tsx +++ b/apps/redi-connect/src/pages/front/signup/SignUp.tsx @@ -199,7 +199,7 @@ export default function SignUp() { name="mentee_currentlyEnrolledInCourse" placeholder="Choose your ReDI Course" items={formCourses} - {...formik} + formik={formik} /> )} diff --git a/apps/redi-talent-pool/src/components/organisms/company-profile-editables/EditableJobPostings.tsx b/apps/redi-talent-pool/src/components/organisms/company-profile-editables/EditableJobPostings.tsx index 92ec85166..ef8d83c87 100644 --- a/apps/redi-talent-pool/src/components/organisms/company-profile-editables/EditableJobPostings.tsx +++ b/apps/redi-talent-pool/src/components/organisms/company-profile-editables/EditableJobPostings.tsx @@ -274,7 +274,7 @@ function ModalForm({ label="Location (Federal State in Germany)" items={federalStatesOptions} placeholder="Select federal states" - {...formik} + formik={formik} /> @@ -382,7 +382,7 @@ export function JobseekerFormSectionEducation({ name={`education[${index}].endDateMonth`} label="Ended in month*" items={formMonthsOptions} - {...formik} + formik={formik} /> diff --git a/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableImportantDetails.tsx b/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableImportantDetails.tsx index 5ac16a034..869e88764 100644 --- a/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableImportantDetails.tsx +++ b/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableImportantDetails.tsx @@ -310,7 +310,7 @@ export function JobseekerFormSectionImportantDetails({ label="What kind of employment are you looking for?*" name="desiredEmploymentType" items={formDesiredEmploymentType} - {...formik} + formik={formik} multiselect placeholder="Select desired employment types" closeMenuOnSelect={false} @@ -319,7 +319,7 @@ export function JobseekerFormSectionImportantDetails({ label="When are you available to start?*" name="availability" items={formAvailabilityOptions} - {...formik} + formik={formik} /> {formik.values.availability === 'date' ? ( )} diff --git a/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableLanguages.tsx b/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableLanguages.tsx index b0265560d..32f35aed8 100644 --- a/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableLanguages.tsx +++ b/apps/redi-talent-pool/src/components/organisms/jobseeker-profile-editables/EditableLanguages.tsx @@ -251,13 +251,13 @@ export function JobseekerFormSectionLanguages({ name={`workingLanguages[${index}].language`} label="Language*" items={formLanguages} - {...formik} + formik={formik} /> 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 ce3533b4b..2a055132e 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 @@ -208,7 +208,7 @@ function ModalForm({ name="federalState" label="Your place of residence (state)*" items={federalStatesOptions} - {...formik} + formik={formik} /> )}