@dsivd/prestations-ng 19.2.0-beta.6 → 19.2.0-beta.7

package/CHANGELOG.md

@@ -122,6 +122,10 @@ Please check the [UPGRADING_V19.md](UPGRADING_V19.md) guide for more information
     - dynamic list: a model changed by the project (another value, `null`) is displayed again; once a value had been
       displayed, the display no longer followed the model. The elements loaded for the search of the user still do
       not replace what they type.
+- `foehn-input-address` without zone.js: an address given by the parent right after the initialization of the
+  component (e.g. prefilled with `SessionInfoWithApplicationService.prefillForm()` for a connected user) is no
+  longer overwritten by the model with the default country only; the default country and the clean-up of the model
+  are applied after the next rendering, from the latest model.
 - `foehn-input-address`: the deferred clean-up of the model (hidden address lines and post office box) applies
   to the latest model, it could restore a previous value (e.g. remove the default country); nothing is
   updated anymore once the component is destroyed.

package/fesm2022/dsivd-prestations-ng.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, inject, InjectionToken, model, input, viewChildren, viewChild, forwardRef, output, computed, linkedSignal, DestroyRef, signal, effect, untracked, PendingTasks, Directive, ChangeDetectorRef, Pipe, Component, contentChildren, EnvironmentInjector, runInInjectionContext, afterNextRender, ElementRef, Injector, makeEnvironmentProviders, ErrorHandler, provideBrowserGlobalErrorListeners, provideAppInitializer, importProvidersFrom, NgZone, contentChild, TemplateRef } from '@angular/core';
 import { takeUntilDestroyed, toSignal, toObservable, outputToObservable } from '@angular/core/rxjs-interop';
 import { Router, ActivatedRoute, RouterLink, NavigationStart, NavigationEnd } from '@angular/router';
-import { Subject, BehaviorSubject, combineLatest, of, filter as filter$1, tap as tap$1, throwError, switchMap as switchMap$1, forkJoin, from, concatMap, toArray, EMPTY, startWith, merge, noop, interval, withLatestFrom, Observable, map as map$1, concat } from 'rxjs';
+import { Subject, BehaviorSubject, combineLatest, of, filter as filter$1, tap as tap$1, throwError, switchMap as switchMap$1, forkJoin, from, concatMap, toArray, EMPTY, startWith, merge, noop, interval, withLatestFrom, map as map$1, concat } from 'rxjs';
 import { filter, shareReplay, tap, map, debounceTime, catchError, switchMap, first, finalize, throttleTime, mergeMap, share, take, distinctUntilChanged, startWith as startWith$1, takeWhile, takeUntil } from 'rxjs/operators';
 import { HttpClient, HttpEventType, HttpResponse, HTTP_INTERCEPTORS, HttpStatusCode, HttpResponseBase, HttpErrorResponse, HttpParams, provideHttpClient, withInterceptorsFromDi, withInterceptors } from '@angular/common/http';
 import * as i1 from '@angular/forms';
@@ -9044,34 +9044,6 @@ class StreetNumber {
 }
 const isDefined$1 = (value) => value === true || value === false;
 const hasInputChanged$1 = (change) => change && !ObjectHelper.isEqual(change.previousValue, change.currentValue);
-/**
- * Same as `debounceTime(0)`, but the application is not stable (PendingTasks, e.g. `fixture.whenStable()`)
- * while a value is waiting to be emitted and processed synchronously by the next operators.
- */
-const debounceTimeZeroAsPendingTask = (pendingTasks) => (source) => new Observable((subscriber) => {
-    let removeTask = null;
-    const subscription = source
-        .pipe(tap(() => (removeTask ??= pendingTasks.add())), debounceTime(0))
-        .subscribe({
-        next: (value) => {
-            const removeSettledTask = removeTask;
-            removeTask = null;
-            try {
-                subscriber.next(value);
-            }
-            finally {
-                removeSettledTask?.();
-            }
-        },
-        error: (error) => subscriber.error(error),
-        complete: () => subscriber.complete(),
-    });
-    return () => {
-        subscription.unsubscribe();
-        removeTask?.();
-        removeTask = null;
-    };
-});
 class FoehnInputAddressComponent extends FoehnInputComponent {
     isOnlySwiss = input(true, ...(ngDevMode ? [{ debugName: "isOnlySwiss" }] : /* istanbul ignore next */ []));
     showPostOfficeBoxText = input(false, ...(ngDevMode ? [{ debugName: "showPostOfficeBoxText" }] : /* istanbul ignore next */ []));
@@ -9118,8 +9090,9 @@ class FoehnInputAddressComponent extends FoehnInputComponent {
     streetCustomErrors = signal({}, ...(ngDevMode ? [{ debugName: "streetCustomErrors" }] : /* istanbul ignore next */ []));
     httpClient = inject(HttpClient);
     dictionaryService = inject(SdkDictionaryService);
-    addressPendingTasks = inject(PendingTasks);
+    addressInjector = inject(Injector);
     isSanitizationScheduled = false;
+    isDefaultCountryScheduled = false;
     iso2IdSubject = new BehaviorSubject(null);
     zipCodeIdSubject = new BehaviorSubject(null);
     estrIdSubject = new BehaviorSubject(null);
@@ -9355,32 +9328,21 @@ class FoehnInputAddressComponent extends FoehnInputComponent {
         return ObjectHelper.isDifferent(value, sanitized) ? sanitized : null;
     }
     /**
-     * The sanitized model is set in a macrotask (not while the view is checked) and computed from the latest model
-     * (e.g. the default country may have been set in between). The application is not stable until it is done.
+     * The sanitized model is set after the next rendering (not while the view is checked), from the latest model: the
+     * model given by the parent in between (e.g. prefilled asynchronously) has been received, it is not overwritten.
      */
     scheduleModelSanitization() {
         if (this.isSanitizationScheduled) {
             return;
         }
         this.isSanitizationScheduled = true;
-        const removeTask = this.addressPendingTasks.add();
-        const timeoutId = setTimeout(() => {
-            unregisterOnDestroy();
+        afterNextRender(() => {
             this.isSanitizationScheduled = false;
-            try {
-                const sanitized = this.getSanitizedModel(this.model());
-                if (sanitized) {
-                    this.updateNgModel(sanitized);
-                }
+            const sanitized = this.getSanitizedModel(this.model());
+            if (sanitized) {
+                this.updateNgModel(sanitized);
             }
-            finally {
-                removeTask();
-            }
-        });
-        const unregisterOnDestroy = this._destroyRef.onDestroy(() => {
-            clearTimeout(timeoutId);
-            removeTask();
-        });
+        }, { injector: this.addressInjector });
     }
     replaceAtLeastOneNotNull(notNullErrorLabel) {
         if (!this.showPostOfficeBoxText()) {
@@ -9522,29 +9484,45 @@ class FoehnInputAddressComponent extends FoehnInputComponent {
             this.isEmpty(this.addressLine2()));
     }
     manageDefaultCountry() {
-        // The application is not stable until the debounced changes are processed (the model can be updated).
         combineLatest([
-            this.countryModelChangeSubject.asObservable().pipe(debounceTimeZeroAsPendingTask(this.addressPendingTasks), distinctUntilChanged((previous, current) => previous?.iso2Id === current?.iso2Id)),
+            this.countryModelChangeSubject
+                .asObservable()
+                .pipe(distinctUntilChanged((previous, current) => previous?.iso2Id === current?.iso2Id)),
             this.isOnlySwissChangeSubject
                 .asObservable()
-                .pipe(debounceTimeZeroAsPendingTask(this.addressPendingTasks), distinctUntilChanged()),
+                .pipe(distinctUntilChanged()),
         ])
-            .pipe(tap(([country, isOnlySwiss]) => {
-            if (!isOnlySwiss &&
-                !country &&
-                !this.isCountryInputDirty()) {
-                this.setDefaultCountry();
-                return;
-            }
-            if (isOnlySwiss) {
-                // When there is a country, we need to check if it has to be cleaned and set to default
-                if (country && !ObjectHelper.isEmpty(country)) {
-                    this.clearAutocompletesWhenCountryIsUnappropriatedToComponentConfiguration();
-                }
-                this.setDefaultCountry();
+            .pipe(takeUntilDestroyed(this._destroyRef))
+            .subscribe(() => this.scheduleDefaultCountry());
+    }
+    /**
+     * The default country is applied after the next rendering (once for the changes of the same rendering), from the
+     * latest state: without zone.js, a model given by the parent in between (e.g. prefilled asynchronously) is only
+     * received with the next change detection, it must not be overwritten by the model with the default country only.
+     */
+    scheduleDefaultCountry() {
+        if (this.isDefaultCountryScheduled) {
+            return;
+        }
+        this.isDefaultCountryScheduled = true;
+        afterNextRender(() => {
+            this.isDefaultCountryScheduled = false;
+            this.applyDefaultCountry();
+        }, { injector: this.addressInjector });
+    }
+    applyDefaultCountry() {
+        const country = this.country();
+        if (!this.isOnlySwiss() && !country && !this.isCountryInputDirty()) {
+            this.setDefaultCountry();
+            return;
+        }
+        if (this.isOnlySwiss()) {
+            // When there is a country, we need to check if it has to be cleaned and set to default
+            if (country && !ObjectHelper.isEmpty(country)) {
+                this.clearAutocompletesWhenCountryIsUnappropriatedToComponentConfiguration();
             }
-        }), takeUntilDestroyed(this._destroyRef))
-            .subscribe();
+            this.setDefaultCountry();
+        }
     }
     isCountryInputDirty() {
         const countryAutocomplete = this.countryAutocomplete();