From ee6a0610362d3111f368b7cc2e2b83665a1c51ac Mon Sep 17 00:00:00 2001 From: Emile Bex Date: Fri, 18 Aug 2023 14:47:01 +0200 Subject: [PATCH] [EN-4026] chore(inputs): continue testing --- src/api/types.ts | 11 ++-- .../backoffice/admin/AdminOpportunityList.tsx | 2 +- .../members/MemberDetails/EditMemberModal.tsx | 16 +++++- .../backoffice/admin/useOnMemberFormSubmit.ts | 4 +- .../SendMailModalContent.tsx | 8 +-- src/components/cards/CandidatCard.js | 32 +++-------- src/components/cards/StoryProfileCard.tsx | 6 +- .../CVCareerPathSentence.tsx | 4 +- .../CVCareerPathSentenceNew.tsx | 8 +-- src/components/cv/CVEditCareerPath.tsx | 2 +- .../{CVEditReviews.js => CVEditReviews.tsx} | 37 ++++++------- src/components/forms/FormWithValidation.tsx | 8 +-- .../FieldErrorMessage/FieldErrorMessage.tsx | 12 +++- src/components/forms/fields/GenericField.tsx | 25 +++++++-- .../forms/schemas/formEditCareerPath.ts | 50 +++++++++++++---- .../forms/schemas/formEditTestimonial.ts | 4 +- .../StepperModal/ModalShareCV/ModalShareCV.js | 1 + .../opportunities/OpportunityList.js | 8 +-- .../CVShareButtons/CVShareButtons.tsx | 20 +++---- .../utils/Inputs/CheckBox/CheckBox.tsx | 1 + .../utils/Inputs/DatePicker/DatePicker.tsx | 1 + src/components/utils/Inputs/Inputs.styles.ts | 27 +++++++++ src/components/utils/Inputs/Inputs.types.ts | 4 +- .../utils/Inputs/PhoneInput/PhoneInput.tsx | 2 +- .../utils/Inputs/Radio/Radio.styles.ts | 2 + src/components/utils/Inputs/Radio/Radio.tsx | 6 +- .../Inputs/SelectSimple/SelectSimple.tsx | 2 +- .../utils/Inputs/Selects/Select/Select.tsx | 2 +- .../Selects/SelectAsync/SelectAsync.tsx | 4 +- .../SelectCreatable/SelectCreatable.tsx | 2 +- .../utils/Inputs/Text/Text.styles.ts | 10 ++++ src/components/utils/Inputs/Text/Text.tsx | 5 +- .../utils/Inputs/TextArea/TextArea.styles.tsx | 15 ----- .../utils/Inputs/TextArea/TextArea.tsx | 55 +++++++++++-------- .../utils/Inputs/TextArea/useLineLimit.ts | 19 ++----- .../Inputs/TextInput/TextInput.styles.ts | 15 ----- .../utils/Inputs/TextInput/TextInput.tsx | 36 ++++++------ src/hooks/useUpdateSharesCount.ts | 16 +++--- .../candidat/[candidateId]/suivi.tsx | 43 +++++++-------- src/pages/backoffice/parametres.tsx | 2 +- src/pages/{contact.js => contact.tsx} | 3 +- src/utils/Sorting.ts | 4 +- 42 files changed, 294 insertions(+), 240 deletions(-) rename src/components/cv/{CVEditReviews.js => CVEditReviews.tsx} (84%) create mode 100644 src/components/utils/Inputs/Text/Text.styles.ts rename src/pages/{contact.js => contact.tsx} (98%) diff --git a/src/api/types.ts b/src/api/types.ts index cbffd7134..382174392 100644 --- a/src/api/types.ts +++ b/src/api/types.ts @@ -6,11 +6,12 @@ import { AmbitionsPrefixesType, BusinessLineValue, ExternalOfferOrigin, + HeardAboutValue, } from 'src/constants'; import { AdminZone, Department } from 'src/constants/departements'; import { AdminRole, Gender, UserRole } from 'src/constants/users'; -export type SocialMedia = 'facebook' | 'linkedin' | 'twitter'; +export type SocialMedia = 'facebook' | 'linkedin' | 'twitter' |'whatsapp' | 'other'; export const APIRoutes = { USERS: 'user', @@ -125,7 +126,7 @@ export interface CV { }[]; transport: string; skills: { - id: string; + id?: string; name: string; order: number; }[]; @@ -134,7 +135,7 @@ export interface CV { order: number; }[]; reviews: { - id: string; + id?: string; name: string; text: string; status: string; @@ -143,7 +144,7 @@ export interface CV { description: string; order: number; skills: { - id: string; + id?: string; name: string; order: number; }[]; @@ -376,7 +377,7 @@ export type ContactContactUs = { email: string; structure: string; message: string; - heardAbout: object; + heardAbout: HeardAboutValue; cgu: boolean; }; diff --git a/src/components/backoffice/admin/AdminOpportunityList.tsx b/src/components/backoffice/admin/AdminOpportunityList.tsx index 97d1641ed..3d083cac5 100644 --- a/src/components/backoffice/admin/AdminOpportunityList.tsx +++ b/src/components/backoffice/admin/AdminOpportunityList.tsx @@ -115,7 +115,7 @@ export const AdminOpportunityList = ({ { + async ( + fields: ExtractFormSchemaValidation, + closeModal + ) => { const updatedUser = await onSubmit(fields, closeModal); try { + const userToLinkId = Array.isArray(fields.userToLinkId) + ? fields.userToLinkId.map(({ value }) => value) + : fields.userToLinkId?.value; const { data: updatedUserWithLinkedMember } = await Api.putLinkUser( user.id, - fields.userToLinkId || null + userToLinkId || null ); setUser(updatedUserWithLinkedMember); @@ -81,7 +88,10 @@ export function EditMemberModal({ user, setUser }: EditMemberModal) { description: 'Merci de modifier les informations que vous souhaitez concernant le membre.', submitText: 'Modifier le membre', - onSubmit: async (fields, closeModal) => { + onSubmit: async ( + fields: ExtractFormSchemaValidation, + closeModal + ) => { if (fields.role !== user.role) { openModal( { - setTextAreaContent(e.target.value); - }; + const [textAreaContent, setTextAreaContent] = useState(); const object = relance ? 'Relance - demande de contact' : 'Demande de contact'; + const description = relance ? ( <> Vous pouvez ci-dessous envoyer un mail de relance pour le poste de @@ -149,7 +147,7 @@ export const SendMailModalContent = ({