@dsivd/prestations-ng 18.1.0-beta.2 → 18.1.0-beta.4

package/CHANGELOG.md

@@ -18,7 +18,7 @@
 
 - [foehn-page.component.ts](projects/prestations-ng/src/foehn-page/foehn-page.component.ts)
 
-    - Added `@Input() showBeforeUnloadNativeConfirmAlert = true;` to display or hide native browser alert message when closing the tab, closing the browser or reloading the page while having unsaved data.
+    - Added `@Input() showBeforeUnloadNativeConfirmAlert = true;` to display or hide native browser alert message when closing the tab, closing the browser or reloading the page while having unsaved data or a gesdem reference.
 
 - [foehn-modal.component.ts](projects/prestations-ng/src/foehn-modal/foehn-modal.component.ts)
 - [foehn-help-modal.component.ts](projects/prestations-ng/src/foehn-help-modal/foehn-help-modal.component.ts)

package/fesm2022/dsivd-prestations-ng.mjs

@@ -1722,19 +1722,17 @@ class FoehnFormComponent {
         }
         this.ngFormComponent.form.markAsUntouched();
         this.ngFormComponent.form.markAsPristine();
-        this.registerNgModelService.setHasInteractions(false);
     }
     ngOnDestroy() {
         this.registerNgModelServiceSubscription?.unsubscribe();
         this.formValueChangesSubscription?.unsubscribe();
-        this.registerNgModelService.setHasInteractions(false);
     }
     ngAfterViewInit() {
         this.updateRegisteredNgModels();
         // eslint-disable-next-line rxjs-angular/prefer-async-pipe
         this.childrenInputComponents.changes.subscribe(() => this.updateRegisteredNgModels());
-        // eslint-disable-next-line rxjs-angular/prefer-async-pipe
         this.formValueChangesSubscription =
+            // eslint-disable-next-line rxjs-angular/prefer-async-pipe
             this.ngFormComponent.form.valueChanges.subscribe(() => {
                 if (this.ngFormComponent.form.dirty) {
                     this.registerNgModelService.setHasInteractions(true);
@@ -3585,9 +3583,13 @@ class AbstractPageComponent {
                 this._gesdemService.lastResponse.form &&
                 this._gesdemService.lastResponse.form.language;
             this._dictionaryService.changeLanguage(languageCode);
+            if (this.reference) {
+                this._registerNgModelService.setHasInteractions(true);
+            }
             if (!shouldPreventNavigationToLast &&
                 this.reference &&
                 GesdemStatutUtils.isFinal(ActionStatut[statut])) {
+                this._registerNgModelService.setHasInteractions(false);
                 this._navigation.last();
             }
             if (this.reference &&
@@ -3667,8 +3669,9 @@ class AbstractPageComponent {
             return EMPTY;
         }))
             .subscribe(() => {
-            this._registerNgModelService.setHasInteractions(false);
             if (!this._gesdemService.lastResponse.errors.length) {
+                // Do not show warning alert on closing tab or navigator when form has been transmitted
+                this._registerNgModelService.setHasInteractions(false);
                 this._gesdemEventService.formTransmittedSubject.next(this._gesdemService.lastResponse);
                 this._navigation.next();
             }
@@ -3706,11 +3709,7 @@ class AbstractPageComponent {
     }
     onFormSent(goToNextPage) {
         // Some pages don't have a form.
-        if (!this.foehnFormComponent) {
-            this._registerNgModelService.setHasInteractions(false);
-        }
-        else {
-            // NB: Reset the form sets hasInteractions to false
+        if (this.foehnFormComponent) {
             this.foehnFormComponent.reset();
         }
         this._navigation.current().then(() => {