Merge branch '323-missing-contact-data' into 'dev'

fix(edit-structure): missing information on structure contact

See merge request !538

src/app/form/form-view/structure-form/structure-contact/structure-contact.component.html

@@ -44,7 +44,7 @@
         (input)="utils.modifyPhoneInput(structureForm, 'contactPhone', $event.target); setValidationsForm()"
       />
       <app-svg-icon
-        *ngIf="structureForm.get('contactPhone').valid && structureForm.get('contactPhone').value"
+        *ngIf="structureForm.get('contactPhone').valid"
         [iconClass]="'icon-26'"
         [type]="'form'"
         [icon]="'validate'"

src/app/utils/formUtils.ts

@@ -80,18 +80,14 @@ export class formUtils {
         street: new UntypedFormControl(structure.address.street, Validators.required),
         commune: new UntypedFormControl(structure.address.commune, Validators.required),
       }),
-      contactMail: new UntypedFormControl(
-        structure.contactMail === '' ? null : structure.contactMail,
-        !isEditMode
-          ? [Validators.required, Validators.pattern(CustomRegExp.EMAIL)]
-          : [Validators.pattern(CustomRegExp.EMAIL)]
-      ),
-      contactPhone: new UntypedFormControl(
-        structure.contactPhone,
-        !isEditMode
-          ? [Validators.required, Validators.pattern(CustomRegExp.PHONE)]
-          : [Validators.pattern(CustomRegExp.PHONE)]
-      ),
+      contactMail: new UntypedFormControl(structure.contactMail === '' ? null : structure.contactMail, [
+        Validators.required,
+        Validators.pattern(CustomRegExp.EMAIL),
+      ]),
+      contactPhone: new UntypedFormControl(structure.contactPhone, [
+        Validators.required,
+        Validators.pattern(CustomRegExp.PHONE),
+      ]),
       contactPersonFirstname: new UntypedFormControl(
         structure.contactPersonLastName,
         !isEditMode && Validators.required