[EN-4026] chore(inputs): continue testing

cypress/e2e/parcours-travailler.cy.js

@@ -38,7 +38,7 @@ describe('Parcours travailler', () => {
       '[email protected]'
     );
     cy.get('[data-testid="form-candidate-inscription-heardAbout"]').click();
-    cy.get('[data-testid="select-option-LinkedIn"]').click();
+    cy.get('[data-testid="select-option-linkedin"]').click();
     cy.get('[data-testid="form-candidate-inscription-infoCoSubtitle"]').should(
       'include.text',
       Cypress.env('adresseLocauxParis')

src/api/api.ts

@@ -13,7 +13,6 @@ import {
   ContactCandidate,
   ContactNewsletter,
   ExternalOpportunityDto,
-  Opportunity,
   OpportunityJoin,
   OpportunityUserEvent,
   PutCandidate,

src/api/types.ts

@@ -11,7 +11,12 @@ import {
 import { AdminZone, Department } from 'src/constants/departements';
 import { AdminRole, Gender, UserRole } from 'src/constants/users';
 
-export type SocialMedia = 'facebook' | 'linkedin' | 'twitter' |'whatsapp' | 'other';
+export type SocialMedia =
+  | 'facebook'
+  | 'linkedin'
+  | 'twitter'
+  | 'whatsapp'
+  | 'other';
 
 export const APIRoutes = {
   USERS: 'user',
@@ -80,7 +85,6 @@ export type User = {
   hashReset: string;
   saltReset: string;
   zone: AdminZone;
-  userToCoach: string;
   organization: Organization;
   deletedAt?: string;
 };

src/components/backoffice/admin/members/MemberDetails/EditMemberModal.tsx

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import React, { useCallback, useEffect, useMemo } from 'react';
 import UIkit from 'uikit';
-import { ExtractFormSchemaValidation } from '../../../../forms/FormSchema';
 import { Api } from 'src/api';
 import { User, UserDto } from 'src/api/types';
 import { useOnMemberFormSubmit } from 'src/components/backoffice/admin/useOnMemberFormSubmit';
+import { ExtractFormSchemaValidation } from 'src/components/forms/FormSchema';
 import { formAddUser } from 'src/components/forms/schemas/formAddUser';
 import { openModal } from 'src/components/modals/Modal';
 import { ModalConfirm } from 'src/components/modals/Modal/ModalGeneric/ModalConfirm';
@@ -108,7 +108,15 @@ export function EditMemberModal({ user, setUser }: EditMemberModal) {
       },
       onCancel: () => setFilledUserFields({}),
       defaultValues: {
-        ...user,
+        firstName: user.firstName,
+        lastName: user.lastName,
+        email: user.email,
+        role: user.role,
+        adminRole: user.adminRole,
+        gender: user.gender,
+        phone: user.phone,
+        address: user.address,
+        zone: user.zone,
         organizationId: organization,
         userToLinkId: userToLink,
       },
@@ -121,6 +129,7 @@ export function EditMemberModal({ user, setUser }: EditMemberModal) {
     userToLink,
   ]);
 
+  // TODO TEST AND FIX
   useEffect(() => {
     if (
       !_.isEmpty(filledUserFields) &&

src/components/backoffice/candidate/ExternalCoach/ExternalCoachMemberList.tsx

@@ -30,23 +30,26 @@ export const ExternalCoachMemberList = () => {
   useEffect(() => {
     if (user) {
       const getRelatedUsers = async () => {
-        const relatedUsersPromises = user.coaches.map(async (relatedUser) => {
-          const { candidat, ...relatedUserWithoutCandidate } = relatedUser;
-          try {
-            const response = await Api.getCVByCandidateId(candidat.id);
-            return {
-              ...candidat,
-              candidat: {
-                ...relatedUserWithoutCandidate,
-                cvs: [response.data],
-              },
-            };
-          } catch (err) {
-            console.error(err);
-          }
-        });
-        const membersData = await Promise.all(relatedUsersPromises);
-        setMembers(membersData);
+        if (user.coaches) {
+          const relatedUsersPromises = user.coaches.map(async (relatedUser) => {
+            const { candidat, ...relatedUserWithoutCandidate } = relatedUser;
+            try {
+              const response = await Api.getCVByCandidateId(candidat.id);
+              return {
+                ...candidat,
+                candidat: {
+                  ...relatedUserWithoutCandidate,
+                  cvs: [response.data],
+                },
+              };
+            } catch (err) {
+              console.error(err);
+            }
+          });
+          const membersData = await Promise.all(relatedUsersPromises);
+          setMembers(membersData);
+        }
+
         setLoading(false);
       };
       getRelatedUsers();

src/components/forms/FormFooter/FormFooter.tsx

@@ -12,6 +12,8 @@ interface FooterFormProps {
   formId: string;
   noCompulsory?: boolean;
 }
+
+// TODO NEW STYLE
 export const FormFooter = ({
   error,
   onSubmit,

src/components/forms/FormWithValidation.tsx

@@ -8,13 +8,13 @@ import { Text } from 'src/components/utils/Inputs/Text';
 import { AnyCantFix } from 'src/utils/Types';
 import {
   ComponentException,
+  ExtractFormSchemaValidation,
+  FormField,
   FormSchema,
   isFormFieldGroup,
+  isFormFieldInput,
   isFormFieldMultiple,
   isFormFieldText,
-  ExtractFormSchemaValidation,
-  FormField,
-  isFormFieldInput,
 } from './FormSchema';
 import { StyledForm } from './Forms.styles';
 import { GenericField } from './fields/GenericField';
@@ -71,8 +71,8 @@ export function FormWithValidation<S extends FormSchema<AnyCantFix>>({
 
   const onValidForm: SubmitHandler<ExtractFormSchemaValidation<S>> =
     useCallback(
-      (formValues) => {
-        onSubmit(formValues, (msg) => {
+      (fieldValues) => {
+        onSubmit(fieldValues, (msg) => {
           setError(msg);
         });
       },
@@ -90,34 +90,36 @@ export function FormWithValidation<S extends FormSchema<AnyCantFix>>({
       <StyledForm
         id={formId}
         data-testid="form-with-validation"
+        onSubmit={handleSubmit(onValidForm, onErrorForm)}
         onKeyDown={(ev) => {
           if (enterToSubmit) {
             if (ev.key === 'Enter') {
-              handleSubmit(() => onValidForm(ev), onErrorForm);
+              handleSubmit(onValidForm, onErrorForm)();
             }
           }
         }}
       >
         <fieldset>
           {fields.map((field: FormField<ExtractFormSchemaValidation<S>>, i) => {
             const shouldHide = field.hide
-              ? field.hide(getValues)
+              ? field.hide(getValues, fieldOptions)
               : field.hidden;
 
-            if (shouldHide) {
-              return null;
-            }
-
             if (isFormFieldText(field)) {
+              if (shouldHide) {
+                return null;
+              }
               const title =
                 typeof field.title === 'function'
                   ? field.title(getValues)
                   : field.title;
+
               if (field.component === 'heading') {
                 return (
                   <Heading id={`${formId}-${field.id}`} title={title} key={i} />
                 );
               }
+
               if (field.component === 'text') {
                 return (
                   <Text id={`${formId}-${field.id}`} title={title} key={i} />
@@ -126,60 +128,71 @@ export function FormWithValidation<S extends FormSchema<AnyCantFix>>({
             }
 
             if (isFormFieldGroup(field)) {
+              if (shouldHide) {
+                return null;
+              }
+
               if (field.component === 'fieldgroup') {
                 const { fields: childrenFields } = field;
 
                 return (
-                  !shouldHide && (
-                    <li key={i}>
-                      <InputsContainer
-                        fields={childrenFields.map((childrenField) => {
+                  <li key={i}>
+                    <InputsContainer
+                      fields={childrenFields.map((childrenField) => {
+                        if (isFormFieldText(childrenField)) {
                           const shouldHideField = childrenField.hide
                             ? childrenField.hide(getValues)
                             : childrenField.hidden;
 
-                          if (isFormFieldText(childrenField)) {
-                            const title =
-                              typeof childrenField.title === 'function'
-                                ? childrenField.title(getValues)
-                                : childrenField.title;
-
-                            if (childrenField.component === 'text') {
-                              return (
-                                <Text
-                                  id={`${formId}-${childrenField.id}`}
-                                  title={title}
-                                  key={i}
-                                />
-                              );
-                            }
-                            throw new ComponentException(
-                              childrenField.component,
-                              field.component
+                          if (shouldHideField) {
+                            return null;
+                          }
+
+                          const title =
+                            typeof childrenField.title === 'function'
+                              ? childrenField.title(getValues)
+                              : childrenField.title;
+
+                          if (childrenField.component === 'text') {
+                            return (
+                              <Text
+                                id={`${formId}-${childrenField.id}`}
+                                title={title}
+                                key={i}
+                              />
                             );
                           }
 
-                          return !shouldHideField ? (
-                            <GenericField
-                              formSchema={formSchema}
-                              watch={watch}
-                              resetField={resetField}
-                              control={control}
-                              field={childrenField}
-                              fieldOptions={fieldOptions}
-                              updateFieldOptions={updateFieldOptions}
-                              getValue={getValues}
-                            />
-                          ) : null;
-                        })}
-                      />
-                    </li>
-                  )
+                          throw new ComponentException(
+                            childrenField.component,
+                            field.component
+                          );
+                        }
+
+                        return (
+                          <GenericField
+                            formSchema={formSchema}
+                            watch={watch}
+                            resetField={resetField}
+                            control={control}
+                            field={childrenField}
+                            fieldOptions={fieldOptions}
+                            updateFieldOptions={updateFieldOptions}
+                            getValue={getValues}
+                          />
+                        );
+                      })}
+                    />
+                  </li>
                 );
               }
             }
 
             if (isFormFieldMultiple(field)) {
+              if (shouldHide) {
+                return null;
+              }
+
               if (field.component === 'multiple-fields') {
                 const {
                   fields: multipleFields,

src/components/forms/fields/GenericField.tsx

@@ -132,10 +132,6 @@ export function GenericField<S extends FormSchema<AnyCantFix>>({
     value,
   ]);
 
-  if (commonProps.hidden) {
-    return null;
-  }
-
   if (field.component === 'datepicker') {
     return <DatePicker {...commonProps} min={field.min} max={field.max} />;
   }

src/components/forms/schemas/formAddUser.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { isValidPhoneNumber } from 'react-phone-number-input/mobile';
 import { isEmail } from 'validator';
 import PlusFilledIcon from 'assets/custom/icons/plus-filled.svg';
-import { FormSchema, GetValueType } from '../FormSchema';
+import { FormSchema, FormSchemaValidation, GetValueType } from '../FormSchema';
 import { Api } from 'src/api';
 import { ADMIN_ZONES_FILTERS, AdminZone } from 'src/constants/departements';
 import { COLORS } from 'src/constants/styles';
@@ -31,7 +31,7 @@ const CREATE_NEW_ORGANIZATION_OPTION = {
   ),
 };
 
-type FormAddUserSchema = {
+interface FormAddUserSchema extends FormSchemaValidation {
   firstName: string;
   lastName: string;
   role: UserRole;
@@ -49,7 +49,8 @@ type FormAddUserSchema = {
   referentLastNameOrganization: string;
   referentPhoneOrganization: string;
   referentMailOrganization: string;
-};
+}
+
 const hideMethod = (getValue: GetValueType<FormAddUserSchema>) => {
   const role = getValue('role');
   const organizationId = getValue('organizationId')?.value;
@@ -79,15 +80,13 @@ export const formAddUser: FormSchema<FormAddUserSchema> = {
           component: 'text-input',
           title: 'Prénom *',
           isRequired: true,
-          maxLength: 80,
         },
         {
           id: 'lastName',
           name: 'lastName',
           component: 'text-input',
           title: 'Nom *',
           isRequired: true,
-          maxLength: 80,
         },
       ],
     },