fix(UI): fix newsletter form

src/app/form/footer-form/footer-form.component.ts

@@ -25,7 +25,6 @@ export class FooterFormComponent {
   @Input() nbPagesForm: number;
   @Input() form: UntypedFormGroup;
   @Input() linkedStructureId: string[] = null;
-  @Input() acceptNewsletter: boolean;
   @Input() currentStep: stepType;
   @Input() hasOtherPersonalOffer: boolean;
   @Input() isPersonalOfferProfile: boolean;
@@ -102,7 +101,7 @@ export class FooterFormComponent {
       user.structuresLink = this.linkedStructureId;
       try {
         await firstValueFrom(this.authService.register(user));
-        if (this.acceptNewsletter) {
+        if (this.form.value.hasAcceptedNewsletter) {
           this.newsletterService.subscribe(user.email).subscribe();
         }
         document.getElementsByClassName('page')[0].scrollTo(0, 0);

src/app/form/form-view/account-form/account-form.component.html

@@ -12,11 +12,7 @@
     />
   </ng-container>
   <ng-container *ngIf="currentStep === accountFormStepEnum.accountNewsletter">
-    <app-account-newsletter
-      [accountForm]="accountForm"
-      [profile]="profile"
-      (acceptNewsletter)="acceptReceiveNewsletter($event)"
-    />
+    <app-account-newsletter [accountForm]="accountForm" [profile]="profile" (validateForm)="setValidationsForm()" />
   </ng-container>
   <ng-container *ngIf="currentStep === accountFormStepEnum.confirmEmailSentInfo">
     <app-information-step [step]="accountFormStepEnum.confirmEmailSentInfo" [formType]="formType.account" />

src/app/form/form-view/account-form/account-form.component.ts

@@ -50,7 +50,7 @@ export class AccountFormComponent implements OnInit, OnChanges {
         this.accountForm.get('confirmPassword').valid,
     };
     this.pagesValidation[accountFormStep.accountNewsletter] = {
-      valid: true,
+      valid: this.accountForm.get('hasAcceptedNewsletter').value !== null,
     };
     this.pagesValidation[accountFormStep.confirmEmailSentInfo] = {
       valid: true,
@@ -74,7 +74,4 @@ export class AccountFormComponent implements OnInit, OnChanges {
     const isPageValid = this.pagesValidation[this.currentStep].valid;
     this.pageValid.emit(isPageValid);
   }
-  public acceptReceiveNewsletter(accept: boolean): void {
-    this.acceptNewsletter.emit(accept);
-  }
 }

src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html

@@ -8,14 +8,14 @@
       [id]="'yes'"
       [label]="'Oui'"
       [value]="true"
-      [selected]="userAcceptNewsletter"
+      [selected]="accountForm.get('hasAcceptedNewsletter').value === true"
       (click)="acceptReceiveNewsletter(true)"
     />
     <app-radio-option
       [id]="'no'"
       [label]="'Non'"
       [value]="false"
-      [selected]="!userAcceptNewsletter"
+      [selected]="accountForm.get('hasAcceptedNewsletter').value === false"
       (click)="acceptReceiveNewsletter(false)"
     />
   </div>

src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.ts

@@ -9,11 +9,10 @@ import { User } from '../../../../models/user.model';
 export class AccountNewsletterComponent {
   @Input() accountForm: UntypedFormGroup;
   @Input() profile: User;
-  @Output() acceptNewsletter = new EventEmitter<any>();
-  public userAcceptNewsletter = false;
+  @Output() validateForm = new EventEmitter<any>();
 
   public acceptReceiveNewsletter(accepts: boolean): void {
-    this.userAcceptNewsletter = accepts;
-    this.acceptNewsletter.emit(accepts);
+    this.accountForm.get('hasAcceptedNewsletter').setValue(accepts);
+    this.validateForm.emit();
   }
 }

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

@@ -25,7 +25,6 @@
       [isAccountMode]="isAccountMode"
       (goNext)="nextPage()"
       (pageValid)="validatePage($event)"
-      (acceptNewsletter)="acceptReceiveNewsletter($event)"
     />
     <app-profile-form
       *ngIf="formType[routeParam] === formType.profile"
@@ -66,7 +65,6 @@
     [form]="currentForm"
     [linkedStructureId]="linkedStructureId"
     [isValid]="isPageValid"
-    [acceptNewsletter]="userAcceptNewsletter"
     [hasOtherPersonalOffer]="hasOtherPersonalOffer"
     [isPersonalOfferProfile]="isPersonalOfferProfile"
     [isEditMode]="isEditMode"

src/app/form/form-view/form-view.component.ts

@@ -37,7 +37,6 @@ export class FormViewComponent implements OnInit, AfterViewInit {
   public formUtils = new FormUtils();
   // Account Form
   public accountForm: UntypedFormGroup;
-  public userAcceptNewsletter: boolean;
   // Profile Form
   public profileForm: UntypedFormGroup;
   public isPersonalOfferProfile = false;
@@ -214,6 +213,7 @@ export class FormViewComponent implements OnInit, AfterViewInit {
           Validators.pattern(CustomRegExp.PASSWORD), // NOSONAR
         ]),
         confirmPassword: new UntypedFormControl(''),
+        hasAcceptedNewsletter: new UntypedFormControl(null),
       },
       [MustMatch('password', 'confirmPassword')],
     );
@@ -235,10 +235,6 @@ export class FormViewComponent implements OnInit, AfterViewInit {
     });
   }
 
-  public acceptReceiveNewsletter(isAccepted: boolean): void {
-    this.userAcceptNewsletter = isAccepted;
-  }
-
   private createPersonalOfferForm(personalOffer: PersonalOffer): void {
     this.personalOfferForm = new UntypedFormGroup({
       categories: new UntypedFormGroup({